From 90ac4671c13ed4f548bb4188355b02217b9e24ba Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Fri, 28 Jul 2017 16:43:06 +0100 Subject: make IntlWrapper arg to GetPresentation non-implicit and non-optional MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara --- include/avmedia/mediaitem.hxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'include/avmedia/mediaitem.hxx') diff --git a/include/avmedia/mediaitem.hxx b/include/avmedia/mediaitem.hxx index 4819d62c9d87..1f92d0b0d7b6 100644 --- a/include/avmedia/mediaitem.hxx +++ b/include/avmedia/mediaitem.hxx @@ -76,7 +76,7 @@ public: MapUnit eCoreUnit, MapUnit ePresUnit, OUString& rText, - const IntlWrapper *pIntl = nullptr ) const override; + const IntlWrapper& rIntl ) const override; virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override; -- cgit