diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2014-12-12 09:46:25 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2014-12-12 11:49:04 +0000 |
| commit | efa5db0755f0a0af41b9958ef3d5edeaddaed056 (patch) | |
| tree | bb64adc26a1199ccd9e0f41cde75b1ac2e3cfbe6 | |
| parent | 2c2e80da68efcee5bffdb61d9c078f9360a639a4 (diff) | |
leave this Clone as inline
so code isn't generated for it unless the new_clone is required,
which it isn't under gcc.
Change-Id: I07e0b3e4b2e07625509b51ba7d37e24440f56cfe
| -rw-r--r-- | include/svl/zforlist.hxx | 12 | ||||
| -rw-r--r-- | svl/source/numbers/zforlist.cxx | 6 | ||||
| -rw-r--r-- | unusedcode.easy | 1 |
3 files changed, 9 insertions, 10 deletions
diff --git a/include/svl/zforlist.hxx b/include/svl/zforlist.hxx index 4b06d40517d4..e2df52d5b4a4 100644 --- a/include/svl/zforlist.hxx +++ b/include/svl/zforlist.hxx @@ -255,7 +255,7 @@ public: sal_Unicode cZero ); ~NfCurrencyEntry() {} - NfCurrencyEntry* Clone() const; + inline NfCurrencyEntry* Clone() const; /// Symbols and language identical bool operator==( const NfCurrencyEntry& r ) const; @@ -305,9 +305,15 @@ public: }; /** - * Necessary for ptr_vector on Windows. Please don't remove this, or at - * least check it on Windows before attempting to remove it. + * Necessary for ptr_vector on Windows. Please don't remove these, or at + * least check it on Windows before attempting to remove them. */ +NfCurrencyEntry* NfCurrencyEntry::Clone() const +{ + return new NfCurrencyEntry( + aSymbol, aBankSymbol, eLanguage, nPositiveFormat, nNegativeFormat, nDigits, cZeroChar); +} + inline NfCurrencyEntry* new_clone( const NfCurrencyEntry& r ) { return r.Clone(); diff --git a/svl/source/numbers/zforlist.cxx b/svl/source/numbers/zforlist.cxx index b9672a004ec4..cb7af29b357b 100644 --- a/svl/source/numbers/zforlist.cxx +++ b/svl/source/numbers/zforlist.cxx @@ -3837,12 +3837,6 @@ NfCurrencyEntry::NfCurrencyEntry( nPositiveFormat(nPositiveFmt), nNegativeFormat(nNegativeFmt), nDigits(nDig), cZeroChar(cZero) {} -NfCurrencyEntry* NfCurrencyEntry::Clone() const -{ - return new NfCurrencyEntry( - aSymbol, aBankSymbol, eLanguage, nPositiveFormat, nNegativeFormat, nDigits, cZeroChar); -} - bool NfCurrencyEntry::operator==( const NfCurrencyEntry& r ) const { return aSymbol == r.aSymbol diff --git a/unusedcode.easy b/unusedcode.easy index ee18f774ffc5..0c3074abb44e 100644 --- a/unusedcode.easy +++ b/unusedcode.easy @@ -8,7 +8,6 @@ GDriveSession::GDriveSession() ImpBitmap::ImplCrop(Rectangle const&) ImpBitmap::ImplErase(Color const&) ImpBitmap::ImplSetSalBitmap(SalBitmap*) -NfCurrencyEntry::Clone() const OpenGLContext::init(_XDisplay*, unsigned long, unsigned int, unsigned int, int) OpenGLContext::renderToFile() OpenGLContext::requestSingleBufferedRendering() |