incubator-ooo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From a..@apache.org
Subject svn commit: r1394533 - /incubator/ooo/trunk/main/filter/source/msfilter/svdfppt.cxx
Date Fri, 05 Oct 2012 14:02:32 GMT
Author: alg
Date: Fri Oct  5 14:02:31 2012
New Revision: 1394533

URL: http://svn.apache.org/viewvc?rev=1394533&view=rev
Log:
#119885# corrected AutoGrowHeight setting when importing PPT text boxes

Modified:
    incubator/ooo/trunk/main/filter/source/msfilter/svdfppt.cxx

Modified: incubator/ooo/trunk/main/filter/source/msfilter/svdfppt.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/filter/source/msfilter/svdfppt.cxx?rev=1394533&r1=1394532&r2=1394533&view=diff
==============================================================================
--- incubator/ooo/trunk/main/filter/source/msfilter/svdfppt.cxx (original)
+++ incubator/ooo/trunk/main/filter/source/msfilter/svdfppt.cxx Fri Oct  5 14:02:31 2012
@@ -1170,13 +1170,17 @@ SdrObject* SdrEscherImport::ProcessObj( 
 					}
 					if ( bVerticalText )
 					{
-						bAutoGrowWidth = bFitShapeToText;	// bFitShapeToText; can't be used, because we cut
the text if it is too height,
+						bAutoGrowWidth = bFitShapeToText;
 						bAutoGrowHeight = sal_False;
 					}
 					else
 					{
 						bAutoGrowWidth = sal_False;
-						bAutoGrowHeight = sal_True;			// bFitShapeToText;	can't be used, because we cut the
text if it is too height,
+
+                        // #119885# re-activationg bFitShapeToText here, could not find deeper
explanations
+                        // for it (it was from 2005). Keeping the old commeht here for reference
+                        // old comment: // bFitShapeToText;	can't be used, because we cut
the text if it is too height,
+						bAutoGrowHeight = bFitShapeToText;
 					}
 				}
 				pTObj->SetMergedItem( SvxFrameDirectionItem( bVerticalText ? FRMDIR_VERT_TOP_RIGHT
: FRMDIR_HORI_LEFT_TOP, EE_PARA_WRITINGDIR ) );



Mime
View raw message