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 /sw/source/uibase/shells/txtnum.cxx | |
| parent | 0db96caf0fcce09b87621c11b584a6d81cc7df86 (diff) | |
bin/rename-sw-abbreviations.sh
libreoffice-5-0-branch-point
renames the most annoying abbreviations in Writer (and partially
in the shared code too).
Change-Id: I9a62759138126c1537cc5c985ba05cf54d6132d9
Diffstat (limited to 'sw/source/uibase/shells/txtnum.cxx')
| -rw-r--r-- | sw/source/uibase/shells/txtnum.cxx | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/sw/source/uibase/shells/txtnum.cxx b/sw/source/uibase/shells/txtnum.cxx index 9886a8a048df..30bf893c550f 100644 --- a/sw/source/uibase/shells/txtnum.cxx +++ b/sw/source/uibase/shells/txtnum.cxx @@ -123,13 +123,13 @@ void SwTextShell::ExecEnterNum(SfxRequest &rReq) //convert type of linked bitmaps from SVX_NUM_BITMAP to (SVX_NUM_BITMAP|LINK_TOKEN) for ( sal_uInt16 i = 0; i < aRule.GetLevelCount(); i++ ) { - SvxNumberFormat aFmt( aRule.GetLevel( i ) ); - if ( SVX_NUM_BITMAP == aFmt.GetNumberingType() ) + SvxNumberFormat aFormat( aRule.GetLevel( i ) ); + if ( SVX_NUM_BITMAP == aFormat.GetNumberingType() ) { - const SvxBrushItem* pBrush = aFmt.GetBrush(); + const SvxBrushItem* pBrush = aFormat.GetBrush(); if(pBrush && !pBrush->GetGraphicLink().isEmpty()) - aFmt.SetNumberingType(SvxExtNumType(SVX_NUM_BITMAP|LINK_TOKEN)); - aRule.SetLevel(i, aFmt, aRule.Get(i) != 0); + aFormat.SetNumberingType(SvxExtNumType(SVX_NUM_BITMAP|LINK_TOKEN)); + aRule.SetLevel(i, aFormat, aRule.Get(i) != 0); } } if(bHtml) @@ -157,19 +157,19 @@ void SwTextShell::ExecEnterNum(SfxRequest &rReq) { for ( sal_uInt8 n = 0; n < MAXLEVEL; ++n ) { - SvxNumberFormat aFmt( aSvxRule.GetLevel( n ) ); + SvxNumberFormat aFormat( aSvxRule.GetLevel( n ) ); if ( n && bHtml ) { // 1/2" for HTML - aFmt.SetAbsLSpace(n * 720); + aFormat.SetAbsLSpace(n * 720); } // #i38904# Default alignment for // numbering/bullet should be rtl in rtl paragraph: if ( bRightToLeft ) { - aFmt.SetNumAdjust( SVX_ADJUST_RIGHT ); + aFormat.SetNumAdjust( SVX_ADJUST_RIGHT ); } - aSvxRule.SetLevel( n, aFmt, false ); + aSvxRule.SetLevel( n, aFormat, false ); } aSvxRule.SetFeatureFlag(SvxNumRuleFlags::ENABLE_EMBEDDED_BMP, false); } |