GNOME.org
 

ooo-build r13675 - in trunk: . patches/dev300

Author: thorstenb
Date: Tue Aug 26 10:28:32 2008
New Revision: 13675
URL: http://svn.gnome.org/viewvc/ooo-build?rev=13675&view=rev

Log:
    * patches/dev300/fit-list-to-size.diff: fixed vertical writing
    mode, fixed wrong bullet position on indented, scaled-down text.



Modified:
   trunk/ChangeLog
   trunk/patches/dev300/fit-list-to-size.diff

Modified: trunk/patches/dev300/fit-list-to-size.diff
==============================================================================
--- trunk/patches/dev300/fit-list-to-size.diff	(original)
+++ trunk/patches/dev300/fit-list-to-size.diff	Tue Aug 26 10:28:32 2008
@@ -1,5 +1,27 @@
-diff --git a/offapi/com/sun/star/drawing/TextFitToSizeType.idl b/offapi/com/sun/star/drawing/TextFitToSizeType.idl
-index 68557cc..6692ca5 100644
+ offapi/com/sun/star/drawing/TextFitToSizeType.idl |    7 +
+ qadevOOo/runner/util/ValueChanger.java            |    2 
+ sd/sdi/_drvwsh.sdi                                |   12 --
+ svx/inc/svx/sdtfsitm.hxx                          |   26 +++--
+ svx/inc/svx/svdotext.hxx                          |   10 ++
+ svx/source/dialog/textattr.cxx                    |    1 
+ svx/source/editeng/editobj2.hxx                   |   10 ++
+ svx/source/editeng/impedit3.cxx                   |    7 +
+ svx/source/editeng/impedit4.cxx                   |    6 +
+ svx/source/outliner/outliner.cxx                  |   11 ++
+ svx/source/svdraw/svdedxv.cxx                     |    4 -
+ svx/source/svdraw/svdfppt.cxx                     |   12 ++
+ svx/source/svdraw/svdotext.cxx                    |  104 +++++++++++++++++----
+ svx/source/svdraw/svdotxat.cxx                    |    3 -
+ svx/source/svdraw/svdotxed.cxx                    |   17 ++-
+ svx/source/svdraw/svdotxtr.cxx                    |    9 --
+ svx/source/svdraw/svdtxhdl.cxx                    |    3 -
+ svx/source/svdraw/svdview.cxx                     |    3 -
+ xmloff/source/draw/sdpropls.cxx                   |    4 -
+ 19 files changed, 167 insertions(+), 84 deletions(-)
+
+
+diff --git offapi/com/sun/star/drawing/TextFitToSizeType.idl offapi/com/sun/star/drawing/TextFitToSizeType.idl
+index d17a737..d33a674 100644
 --- offapi/com/sun/star/drawing/TextFitToSizeType.idl
 +++ offapi/com/sun/star/drawing/TextFitToSizeType.idl
 @@ -63,9 +63,10 @@ published enum TextFitToSizeType
@@ -16,6 +38,8 @@
   
  }; 
   
+diff --git qadevOOo/runner/util/ValueChanger.java qadevOOo/runner/util/ValueChanger.java
+index 32a295a..faeae99 100644
 --- qadevOOo/runner/util/ValueChanger.java
 +++ qadevOOo/runner/util/ValueChanger.java
 @@ -389,7 +389,7 @@ public class ValueChanger {
@@ -27,8 +51,8 @@
          if (oldValue.equals(TF1)) newValue = TF2;
          if (oldValue.equals(TF2)) newValue = TF3;
          if (oldValue.equals(TF3)) newValue = TF4;
-diff --git a/sd/sdi/_drvwsh.sdi b/sd/sdi/_drvwsh.sdi
-index d23bae2..7d5292c 100644
+diff --git sd/sdi/_drvwsh.sdi sd/sdi/_drvwsh.sdi
+index 69208fe..76ed4a3 100644
 --- sd/sdi/_drvwsh.sdi
 +++ sd/sdi/_drvwsh.sdi
 @@ -28,18 +28,6 @@
@@ -50,8 +74,8 @@
  interface DrawView
  {
  	SID_JUMPTOMARK // ole : no, status : ?
-diff --git a/svx/inc/svx/sdtfsitm.hxx b/svx/inc/svx/sdtfsitm.hxx
-index 6a583eb..abaf580 100644
+diff --git svx/inc/svx/sdtfsitm.hxx svx/inc/svx/sdtfsitm.hxx
+index 97fb158..474cf75 100644
 --- svx/inc/svx/sdtfsitm.hxx
 +++ svx/inc/svx/sdtfsitm.hxx
 @@ -34,19 +34,21 @@
@@ -88,8 +112,8 @@
  
  //--------------------------------
  // class SdrTextFitToSizeTypeItem
-diff --git a/svx/inc/svx/svdotext.hxx b/svx/inc/svx/svdotext.hxx
-index e90c491..d1fc9df 100644
+diff --git svx/inc/svx/svdotext.hxx svx/inc/svx/svdotext.hxx
+index ab9a41b..332ee89 100644
 --- svx/inc/svx/svdotext.hxx
 +++ svx/inc/svx/svdotext.hxx
 @@ -244,6 +244,9 @@ protected:
@@ -130,8 +154,8 @@
  	SdrObjKind GetTextKind() const { return eTextKind; }
  
  	virtual bool HasText() const;
-diff --git a/svx/source/dialog/textattr.cxx b/svx/source/dialog/textattr.cxx
-index 4eab4bf..b4b1114 100644
+diff --git svx/source/dialog/textattr.cxx svx/source/dialog/textattr.cxx
+index 563a367..aa64e10 100644
 --- svx/source/dialog/textattr.cxx
 +++ svx/source/dialog/textattr.cxx
 @@ -460,7 +460,6 @@ BOOL SvxTextAttrPage::FillItemSet( SfxItemSet& rAttrs)
@@ -142,8 +166,8 @@
  			case STATE_CHECK: eFTS = SDRTEXTFIT_PROPORTIONAL; break;
  		}
  		rAttrs.Put( SdrTextFitToSizeTypeItem( eFTS ) );
-diff --git a/svx/source/editeng/editobj2.hxx b/svx/source/editeng/editobj2.hxx
-index 7a4c996..bdbf26b 100644
+diff --git svx/source/editeng/editobj2.hxx svx/source/editeng/editobj2.hxx
+index 63ec23a..a44ad12 100644
 --- svx/source/editeng/editobj2.hxx
 +++ svx/source/editeng/editobj2.hxx
 @@ -115,12 +115,16 @@ class XParaPortionList : public  XBaseParaPortionList
@@ -174,8 +198,8 @@
  };
  
  /* cl removed because not needed anymore since binfilter
-diff --git a/svx/source/editeng/impedit3.cxx b/svx/source/editeng/impedit3.cxx
-index 5639cb5..aa7162c 100644
+diff --git svx/source/editeng/impedit3.cxx svx/source/editeng/impedit3.cxx
+index 6b1ccc4..0ae30f5 100644
 --- svx/source/editeng/impedit3.cxx
 +++ svx/source/editeng/impedit3.cxx
 @@ -3978,20 +3978,25 @@ void ImpEditEngine::SetFlatMode( sal_Bool bFlat )
@@ -205,11 +229,11 @@
  		UpdateViews( GetActiveView() );
  	}
  }
-diff --git a/svx/source/editeng/impedit4.cxx b/svx/source/editeng/impedit4.cxx
-index 5c308c6..f1b4669 100644
+diff --git svx/source/editeng/impedit4.cxx svx/source/editeng/impedit4.cxx
+index 684177c..8d75507 100644
 --- svx/source/editeng/impedit4.cxx
 +++ svx/source/editeng/impedit4.cxx
-@@ -1151,7 +1151,7 @@ EditTextObject*	ImpEditEngine::CreateBinTextObject( EditSelection aSel, SfxItemP
+@@ -1155,7 +1155,7 @@ EditTextObject*	ImpEditEngine::CreateBinTextObject( EditSelection aSel, SfxItemP
  	// Schwelle rauf setzen, wenn Olli die Absaetze nicht mehr zerhackt!
  	if ( bAllowBigObjects && bOnlyFullParagraphs && IsFormatted() && GetUpdateMode() && ( nTextPortions >= nBigObjectStart ) )
  	{
@@ -218,7 +242,7 @@
  		pTxtObj->SetPortionInfo( pXList );
  		for ( nNode = nStartNode; nNode <= nEndNode; nNode++  )
  		{
-@@ -1242,7 +1242,9 @@ EditSelection ImpEditEngine::InsertBinTextObject( BinTextObject& rTextObject, Ed
+@@ -1246,7 +1246,9 @@ EditSelection ImpEditEngine::InsertBinTextObject( BinTextObject& rTextObject, Ed
  	XParaPortionList* pPortionInfo = rTextObject.GetPortionInfo();
  
  	if ( pPortionInfo && ( (long)pPortionInfo->GetPaperWidth() == aPaperSize.Width() )
@@ -229,11 +253,11 @@
  	{
  		if ( ( pPortionInfo->GetRefDevPtr() == (sal_uIntPtr)GetRefDevice() ) ||
  			 ( ( pPortionInfo->GetRefDevType() == OUTDEV_VIRDEV ) &&
-diff --git a/svx/source/outliner/outliner.cxx b/svx/source/outliner/outliner.cxx
-index 9ed0fac..bd3c7ad 100644
+diff --git svx/source/outliner/outliner.cxx svx/source/outliner/outliner.cxx
+index c27272d..2cdd508 100644
 --- svx/source/outliner/outliner.cxx
 +++ svx/source/outliner/outliner.cxx
-@@ -889,7 +889,10 @@ Font Outliner::ImpCalcBulletFont( USHORT nPara ) const
+@@ -900,7 +900,10 @@ Font Outliner::ImpCalcBulletFont( USHORT nPara ) const
      }
  
      // #107508# Use original scale...
@@ -245,8 +269,21 @@
  	ULONG nScaledLineHeight = aStdFont.GetSize().Height();
  	nScaledLineHeight *= nScale*10;
  	nScaledLineHeight /= 1000;
-diff --git a/svx/source/svdraw/svdedxv.cxx b/svx/source/svdraw/svdedxv.cxx
-index 40d9ee8..d373176 100644
+@@ -943,6 +946,12 @@ void Outliner::PaintBullet( USHORT nPara, const Point& rStartPos,
+         BOOL bRightToLeftPara = pEditEngine->IsRightToLeft( nPara );
+ 
+ 		Rectangle aBulletArea( ImpCalcBulletArea( nPara, TRUE, FALSE ) );
++        USHORT nStretchX, nStretchY;
++        GetGlobalCharStretching(nStretchX, nStretchY);
++        aBulletArea = Rectangle( Point(aBulletArea.Left()*nStretchX/100,
++                                       aBulletArea.Top()),
++                                 Size(aBulletArea.GetWidth()*nStretchX/100,
++                                      aBulletArea.GetHeight()) );
+ 
+         Paragraph* pPara = pParaList->GetParagraph( nPara );
+         const SvxNumberFormat* pFmt = GetNumberFormat( nPara );
+diff --git svx/source/svdraw/svdedxv.cxx svx/source/svdraw/svdedxv.cxx
+index f6a67ac..1a20173 100644
 --- svx/source/svdraw/svdedxv.cxx
 +++ svx/source/svdraw/svdedxv.cxx
 @@ -318,7 +318,7 @@ void SdrObjEditView::ImpPaintOutlinerView(OutlinerView& rOutlView, const Rectang
@@ -267,8 +304,8 @@
  
  		if(bTextFrame && !bFitToSize) 
  		{
-diff --git a/svx/source/svdraw/svdfppt.cxx b/svx/source/svdraw/svdfppt.cxx
-index 3b7d8e7..f46ae16 100644
+diff --git svx/source/svdraw/svdfppt.cxx svx/source/svdraw/svdfppt.cxx
+index 42d0b1b..f216075 100644
 --- svx/source/svdraw/svdfppt.cxx
 +++ svx/source/svdraw/svdfppt.cxx
 @@ -1119,6 +1119,7 @@ SdrObject* SdrEscherImport::ProcessObj( SvStream& rSt, DffObjData& rObjData, voi
@@ -304,8 +341,8 @@
  			if ( !pTObj->ISA( SdrObjCustomShape ) )
  			{
  		 		pTObj->SetMergedItem( SdrTextAutoGrowWidthItem( bAutoGrowWidth ) );
-diff --git a/svx/source/svdraw/svdotext.cxx b/svx/source/svdraw/svdotext.cxx
-index 65d164b..8b8f1a0 100644
+diff --git svx/source/svdraw/svdotext.cxx svx/source/svdraw/svdotext.cxx
+index e457f0c..396e1cb 100644
 --- svx/source/svdraw/svdotext.cxx
 +++ svx/source/svdraw/svdotext.cxx
 @@ -140,6 +140,7 @@ SdrTextObj::SdrTextObj()
@@ -424,7 +461,7 @@
          {
              ULONG nStat=rOutliner.GetControlWord();
              nStat|=EE_CNTRL_STRETCHING|EE_CNTRL_AUTOPAGESIZE;
-@@ -1798,15 +1798,52 @@ void SdrTextObj::ImpSetupDrawOutlinerForPaint( FASTBOOL 		bContourFrame,
+@@ -1798,13 +1798,54 @@ void SdrTextObj::ImpSetupDrawOutlinerForPaint( FASTBOOL 		bContourFrame,
      if (!bContourFrame)
      {
          // FitToSize erstmal nicht mit ContourFrame
@@ -440,9 +477,9 @@
 +        {
 +            ImpAutoFitText(rOutliner);
 +        }
-     }
- }
- 
++    }
++}
++
 +void SdrTextObj::ImpAutoFitText( SdrOutliner& rOutliner ) const
 +{
 +    // EditEngine formatting is unstable enough for
@@ -452,9 +489,13 @@
 +    for(int i=0; i<3; ++i)
 +    {
 +        const Size aCurrTextSize = rOutliner.CalcTextSize();
-+        const double fFactor( 
-+            double(aShapeSize.Height())/
-+            (aCurrTextSize.Height()+GetTextUpperDistance()+GetTextLowerDistance()));
++        double fFactor(1.0);
++        if( IsVerticalWriting() )
++            fFactor = double(aShapeSize.Width())/
++                (aCurrTextSize.Width()+GetTextLeftDistance()+GetTextRightDistance());
++        else
++            fFactor = double(aShapeSize.Height())/
++                (aCurrTextSize.Height()+GetTextUpperDistance()+GetTextLowerDistance());
 +
 +        USHORT nCurrStretchX, nCurrStretchY;
 +        rOutliner.GetGlobalCharStretching(nCurrStretchX, nCurrStretchY);
@@ -471,16 +512,14 @@
 +            nMinStretchX = std::min(nMinStretchX,nCurrStretchX);
 +            nMinStretchY = std::min(nMinStretchY,nCurrStretchY);
 +        }
-+    }
+     }
 +
 +    rOutliner.SetGlobalCharStretching(std::min(USHORT(100),nMinStretchX),
 +                                      std::min(USHORT(100),nMinStretchY));
-+}
-+
+ }
+ 
  void SdrTextObj::SetupOutlinerFormatting( SdrOutliner& rOutl, Rectangle& rPaintRect ) const
- {
-     ImpInitDrawOutliner( rOutl );
-@@ -2397,6 +2434,17 @@ sal_Bool SdrTextObj::IsTextAnimationAllowed() const
+@@ -2394,6 +2435,17 @@ sal_Bool SdrTextObj::IsTextAnimationAllowed() const
  	return mbTextAnimationAllowed;
  }
  
@@ -498,7 +537,7 @@
  void SdrTextObj::SetTextAnimationAllowed(sal_Bool bNew)
  {
  	if(mbTextAnimationAllowed != bNew)
-@@ -2414,13 +2462,21 @@ void SdrTextObj::onEditOutlinerStatusEvent( EditStatus* pEditStatus )
+@@ -2411,13 +2463,21 @@ void SdrTextObj::onEditOutlinerStatusEvent( EditStatus* pEditStatus )
  	const bool bGrowY=(nStat & EE_STAT_TEXTHEIGHTCHANGED) !=0;
      if(bTextFrame && (bGrowX || bGrowY))
  	{
@@ -524,8 +563,8 @@
  	}
  }
  
-diff --git a/svx/source/svdraw/svdotxat.cxx b/svx/source/svdraw/svdotxat.cxx
-index 4d6ec63..15eb01b 100644
+diff --git svx/source/svdraw/svdotxat.cxx svx/source/svdraw/svdotxat.cxx
+index 67b6cc2..f3e4564 100644
 --- svx/source/svdraw/svdotxat.cxx
 +++ svx/source/svdraw/svdotxat.cxx
 @@ -82,8 +82,7 @@ FASTBOOL SdrTextObj::AdjustTextFrameWidthAndHeight(Rectangle& rR, FASTBOOL bHgt,
@@ -538,8 +577,8 @@
  		FASTBOOL bWdtGrow=bWdt && IsAutoGrowWidth();
  		FASTBOOL bHgtGrow=bHgt && IsAutoGrowHeight();
  		SdrTextAniKind eAniKind=GetTextAniKind();
-diff --git a/svx/source/svdraw/svdotxed.cxx b/svx/source/svdraw/svdotxed.cxx
-index 7838d97..265283b 100644
+diff --git svx/source/svdraw/svdotxed.cxx svx/source/svdraw/svdotxed.cxx
+index 7400015..0307a92 100644
 --- svx/source/svdraw/svdotxed.cxx
 +++ svx/source/svdraw/svdotxed.cxx
 @@ -75,15 +75,17 @@ sal_Bool SdrTextObj::BegTextEdit(SdrOutliner& rOutl)
@@ -587,8 +626,8 @@
  	Size aPaperMin,aPaperMax;
  	Rectangle aViewInit;
  	TakeTextAnchorRect(aViewInit);
-diff --git a/svx/source/svdraw/svdotxtr.cxx b/svx/source/svdraw/svdotxtr.cxx
-index 7b6d5d5..df448f3 100644
+diff --git svx/source/svdraw/svdotxtr.cxx svx/source/svdraw/svdotxtr.cxx
+index 6ecb8e0..621111b 100644
 --- svx/source/svdraw/svdotxtr.cxx
 +++ svx/source/svdraw/svdotxtr.cxx
 @@ -85,9 +85,6 @@ void SdrTextObj::NbcSetSnapRect(const Rectangle& rRect)
@@ -621,8 +660,8 @@
  		NbcAdjustTextFrameWidthAndHeight();
  	}
  	ImpCheckShear();
-diff --git a/svx/source/svdraw/svdtxhdl.cxx b/svx/source/svdraw/svdtxhdl.cxx
-index 69aeaa4..d1e526f 100644
+diff --git svx/source/svdraw/svdtxhdl.cxx svx/source/svdraw/svdtxhdl.cxx
+index b06de31..ff0e8f8 100644
 --- svx/source/svdraw/svdtxhdl.cxx
 +++ svx/source/svdraw/svdtxhdl.cxx
 @@ -90,8 +90,7 @@ void ImpTextPortionHandler::ConvertToPathObj(SdrObjGroup& rGroup, FASTBOOL bPoly
@@ -635,8 +674,8 @@
  	// Bei TakeTextRect wird u.a. auch der Text in
  	// den Outliner gesteckt
  	rTextObj.TakeTextRect(rOutliner,aTextRect,FALSE,&aAnchorRect);
-diff --git a/svx/source/svdraw/svdview.cxx b/svx/source/svdraw/svdview.cxx
-index f1b2a6d..e353e58 100644
+diff --git svx/source/svdraw/svdview.cxx svx/source/svdraw/svdview.cxx
+index 2e14bc7..453ddc4 100644
 --- svx/source/svdraw/svdview.cxx
 +++ svx/source/svdraw/svdview.cxx
 @@ -504,8 +504,7 @@ SdrHitKind SdrView::PickAnything(const Point& rLogicPos, SdrViewEvent& rVEvt) co
@@ -649,11 +688,11 @@
  				if (bFitToSize) {
  					Fraction aX(aTextRect.GetWidth()-1,aAnchor.GetWidth()-1);
  					Fraction aY(aTextRect.GetHeight()-1,aAnchor.GetHeight()-1);
-diff --git a/xmloff/source/draw/sdpropls.cxx b/xmloff/source/draw/sdpropls.cxx
-index 4e050a4..0859b9c 100644
+diff --git xmloff/source/draw/sdpropls.cxx xmloff/source/draw/sdpropls.cxx
+index 0182e28..9df993c 100644
 --- xmloff/source/draw/sdpropls.cxx
 +++ xmloff/source/draw/sdpropls.cxx
-@@ -621,8 +621,8 @@ SvXMLEnumMapEntry __READONLY_DATA pXML_FitToSize_Enum[] =
+@@ -624,8 +624,8 @@ SvXMLEnumMapEntry __READONLY_DATA pXML_FitToSize_Enum[] =
  {
  	{ XML_FALSE,		drawing::TextFitToSizeType_NONE },
  	{ XML_TRUE, 		drawing::TextFitToSizeType_PROPORTIONAL },
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]