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 /editeng/source/items/paraitem.cxx | |
| 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 'editeng/source/items/paraitem.cxx')
| -rw-r--r-- | editeng/source/items/paraitem.cxx | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/editeng/source/items/paraitem.cxx b/editeng/source/items/paraitem.cxx index 166c8ff359da..dde08b33510c 100644 --- a/editeng/source/items/paraitem.cxx +++ b/editeng/source/items/paraitem.cxx @@ -228,7 +228,7 @@ bool SvxLineSpacingItem::GetPresentation SfxItemPresentation /*ePres*/, MapUnit /*eCoreUnit*/, MapUnit /*ePresUnit*/, - OUString& rText, const IntlWrapper * + OUString& rText, const IntlWrapper& ) const { #ifdef DBG_UTIL @@ -407,7 +407,7 @@ bool SvxAdjustItem::GetPresentation SfxItemPresentation ePres, MapUnit /*eCoreUnit*/, MapUnit /*ePresUnit*/, - OUString& rText, const IntlWrapper * + OUString& rText, const IntlWrapper& ) const { switch ( ePres ) @@ -529,7 +529,7 @@ bool SvxWidowsItem::GetPresentation SfxItemPresentation ePres, MapUnit /*eCoreUnit*/, MapUnit /*ePresUnit*/, - OUString& rText, const IntlWrapper * + OUString& rText, const IntlWrapper& ) const { switch ( ePres ) @@ -590,7 +590,7 @@ bool SvxOrphansItem::GetPresentation SfxItemPresentation ePres, MapUnit /*eCoreUnit*/, MapUnit /*ePresUnit*/, - OUString& rText, const IntlWrapper * + OUString& rText, const IntlWrapper& ) const { switch ( ePres ) @@ -702,7 +702,7 @@ bool SvxHyphenZoneItem::GetPresentation SfxItemPresentation ePres, MapUnit /*eCoreUnit*/, MapUnit /*ePresUnit*/, - OUString& rText, const IntlWrapper * + OUString& rText, const IntlWrapper& ) const { OUString cpDelimTmp(cpDelim); @@ -1027,7 +1027,7 @@ bool SvxTabStopItem::GetPresentation SfxItemPresentation ePres, MapUnit eCoreUnit, MapUnit ePresUnit, - OUString& rText, const IntlWrapper *pIntl + OUString& rText, const IntlWrapper& rIntl ) const { rText.clear(); @@ -1041,7 +1041,7 @@ bool SvxTabStopItem::GetPresentation if ( bComma ) rText += ","; rText += GetMetricText( - ((*this)[i]).GetTabPos(), eCoreUnit, ePresUnit, pIntl ); + ((*this)[i]).GetTabPos(), eCoreUnit, ePresUnit, &rIntl ); if ( SfxItemPresentation::Complete == ePres ) { rText += " " + EditResId(GetMetricId(ePresUnit)); @@ -1185,7 +1185,7 @@ bool SvxFormatSplitItem::GetPresentation SfxItemPresentation /*ePres*/, MapUnit /*eCoreUnit*/, MapUnit /*ePresUnit*/, - OUString& rText, const IntlWrapper * + OUString& rText, const IntlWrapper& ) const { const char* pId = RID_SVXITEMS_FMTSPLIT_FALSE; @@ -1245,7 +1245,7 @@ bool SvxPageModelItem::GetPresentation SfxItemPresentation ePres, MapUnit /*eCoreUnit*/, MapUnit /*ePresUnit*/, - OUString& rText, const IntlWrapper * + OUString& rText, const IntlWrapper& ) const { rText.clear(); @@ -1300,7 +1300,7 @@ sal_uInt16 SvxScriptSpaceItem::GetVersion( sal_uInt16 nFFVer ) const bool SvxScriptSpaceItem::GetPresentation( SfxItemPresentation /*ePres*/, MapUnit /*eCoreMetric*/, MapUnit /*ePresMetric*/, - OUString &rText, const IntlWrapper* /*pIntl*/ ) const + OUString &rText, const IntlWrapper& /*rIntl*/ ) const { rText = EditResId( !GetValue() ? RID_SVXITEMS_SCRPTSPC_OFF @@ -1340,7 +1340,7 @@ sal_uInt16 SvxHangingPunctuationItem::GetVersion( sal_uInt16 nFFVer ) const bool SvxHangingPunctuationItem::GetPresentation( SfxItemPresentation /*ePres*/, MapUnit /*eCoreMetric*/, MapUnit /*ePresMetric*/, - OUString &rText, const IntlWrapper* /*pIntl*/ ) const + OUString &rText, const IntlWrapper& /*rIntl*/ ) const { rText = EditResId( !GetValue() ? RID_SVXITEMS_HNGPNCT_OFF @@ -1380,7 +1380,7 @@ sal_uInt16 SvxForbiddenRuleItem::GetVersion( sal_uInt16 nFFVer ) const bool SvxForbiddenRuleItem::GetPresentation( SfxItemPresentation /*ePres*/, MapUnit /*eCoreMetric*/, MapUnit /*ePresMetric*/, - OUString &rText, const IntlWrapper* /*pIntl*/ ) const + OUString &rText, const IntlWrapper& /*rIntl*/ ) const { rText = EditResId( !GetValue() ? RID_SVXITEMS_FORBIDDEN_RULE_OFF @@ -1424,7 +1424,7 @@ sal_uInt16 SvxParaVertAlignItem::GetVersion( sal_uInt16 nFFVer ) const bool SvxParaVertAlignItem::GetPresentation( SfxItemPresentation /*ePres*/, MapUnit /*eCoreMetric*/, MapUnit /*ePresMetric*/, - OUString &rText, const IntlWrapper* ) const + OUString &rText, const IntlWrapper& ) const { const char* pTmp; switch( GetValue() ) @@ -1496,7 +1496,7 @@ sal_uInt16 SvxParaGridItem::GetVersion( sal_uInt16 nFFVer ) const bool SvxParaGridItem::GetPresentation( SfxItemPresentation /*ePres*/, MapUnit /*eCoreMetric*/, MapUnit /*ePresMetric*/, - OUString &rText, const IntlWrapper* /*pIntl*/ ) const + OUString &rText, const IntlWrapper& /*rIntl*/ ) const { rText = GetValue() ? EditResId( RID_SVXITEMS_PARASNAPTOGRID_ON ) : |