diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2019-03-04 08:57:28 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2019-03-05 12:12:26 +0100 |
| commit | 191f85df5851473af270be486f95f940e3091fef (patch) | |
| tree | 753d9513ccda8ee2a132bdad74eedc47bd71b179 /svl | |
| parent | 983566119c926d0e2478f74548f00a789de55c15 (diff) | |
re-land "new loplugin typedefparam""
This reverts commit c9bb48386bad7d2a40e6958883328145ae439cad,
and adds a bunch more fixes.
Change-Id: Ib584d302a73125528eba85fa1e722cb6fc41538a
Reviewed-on: https://gerrit.libreoffice.org/68680
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'svl')
| -rw-r--r-- | svl/source/numbers/numfmuno.cxx | 12 | ||||
| -rw-r--r-- | svl/source/numbers/numfmuno.hxx | 14 |
2 files changed, 13 insertions, 13 deletions
diff --git a/svl/source/numbers/numfmuno.cxx b/svl/source/numbers/numfmuno.cxx index 4fa91ec9a0cd..29024c7cc6f9 100644 --- a/svl/source/numbers/numfmuno.cxx +++ b/svl/source/numbers/numfmuno.cxx @@ -188,9 +188,9 @@ OUString SAL_CALL SvNumberFormatterServiceObj::convertNumberToString( sal_Int32 return aRet; } -util::Color SAL_CALL SvNumberFormatterServiceObj::queryColorForNumber( sal_Int32 nKey, +sal_Int32 SAL_CALL SvNumberFormatterServiceObj::queryColorForNumber( sal_Int32 nKey, double fValue, - util::Color aDefaultColor ) + sal_Int32 aDefaultColor ) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -227,9 +227,9 @@ OUString SAL_CALL SvNumberFormatterServiceObj::formatString( sal_Int32 nKey, return aRet; } -util::Color SAL_CALL SvNumberFormatterServiceObj::queryColorForString( sal_Int32 nKey, +sal_Int32 SAL_CALL SvNumberFormatterServiceObj::queryColorForString( sal_Int32 nKey, const OUString& aString, - util::Color aDefaultColor ) + sal_Int32 aDefaultColor ) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -295,11 +295,11 @@ OUString SAL_CALL SvNumberFormatterServiceObj::convertNumberToPreviewString( con return aRet; } -util::Color SAL_CALL SvNumberFormatterServiceObj::queryPreviewColorForNumber( const OUString& aFormat, +sal_Int32 SAL_CALL SvNumberFormatterServiceObj::queryPreviewColorForNumber( const OUString& aFormat, double fValue, const lang::Locale& nLocale, sal_Bool bAllowEnglish, - util::Color aDefaultColor ) + sal_Int32 aDefaultColor ) { ::osl::MutexGuard aGuard( m_aMutex ); diff --git a/svl/source/numbers/numfmuno.hxx b/svl/source/numbers/numfmuno.hxx index f68f73459b75..7be9b1aa2493 100644 --- a/svl/source/numbers/numfmuno.hxx +++ b/svl/source/numbers/numfmuno.hxx @@ -57,22 +57,22 @@ public: virtual sal_Int32 SAL_CALL detectNumberFormat( sal_Int32 nKey, const OUString& aString ) override; virtual double SAL_CALL convertStringToNumber( sal_Int32 nKey, const OUString& aString ) override; virtual OUString SAL_CALL convertNumberToString( sal_Int32 nKey, double fValue ) override; - virtual css::util::Color SAL_CALL queryColorForNumber( sal_Int32 nKey, - double fValue, css::util::Color aDefaultColor ) override; + virtual sal_Int32 SAL_CALL queryColorForNumber( sal_Int32 nKey, + double fValue, sal_Int32 aDefaultColor ) override; virtual OUString SAL_CALL formatString( sal_Int32 nKey, const OUString& aString ) override; - virtual css::util::Color SAL_CALL queryColorForString( sal_Int32 nKey, - const OUString& aString, - css::util::Color aDefaultColor ) override; + virtual sal_Int32 SAL_CALL queryColorForString( sal_Int32 nKey, + const OUString& aString, + sal_Int32 aDefaultColor ) override; virtual OUString SAL_CALL getInputString( sal_Int32 nKey, double fValue ) override; // XNumberFormatPreviewer virtual OUString SAL_CALL convertNumberToPreviewString( const OUString& aFormat, double fValue, const css::lang::Locale& nLocale, sal_Bool bAllowEnglish ) override; - virtual css::util::Color SAL_CALL queryPreviewColorForNumber( + virtual sal_Int32 SAL_CALL queryPreviewColorForNumber( const OUString& aFormat, double fValue, const css::lang::Locale& nLocale, sal_Bool bAllowEnglish, - css::util::Color aDefaultColor ) override; + sal_Int32 aDefaultColor ) override; // XServiceInfo virtual OUString SAL_CALL getImplementationName( ) override; |