diff options
| author | Oliver Bolte <obo@openoffice.org> | 2006-10-11 08:29:17 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2006-10-11 08:29:17 +0000 |
| commit | f52e1e992cfbb1a56f9704da3f3f774b7a41deb9 (patch) | |
| tree | 2b1a70e49d392942dafd5880c6a519d74ccaded4 | |
| parent | 61718e5018c8a042c10e75ae252fcbe9a837a06a (diff) | |
INTEGRATION: CWS cmcfixes28 (1.110.14); FILE MERGED
2006/09/27 10:23:52 cmc 1.110.14.1: #i69841# type promotion fixes for x86_64 .ppt import line spacing
| -rw-r--r-- | svx/source/editeng/impedit3.cxx | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/svx/source/editeng/impedit3.cxx b/svx/source/editeng/impedit3.cxx index 49ab6480ccf0..b5e9ce433d32 100644 --- a/svx/source/editeng/impedit3.cxx +++ b/svx/source/editeng/impedit3.cxx @@ -4,9 +4,9 @@ * * $RCSfile: impedit3.cxx,v $ * - * $Revision: 1.111 $ + * $Revision: 1.112 $ * - * last change: $Author: obo $ $Date: 2006-10-11 08:18:56 $ + * last change: $Author: obo $ $Date: 2006-10-11 09:29:17 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -1314,10 +1314,11 @@ sal_Bool ImpEditEngine::CreateLines( USHORT nPara, sal_uInt32 nStartPosY ) if ( nPara || IsFixedCellHeight() || pLine->GetStartPortion() ) // Nicht die aller erste Zeile { // #100508# There are documents with PropLineSpace 0, why? + // (cmc: re above question :-) such documents can be seen by importing a .ppt if ( rLSItem.GetPropLineSpace() && ( rLSItem.GetPropLineSpace() != 100 ) ) { sal_uInt16 nTxtHeight = pLine->GetHeight(); - sal_uInt32 nH = nTxtHeight; + sal_Int32 nH = nTxtHeight; nH *= rLSItem.GetPropLineSpace(); nH /= 100; // Der Ascent muss um die Differenz angepasst werden: @@ -1656,10 +1657,11 @@ void ImpEditEngine::CreateAndInsertEmptyLine( ParaPortion* pParaPortion, sal_uIn if ( nPara || IsFixedCellHeight() || pTmpLine->GetStartPortion() ) // Nicht die aller erste Zeile { // #100508# There are documents with PropLineSpace 0, why? + // (cmc: re above question :-) such documents can be seen by importing a .ppt if ( rLSItem.GetPropLineSpace() && ( rLSItem.GetPropLineSpace() != 100 ) ) { sal_uInt16 nTxtHeight = pTmpLine->GetHeight(); - sal_uInt32 nH = nTxtHeight; + sal_Int32 nH = nTxtHeight; nH *= rLSItem.GetPropLineSpace(); nH /= 100; // Der Ascent muss um die Differenz angepasst werden: |