summaryrefslogtreecommitdiff
path: root/cui
diff options
context:
space:
mode:
authorMike Kaganski <mike.kaganski@collabora.com>2020-09-03 16:47:06 +0300
committerMike Kaganski <mike.kaganski@collabora.com>2020-09-03 19:32:28 +0200
commitf12050bfb15580b564e342b704d5c55128fac644 (patch)
treee4a825d72c93548bf7ec39e7a8325855d58b288e /cui
parent07dcb0dab759d4ab535d99c0e6d326959906b87e (diff)
Make ImpSvNumberformatScan::GetColor const
Change-Id: Idbcce18029944ab884cdde03e21190cbb574a00f Reviewed-on: https://gerrit.libreoffice.org/c/core/+/102005 Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk> Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com> Tested-by: Jenkins
Diffstat (limited to 'cui')
-rw-r--r--cui/source/inc/numfmt.hxx2
-rw-r--r--cui/source/options/optupdt.cxx2
-rw-r--r--cui/source/tabpages/numfmt.cxx10
3 files changed, 7 insertions, 7 deletions
diff --git a/cui/source/inc/numfmt.hxx b/cui/source/inc/numfmt.hxx
index 54796c63b736..23e6806d3a2c 100644
--- a/cui/source/inc/numfmt.hxx
+++ b/cui/source/inc/numfmt.hxx
@@ -125,7 +125,7 @@ private:
void Obstructing();
void EnableBySourceFormat_Impl();
void SetCategory( sal_uInt16 nPos );
- OUString GetExpColorString( Color*& rpPreviewColor, const OUString& aFormatStr, short nTmpCatPos );
+ OUString GetExpColorString( const Color*& rpPreviewColor, const OUString& aFormatStr, short nTmpCatPos );
void MakePreviewText( const OUString& rFormat );
void ChangePreviewText( sal_uInt16 nPos );
void AddAutomaticLanguage_Impl(LanguageType eAutoLang, bool bSelect);
diff --git a/cui/source/options/optupdt.cxx b/cui/source/options/optupdt.cxx
index 2f39687cc87d..203e98949e5a 100644
--- a/cui/source/options/optupdt.cxx
+++ b/cui/source/options/optupdt.cxx
@@ -121,7 +121,7 @@ void SvxOnlineUpdateTabPage::UpdateLastCheckedText()
LanguageType eUILang = Application::GetSettings().GetUILanguageTag().getLanguageType();
std::unique_ptr<SvNumberFormatter> pNumberFormatter(new SvNumberFormatter( ::comphelper::getProcessComponentContext(), eUILang ));
- Color* pColor = nullptr;
+ const Color* pColor = nullptr;
const Date& rNullDate = pNumberFormatter->GetNullDate();
sal_uInt32 nFormat = pNumberFormatter->GetStandardFormat( SvNumFormatType::DATE, eUILang );
diff --git a/cui/source/tabpages/numfmt.cxx b/cui/source/tabpages/numfmt.cxx
index 4297cd52241e..c9826d2a7c3e 100644
--- a/cui/source/tabpages/numfmt.cxx
+++ b/cui/source/tabpages/numfmt.cxx
@@ -502,7 +502,7 @@ void SvxNumberFormatTabPage::Reset( const SfxItemSet* rSet )
FillCurrencyBox();
OUString aPrevString;
- Color* pDummy = nullptr;
+ const Color* pDummy = nullptr;
pNumFmtShell->GetInitSettings( nCatLbSelPos, eLangType, nFmtLbSelPos,
aFmtEntryList, aPrevString, pDummy );
@@ -820,7 +820,7 @@ void SvxNumberFormatTabPage::FillFormatListBox_Impl( std::vector<OUString>& rEnt
short aPrivCat = pNumFmtShell->GetCategory4Entry( static_cast<short>(i) );
if(aPrivCat!=CAT_TEXT)
{
- Color* pPreviewColor = nullptr;
+ const Color* pPreviewColor = nullptr;
OUString aPreviewString( GetExpColorString( pPreviewColor, aEntry, aPrivCat ) );
m_xLbFormat->append_text(aPreviewString);
if (pPreviewColor)
@@ -1625,7 +1625,7 @@ IMPL_LINK_NOARG(SvxNumberFormatTabPage, LostFocusHdl_Impl, weld::Widget&, void)
#************************************************************************/
OUString SvxNumberFormatTabPage::GetExpColorString(
- Color*& rpPreviewColor, const OUString& rFormatStr, short nTmpCatPos)
+ const Color*& rpPreviewColor, const OUString& rFormatStr, short nTmpCatPos)
{
SvxNumValCategory i;
switch (nTmpCatPos)
@@ -1663,7 +1663,7 @@ OUString SvxNumberFormatTabPage::GetExpColorString(
void SvxNumberFormatTabPage::MakePreviewText( const OUString& rFormat )
{
OUString aPreviewString;
- Color* pPreviewColor = nullptr;
+ const Color* pPreviewColor = nullptr;
pNumFmtShell->MakePreviewString( rFormat, aPreviewString, pPreviewColor );
m_aWndPreview.NotifyChange( aPreviewString, pPreviewColor );
}
@@ -1671,7 +1671,7 @@ void SvxNumberFormatTabPage::MakePreviewText( const OUString& rFormat )
void SvxNumberFormatTabPage::ChangePreviewText( sal_uInt16 nPos )
{
OUString aPreviewString;
- Color* pPreviewColor = nullptr;
+ const Color* pPreviewColor = nullptr;
pNumFmtShell->FormatChanged( nPos, aPreviewString, pPreviewColor );
m_aWndPreview.NotifyChange( aPreviewString, pPreviewColor );
}