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 /include/unotools | |
| 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 'include/unotools')
| -rw-r--r-- | include/unotools/intlwrapper.hxx | 23 |
1 files changed, 8 insertions, 15 deletions
diff --git a/include/unotools/intlwrapper.hxx b/include/unotools/intlwrapper.hxx index a78d4bdcab12..65f298f9c88e 100644 --- a/include/unotools/intlwrapper.hxx +++ b/include/unotools/intlwrapper.hxx @@ -47,26 +47,19 @@ class UNOTOOLS_DLLPUBLIC IntlWrapper { private: - - LanguageTag maLanguageTag; + LanguageTag maLanguageTag; css::uno::Reference< css::uno::XComponentContext > m_xContext; - LocaleDataWrapper* pLocaleData; - CollatorWrapper* pCollator; - CollatorWrapper* pCaseCollator; + LocaleDataWrapper* pLocaleData; + CollatorWrapper* pCollator; + CollatorWrapper* pCaseCollator; - void ImplNewLocaleData() const; - void ImplNewCollator( bool bCaseSensitive ) const; + void ImplNewLocaleData() const; + void ImplNewCollator( bool bCaseSensitive ) const; public: - IntlWrapper( - const css::uno::Reference< css::uno::XComponentContext > & rxContext, - const LanguageTag& rLanguageTag - ); - IntlWrapper( - const LanguageTag& rLanguageTag - ); - ~IntlWrapper(); + IntlWrapper(const LanguageTag& rLanguageTag); + ~IntlWrapper(); const LanguageTag& getLanguageTag() const { return maLanguageTag; } |