Index: source/filter/excel/xiescher.cxx =================================================================== RCS file: /cvs/sc/sc/source/filter/excel/xiescher.cxx,v retrieving revision 1.26.28.2 diff -u -r1.26.28.2 xiescher.cxx --- source/filter/excel/xiescher.cxx 4 Jan 2005 12:54:37 -0000 1.26.28.2 +++ source/filter/excel/xiescher.cxx 6 Jan 2005 13:54:39 -0000 @@ -462,8 +462,6 @@ } // horizontal text alignment (#i12188# not stored in Escher stream, but in TXO) - // #i37794# always default to "full width" regardless of alignment. - SdrTextHorzAdjust eSdrHorAlign = SDRTEXTHORZADJUST_BLOCK; SvxAdjust eEEHorAlign = SVX_ADJUST_LEFT; switch( meHorAlign ) { @@ -472,7 +470,6 @@ case xlTxoHAlignRight: eEEHorAlign = SVX_ADJUST_RIGHT; break; case xlTxoHAlignJustify: eEEHorAlign = SVX_ADJUST_BLOCK; break; } - pTextObj->SetMergedItem( SdrTextHorzAdjustItem( eSdrHorAlign ) ); pTextObj->SetMergedItem( SvxAdjustItem( eEEHorAlign, EE_PARA_JUST ) ); // vertical text alignment (#i12188# not stored in Escher stream, but in TXO) @@ -1502,6 +1499,9 @@ pRetSdrObj->SetMergedItem( SdrTextUpperDistItem( nMargin ) ); pRetSdrObj->SetMergedItem( SdrTextLowerDistItem( nMargin ) ); } + // #i39167# always default to "full width" for text & textless + // objects regardless of alignment. + pRetSdrObj->SetMergedItem( SdrTextHorzAdjustItem( SDRTEXTHORZADJUST_BLOCK ) ); // text data and text alignment properties // #98132# don't ask for a text-ID, Escher export doesn't set one