Attachment #21131 for issue #39167

View | Details | Raw Unified | Return to issue 39167
Collapse All | Expand All




        }

        // 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 )
        {

            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)

                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

Return to issue 39167

Lines 462-469 Link Here

(-)source/filter/excel/xiescher.cxx (-3 / +3 lines)
462	}	462	}
463		463
464	// horizontal text alignment (#i12188# not stored in Escher stream, but in TXO)	464	// horizontal text alignment (#i12188# not stored in Escher stream, but in TXO)
465	// #i37794# always default to "full width" regardless of alignment.
466	SdrTextHorzAdjust eSdrHorAlign = SDRTEXTHORZADJUST_BLOCK;
467	SvxAdjust eEEHorAlign = SVX_ADJUST_LEFT;	465	SvxAdjust eEEHorAlign = SVX_ADJUST_LEFT;
468	switch( meHorAlign )	466	switch( meHorAlign )
469	{	467	{
Lines 472-478 Link Here
472	case xlTxoHAlignRight: eEEHorAlign = SVX_ADJUST_RIGHT; break;	470	case xlTxoHAlignRight: eEEHorAlign = SVX_ADJUST_RIGHT; break;
473	case xlTxoHAlignJustify: eEEHorAlign = SVX_ADJUST_BLOCK; break;	471	case xlTxoHAlignJustify: eEEHorAlign = SVX_ADJUST_BLOCK; break;
474	}	472	}
475	pTextObj->SetMergedItem( SdrTextHorzAdjustItem( eSdrHorAlign ) );
476	pTextObj->SetMergedItem( SvxAdjustItem( eEEHorAlign, EE_PARA_JUST ) );	473	pTextObj->SetMergedItem( SvxAdjustItem( eEEHorAlign, EE_PARA_JUST ) );
477		474
478	// vertical text alignment (#i12188# not stored in Escher stream, but in TXO)	475	// vertical text alignment (#i12188# not stored in Escher stream, but in TXO)
Lines 1502-1507 Link Here
1502	pRetSdrObj->SetMergedItem( SdrTextUpperDistItem( nMargin ) );	1499	pRetSdrObj->SetMergedItem( SdrTextUpperDistItem( nMargin ) );
1503	pRetSdrObj->SetMergedItem( SdrTextLowerDistItem( nMargin ) );	1500	pRetSdrObj->SetMergedItem( SdrTextLowerDistItem( nMargin ) );
1504	}	1501	}
		1502	// #i39167# always default to "full width" for text & textless
		1503	// objects regardless of alignment.
		1504	pRetSdrObj->SetMergedItem( SdrTextHorzAdjustItem( SDRTEXTHORZADJUST_BLOCK ) );
1505		1505
1506	// text data and text alignment properties	1506	// text data and text alignment properties
1507	// #98132# don't ask for a text-ID, Escher export doesn't set one	1507	// #98132# don't ask for a text-ID, Escher export doesn't set one