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 /embeddedobj | |
| 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 'embeddedobj')
| -rw-r--r-- | embeddedobj/Library_embobj.mk | 1 | ||||
| -rw-r--r-- | embeddedobj/source/general/docholder.cxx | 3 |
2 files changed, 2 insertions, 2 deletions
diff --git a/embeddedobj/Library_embobj.mk b/embeddedobj/Library_embobj.mk index dc0f88667be7..3030e2ae70c5 100644 --- a/embeddedobj/Library_embobj.mk +++ b/embeddedobj/Library_embobj.mk @@ -27,6 +27,7 @@ $(eval $(call gb_Library_use_libraries,embobj,\ cppuhelper \ sal \ svt \ + utl \ vcl \ tl \ i18nlangtag \ diff --git a/embeddedobj/source/general/docholder.cxx b/embeddedobj/source/general/docholder.cxx index 751c7c0fff5a..b774ab6aa479 100644 --- a/embeddedobj/source/general/docholder.cxx +++ b/embeddedobj/source/general/docholder.cxx @@ -971,8 +971,7 @@ bool DocumentHolder::LoadDocToFrame( bool bInPlace ) css::uno::Reference< css::frame::XTitle > xModelTitle( xDoc, css::uno::UNO_QUERY ); if( xModelTitle.is() ) { - LanguageTag aLocale( Application::GetSettings().GetUILanguageTag() ); - std::locale aResLoc = Translate::Create("sfx", aLocale); + std::locale aResLoc = Translate::Create("sfx", SvtSysLocale().GetUILanguageTag()); OUString sEmbedded = Translate::get(STR_EMBEDDED_TITLE, aResLoc); xModelTitle->setTitle( m_pEmbedObj->getContainerName() + sEmbedded); m_aContainerName = m_pEmbedObj->getContainerName(); |