filter/source/msfilter/svdfppt.cxx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
New commits: commit a9f03c1ad14890f2cd02ebfc1c2adfe9c2b55259 Author: Xisco Fauli <[email protected]> Date: Mon Apr 1 23:18:03 2013 +0200 Related to 119875: Remove RTL_CONSTASCII_USTRINGPARAM Change-Id: I86461c14b5b73c3c7473b48bff70fd27f640ba59 diff --git a/filter/source/msfilter/svdfppt.cxx b/filter/source/msfilter/svdfppt.cxx index d65254ba..6071eb6 100644 --- a/filter/source/msfilter/svdfppt.cxx +++ b/filter/source/msfilter/svdfppt.cxx @@ -7275,8 +7275,8 @@ void ApplyCellAttributes( const SdrObject* pObj, Reference< XCell >& xCell ) //set textHorizontalAdjust and TextWritingMode attr const sal_Int32 eHA(((const SdrTextLeftDistItem&)pObj->GetMergedItem(SDRATTR_TEXT_HORZADJUST)).GetValue()); const SvxFrameDirection eDirection = (const SvxFrameDirection)((( const SvxFrameDirectionItem&)pObj->GetMergedItem(EE_PARA_WRITINGDIR)).GetValue()); - static const rtl::OUString sHorizontalAdjust( RTL_CONSTASCII_USTRINGPARAM( "TextHorizontalAdjust" ) ); - static const rtl::OUString sWritingMode( RTL_CONSTASCII_USTRINGPARAM("TextWritingMode") ); + static const rtl::OUString sHorizontalAdjust( "TextHorizontalAdjust" ); + static const rtl::OUString sWritingMode( "TextWritingMode" ); xPropSet->setPropertyValue( sHorizontalAdjust , Any( eHA ) ); if ( eDirection == FRMDIR_VERT_TOP_RIGHT ) {//vertical writing commit 460e17a1c7dae290ae9375e78820ec1257fe3942 Author: Sun Ying <[email protected]> Date: Thu Aug 16 02:13:43 2012 +0000 #119875# fix vertical text direction in table cell change when save .ppt file Reported by: Li Feng Wang Patch by: Ying Sun Review by: Jian Yuan Li diff --git a/filter/source/msfilter/svdfppt.cxx b/filter/source/msfilter/svdfppt.cxx index 200e7b4..d65254ba 100644 --- a/filter/source/msfilter/svdfppt.cxx +++ b/filter/source/msfilter/svdfppt.cxx @@ -7272,6 +7272,16 @@ void ApplyCellAttributes( const SdrObject* pObj, Reference< XCell >& xCell ) eVA = drawing::TextVerticalAdjust_BOTTOM; xPropSet->setPropertyValue( sTextVerticalAdjust, Any( eVA ) ); + //set textHorizontalAdjust and TextWritingMode attr + const sal_Int32 eHA(((const SdrTextLeftDistItem&)pObj->GetMergedItem(SDRATTR_TEXT_HORZADJUST)).GetValue()); + const SvxFrameDirection eDirection = (const SvxFrameDirection)((( const SvxFrameDirectionItem&)pObj->GetMergedItem(EE_PARA_WRITINGDIR)).GetValue()); + static const rtl::OUString sHorizontalAdjust( RTL_CONSTASCII_USTRINGPARAM( "TextHorizontalAdjust" ) ); + static const rtl::OUString sWritingMode( RTL_CONSTASCII_USTRINGPARAM("TextWritingMode") ); + xPropSet->setPropertyValue( sHorizontalAdjust , Any( eHA ) ); + if ( eDirection == FRMDIR_VERT_TOP_RIGHT ) + {//vertical writing + xPropSet->setPropertyValue( sWritingMode , Any( ::com::sun::star::text::WritingMode_TB_RL ) ); + } SfxItemSet aSet( pObj->GetMergedItemSet() ); XFillStyle eFillStyle(((XFillStyleItem&)pObj->GetMergedItem( XATTR_FILLSTYLE )).GetValue()); ::com::sun::star::drawing::FillStyle eFS( com::sun::star::drawing::FillStyle_NONE ); commit a9d8b4dfc103b991de6c4d99914a39acef93ad23 Author: Xisco Fauli <[email protected]> Date: Mon Apr 1 23:14:21 2013 +0200 Revert "Reported by: Li Feng Wang" This reverts commit e518ef52bbda3449130f51dbbf6f0a60bb76298f. diff --git a/filter/source/msfilter/svdfppt.cxx b/filter/source/msfilter/svdfppt.cxx index d65254ba..200e7b4 100644 --- a/filter/source/msfilter/svdfppt.cxx +++ b/filter/source/msfilter/svdfppt.cxx @@ -7272,16 +7272,6 @@ void ApplyCellAttributes( const SdrObject* pObj, Reference< XCell >& xCell ) eVA = drawing::TextVerticalAdjust_BOTTOM; xPropSet->setPropertyValue( sTextVerticalAdjust, Any( eVA ) ); - //set textHorizontalAdjust and TextWritingMode attr - const sal_Int32 eHA(((const SdrTextLeftDistItem&)pObj->GetMergedItem(SDRATTR_TEXT_HORZADJUST)).GetValue()); - const SvxFrameDirection eDirection = (const SvxFrameDirection)((( const SvxFrameDirectionItem&)pObj->GetMergedItem(EE_PARA_WRITINGDIR)).GetValue()); - static const rtl::OUString sHorizontalAdjust( RTL_CONSTASCII_USTRINGPARAM( "TextHorizontalAdjust" ) ); - static const rtl::OUString sWritingMode( RTL_CONSTASCII_USTRINGPARAM("TextWritingMode") ); - xPropSet->setPropertyValue( sHorizontalAdjust , Any( eHA ) ); - if ( eDirection == FRMDIR_VERT_TOP_RIGHT ) - {//vertical writing - xPropSet->setPropertyValue( sWritingMode , Any( ::com::sun::star::text::WritingMode_TB_RL ) ); - } SfxItemSet aSet( pObj->GetMergedItemSet() ); XFillStyle eFillStyle(((XFillStyleItem&)pObj->GetMergedItem( XATTR_FILLSTYLE )).GetValue()); ::com::sun::star::drawing::FillStyle eFS( com::sun::star::drawing::FillStyle_NONE ); _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
