diff options
| author | Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> | 2015-05-20 13:05:49 +0200 |
|---|---|---|
| committer | Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> | 2015-05-20 13:05:49 +0200 |
| commit | ab465b90f6c6da5595393a0ba73f33a1e71a2b65 (patch) | |
| tree | 36b77192de2799a11b4bf0b269cb3f74d0a0bb1f /filter | |
| parent | 0db96caf0fcce09b87621c11b584a6d81cc7df86 (diff) | |
bin/rename-sw-abbreviations.shlibreoffice-5-0-branch-point
renames the most annoying abbreviations in Writer (and partially
in the shared code too).
Change-Id: I9a62759138126c1537cc5c985ba05cf54d6132d9
Diffstat (limited to 'filter')
| -rw-r--r-- | filter/source/msfilter/msdffimp.cxx | 4 | ||||
| -rw-r--r-- | filter/source/msfilter/svdfppt.cxx | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/filter/source/msfilter/msdffimp.cxx b/filter/source/msfilter/msdffimp.cxx index 506c449d9bed..9e88ceb4a361 100644 --- a/filter/source/msfilter/msdffimp.cxx +++ b/filter/source/msfilter/msdffimp.cxx @@ -5460,7 +5460,7 @@ SdrObject* SvxMSDffManager::ProcessObj(SvStream& rSt, void SvxMSDffManager::StoreShapeOrder(sal_uLong nId, sal_uLong nTxBx, SdrObject* pObject, - SwFlyFrmFmt* pFly, + SwFlyFrameFormat* pFly, short nHdFtSection) const { sal_uInt16 nShpCnt = pShapeOrders->size(); @@ -5481,7 +5481,7 @@ void SvxMSDffManager::StoreShapeOrder(sal_uLong nId, void SvxMSDffManager::ExchangeInShapeOrder( SdrObject* pOldObject, sal_uLong nTxBx, - SwFlyFrmFmt* pFly, + SwFlyFrameFormat* pFly, SdrObject* pObject) const { sal_uInt16 nShpCnt = pShapeOrders->size(); diff --git a/filter/source/msfilter/svdfppt.cxx b/filter/source/msfilter/svdfppt.cxx index 42f3c2d0b531..4536cda3ad52 100644 --- a/filter/source/msfilter/svdfppt.cxx +++ b/filter/source/msfilter/svdfppt.cxx @@ -6094,14 +6094,14 @@ void PPTParagraphObj::ApplyTo( SfxItemSet& rSet, boost::optional< sal_Int16 >& sal_uInt16 nAbsLSpace = (sal_uInt16)( ( (sal_uInt32)_nTextOfs * 2540 ) / 576 ); sal_uInt16 nFirstLineOffset = nAbsLSpace - (sal_uInt16)( ( (sal_uInt32)_nBulletOfs * 2540 ) / 576 ); aLRSpaceItem.SetLeft( nAbsLSpace ); - aLRSpaceItem.SetTxtFirstLineOfstValue( -nFirstLineOffset ); + aLRSpaceItem.SetTextFirstLineOfstValue( -nFirstLineOffset ); rSet.Put( aLRSpaceItem ); } else { SvxLRSpaceItem aLRSpaceItem( EE_PARA_LRSPACE ); aLRSpaceItem.SetLeft( 0 ); - aLRSpaceItem.SetTxtFirstLineOfstValue( 0 ); + aLRSpaceItem.SetTextFirstLineOfstValue( 0 ); rSet.Put( aLRSpaceItem ); } if ( GetAttrib( PPT_ParaAttr_Adjust, nVal, nDestinationInstance ) ) |