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 /sfx2 | |
| 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 'sfx2')
| -rw-r--r-- | sfx2/source/config/evntconf.cxx | 2 | ||||
| -rw-r--r-- | sfx2/source/dialog/templdlg.cxx | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/sfx2/source/config/evntconf.cxx b/sfx2/source/config/evntconf.cxx index eed3e1cbd47a..77a0a823b882 100644 --- a/sfx2/source/config/evntconf.cxx +++ b/sfx2/source/config/evntconf.cxx @@ -97,7 +97,7 @@ bool SfxEventNamesItem::GetPresentation( SfxItemPresentation, MapUnit, MapUnit, OUString &rText, - const IntlWrapper* ) const + const IntlWrapper& ) const { rText.clear(); return false; diff --git a/sfx2/source/dialog/templdlg.cxx b/sfx2/source/dialog/templdlg.cxx index 3ff7eea52887..4f74c2b46424 100644 --- a/sfx2/source/dialog/templdlg.cxx +++ b/sfx2/source/dialog/templdlg.cxx @@ -444,7 +444,7 @@ TriState StyleTreeListBox_Impl::NotifyMoving(SvTreeListEntry* pTarget, const bool bRet = aDropLink.Call(*this); rpNewParent = pTarget; lPos=0; - IntlWrapper aIntlWrapper( Application::GetSettings().GetLanguageTag() ); + IntlWrapper aIntlWrapper(SvtSysLocale().GetUILanguageTag()); const CollatorWrapper* pCollator = aIntlWrapper.getCaseCollator(); for(SvTreeListEntry *pTmpEntry=FirstChild(pTarget); pTmpEntry && pCollator->compareString( |