From ab465b90f6c6da5595393a0ba73f33a1e71a2b65 Mon Sep 17 00:00:00 2001 From: Christian Lohmaier Date: Wed, 20 May 2015 13:05:49 +0200 Subject: bin/rename-sw-abbreviations.sh renames the most annoying abbreviations in Writer (and partially in the shared code too). Change-Id: I9a62759138126c1537cc5c985ba05cf54d6132d9 --- svl/source/numbers/zforlist.cxx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'svl') diff --git a/svl/source/numbers/zforlist.cxx b/svl/source/numbers/zforlist.cxx index 8b8f03f3e15d..d17954ec99cf 100644 --- a/svl/source/numbers/zforlist.cxx +++ b/svl/source/numbers/zforlist.cxx @@ -2969,7 +2969,7 @@ SvNumberFormatterIndexTable* SvNumberFormatter::MergeFormatter(SvNumberFormatter SvNumberFormatterMergeMap SvNumberFormatter::ConvertMergeTableToMap() { - if (!HasMergeFmtTbl()) + if (!HasMergeFormatTable()) { return SvNumberFormatterMergeMap(); } @@ -3837,7 +3837,7 @@ sal_uInt16 SvNumberFormatter::GetCurrencyFormatStrings( NfWSStringsDtor& rStrArr return nDefault; } -sal_uInt32 SvNumberFormatter::GetMergeFmtIndex( sal_uInt32 nOldFmt ) const +sal_uInt32 SvNumberFormatter::GetMergeFormatIndex( sal_uInt32 nOldFmt ) const { if (pMergeTable) { @@ -3850,7 +3850,7 @@ sal_uInt32 SvNumberFormatter::GetMergeFmtIndex( sal_uInt32 nOldFmt ) const return nOldFmt; } -bool SvNumberFormatter::HasMergeFmtTbl() const +bool SvNumberFormatter::HasMergeFormatTable() const { return pMergeTable && !pMergeTable->empty(); } -- cgit