diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2017-07-28 16:43:06 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2017-07-31 22:00:27 +0200 |
| commit | 90ac4671c13ed4f548bb4188355b02217b9e24ba (patch) | |
| tree | b07d9238cbe7b7d39530b6e18875196278790368 /svtools | |
| parent | d62d07b3d29014f76c0d676c891cbafa80d0765f (diff) | |
make IntlWrapper arg to GetPresentation non-implicit and non-optional
which requires explicitly adding null in
1) SdrItemBrowserControl::SetAttributes(const SfxItemSet* pSet, const SfxItemSet* p2ndSet)
where SdrItemBrowserControl is only used by SdrItemBrowser and the only use of that is
within DBG_UTIL in SdrPaintView
2) SwCursorShell::GetContentAtPos( const Point& rPt,
within a #ifdef DBG_UTIL block in
3) SvxSearchDialog::BuildAttrText_Impl( OUString& rStr,
bool bSrchFlag ) const
where the other branch uses SvxResId
4) SfxPoolItem::dumpAsXml(xmlTextWriterPtr pWriter) const
5) XFillStyleItem::dumpAsXml(xmlTextWriterPtr pWriter) const
looks very much like all uses (outside the dumpers) are intended
to be in the ui locale
results in that INetContentTypes::GetPresentation always called with UI Locale
Change-Id: I5a110c107838b4db3c355476426d6532f2b6ce52
Reviewed-on: https://gerrit.libreoffice.org/40538
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'svtools')
| -rw-r--r-- | svtools/source/contnr/simptabl.cxx | 2 | ||||
| -rw-r--r-- | svtools/source/misc/svtresid.cxx | 14 |
2 files changed, 4 insertions, 12 deletions
diff --git a/svtools/source/contnr/simptabl.cxx b/svtools/source/contnr/simptabl.cxx index 0d910049248f..0b59579b4598 100644 --- a/svtools/source/contnr/simptabl.cxx +++ b/svtools/source/contnr/simptabl.cxx @@ -103,7 +103,7 @@ SvSimpleTable::SvSimpleTable(SvSimpleTableContainer& rParent, WinBits nBits): aHeaderBar(VclPtr<HeaderBar>::Create(&rParent,WB_BUTTONSTYLE | WB_BORDER | WB_TABSTOP)), nHeaderItemId(1), bPaintFlag(true), - aCollator(*(IntlWrapper( Application::GetSettings().GetLanguageTag() ).getCaseCollator())) + aCollator(*(IntlWrapper(SvtSysLocale().GetUILanguageTag()).getCaseCollator())) { m_rParentTableContainer.SetTable(this); diff --git a/svtools/source/misc/svtresid.cxx b/svtools/source/misc/svtresid.cxx index dff8d906abcf..c3e5ecbd1239 100644 --- a/svtools/source/misc/svtresid.cxx +++ b/svtools/source/misc/svtresid.cxx @@ -24,19 +24,11 @@ static std::locale* pResLocale=nullptr; -namespace -{ - std::locale* getResLocale(const LanguageTag& aLocale) - { - if (!pResLocale) - pResLocale = new std::locale(Translate::Create("svt", aLocale)); - return pResLocale; - } -} - std::locale* SvtResLocale::GetResLocale() { - return getResLocale(Application::GetSettings().GetUILanguageTag()); + if (!pResLocale) + pResLocale = new std::locale(Translate::Create("svt", SvtSysLocale().GetUILanguageTag())); + return pResLocale; } void SvtResLocale::DeleteResLocale() |