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 | |
| 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>
243 files changed, 581 insertions, 687 deletions
diff --git a/avmedia/source/framework/mediaitem.cxx b/avmedia/source/framework/mediaitem.cxx index 6b54e8d43271..bbb44b5931ca 100644 --- a/avmedia/source/framework/mediaitem.cxx +++ b/avmedia/source/framework/mediaitem.cxx @@ -119,7 +119,7 @@ bool MediaItem::GetPresentation( SfxItemPresentation, MapUnit, MapUnit, OUString& rText, - const IntlWrapper * ) const + const IntlWrapper& ) const { rText.clear(); return false; diff --git a/connectivity/source/drivers/evoab2/NResultSet.cxx b/connectivity/source/drivers/evoab2/NResultSet.cxx index 52bc5b567de1..6fc4365e0f21 100644 --- a/connectivity/source/drivers/evoab2/NResultSet.cxx +++ b/connectivity/source/drivers/evoab2/NResultSet.cxx @@ -86,9 +86,9 @@ struct ComparisonData const SortDescriptor& rSortOrder; IntlWrapper aIntlWrapper; - ComparisonData( const SortDescriptor& _rSortOrder, const Reference< XComponentContext >& _rxContext ) - :rSortOrder( _rSortOrder ) - ,aIntlWrapper( _rxContext, SvtSysLocale().GetLanguageTag() ) + ComparisonData(const SortDescriptor& _rSortOrder) + : rSortOrder(_rSortOrder) + , aIntlWrapper(SvtSysLocale().GetUILanguageTag()) { } }; @@ -695,8 +695,8 @@ void OEvoabResultSet::construct( const QueryData& _rData ) if ( m_pVersionHelper->hasContacts() && !_rData.aSortOrder.empty() ) { - ComparisonData aCompData( _rData.aSortOrder, comphelper::getComponentContext(getConnection()->getDriver().getMSFactory()) ); - m_pVersionHelper->sortContacts( aCompData ); + ComparisonData aCompData(_rData.aSortOrder); + m_pVersionHelper->sortContacts(aCompData); } } m_nLength = m_pVersionHelper->getNumContacts(); diff --git a/cui/source/options/optdict.cxx b/cui/source/options/optdict.cxx index 339eaef3914b..c6ae57d78673 100644 --- a/cui/source/options/optdict.cxx +++ b/cui/source/options/optdict.cxx @@ -381,7 +381,7 @@ sal_uLong SvxEditDictionaryDialog::GetLBInsertPos(const OUString &rDicWord) { sal_uLong nPos = TREELIST_ENTRY_NOTFOUND; - IntlWrapper aIntlWrapper( Application::GetSettings().GetLanguageTag() ); + IntlWrapper aIntlWrapper(SvtSysLocale().GetUILanguageTag()); const CollatorWrapper* pCollator = aIntlWrapper.getCollator(); sal_uLong j; for( j = 0; j < pWordsLB->GetEntryCount(); j++ ) diff --git a/editeng/source/items/bulitem.cxx b/editeng/source/items/bulitem.cxx index a8c9110e0b39..c9b419f5c3a8 100644 --- a/editeng/source/items/bulitem.cxx +++ b/editeng/source/items/bulitem.cxx @@ -337,7 +337,7 @@ bool SvxBulletItem::GetPresentation SfxItemPresentation /*ePres*/, MapUnit /*eCoreUnit*/, MapUnit /*ePresUnit*/, - OUString& rText, const IntlWrapper * + OUString& rText, const IntlWrapper& ) const { rText = GetFullText(); diff --git a/editeng/source/items/charhiddenitem.cxx b/editeng/source/items/charhiddenitem.cxx index c27a188af5aa..ca298c717fef 100644 --- a/editeng/source/items/charhiddenitem.cxx +++ b/editeng/source/items/charhiddenitem.cxx @@ -38,7 +38,7 @@ bool SvxCharHiddenItem::GetPresentation MapUnit /*eCoreUnit*/, MapUnit /*ePresUnit*/, OUString& rText, - const IntlWrapper * /*pIntl*/ + const IntlWrapper & /*rIntl*/ ) const { const char* pId = RID_SVXITEMS_CHARHIDDEN_FALSE; diff --git a/editeng/source/items/frmitems.cxx b/editeng/source/items/frmitems.cxx index ec920d1cdde6..ff1d7f839c04 100644 --- a/editeng/source/items/frmitems.cxx +++ b/editeng/source/items/frmitems.cxx @@ -182,7 +182,7 @@ bool SvxPaperBinItem::GetPresentation SfxItemPresentation ePres, MapUnit /*eCoreUnit*/, MapUnit /*ePresUnit*/, - OUString& rText, const IntlWrapper * + OUString& rText, const IntlWrapper& ) const { switch ( ePres ) @@ -320,25 +320,25 @@ bool SvxSizeItem::GetPresentation SfxItemPresentation ePres, MapUnit eCoreUnit, MapUnit ePresUnit, - OUString& rText, const IntlWrapper *pIntl + OUString& rText, const IntlWrapper& rIntl ) const { OUString cpDelimTmp(cpDelim); switch ( ePres ) { case SfxItemPresentation::Nameless: - rText = GetMetricText( aSize.Width(), eCoreUnit, ePresUnit, pIntl ) + + rText = GetMetricText( aSize.Width(), eCoreUnit, ePresUnit, &rIntl ) + cpDelimTmp + - GetMetricText( aSize.Height(), eCoreUnit, ePresUnit, pIntl ); + GetMetricText( aSize.Height(), eCoreUnit, ePresUnit, &rIntl ); return true; case SfxItemPresentation::Complete: rText = EditResId(RID_SVXITEMS_SIZE_WIDTH) + - GetMetricText( aSize.Width(), eCoreUnit, ePresUnit, pIntl ) + + GetMetricText( aSize.Width(), eCoreUnit, ePresUnit, &rIntl ) + " " + EditResId(GetMetricId(ePresUnit)) + cpDelimTmp + EditResId(RID_SVXITEMS_SIZE_HEIGHT) + - GetMetricText( aSize.Height(), eCoreUnit, ePresUnit, pIntl ) + + GetMetricText( aSize.Height(), eCoreUnit, ePresUnit, &rIntl ) + " " + EditResId(GetMetricId(ePresUnit)); return true; // no break necessary @@ -594,7 +594,7 @@ bool SvxLRSpaceItem::GetPresentation SfxItemPresentation ePres, MapUnit eCoreUnit, MapUnit ePresUnit, - OUString& rText, const IntlWrapper* pIntl + OUString& rText, const IntlWrapper& rIntl ) const { switch ( ePres ) @@ -608,7 +608,7 @@ bool SvxLRSpaceItem::GetPresentation } else rText = GetMetricText( (long)nLeftMargin, - eCoreUnit, ePresUnit, pIntl ); + eCoreUnit, ePresUnit, &rIntl ); rText += OUString(cpDelim); if ( 100 != nPropFirstLineOfst ) { @@ -617,7 +617,7 @@ bool SvxLRSpaceItem::GetPresentation } else rText += GetMetricText( (long)nFirstLineOfst, - eCoreUnit, ePresUnit, pIntl ); + eCoreUnit, ePresUnit, &rIntl ); rText += OUString(cpDelim); if ( 100 != nRightMargin ) { @@ -626,7 +626,7 @@ bool SvxLRSpaceItem::GetPresentation } else rText += GetMetricText( (long)nRightMargin, - eCoreUnit, ePresUnit, pIntl ); + eCoreUnit, ePresUnit, &rIntl ); return true; } case SfxItemPresentation::Complete: @@ -638,7 +638,7 @@ bool SvxLRSpaceItem::GetPresentation else { rText = rText + - GetMetricText( (long)nLeftMargin, eCoreUnit, ePresUnit, pIntl ) + + GetMetricText( (long)nLeftMargin, eCoreUnit, ePresUnit, &rIntl ) + " " + EditResId(GetMetricId(ePresUnit)); } rText += OUString(cpDelim); @@ -652,7 +652,7 @@ bool SvxLRSpaceItem::GetPresentation { rText = rText + GetMetricText( (long)nFirstLineOfst, - eCoreUnit, ePresUnit, pIntl ) + + eCoreUnit, ePresUnit, &rIntl ) + " " + EditResId(GetMetricId(ePresUnit)); } rText += OUString(cpDelim); @@ -665,7 +665,7 @@ bool SvxLRSpaceItem::GetPresentation { rText = rText + GetMetricText( (long)nRightMargin, - eCoreUnit, ePresUnit, pIntl ) + + eCoreUnit, ePresUnit, &rIntl ) + " " + EditResId(GetMetricId(ePresUnit)); } return true; @@ -972,7 +972,7 @@ bool SvxULSpaceItem::GetPresentation MapUnit eCoreUnit, MapUnit ePresUnit, OUString& rText, - const IntlWrapper *pIntl + const IntlWrapper& rIntl ) const { switch ( ePres ) @@ -985,7 +985,7 @@ bool SvxULSpaceItem::GetPresentation Application::GetSettings().GetUILanguageTag()); } else - rText = GetMetricText( (long)nUpper, eCoreUnit, ePresUnit, pIntl ); + rText = GetMetricText( (long)nUpper, eCoreUnit, ePresUnit, &rIntl ); rText += OUString(cpDelim); if ( 100 != nPropLower ) { @@ -993,7 +993,7 @@ bool SvxULSpaceItem::GetPresentation Application::GetSettings().GetUILanguageTag()); } else - rText += GetMetricText( (long)nLower, eCoreUnit, ePresUnit, pIntl ); + rText += GetMetricText( (long)nLower, eCoreUnit, ePresUnit, &rIntl ); return true; } case SfxItemPresentation::Complete: @@ -1007,7 +1007,7 @@ bool SvxULSpaceItem::GetPresentation else { rText = rText + - GetMetricText( (long)nUpper, eCoreUnit, ePresUnit, pIntl ) + + GetMetricText( (long)nUpper, eCoreUnit, ePresUnit, &rIntl ) + " " + EditResId(GetMetricId(ePresUnit)); } rText = rText + OUString(cpDelim) + EditResId(RID_SVXITEMS_ULSPACE_LOWER); @@ -1019,7 +1019,7 @@ bool SvxULSpaceItem::GetPresentation else { rText = rText + - GetMetricText( (long)nLower, eCoreUnit, ePresUnit, pIntl ) + + GetMetricText( (long)nLower, eCoreUnit, ePresUnit, &rIntl ) + " " + EditResId(GetMetricId(ePresUnit)); } return true; @@ -1121,7 +1121,7 @@ bool SvxPrintItem::GetPresentation SfxItemPresentation /*ePres*/, MapUnit /*eCoreUnit*/, MapUnit /*ePresUnit*/, - OUString& rText, const IntlWrapper * + OUString& rText, const IntlWrapper& ) const { const char* pId = RID_SVXITEMS_PRINT_FALSE; @@ -1159,7 +1159,7 @@ bool SvxOpaqueItem::GetPresentation SfxItemPresentation /*ePres*/, MapUnit /*eCoreUnit*/, MapUnit /*ePresUnit*/, - OUString& rText, const IntlWrapper * + OUString& rText, const IntlWrapper& ) const { const char* pId = RID_SVXITEMS_OPAQUE_FALSE; @@ -1229,7 +1229,7 @@ bool SvxProtectItem::GetPresentation SfxItemPresentation /*ePres*/, MapUnit /*eCoreUnit*/, MapUnit /*ePresUnit*/, - OUString& rText, const IntlWrapper * + OUString& rText, const IntlWrapper& ) const { const char* pId = RID_SVXITEMS_PROT_CONTENT_FALSE; @@ -1463,7 +1463,7 @@ bool SvxShadowItem::GetPresentation SfxItemPresentation ePres, MapUnit eCoreUnit, MapUnit ePresUnit, - OUString& rText, const IntlWrapper *pIntl + OUString& rText, const IntlWrapper& rIntl ) const { switch ( ePres ) @@ -1478,7 +1478,7 @@ bool SvxShadowItem::GetPresentation rText = rText + EditResId(pId) + OUString(cpDelim) + - GetMetricText( (long)nWidth, eCoreUnit, ePresUnit, pIntl ) + + GetMetricText( (long)nWidth, eCoreUnit, ePresUnit, &rIntl ) + OUString(cpDelim) + EditResId(RID_SVXITEMS_SHADOW[(int)eLocation]); return true; @@ -1495,7 +1495,7 @@ bool SvxShadowItem::GetPresentation rText = rText + EditResId(pId) + OUString(cpDelim) + - GetMetricText( (long)nWidth, eCoreUnit, ePresUnit, pIntl ) + + GetMetricText( (long)nWidth, eCoreUnit, ePresUnit, &rIntl ) + " " + EditResId(GetMetricId(ePresUnit)) + OUString(cpDelim) + EditResId(RID_SVXITEMS_SHADOW[(int)eLocation]); @@ -2063,7 +2063,7 @@ bool SvxBoxItem::GetPresentation SfxItemPresentation ePres, MapUnit eCoreUnit, MapUnit ePresUnit, - OUString& rText, const IntlWrapper *pIntl + OUString& rText, const IntlWrapper& rIntl ) const { OUString cpDelimTmp = OUString(cpDelim); @@ -2075,37 +2075,37 @@ bool SvxBoxItem::GetPresentation if ( pTop ) { - rText = pTop->GetValueString( eCoreUnit, ePresUnit, pIntl ) + cpDelimTmp; + rText = pTop->GetValueString( eCoreUnit, ePresUnit, &rIntl ) + cpDelimTmp; } if( !(pTop && pBottom && pLeft && pRight && *pTop == *pBottom && *pTop == *pLeft && *pTop == *pRight) ) { if ( pBottom ) { - rText = rText + pBottom->GetValueString( eCoreUnit, ePresUnit, pIntl ) + cpDelimTmp; + rText = rText + pBottom->GetValueString( eCoreUnit, ePresUnit, &rIntl ) + cpDelimTmp; } if ( pLeft ) { - rText = rText + pLeft->GetValueString( eCoreUnit, ePresUnit, pIntl ) + cpDelimTmp; + rText = rText + pLeft->GetValueString( eCoreUnit, ePresUnit, &rIntl ) + cpDelimTmp; } if ( pRight ) { - rText = rText + pRight->GetValueString( eCoreUnit, ePresUnit, pIntl ) + cpDelimTmp; + rText = rText + pRight->GetValueString( eCoreUnit, ePresUnit, &rIntl ) + cpDelimTmp; } } - rText += GetMetricText( (long)nTopDist, eCoreUnit, ePresUnit, pIntl ); + rText += GetMetricText( (long)nTopDist, eCoreUnit, ePresUnit, &rIntl ); if( nTopDist != nBottomDist || nTopDist != nLeftDist || nTopDist != nRightDist ) { rText = rText + cpDelimTmp + GetMetricText( (long)nBottomDist, eCoreUnit, - ePresUnit, pIntl ) + + ePresUnit, &rIntl ) + cpDelimTmp + - GetMetricText( (long)nLeftDist, eCoreUnit, ePresUnit, pIntl ) + + GetMetricText( (long)nLeftDist, eCoreUnit, ePresUnit, &rIntl ) + cpDelimTmp + GetMetricText( (long)nRightDist, eCoreUnit, - ePresUnit, pIntl ); + ePresUnit, &rIntl ); } return true; } @@ -2121,7 +2121,7 @@ bool SvxBoxItem::GetPresentation if( pTop && pBottom && pLeft && pRight && *pTop == *pBottom && *pTop == *pLeft && *pTop == *pRight ) { - rText += pTop->GetValueString( eCoreUnit, ePresUnit, pIntl, true ) + cpDelimTmp; + rText += pTop->GetValueString( eCoreUnit, ePresUnit, &rIntl, true ) + cpDelimTmp; } else { @@ -2129,28 +2129,28 @@ bool SvxBoxItem::GetPresentation { rText = rText + EditResId(RID_SVXITEMS_BORDER_TOP) + - pTop->GetValueString( eCoreUnit, ePresUnit, pIntl, true ) + + pTop->GetValueString( eCoreUnit, ePresUnit, &rIntl, true ) + cpDelimTmp; } if ( pBottom ) { rText = rText + EditResId(RID_SVXITEMS_BORDER_BOTTOM) + - pBottom->GetValueString( eCoreUnit, ePresUnit, pIntl, true ) + + pBottom->GetValueString( eCoreUnit, ePresUnit, &rIntl, true ) + cpDelimTmp; } if ( pLeft ) { rText = rText + EditResId(RID_SVXITEMS_BORDER_LEFT) + - pLeft->GetValueString( eCoreUnit, ePresUnit, pIntl, true ) + + pLeft->GetValueString( eCoreUnit, ePresUnit, &rIntl, true ) + cpDelimTmp; } if ( pRight ) { rText = rText + EditResId(RID_SVXITEMS_BORDER_RIGHT) + - pRight->GetValueString( eCoreUnit, ePresUnit, pIntl, true ) + + pRight->GetValueString( eCoreUnit, ePresUnit, &rIntl, true ) + cpDelimTmp; } } @@ -2162,7 +2162,7 @@ bool SvxBoxItem::GetPresentation { rText = rText + GetMetricText( (long)nTopDist, eCoreUnit, - ePresUnit, pIntl ) + + ePresUnit, &rIntl ) + " " + EditResId(GetMetricId(ePresUnit)); } else @@ -2170,22 +2170,22 @@ bool SvxBoxItem::GetPresentation rText = rText + EditResId(RID_SVXITEMS_BORDER_TOP) + GetMetricText( (long)nTopDist, eCoreUnit, - ePresUnit, pIntl ) + + ePresUnit, &rIntl ) + " " + EditResId(GetMetricId(ePresUnit)) + cpDelimTmp + EditResId(RID_SVXITEMS_BORDER_BOTTOM) + GetMetricText( (long)nBottomDist, eCoreUnit, - ePresUnit, pIntl ) + + ePresUnit, &rIntl ) + " " + EditResId(GetMetricId(ePresUnit)) + cpDelimTmp + EditResId(RID_SVXITEMS_BORDER_LEFT) + GetMetricText( (long)nLeftDist, eCoreUnit, - ePresUnit, pIntl ) + + ePresUnit, &rIntl ) + " " + EditResId(GetMetricId(ePresUnit)) + cpDelimTmp + EditResId(RID_SVXITEMS_BORDER_RIGHT) + GetMetricText( (long)nRightDist, eCoreUnit, - ePresUnit, pIntl ) + + ePresUnit, &rIntl ) + " " + EditResId(GetMetricId(ePresUnit)); } return true; @@ -2597,7 +2597,7 @@ bool SvxBoxInfoItem::GetPresentation SfxItemPresentation /*ePres*/, MapUnit /*eCoreUnit*/, MapUnit /*ePresUnit*/, - OUString& rText, const IntlWrapper * + OUString& rText, const IntlWrapper& ) const { rText.clear(); @@ -2933,7 +2933,7 @@ bool SvxFormatBreakItem::GetPresentation SfxItemPresentation /*ePres*/, MapUnit /*eCoreUnit*/, MapUnit /*ePresUnit*/, - OUString& rText, const IntlWrapper * + OUString& rText, const IntlWrapper& ) const { rText = GetValueTextByPos( GetEnumValue() ); @@ -3072,7 +3072,7 @@ bool SvxFormatKeepItem::GetPresentation SfxItemPresentation /*ePres*/, MapUnit /*eCoreUnit*/, MapUnit /*ePresUnit*/, - OUString& rText, const IntlWrapper * + OUString& rText, const IntlWrapper& ) const { const char* pId = RID_SVXITEMS_FMTKEEP_FALSE; @@ -3201,13 +3201,13 @@ bool SvxLineItem::GetPresentation SfxItemPresentation ePres, MapUnit eCoreUnit, MapUnit ePresUnit, - OUString& rText, const IntlWrapper *pIntl + OUString& rText, const IntlWrapper& rIntl ) const { rText.clear(); if ( pLine ) - rText = pLine->GetValueString( eCoreUnit, ePresUnit, pIntl, + rText = pLine->GetValueString( eCoreUnit, ePresUnit, &rIntl, (SfxItemPresentation::Complete == ePres) ); return true; } @@ -3672,7 +3672,7 @@ bool SvxBrushItem::GetPresentation SfxItemPresentation /*ePres*/, MapUnit /*eCoreUnit*/, MapUnit /*ePresUnit*/, - OUString& rText, const IntlWrapper * + OUString& rText, const IntlWrapper& ) const { if ( GPOS_NONE == eGraphicPos ) @@ -4043,7 +4043,7 @@ bool SvxFrameDirectionItem::GetPresentation( SfxItemPresentation /*ePres*/, MapUnit /*eCoreUnit*/, MapUnit /*ePresUnit*/, - OUString& rText, const IntlWrapper *) const + OUString& rText, const IntlWrapper&) const { rText = EditResId(getFrmDirResId(GetEnumValue())); return true; diff --git a/editeng/source/items/justifyitem.cxx b/editeng/source/items/justifyitem.cxx index fc9f48e3a6a8..540d4f244150 100644 --- a/editeng/source/items/justifyitem.cxx +++ b/editeng/source/items/justifyitem.cxx @@ -54,7 +54,7 @@ bool SvxHorJustifyItem::GetPresentation SfxItemPresentation /*ePres*/, MapUnit /*eCoreUnit*/, MapUnit /*ePresUnit*/, - OUString& rText, const IntlWrapper *) const + OUString& rText, const IntlWrapper&) const { rText = GetValueText( (sal_uInt16)GetValue() ); return true; @@ -203,7 +203,7 @@ bool SvxVerJustifyItem::GetPresentation MapUnit /*eCoreUnit*/, MapUnit /*ePresUnit*/, OUString& rText, - const IntlWrapper * ) const + const IntlWrapper& ) const { rText = GetValueText( GetValue() ); return true; @@ -334,7 +334,7 @@ bool SvxJustifyMethodItem::GetPresentation MapUnit /*eCoreUnit*/, MapUnit /*ePresUnit*/, OUString& rText, - const IntlWrapper * ) const + const IntlWrapper& ) const { rText = GetValueText( GetEnumValue() ); return true; diff --git a/editeng/source/items/optitems.cxx b/editeng/source/items/optitems.cxx index 920c30f7f4fd..89b6fdaf5fb9 100644 --- a/editeng/source/items/optitems.cxx +++ b/editeng/source/items/optitems.cxx @@ -55,7 +55,7 @@ bool SfxSpellCheckItem::GetPresentation MapUnit , MapUnit , OUString& , - const IntlWrapper* + const IntlWrapper& ) const { return true; @@ -115,7 +115,7 @@ bool SfxHyphenRegionItem::GetPresentation MapUnit , MapUnit , OUString& rText, - const IntlWrapper* + const IntlWrapper& ) const { rText = rText + 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 ) : diff --git a/editeng/source/items/textitem.cxx b/editeng/source/items/textitem.cxx index 37af9cfa6a76..220c99e417a5 100644 --- a/editeng/source/items/textitem.cxx +++ b/editeng/source/items/textitem.cxx @@ -176,7 +176,7 @@ bool SvxFontListItem::GetPresentation SfxItemPresentation /*ePres*/, MapUnit /*eCoreUnit*/, MapUnit /*ePresUnit*/, - OUString& rText, const IntlWrapper * /*pIntl*/ + OUString& rText, const IntlWrapper& /*rIntl*/ ) const { rText.clear(); @@ -411,7 +411,7 @@ bool SvxFontItem::GetPresentation SfxItemPresentation /*ePres*/, MapUnit /*eCoreUnit*/, MapUnit /*ePresUnit*/, - OUString& rText, const IntlWrapper * /*pIntl*/ + OUString& rText, const IntlWrapper& /*rIntl*/ ) const { rText = aFamilyName; @@ -476,7 +476,7 @@ bool SvxPostureItem::GetPresentation SfxItemPresentation /*ePres*/, MapUnit /*eCoreUnit*/, MapUnit /*ePresUnit*/, - OUString& rText, const IntlWrapper * /*pIntl*/ + OUString& rText, const IntlWrapper& /*rIntl*/ ) const { rText = GetValueTextByPos( GetValue() ); @@ -623,7 +623,7 @@ bool SvxWeightItem::GetPresentation SfxItemPresentation /*ePres*/, MapUnit /*eCoreUnit*/, MapUnit /*ePresUnit*/, - OUString& rText, const IntlWrapper * /*pIntl*/ + OUString& rText, const IntlWrapper& /*rIntl*/ ) const { rText = GetValueTextByPos( GetValue() ); @@ -1006,7 +1006,7 @@ bool SvxFontHeightItem::GetPresentation SfxItemPresentation /*ePres*/, MapUnit eCoreUnit, MapUnit /*ePresUnit*/, - OUString& rText, const IntlWrapper *pIntl + OUString& rText, const IntlWrapper& rIntl ) const { if( MapUnit::MapRelative != ePropUnit ) @@ -1019,7 +1019,7 @@ bool SvxFontHeightItem::GetPresentation else if( 100 == nProp ) { rText = GetMetricText( (long)nHeight, - eCoreUnit, MapUnit::MapPoint, pIntl ) + + eCoreUnit, MapUnit::MapPoint, &rIntl ) + " " + EditResId(GetMetricId(MapUnit::MapPoint)); } else @@ -1191,13 +1191,13 @@ bool SvxFontWidthItem::GetPresentation SfxItemPresentation /*ePres*/, MapUnit eCoreUnit, MapUnit /*ePresUnit*/, - OUString& rText, const IntlWrapper *pIntl + OUString& rText, const IntlWrapper& rIntl ) const { if ( 100 == nProp ) { rText = GetMetricText( (long)nWidth, - eCoreUnit, MapUnit::MapPoint, pIntl ) + + eCoreUnit, MapUnit::MapPoint, &rIntl ) + " " + EditResId(GetMetricId(MapUnit::MapPoint)); } else @@ -1265,7 +1265,7 @@ bool SvxTextLineItem::GetPresentation SfxItemPresentation /*ePres*/, MapUnit /*eCoreUnit*/, MapUnit /*ePresUnit*/, - OUString& rText, const IntlWrapper * /*pIntl*/ + OUString& rText, const IntlWrapper& /*rIntl*/ ) const { rText = GetValueTextByPos( GetValue() ); @@ -1514,7 +1514,7 @@ bool SvxCrossedOutItem::GetPresentation SfxItemPresentation /*ePres*/, MapUnit /*eCoreUnit*/, MapUnit /*ePresUnit*/, - OUString& rText, const IntlWrapper * /*pIntl*/ + OUString& rText, const IntlWrapper& /*rIntl*/ ) const { rText = GetValueTextByPos( GetValue() ); @@ -1606,7 +1606,7 @@ bool SvxShadowedItem::GetPresentation SfxItemPresentation /*ePres*/, MapUnit /*eCoreUnit*/, MapUnit /*ePresUnit*/, - OUString& rText, const IntlWrapper * /*pIntl*/ + OUString& rText, const IntlWrapper& /*rIntl*/ ) const { const char* pId = RID_SVXITEMS_SHADOWED_FALSE; @@ -1651,7 +1651,7 @@ bool SvxAutoKernItem::GetPresentation SfxItemPresentation /*ePres*/, MapUnit /*eCoreUnit*/, MapUnit /*ePresUnit*/, - OUString& rText, const IntlWrapper * /*pIntl*/ + OUString& rText, const IntlWrapper& /*rIntl*/ ) const { const char* pId = RID_SVXITEMS_AUTOKERN_FALSE; @@ -1697,7 +1697,7 @@ bool SvxWordLineModeItem::GetPresentation SfxItemPresentation /*ePres*/, MapUnit /*eCoreUnit*/, MapUnit /*ePresUnit*/, - OUString& rText, const IntlWrapper * /*pIntl*/ + OUString& rText, const IntlWrapper& /*rIntl*/ ) const { const char* pId = RID_SVXITEMS_WORDLINE_FALSE; @@ -1742,7 +1742,7 @@ bool SvxContourItem::GetPresentation SfxItemPresentation /*ePres*/, MapUnit /*eCoreUnit*/, MapUnit /*ePresUnit*/, - OUString& rText, const IntlWrapper * /*pIntl*/ + OUString& rText, const IntlWrapper& /*rIntl*/ ) const { const char* pId = RID_SVXITEMS_CONTOUR_FALSE; @@ -1787,7 +1787,7 @@ bool SvxPropSizeItem::GetPresentation SfxItemPresentation /*ePres*/, MapUnit /*eCoreUnit*/, MapUnit /*ePresUnit*/, - OUString& rText, const IntlWrapper * /*pIntl*/ + OUString& rText, const IntlWrapper& /*rIntl*/ ) const { rText.clear(); @@ -1971,7 +1971,7 @@ bool SvxColorItem::GetPresentation SfxItemPresentation /*ePres*/, MapUnit /*eCoreUnit*/, MapUnit /*ePresUnit*/, - OUString& rText, const IntlWrapper * /*pIntl*/ + OUString& rText, const IntlWrapper& /*rIntl*/ ) const { rText = ::GetColorString( mColor ); @@ -2033,7 +2033,7 @@ bool SvxCharSetColorItem::GetPresentation SfxItemPresentation /*ePres*/, MapUnit /*eCoreUnit*/, MapUnit /*ePresUnit*/, - OUString& rText, const IntlWrapper * /*pIntl*/ + OUString& rText, const IntlWrapper& /*rIntl*/ ) const { rText.clear(); @@ -2086,13 +2086,13 @@ bool SvxKerningItem::GetPresentation SfxItemPresentation ePres, MapUnit eCoreUnit, MapUnit /*ePresUnit*/, - OUString& rText, const IntlWrapper *pIntl + OUString& rText, const IntlWrapper& rIntl ) const { switch ( ePres ) { case SfxItemPresentation::Nameless: - rText = GetMetricText( (long)GetValue(), eCoreUnit, MapUnit::MapPoint, pIntl ) + + rText = GetMetricText( (long)GetValue(), eCoreUnit, MapUnit::MapPoint, &rIntl ) + " " + EditResId(GetMetricId(MapUnit::MapPoint)); return true; case SfxItemPresentation::Complete: @@ -2108,7 +2108,7 @@ bool SvxKerningItem::GetPresentation if (pId) rText += EditResId(pId); rText = rText + - GetMetricText( (long)GetValue(), eCoreUnit, MapUnit::MapPoint, pIntl ) + + GetMetricText( (long)GetValue(), eCoreUnit, MapUnit::MapPoint, &rIntl ) + " " + EditResId(GetMetricId(MapUnit::MapPoint)); return true; } @@ -2177,7 +2177,7 @@ bool SvxCaseMapItem::GetPresentation SfxItemPresentation /*ePres*/, MapUnit /*eCoreUnit*/, MapUnit /*ePresUnit*/, - OUString& rText, const IntlWrapper * /*pIntl*/ + OUString& rText, const IntlWrapper& /*rIntl*/ ) const { rText = GetValueTextByPos( (sal_uInt16)GetValue() ); @@ -2318,7 +2318,7 @@ bool SvxEscapementItem::GetPresentation SfxItemPresentation /*ePres*/, MapUnit /*eCoreUnit*/, MapUnit /*ePresUnit*/, - OUString& rText, const IntlWrapper * /*pIntl*/ + OUString& rText, const IntlWrapper& /*rIntl*/ ) const { rText = GetValueTextByPos( GetEnumValue() ); @@ -2468,7 +2468,7 @@ bool SvxLanguageItem::GetPresentation SfxItemPresentation /*ePres*/, MapUnit /*eCoreUnit*/, MapUnit /*ePresUnit*/, - OUString& rText, const IntlWrapper * /*pIntl*/ + OUString& rText, const IntlWrapper& /*rIntl*/ ) const { rText = SvtLanguageTable::GetLanguageString( GetValue() ); @@ -2551,7 +2551,7 @@ bool SvxNoLinebreakItem::GetPresentation SfxItemPresentation /*ePres*/, MapUnit /*eCoreUnit*/, MapUnit /*ePresUnit*/, - OUString& rText, const IntlWrapper * /*pIntl*/ + OUString& rText, const IntlWrapper& /*rIntl*/ ) const { rText.clear(); @@ -2592,7 +2592,7 @@ bool SvxNoHyphenItem::GetPresentation SfxItemPresentation /*ePres*/, MapUnit /*eCoreUnit*/, MapUnit /*ePresUnit*/, - OUString& rText, const IntlWrapper * /*pIntl*/ + OUString& rText, const IntlWrapper& /*rIntl*/ ) const { rText.clear(); @@ -2640,7 +2640,7 @@ bool SvxBlinkItem::GetPresentation SfxItemPresentation /*ePres*/, MapUnit /*eCoreUnit*/, MapUnit /*ePresUnit*/, - OUString& rText, const IntlWrapper * /*pIntl*/ + OUString& rText, const IntlWrapper& /*rIntl*/ ) const { const char* pId = RID_SVXITEMS_BLINK_FALSE; @@ -2688,7 +2688,7 @@ bool SvxEmphasisMarkItem::GetPresentation MapUnit /*eCoreUnit*/, MapUnit /*ePresUnit*/, OUString& rText, - const IntlWrapper * /*pIntl*/ + const IntlWrapper& /*rIntl*/ ) const { static const char* RID_SVXITEMS_EMPHASIS[] = @@ -2882,7 +2882,7 @@ bool SvxTwoLinesItem::PutValue( const css::uno::Any& rVal, bool SvxTwoLinesItem::GetPresentation( SfxItemPresentation /*ePres*/, MapUnit /*eCoreMetric*/, MapUnit /*ePresMetric*/, - OUString &rText, const IntlWrapper* /*pIntl*/ ) const + OUString &rText, const IntlWrapper& /*rIntl*/ ) const { if( !GetValue() ) rText = EditResId( RID_SVXITEMS_TWOLINES_OFF ); @@ -2958,7 +2958,7 @@ sal_uInt16 SvxTextRotateItem::GetVersion(sal_uInt16 nFFVer) const bool SvxTextRotateItem::GetPresentation( SfxItemPresentation /*ePres*/, MapUnit /*eCoreMetric*/, MapUnit /*ePresMetric*/, - OUString &rText, const IntlWrapper*) const + OUString &rText, const IntlWrapper&) const { if (!GetValue()) rText = EditResId(RID_SVXITEMS_TEXTROTATE_OFF); @@ -3063,7 +3063,7 @@ sal_uInt16 SvxCharRotateItem::GetVersion( sal_uInt16 nFFVer ) const bool SvxCharRotateItem::GetPresentation( SfxItemPresentation /*ePres*/, MapUnit /*eCoreMetric*/, MapUnit /*ePresMetric*/, - OUString &rText, const IntlWrapper* ) const + OUString &rText, const IntlWrapper&) const { if( !GetValue() ) rText = EditResId( RID_SVXITEMS_CHARROTATE_OFF ); @@ -3196,7 +3196,7 @@ sal_uInt16 SvxCharScaleWidthItem::GetVersion( sal_uInt16 nFFVer ) const bool SvxCharScaleWidthItem::GetPresentation( SfxItemPresentation /*ePres*/, MapUnit /*eCoreMetric*/, MapUnit /*ePresMetric*/, - OUString &rText, const IntlWrapper* ) const + OUString &rText, const IntlWrapper&) const { if( !GetValue() ) rText = EditResId( RID_SVXITEMS_CHARSCALE_OFF ); @@ -3289,7 +3289,7 @@ bool SvxCharReliefItem::GetPresentation SfxItemPresentation /*ePres*/, MapUnit /*eCoreUnit*/, MapUnit /*ePresUnit*/, - OUString& rText, const IntlWrapper * /*pIntl*/ + OUString& rText, const IntlWrapper& /*rIntl*/ ) const { rText = GetValueTextByPos( (sal_uInt16)GetValue() ); diff --git a/editeng/source/items/writingmodeitem.cxx b/editeng/source/items/writingmodeitem.cxx index fbac64aaba46..c3a53475d635 100644 --- a/editeng/source/items/writingmodeitem.cxx +++ b/editeng/source/items/writingmodeitem.cxx @@ -69,7 +69,7 @@ bool SvxWritingModeItem::GetPresentation( SfxItemPresentation /*ePres*/, MapUnit /*eCoreMetric*/, MapUnit /*ePresMetric*/, OUString &rText, - const IntlWrapper * ) const + const IntlWrapper& ) const { rText = EditResId(getFrmDirResId((int)GetValue())); return true; diff --git a/editeng/source/items/xmlcnitm.cxx b/editeng/source/items/xmlcnitm.cxx index 33f07dd5882a..c71f15d20692 100644 --- a/editeng/source/items/xmlcnitm.cxx +++ b/editeng/source/items/xmlcnitm.cxx @@ -61,7 +61,7 @@ bool SvXMLAttrContainerItem::GetPresentation( MapUnit /*eCoreMetric*/, MapUnit /*ePresentationMetric*/, OUString & /*rText*/, - const IntlWrapper * /*pIntlWrapper*/ ) const + const IntlWrapper& /*rIntlWrapper*/ ) const { return false; } 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(); diff --git a/framework/source/uielement/toolbarsmenucontroller.cxx b/framework/source/uielement/toolbarsmenucontroller.cxx index 35f12c14d9ad..8a4502443468 100644 --- a/framework/source/uielement/toolbarsmenucontroller.cxx +++ b/framework/source/uielement/toolbarsmenucontroller.cxx @@ -127,7 +127,7 @@ ToolbarsMenuController::ToolbarsMenuController( const css::uno::Reference< css:: m_aPropUIName( "UIName" ), m_aPropResourceURL( "ResourceURL" ), m_bResetActive( false ), - m_aIntlWrapper( xContext, Application::GetSettings().GetLanguageTag() ) + m_aIntlWrapper(SvtSysLocale().GetUILanguageTag()) { } 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; diff --git a/include/editeng/adjustitem.hxx b/include/editeng/adjustitem.hxx index 8c71878cae65..b74c45ef9596 100644 --- a/include/editeng/adjustitem.hxx +++ b/include/editeng/adjustitem.hxx @@ -61,7 +61,7 @@ public: virtual bool GetPresentation( SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, - OUString &rText, const IntlWrapper * = nullptr ) const override; + OUString &rText, const IntlWrapper& ) const override; virtual sal_uInt16 GetValueCount() const override; virtual OUString GetValueTextByPos( sal_uInt16 nPos ) const override; virtual sal_uInt16 GetEnumValue() const override; diff --git a/include/editeng/autokernitem.hxx b/include/editeng/autokernitem.hxx index 06b47f657190..ad2fc43d9367 100644 --- a/include/editeng/autokernitem.hxx +++ b/include/editeng/autokernitem.hxx @@ -47,7 +47,7 @@ public: virtual bool GetPresentation( SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, - OUString &rText, const IntlWrapper * = nullptr ) const override; + OUString &rText, const IntlWrapper& ) const override; SvxAutoKernItem& operator=(const SvxAutoKernItem& rAutoKern) { diff --git a/include/editeng/blinkitem.hxx b/include/editeng/blinkitem.hxx index fe034a02f5b5..77cad8dcefbe 100644 --- a/include/editeng/blinkitem.hxx +++ b/include/editeng/blinkitem.hxx @@ -46,7 +46,7 @@ public: virtual bool GetPresentation( SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, - OUString &rText, const IntlWrapper * = nullptr ) const override; + OUString &rText, const IntlWrapper& ) const override; SvxBlinkItem& operator=(const SvxBlinkItem& rBlink) { SetValue(rBlink.GetValue()); diff --git a/include/editeng/boxitem.hxx b/include/editeng/boxitem.hxx index 984bd389d7e4..85eba50c4ecd 100644 --- a/include/editeng/boxitem.hxx +++ b/include/editeng/boxitem.hxx @@ -78,7 +78,7 @@ public: virtual bool GetPresentation( SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, - OUString &rText, const IntlWrapper * = nullptr ) const override; + OUString &rText, const IntlWrapper& ) const override; virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const override; @@ -193,7 +193,7 @@ public: virtual bool GetPresentation( SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, - OUString &rText, const IntlWrapper * = nullptr ) const override; + OUString &rText, const IntlWrapper& ) 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; diff --git a/include/editeng/brushitem.hxx b/include/editeng/brushitem.hxx index d1b66da8890d..787fb3f1d8e0 100644 --- a/include/editeng/brushitem.hxx +++ b/include/editeng/brushitem.hxx @@ -82,7 +82,7 @@ public: virtual bool GetPresentation( SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, - OUString &rText, const IntlWrapper * = nullptr ) const override; + OUString &rText, const IntlWrapper& ) const override; virtual bool operator==( const SfxPoolItem& ) const override; virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; diff --git a/include/editeng/bulletitem.hxx b/include/editeng/bulletitem.hxx index c73fcb2d8cb9..e112e9776f9e 100644 --- a/include/editeng/bulletitem.hxx +++ b/include/editeng/bulletitem.hxx @@ -90,7 +90,7 @@ public: virtual bool GetPresentation( SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, - OUString &rText, const IntlWrapper * = nullptr ) const override; + OUString &rText, const IntlWrapper& ) const override; static void StoreFont( SvStream&, const vcl::Font& ); static vcl::Font CreateFont( SvStream&, sal_uInt16 nVer ); diff --git a/include/editeng/charhiddenitem.hxx b/include/editeng/charhiddenitem.hxx index 7f53bcbe0c1f..ec2b1400adaf 100644 --- a/include/editeng/charhiddenitem.hxx +++ b/include/editeng/charhiddenitem.hxx @@ -38,7 +38,7 @@ public: virtual bool GetPresentation( SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, - OUString &rText, const IntlWrapper * = nullptr ) const override; + OUString &rText, const IntlWrapper& ) const override; SvxCharHiddenItem& operator=(const SvxCharHiddenItem& rHidden) { SetValue(rHidden.GetValue()); diff --git a/include/editeng/charreliefitem.hxx b/include/editeng/charreliefitem.hxx index 6da13c4ee9bd..8bdc6f55ef23 100644 --- a/include/editeng/charreliefitem.hxx +++ b/include/editeng/charreliefitem.hxx @@ -51,7 +51,7 @@ public: MapUnit eCoreMetric, MapUnit ePresMetric, OUString &rText, - const IntlWrapper * = nullptr ) const override; + const IntlWrapper& ) 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; diff --git a/include/editeng/charrotateitem.hxx b/include/editeng/charrotateitem.hxx index 292712cc6823..19c7f9cbcd76 100644 --- a/include/editeng/charrotateitem.hxx +++ b/include/editeng/charrotateitem.hxx @@ -45,7 +45,7 @@ public: MapUnit eCoreMetric, MapUnit ePresMetric, OUString &rText, - const IntlWrapper * = nullptr) const override; + const IntlWrapper&) 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; @@ -99,7 +99,7 @@ public: MapUnit eCoreMetric, MapUnit ePresMetric, OUString &rText, - const IntlWrapper * = nullptr ) const override; + const IntlWrapper& ) 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; diff --git a/include/editeng/charscaleitem.hxx b/include/editeng/charscaleitem.hxx index 3c0539031b2a..8bec6b512341 100644 --- a/include/editeng/charscaleitem.hxx +++ b/include/editeng/charscaleitem.hxx @@ -49,7 +49,7 @@ public: MapUnit eCoreMetric, MapUnit ePresMetric, OUString &rText, - const IntlWrapper * = nullptr ) const override; + const IntlWrapper& ) 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; diff --git a/include/editeng/charsetcoloritem.hxx b/include/editeng/charsetcoloritem.hxx index 7223c2b9a944..03d7542b974c 100644 --- a/include/editeng/charsetcoloritem.hxx +++ b/include/editeng/charsetcoloritem.hxx @@ -42,7 +42,7 @@ public: virtual bool GetPresentation( SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, - OUString &rText, const IntlWrapper * = nullptr ) const override; + OUString &rText, const IntlWrapper& ) const override; virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const override; diff --git a/include/editeng/cmapitem.hxx b/include/editeng/cmapitem.hxx index e651a1e4222e..728099361923 100644 --- a/include/editeng/cmapitem.hxx +++ b/include/editeng/cmapitem.hxx @@ -44,7 +44,7 @@ public: virtual bool GetPresentation( SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, - OUString &rText, const IntlWrapper * = nullptr ) const override; + OUString &rText, const IntlWrapper& ) const override; virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const override; diff --git a/include/editeng/colritem.hxx b/include/editeng/colritem.hxx index 55bf50a8f4d1..b90f1e08ba90 100644 --- a/include/editeng/colritem.hxx +++ b/include/editeng/colritem.hxx @@ -51,7 +51,7 @@ public: virtual bool GetPresentation(SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, - OUString &rText, const IntlWrapper* pIntlWrapper = nullptr) const override; + OUString &rText, const IntlWrapper& rIntlWrapper) const override; virtual SfxPoolItem* Clone(SfxItemPool* pPool = nullptr) const override; virtual SfxPoolItem* Create(SvStream& rStream, sal_uInt16 nVersion) const override; diff --git a/include/editeng/contouritem.hxx b/include/editeng/contouritem.hxx index c7865967373a..34602f575ede 100644 --- a/include/editeng/contouritem.hxx +++ b/include/editeng/contouritem.hxx @@ -44,7 +44,7 @@ public: virtual bool GetPresentation( SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, - OUString &rText, const IntlWrapper * = nullptr ) const override; + OUString &rText, const IntlWrapper& ) const override; SvxContourItem& operator=(const SvxContourItem& rCont) { diff --git a/include/editeng/crossedoutitem.hxx b/include/editeng/crossedoutitem.hxx index b09654d946e2..6e460cd869ca 100644 --- a/include/editeng/crossedoutitem.hxx +++ b/include/editeng/crossedoutitem.hxx @@ -43,7 +43,7 @@ public: virtual bool GetPresentation( SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, - OUString &rText, const IntlWrapper * = nullptr ) const override; + OUString &rText, const IntlWrapper& ) const override; virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const override; diff --git a/include/editeng/emphasismarkitem.hxx b/include/editeng/emphasismarkitem.hxx index fe9d92a915e9..356cd56a2a47 100644 --- a/include/editeng/emphasismarkitem.hxx +++ b/include/editeng/emphasismarkitem.hxx @@ -45,7 +45,7 @@ public: MapUnit eCoreMetric, MapUnit ePresMetric, OUString &rText, - const IntlWrapper * = nullptr ) const override; + const IntlWrapper& ) const override; virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const override; diff --git a/include/editeng/escapementitem.hxx b/include/editeng/escapementitem.hxx index 1e8585a0f116..0b0be8793cde 100644 --- a/include/editeng/escapementitem.hxx +++ b/include/editeng/escapementitem.hxx @@ -56,7 +56,7 @@ public: virtual bool GetPresentation( SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, - OUString &rText, const IntlWrapper * = nullptr ) const override; + OUString &rText, const IntlWrapper& ) 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; diff --git a/include/editeng/fhgtitem.hxx b/include/editeng/fhgtitem.hxx index ac021bcca0b3..a982e7a41e90 100644 --- a/include/editeng/fhgtitem.hxx +++ b/include/editeng/fhgtitem.hxx @@ -55,7 +55,7 @@ public: virtual bool GetPresentation( SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, - OUString &rText, const IntlWrapper * = nullptr ) const override; + OUString &rText, const IntlWrapper& ) const override; virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const override; diff --git a/include/editeng/flstitem.hxx b/include/editeng/flstitem.hxx index f75ccca5cd23..527a38544c0b 100644 --- a/include/editeng/flstitem.hxx +++ b/include/editeng/flstitem.hxx @@ -54,7 +54,7 @@ public: virtual bool GetPresentation( SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, - OUString &rText, const IntlWrapper * = nullptr ) const override; + OUString &rText, const IntlWrapper& ) const override; const FontList* GetFontList() const { return pFontList; } }; diff --git a/include/editeng/fontitem.hxx b/include/editeng/fontitem.hxx index bd78542b72c1..558239f34f09 100644 --- a/include/editeng/fontitem.hxx +++ b/include/editeng/fontitem.hxx @@ -58,7 +58,7 @@ public: virtual bool GetPresentation(SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, - OUString &rText, const IntlWrapper* = nullptr) const override; + OUString &rText, const IntlWrapper&) const override; // Access methods: void SetFamilyName(const OUString& rFamilyName) diff --git a/include/editeng/forbiddenruleitem.hxx b/include/editeng/forbiddenruleitem.hxx index 47233b7a3c26..f28849ed6a46 100644 --- a/include/editeng/forbiddenruleitem.hxx +++ b/include/editeng/forbiddenruleitem.hxx @@ -43,7 +43,7 @@ public: MapUnit eCoreMetric, MapUnit ePresMetric, OUString &rText, - const IntlWrapper * = nullptr ) const override; + const IntlWrapper& ) const override; SvxForbiddenRuleItem& operator=( const SvxForbiddenRuleItem& rItem ) diff --git a/include/editeng/formatbreakitem.hxx b/include/editeng/formatbreakitem.hxx index e0fd881162b1..64ca7346feed 100644 --- a/include/editeng/formatbreakitem.hxx +++ b/include/editeng/formatbreakitem.hxx @@ -51,7 +51,7 @@ public: virtual bool GetPresentation( SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, - OUString &rText, const IntlWrapper * = nullptr ) const override; + OUString &rText, const IntlWrapper& ) const override; virtual OUString GetValueTextByPos( sal_uInt16 nPos ) const override; virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; diff --git a/include/editeng/frmdiritem.hxx b/include/editeng/frmdiritem.hxx index 4e3018848722..7ae1a2db2ccf 100644 --- a/include/editeng/frmdiritem.hxx +++ b/include/editeng/frmdiritem.hxx @@ -43,7 +43,7 @@ public: MapUnit eCoreMetric, MapUnit ePresMetric, OUString &rText, - const IntlWrapper * = nullptr ) const override; + const IntlWrapper& ) 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; diff --git a/include/editeng/fwdtitem.hxx b/include/editeng/fwdtitem.hxx index 00e146913360..a9a115ea9dc9 100644 --- a/include/editeng/fwdtitem.hxx +++ b/include/editeng/fwdtitem.hxx @@ -47,7 +47,7 @@ public: virtual bool GetPresentation( SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, - OUString &rText, const IntlWrapper * = nullptr ) const override; + OUString &rText, const IntlWrapper& ) const override; virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const override; diff --git a/include/editeng/hngpnctitem.hxx b/include/editeng/hngpnctitem.hxx index ebb6ab406171..2a0d1f68b668 100644 --- a/include/editeng/hngpnctitem.hxx +++ b/include/editeng/hngpnctitem.hxx @@ -42,7 +42,7 @@ public: MapUnit eCoreMetric, MapUnit ePresMetric, OUString &rText, - const IntlWrapper * = nullptr ) const override; + const IntlWrapper& ) const override; SvxHangingPunctuationItem& operator=( const SvxHangingPunctuationItem& rItem ) diff --git a/include/editeng/hyphenzoneitem.hxx b/include/editeng/hyphenzoneitem.hxx index 3a46267d754d..9c15ae446d38 100644 --- a/include/editeng/hyphenzoneitem.hxx +++ b/include/editeng/hyphenzoneitem.hxx @@ -54,7 +54,7 @@ public: virtual bool GetPresentation( SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, - OUString &rText, const IntlWrapper * = nullptr ) const override; + OUString &rText, const IntlWrapper& ) const override; virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const override; diff --git a/include/editeng/justifyitem.hxx b/include/editeng/justifyitem.hxx index 3f5633c33788..0b04ab39510b 100644 --- a/include/editeng/justifyitem.hxx +++ b/include/editeng/justifyitem.hxx @@ -39,7 +39,7 @@ public: virtual bool GetPresentation( SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, - OUString &rText, const IntlWrapper * = nullptr ) const override; + OUString &rText, const IntlWrapper& ) 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; @@ -71,7 +71,7 @@ public: virtual bool GetPresentation( SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, - OUString &rText, const IntlWrapper * = nullptr ) const override; + OUString &rText, const IntlWrapper& ) 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; @@ -99,7 +99,7 @@ public: virtual bool GetPresentation( SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, - OUString &rText, const IntlWrapper * = nullptr ) const override; + OUString &rText, const IntlWrapper& ) 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; diff --git a/include/editeng/keepitem.hxx b/include/editeng/keepitem.hxx index 115b8117879d..77b528d7c631 100644 --- a/include/editeng/keepitem.hxx +++ b/include/editeng/keepitem.hxx @@ -47,7 +47,7 @@ public: virtual bool GetPresentation( SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, - OUString &rText, const IntlWrapper * = nullptr ) const override; + OUString &rText, const IntlWrapper& ) const override; }; inline SvxFormatKeepItem::SvxFormatKeepItem( const bool bKeep, const sal_uInt16 _nWhich ) : diff --git a/include/editeng/kernitem.hxx b/include/editeng/kernitem.hxx index d5eca73b3104..fa8dcd6e9030 100644 --- a/include/editeng/kernitem.hxx +++ b/include/editeng/kernitem.hxx @@ -51,7 +51,7 @@ public: virtual bool GetPresentation( SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, - OUString &rText, const IntlWrapper * = nullptr ) const override; + OUString &rText, const IntlWrapper& ) const override; SvxKerningItem& operator=(const SvxKerningItem& rKern) { SetValue( rKern.GetValue() ); diff --git a/include/editeng/langitem.hxx b/include/editeng/langitem.hxx index 81bbe052e460..a71c9a9ceef7 100644 --- a/include/editeng/langitem.hxx +++ b/include/editeng/langitem.hxx @@ -52,7 +52,7 @@ public: virtual bool GetPresentation(SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, - OUString &rText, const IntlWrapper * = nullptr) const override; + OUString &rText, const IntlWrapper&) const override; virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const override; diff --git a/include/editeng/lineitem.hxx b/include/editeng/lineitem.hxx index 0fb4a787fcb2..2dcdc97a763b 100644 --- a/include/editeng/lineitem.hxx +++ b/include/editeng/lineitem.hxx @@ -52,7 +52,7 @@ public: virtual bool GetPresentation( SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, - OUString &rText, const IntlWrapper * = nullptr ) const override; + OUString &rText, const IntlWrapper& ) const override; virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const override; diff --git a/include/editeng/lrspitem.hxx b/include/editeng/lrspitem.hxx index 82b2e3c57a40..b0d7e6b714ec 100644 --- a/include/editeng/lrspitem.hxx +++ b/include/editeng/lrspitem.hxx @@ -81,7 +81,7 @@ public: virtual bool GetPresentation( SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, - OUString &rText, const IntlWrapper * = nullptr ) const override; + OUString &rText, const IntlWrapper& ) const override; virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const override; diff --git a/include/editeng/lspcitem.hxx b/include/editeng/lspcitem.hxx index 2c5c6ffcc33c..caec910755fa 100644 --- a/include/editeng/lspcitem.hxx +++ b/include/editeng/lspcitem.hxx @@ -58,7 +58,7 @@ public: virtual bool GetPresentation( SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, - OUString &rText, const IntlWrapper * = nullptr ) const override; + OUString &rText, const IntlWrapper& ) const override; virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const override; diff --git a/include/editeng/nhypitem.hxx b/include/editeng/nhypitem.hxx index fe7a33678c49..b54d69867678 100644 --- a/include/editeng/nhypitem.hxx +++ b/include/editeng/nhypitem.hxx @@ -37,7 +37,7 @@ public: virtual bool GetPresentation( SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, - OUString &rText, const IntlWrapper * = nullptr ) const override; + OUString &rText, const IntlWrapper& ) const override; SvxNoHyphenItem& operator=(const SvxNoHyphenItem& rNHH) { diff --git a/include/editeng/nlbkitem.hxx b/include/editeng/nlbkitem.hxx index fb6a836ab318..f6a2c997bf0c 100644 --- a/include/editeng/nlbkitem.hxx +++ b/include/editeng/nlbkitem.hxx @@ -37,7 +37,7 @@ public: virtual bool GetPresentation( SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, - OUString &rText, const IntlWrapper * = nullptr ) const override; + OUString &rText, const IntlWrapper& ) const override; SvxNoLinebreakItem& operator=(const SvxNoLinebreakItem& rLB) { diff --git a/include/editeng/opaqitem.hxx b/include/editeng/opaqitem.hxx index 6b464e3507a3..d2a26feac987 100644 --- a/include/editeng/opaqitem.hxx +++ b/include/editeng/opaqitem.hxx @@ -46,7 +46,7 @@ public: virtual bool GetPresentation( SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, - OUString &rText, const IntlWrapper * = nullptr ) const override; + OUString &rText, const IntlWrapper& ) const override; }; inline SvxOpaqueItem::SvxOpaqueItem( const sal_uInt16 nId, const bool bOpa ) diff --git a/include/editeng/optitems.hxx b/include/editeng/optitems.hxx index 82c9b55748d5..d950d456ed14 100644 --- a/include/editeng/optitems.hxx +++ b/include/editeng/optitems.hxx @@ -44,7 +44,7 @@ public: virtual bool GetPresentation( SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, - OUString &rText, const IntlWrapper * = nullptr ) const override; + OUString &rText, const IntlWrapper& ) const override; virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; virtual bool operator==( const SfxPoolItem& ) const override; @@ -73,7 +73,7 @@ public: virtual bool GetPresentation( SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, - OUString &rText, const IntlWrapper * = nullptr ) const override; + OUString &rText, const IntlWrapper& ) const override; virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; virtual SfxPoolItem* Create( SvStream& rStrm, sal_uInt16 nVer ) const override; diff --git a/include/editeng/orphitem.hxx b/include/editeng/orphitem.hxx index 8998056f02d1..108ef55edc7c 100644 --- a/include/editeng/orphitem.hxx +++ b/include/editeng/orphitem.hxx @@ -46,7 +46,7 @@ public: virtual bool GetPresentation( SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, - OUString &rText, const IntlWrapper * = nullptr ) const override; + OUString &rText, const IntlWrapper& ) const override; SvxOrphansItem& operator=( const SvxOrphansItem& rOrphans ) { diff --git a/include/editeng/paravertalignitem.hxx b/include/editeng/paravertalignitem.hxx index 19aac0e99766..dc8d695e2c91 100644 --- a/include/editeng/paravertalignitem.hxx +++ b/include/editeng/paravertalignitem.hxx @@ -49,7 +49,7 @@ public: MapUnit eCoreMetric, MapUnit ePresMetric, OUString &rText, - const IntlWrapper * = nullptr ) const override; + const IntlWrapper& ) 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; diff --git a/include/editeng/pbinitem.hxx b/include/editeng/pbinitem.hxx index 3c390451d671..d0f03797e119 100644 --- a/include/editeng/pbinitem.hxx +++ b/include/editeng/pbinitem.hxx @@ -49,7 +49,7 @@ public: virtual bool GetPresentation( SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, - OUString &rText, const IntlWrapper * = nullptr ) const override; + OUString &rText, const IntlWrapper& ) const override; }; inline SvxPaperBinItem::SvxPaperBinItem( const sal_uInt16 nId, const sal_uInt8 nT ) diff --git a/include/editeng/pgrditem.hxx b/include/editeng/pgrditem.hxx index 6b3f297dabfd..741c88a73129 100644 --- a/include/editeng/pgrditem.hxx +++ b/include/editeng/pgrditem.hxx @@ -44,7 +44,7 @@ public: virtual bool GetPresentation( SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, - OUString &rText, const IntlWrapper * = nullptr ) const override; + OUString &rText, const IntlWrapper& ) const override; }; #endif diff --git a/include/editeng/pmdlitem.hxx b/include/editeng/pmdlitem.hxx index 6ab2be2d7e47..a1c895fe98cb 100644 --- a/include/editeng/pmdlitem.hxx +++ b/include/editeng/pmdlitem.hxx @@ -47,7 +47,7 @@ public: virtual bool GetPresentation( SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, - OUString &rText, const IntlWrapper * = nullptr ) const override; + OUString &rText, const IntlWrapper& ) 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; diff --git a/include/editeng/postitem.hxx b/include/editeng/postitem.hxx index a558fbd5c7a1..1db525954f4d 100644 --- a/include/editeng/postitem.hxx +++ b/include/editeng/postitem.hxx @@ -44,7 +44,7 @@ public: virtual bool GetPresentation( SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, - OUString &rText, const IntlWrapper * = nullptr ) const override; + OUString &rText, const IntlWrapper& ) const override; virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const override; diff --git a/include/editeng/prntitem.hxx b/include/editeng/prntitem.hxx index f276cf7f5643..087691c18f10 100644 --- a/include/editeng/prntitem.hxx +++ b/include/editeng/prntitem.hxx @@ -46,7 +46,7 @@ public: virtual bool GetPresentation( SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, - OUString &rText, const IntlWrapper * = nullptr ) const override; + OUString &rText, const IntlWrapper& ) const override; }; inline SvxPrintItem::SvxPrintItem( const sal_uInt16 nId, const bool bPrt ) diff --git a/include/editeng/protitem.hxx b/include/editeng/protitem.hxx index 8c40da989a76..28f82763db41 100644 --- a/include/editeng/protitem.hxx +++ b/include/editeng/protitem.hxx @@ -50,7 +50,7 @@ public: virtual bool GetPresentation( SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, - OUString &rText, const IntlWrapper * = nullptr ) const override; + OUString &rText, const IntlWrapper& ) const override; virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; diff --git a/include/editeng/prszitem.hxx b/include/editeng/prszitem.hxx index 20cb729505e1..ba4412308aad 100644 --- a/include/editeng/prszitem.hxx +++ b/include/editeng/prszitem.hxx @@ -43,7 +43,7 @@ public: virtual bool GetPresentation( SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, - OUString &rText, const IntlWrapper * = nullptr ) const override; + OUString &rText, const IntlWrapper& ) const override; SvxPropSizeItem& operator=(const SvxPropSizeItem& rPropSize) { diff --git a/include/editeng/scriptspaceitem.hxx b/include/editeng/scriptspaceitem.hxx index 3dc6e7473cc3..4e084fedd7f4 100644 --- a/include/editeng/scriptspaceitem.hxx +++ b/include/editeng/scriptspaceitem.hxx @@ -44,7 +44,7 @@ public: MapUnit eCoreMetric, MapUnit ePresMetric, OUString &rText, - const IntlWrapper * = nullptr ) const override; + const IntlWrapper& ) const override; SvxScriptSpaceItem& operator=(const SvxScriptSpaceItem& rItem ) { diff --git a/include/editeng/shaditem.hxx b/include/editeng/shaditem.hxx index 51d5ecfe86cc..bf85da422b58 100644 --- a/include/editeng/shaditem.hxx +++ b/include/editeng/shaditem.hxx @@ -55,7 +55,7 @@ public: virtual bool GetPresentation( SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, - OUString &rText, const IntlWrapper * = nullptr ) const override; + OUString &rText, const IntlWrapper& ) const override; virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const override; diff --git a/include/editeng/shdditem.hxx b/include/editeng/shdditem.hxx index 2c8e21f806ab..a27b54ccc145 100644 --- a/include/editeng/shdditem.hxx +++ b/include/editeng/shdditem.hxx @@ -47,7 +47,7 @@ public: virtual bool GetPresentation( SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, - OUString &rText, const IntlWrapper * = nullptr ) const override; + OUString &rText, const IntlWrapper& ) const override; SvxShadowedItem& operator=(const SvxShadowedItem& rShadow) { SetValue(rShadow.GetValue()); diff --git a/include/editeng/sizeitem.hxx b/include/editeng/sizeitem.hxx index 37fc8c8e5c07..101424e834dc 100644 --- a/include/editeng/sizeitem.hxx +++ b/include/editeng/sizeitem.hxx @@ -51,7 +51,7 @@ public: virtual bool GetPresentation( SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, - OUString &rText, const IntlWrapper * = nullptr ) const override; + OUString &rText, const IntlWrapper& ) const override; virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const override; diff --git a/include/editeng/spltitem.hxx b/include/editeng/spltitem.hxx index 47112ca149ff..620c6bbd0c77 100644 --- a/include/editeng/spltitem.hxx +++ b/include/editeng/spltitem.hxx @@ -49,7 +49,7 @@ public: virtual bool GetPresentation( SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, - OUString &rText, const IntlWrapper * = nullptr ) const override; + OUString &rText, const IntlWrapper& ) const override; }; inline SvxFormatSplitItem::SvxFormatSplitItem( const bool bSplit, const sal_uInt16 nWh ) : diff --git a/include/editeng/tstpitem.hxx b/include/editeng/tstpitem.hxx index 880b46e10c22..c0f5c61649a9 100644 --- a/include/editeng/tstpitem.hxx +++ b/include/editeng/tstpitem.hxx @@ -144,7 +144,7 @@ public: virtual bool GetPresentation( SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, - OUString &rText, const IntlWrapper * = nullptr ) const override; + OUString &rText, const IntlWrapper& ) const override; virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; virtual SfxPoolItem* Create( SvStream&, sal_uInt16 ) const override; diff --git a/include/editeng/twolinesitem.hxx b/include/editeng/twolinesitem.hxx index e978c89ca544..28ca49feae7c 100644 --- a/include/editeng/twolinesitem.hxx +++ b/include/editeng/twolinesitem.hxx @@ -46,7 +46,7 @@ public: MapUnit eCoreMetric, MapUnit ePresMetric, 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; diff --git a/include/editeng/udlnitem.hxx b/include/editeng/udlnitem.hxx index f0702c6f6965..694e92ba43b6 100644 --- a/include/editeng/udlnitem.hxx +++ b/include/editeng/udlnitem.hxx @@ -43,7 +43,7 @@ public: virtual bool GetPresentation( SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, - OUString &rText, const IntlWrapper * = nullptr ) const override; + OUString &rText, const IntlWrapper& ) const override; virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const override; diff --git a/include/editeng/ulspitem.hxx b/include/editeng/ulspitem.hxx index 97fd58990301..5e2ca0f834c7 100644 --- a/include/editeng/ulspitem.hxx +++ b/include/editeng/ulspitem.hxx @@ -55,7 +55,7 @@ public: virtual bool GetPresentation( SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, - OUString &rText, const IntlWrapper * = nullptr ) const override; + OUString &rText, const IntlWrapper& ) const override; virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const override; diff --git a/include/editeng/wghtitem.hxx b/include/editeng/wghtitem.hxx index 1dbd1e875cd3..40fdfcf56d83 100644 --- a/include/editeng/wghtitem.hxx +++ b/include/editeng/wghtitem.hxx @@ -44,7 +44,7 @@ public: virtual bool GetPresentation( SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, - OUString &rText, const IntlWrapper * = nullptr ) const override; + OUString &rText, const IntlWrapper& ) const override; virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const override; diff --git a/include/editeng/widwitem.hxx b/include/editeng/widwitem.hxx index 1d5d9eabf3db..d008c87a29cd 100644 --- a/include/editeng/widwitem.hxx +++ b/include/editeng/widwitem.hxx @@ -46,7 +46,7 @@ public: virtual bool GetPresentation( SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, - OUString &rText, const IntlWrapper * = nullptr ) const override; + OUString &rText, const IntlWrapper& ) const override; SvxWidowsItem& operator=( const SvxWidowsItem& rWidows ) { diff --git a/include/editeng/writingmodeitem.hxx b/include/editeng/writingmodeitem.hxx index 518c087c83d2..55a0d5e2e9ea 100644 --- a/include/editeng/writingmodeitem.hxx +++ b/include/editeng/writingmodeitem.hxx @@ -45,7 +45,7 @@ public: MapUnit eCoreMetric, MapUnit ePresMetric, OUString &rText, - const IntlWrapper * = nullptr ) const override; + const IntlWrapper& ) 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; diff --git a/include/editeng/wrlmitem.hxx b/include/editeng/wrlmitem.hxx index 2459c2557cdb..1e36d391e008 100644 --- a/include/editeng/wrlmitem.hxx +++ b/include/editeng/wrlmitem.hxx @@ -48,7 +48,7 @@ public: virtual bool GetPresentation( SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, - OUString &rText, const IntlWrapper * = nullptr ) const override; + OUString &rText, const IntlWrapper& ) const override; SvxWordLineModeItem& operator=( const SvxWordLineModeItem& rWLM ) { diff --git a/include/editeng/xmlcnitm.hxx b/include/editeng/xmlcnitm.hxx index 02e304ee1b22..41664c404c41 100644 --- a/include/editeng/xmlcnitm.hxx +++ b/include/editeng/xmlcnitm.hxx @@ -41,12 +41,11 @@ public: virtual bool operator==( const SfxPoolItem& ) const override; - virtual bool GetPresentation( - SfxItemPresentation ePresentation, - MapUnit eCoreMetric, - MapUnit ePresentationMetric, - OUString &rText, - const IntlWrapper *pIntlWrapper = nullptr ) const override; + virtual bool GetPresentation(SfxItemPresentation ePresentation, + MapUnit eCoreMetric, + MapUnit ePresentationMetric, + OUString &rText, + const IntlWrapper& rIntlWrapper) const override; virtual sal_uInt16 GetVersion( sal_uInt16 nFileFormatVersion ) const override; diff --git a/include/sfx2/evntconf.hxx b/include/sfx2/evntconf.hxx index 7df7c6ae6f88..ec6a0604f569 100644 --- a/include/sfx2/evntconf.hxx +++ b/include/sfx2/evntconf.hxx @@ -79,7 +79,7 @@ public: MapUnit eCoreMetric, MapUnit ePresMetric, OUString &rText, - const IntlWrapper * = nullptr ) const override; + const IntlWrapper& ) const override; virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const override; virtual SvStream& Store(SvStream &, sal_uInt16 nItemVersion ) const override; diff --git a/include/svl/cenumitm.hxx b/include/svl/cenumitm.hxx index e4ea233c2f8b..1857be8cc886 100644 --- a/include/svl/cenumitm.hxx +++ b/include/svl/cenumitm.hxx @@ -37,7 +37,7 @@ public: virtual bool GetPresentation(SfxItemPresentation, MapUnit, MapUnit, OUString & rText, - const IntlWrapper * = nullptr) const override; + const IntlWrapper&) const override; virtual bool QueryValue(css::uno::Any & rVal, sal_uInt8 = 0) const override; diff --git a/include/svl/cintitem.hxx b/include/svl/cintitem.hxx index 2ccfd942d6f9..9b265179cd77 100644 --- a/include/svl/cintitem.hxx +++ b/include/svl/cintitem.hxx @@ -42,7 +42,7 @@ public: virtual bool GetPresentation(SfxItemPresentation, MapUnit, MapUnit, OUString & rText, - const IntlWrapper * = nullptr) + const IntlWrapper&) const override; virtual bool QueryValue(css::uno::Any& rVal, @@ -89,7 +89,7 @@ public: virtual bool GetPresentation(SfxItemPresentation, MapUnit, MapUnit, OUString & rText, - const IntlWrapper * = nullptr) + const IntlWrapper&) const override; virtual bool QueryValue(css::uno::Any& rVal, @@ -136,7 +136,7 @@ public: virtual bool GetPresentation(SfxItemPresentation, MapUnit, MapUnit, OUString & rText, - const IntlWrapper * = nullptr) + const IntlWrapper&) const override; virtual bool QueryValue(css::uno::Any& rVal, @@ -183,7 +183,7 @@ public: virtual bool GetPresentation(SfxItemPresentation, MapUnit, MapUnit, OUString & rText, - const IntlWrapper * = nullptr) + const IntlWrapper&) const override; virtual bool QueryValue(css::uno::Any& rVal, diff --git a/include/svl/ctypeitm.hxx b/include/svl/ctypeitm.hxx index 17da7e54be71..3fae7a61f215 100644 --- a/include/svl/ctypeitm.hxx +++ b/include/svl/ctypeitm.hxx @@ -50,7 +50,7 @@ public: MapUnit eCoreMetric, MapUnit ePresMetric, OUString & rText, - const IntlWrapper* pIntlWrapper = nullptr ) const override; + const IntlWrapper& rIntlWrapper ) const override; virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; diff --git a/include/svl/custritm.hxx b/include/svl/custritm.hxx index 66f65a85b508..c48988448418 100644 --- a/include/svl/custritm.hxx +++ b/include/svl/custritm.hxx @@ -46,7 +46,7 @@ public: virtual bool GetPresentation(SfxItemPresentation, MapUnit, MapUnit, OUString & rText, - const IntlWrapper * = nullptr) const override; + const IntlWrapper&) const override; virtual bool QueryValue(css::uno::Any& rVal, sal_uInt8 nMemberId = 0) const override; diff --git a/include/svl/eitem.hxx b/include/svl/eitem.hxx index 49b932985c2d..e8933f0bcdaf 100644 --- a/include/svl/eitem.hxx +++ b/include/svl/eitem.hxx @@ -110,9 +110,9 @@ public: virtual bool operator ==(const SfxPoolItem & rItem) const override; virtual bool GetPresentation(SfxItemPresentation, - MapUnit, MapUnit, - OUString & rText, - const IntlWrapper * = nullptr) + MapUnit, MapUnit, + OUString & rText, + const IntlWrapper&) const override; virtual void dumpAsXml(struct _xmlTextWriter* pWriter) const override; diff --git a/include/svl/flagitem.hxx b/include/svl/flagitem.hxx index 34c5b67a2cd5..56965d68ba8b 100644 --- a/include/svl/flagitem.hxx +++ b/include/svl/flagitem.hxx @@ -44,7 +44,7 @@ public: MapUnit eCoreMetric, MapUnit ePresMetric, OUString & rText, - const IntlWrapper * = nullptr ) const override; + const IntlWrapper& ) const override; sal_uInt16 GetValue() const { return nVal; } void SetValue( sal_uInt16 nNewVal ) { DBG_ASSERT( GetRefCount() == 0, "SetValue() with pooled item" ); diff --git a/include/svl/inettype.hxx b/include/svl/inettype.hxx index a5282a53feea..1fbb036b4878 100644 --- a/include/svl/inettype.hxx +++ b/include/svl/inettype.hxx @@ -225,8 +225,7 @@ public: static OUString GetContentType(INetContentType eTypeID); - static OUString GetPresentation(INetContentType eTypeID, - const LanguageTag& aLocale); + static OUString GetPresentation(INetContentType eTypeID); static INetContentType GetContentType4Extension(OUString const & rExtension); diff --git a/include/svl/int64item.hxx b/include/svl/int64item.hxx index 46a3325a2d4b..3c2148e2411f 100644 --- a/include/svl/int64item.hxx +++ b/include/svl/int64item.hxx @@ -28,7 +28,7 @@ public: virtual bool GetPresentation( SfxItemPresentation, MapUnit, MapUnit, - OUString& rText, const IntlWrapper* pIntlWrapper = nullptr ) const override; + OUString& rText, const IntlWrapper& rIntlWrapper ) const override; virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; diff --git a/include/svl/intitem.hxx b/include/svl/intitem.hxx index 6a0e4e92d439..5c73398864ad 100644 --- a/include/svl/intitem.hxx +++ b/include/svl/intitem.hxx @@ -60,7 +60,7 @@ public: virtual bool GetPresentation(SfxItemPresentation, MapUnit, MapUnit, OUString & rText, - const IntlWrapper * = nullptr) + const IntlWrapper&) const override; virtual bool QueryValue( css::uno::Any& rVal, diff --git a/include/svl/itempool.hxx b/include/svl/itempool.hxx index eced0598bad6..f9285f9612bf 100644 --- a/include/svl/itempool.hxx +++ b/include/svl/itempool.hxx @@ -143,7 +143,7 @@ public: virtual bool GetPresentation( const SfxPoolItem& rItem, MapUnit ePresentationMetric, OUString& rText, - const IntlWrapper * pIntlWrapper = nullptr ) const; + const IntlWrapper& rIntlWrapper ) const; virtual SfxItemPool* Clone() const; const OUString& GetName() const; diff --git a/include/svl/macitem.hxx b/include/svl/macitem.hxx index b7e6f292bbd8..788a721ccb37 100644 --- a/include/svl/macitem.hxx +++ b/include/svl/macitem.hxx @@ -128,7 +128,7 @@ public: MapUnit eCoreMetric, MapUnit ePresMetric, OUString &rText, - const IntlWrapper * = nullptr ) const override; + const IntlWrapper& ) const override; virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const override; virtual SvStream& Store(SvStream &, sal_uInt16 nItemVersion ) const override; diff --git a/include/svl/poolitem.hxx b/include/svl/poolitem.hxx index b2a05b993f4a..5e071055f46b 100644 --- a/include/svl/poolitem.hxx +++ b/include/svl/poolitem.hxx @@ -158,7 +158,7 @@ public: MapUnit eCoreMetric, MapUnit ePresentationMetric, OUString &rText, - const IntlWrapper * pIntlWrapper = nullptr ) const; + const IntlWrapper& rIntlWrapper ) const; virtual sal_uInt16 GetVersion( sal_uInt16 nFileFormatVersion ) const; virtual void ScaleMetrics( long lMult, long lDiv ); @@ -255,7 +255,7 @@ public: MapUnit eCoreMetric, MapUnit ePresMetric, OUString &rText, - const IntlWrapper * = nullptr ) const override; + const IntlWrapper& ) const override; virtual void dumpAsXml(struct _xmlTextWriter* pWriter) const override; // create a copy of itself @@ -283,7 +283,7 @@ public: MapUnit eCoreMetric, MapUnit ePresMetric, OUString &rText, - const IntlWrapper * = nullptr ) const override; + const IntlWrapper& ) const override; // create a copy of itself virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override = 0; diff --git a/include/svl/ptitem.hxx b/include/svl/ptitem.hxx index 0d135ee6481d..7854c089abeb 100644 --- a/include/svl/ptitem.hxx +++ b/include/svl/ptitem.hxx @@ -39,7 +39,7 @@ public: MapUnit eCoreMetric, MapUnit ePresMetric, OUString &rText, - const IntlWrapper * = nullptr ) const override; + const IntlWrapper& ) const override; virtual bool operator==( const SfxPoolItem& ) const override; diff --git a/include/svl/rectitem.hxx b/include/svl/rectitem.hxx index bbd33b936161..25a722227355 100644 --- a/include/svl/rectitem.hxx +++ b/include/svl/rectitem.hxx @@ -40,7 +40,7 @@ public: MapUnit eCoreMetric, MapUnit ePresMetric, OUString &rText, - const IntlWrapper * = nullptr ) const override; + const IntlWrapper& ) const override; virtual bool operator==( const SfxPoolItem& ) const override; virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; diff --git a/include/svl/rngitem.hxx b/include/svl/rngitem.hxx index a7187df469d7..e07f21f9cb6e 100644 --- a/include/svl/rngitem.hxx +++ b/include/svl/rngitem.hxx @@ -39,7 +39,7 @@ public: MapUnit eCoreMetric, MapUnit ePresMetric, OUString &rText, - const IntlWrapper * = nullptr ) const override; + const IntlWrapper& ) const override; virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; sal_uInt16& From() { return nFrom; } virtual SfxPoolItem* Create( SvStream &, sal_uInt16 nVersion ) const override; diff --git a/include/svl/slstitm.hxx b/include/svl/slstitm.hxx index 183875d83a2c..22b36293ee85 100644 --- a/include/svl/slstitm.hxx +++ b/include/svl/slstitm.hxx @@ -58,7 +58,7 @@ public: MapUnit eCoreMetric, MapUnit ePresMetric, OUString &rText, - const IntlWrapper * = nullptr ) const override; + const IntlWrapper& ) const override; virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; virtual SfxPoolItem* Create( SvStream &, sal_uInt16 nVersion ) const override; virtual SvStream& Store( SvStream &, sal_uInt16 nItemVersion ) const override; diff --git a/include/svl/srchitem.hxx b/include/svl/srchitem.hxx index b3e52a3b6aae..343433dd8808 100644 --- a/include/svl/srchitem.hxx +++ b/include/svl/srchitem.hxx @@ -105,7 +105,7 @@ public: virtual bool GetPresentation( SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, - OUString &rText, const IntlWrapper * = nullptr ) const override; + OUString &rText, const IntlWrapper& ) const override; // ConfigItem virtual void Notify( const css::uno::Sequence< OUString > &rPropertyNames ) override; diff --git a/include/svl/szitem.hxx b/include/svl/szitem.hxx index 0adfd8466568..c381495db210 100644 --- a/include/svl/szitem.hxx +++ b/include/svl/szitem.hxx @@ -38,7 +38,7 @@ public: MapUnit eCoreMetric, MapUnit ePresMetric, OUString &rText, - const IntlWrapper * = nullptr ) const override; + const IntlWrapper& ) const override; virtual bool operator==( const SfxPoolItem& ) const override; virtual bool QueryValue( css::uno::Any& rVal, diff --git a/include/svl/visitem.hxx b/include/svl/visitem.hxx index 8d3076d96058..c73bd970f863 100644 --- a/include/svl/visitem.hxx +++ b/include/svl/visitem.hxx @@ -46,7 +46,7 @@ public: virtual bool GetPresentation(SfxItemPresentation, MapUnit, MapUnit, OUString & rText, - const IntlWrapper * = nullptr) + const IntlWrapper&) const override; virtual bool QueryValue( css::uno::Any& rVal, diff --git a/include/svx/algitem.hxx b/include/svx/algitem.hxx index e54b8ccf4e39..4438d9148553 100644 --- a/include/svx/algitem.hxx +++ b/include/svx/algitem.hxx @@ -45,7 +45,7 @@ public: virtual bool GetPresentation( SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, - OUString &rText, const IntlWrapper * = nullptr ) const override; + OUString &rText, const IntlWrapper& ) 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; @@ -84,7 +84,7 @@ public: virtual bool GetPresentation( SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, - OUString &rText, const IntlWrapper * = nullptr ) const override; + OUString &rText, const IntlWrapper& ) const override; virtual bool operator==( const SfxPoolItem& ) const override; virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; diff --git a/include/svx/chrtitem.hxx b/include/svx/chrtitem.hxx index 9e29747f06c6..dc28dd52cd16 100644 --- a/include/svx/chrtitem.hxx +++ b/include/svx/chrtitem.hxx @@ -157,7 +157,7 @@ public: virtual bool GetPresentation(SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, - OUString &rText, const IntlWrapper * = nullptr) const override; + OUString &rText, const IntlWrapper&) const override; virtual bool operator == (const SfxPoolItem&) const override; virtual SfxPoolItem* Clone(SfxItemPool *pPool = nullptr) const override; diff --git a/include/svx/drawitem.hxx b/include/svx/drawitem.hxx index 8444ee1f887f..f9e68d5bdb39 100644 --- a/include/svx/drawitem.hxx +++ b/include/svx/drawitem.hxx @@ -39,7 +39,7 @@ public: virtual bool GetPresentation( SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, - OUString &rText, const IntlWrapper * = nullptr ) const override; + OUString &rText, const IntlWrapper& ) const override; virtual bool operator==( const SfxPoolItem& ) const override; virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; @@ -64,7 +64,7 @@ public: virtual bool GetPresentation( SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, - OUString &rText, const IntlWrapper * = nullptr ) const override; + OUString &rText, const IntlWrapper& ) const override; virtual bool operator==( const SfxPoolItem& ) const override; virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; @@ -88,7 +88,7 @@ public: virtual bool GetPresentation( SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, - OUString &rText, const IntlWrapper * = nullptr ) const override; + OUString &rText, const IntlWrapper& ) const override; virtual bool operator==( const SfxPoolItem& ) const override; virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; @@ -113,7 +113,7 @@ public: virtual bool GetPresentation( SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, - OUString &rText, const IntlWrapper * = nullptr ) const override; + OUString &rText, const IntlWrapper& ) const override; virtual bool operator==( const SfxPoolItem& ) const override; virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; @@ -138,7 +138,7 @@ public: virtual bool GetPresentation( SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, - OUString &rText, const IntlWrapper * = nullptr ) const override; + OUString &rText, const IntlWrapper& ) const override; virtual bool operator==( const SfxPoolItem& ) const override; virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; @@ -162,7 +162,7 @@ public: virtual bool GetPresentation( SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, - OUString &rText, const IntlWrapper * = nullptr ) const override; + OUString &rText, const IntlWrapper& ) const override; virtual bool operator==( const SfxPoolItem& ) const override; virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; @@ -187,7 +187,7 @@ public: virtual bool GetPresentation( SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, - OUString &rText, const IntlWrapper * = nullptr ) const override; + OUString &rText, const IntlWrapper& ) const override; virtual bool operator==( const SfxPoolItem& ) const override; virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; diff --git a/include/svx/grfcrop.hxx b/include/svx/grfcrop.hxx index 0526b4409070..2c57b4375df2 100644 --- a/include/svx/grfcrop.hxx +++ b/include/svx/grfcrop.hxx @@ -44,7 +44,7 @@ public: MapUnit eCoreMetric, MapUnit ePresMetric, 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, diff --git a/include/svx/numinf.hxx b/include/svx/numinf.hxx index 58a503fb74dc..6fb9dd171d89 100644 --- a/include/svx/numinf.hxx +++ b/include/svx/numinf.hxx @@ -56,7 +56,7 @@ public: virtual bool GetPresentation( SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, - OUString &rText, const IntlWrapper * = nullptr ) const override; + OUString &rText, const IntlWrapper& ) const override; SvNumberFormatter* GetNumberFormatter() const { return pFormatter; } const OUString& GetValueString() const { return aStringVal; } diff --git a/include/svx/optgrid.hxx b/include/svx/optgrid.hxx index f69ab59bc963..9ca88ff34a10 100644 --- a/include/svx/optgrid.hxx +++ b/include/svx/optgrid.hxx @@ -87,7 +87,7 @@ public: virtual bool GetPresentation( SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, - OUString &rText, const IntlWrapper * = nullptr ) const override; + OUString &rText, const IntlWrapper& ) const override; }; diff --git a/include/svx/pageitem.hxx b/include/svx/pageitem.hxx index 80277b7d3d3f..e83d81b7d59e 100644 --- a/include/svx/pageitem.hxx +++ b/include/svx/pageitem.hxx @@ -71,7 +71,7 @@ public: virtual bool GetPresentation( SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, - OUString &rText, const IntlWrapper * = nullptr ) const override; + OUString &rText, const IntlWrapper& ) 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; @@ -110,7 +110,7 @@ public: virtual bool GetPresentation( SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, - OUString &rText, const IntlWrapper * = nullptr ) const override; + OUString &rText, const IntlWrapper& ) const override; virtual SfxPoolItem* Create( SvStream&, sal_uInt16 nVersion ) const override; virtual SvStream& Store( SvStream&, sal_uInt16 nItemVersion ) const override; diff --git a/include/svx/postattr.hxx b/include/svx/postattr.hxx index ea3230211ac0..bcce77a4e5fb 100644 --- a/include/svx/postattr.hxx +++ b/include/svx/postattr.hxx @@ -41,7 +41,7 @@ public: virtual bool GetPresentation( SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, - OUString &rText, const IntlWrapper * = nullptr ) const override; + OUString &rText, const IntlWrapper& ) const override; virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; @@ -71,7 +71,7 @@ public: virtual bool GetPresentation( SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, - OUString &rText, const IntlWrapper * = nullptr ) const override; + OUString &rText, const IntlWrapper& ) const override; virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; @@ -102,7 +102,7 @@ public: virtual bool GetPresentation( SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, - OUString &rText, const IntlWrapper * = nullptr ) const override; + OUString &rText, const IntlWrapper& ) const override; virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; diff --git a/include/svx/rotmodit.hxx b/include/svx/rotmodit.hxx index fa2b04a2dd03..69c09a09925c 100644 --- a/include/svx/rotmodit.hxx +++ b/include/svx/rotmodit.hxx @@ -50,7 +50,7 @@ public: virtual bool GetPresentation( SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, - OUString& rText, const IntlWrapper * = nullptr ) const override; + OUString& rText, const IntlWrapper& ) 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; }; diff --git a/include/svx/rulritem.hxx b/include/svx/rulritem.hxx index 8ee0ec0db302..e8d8d0f5ba86 100644 --- a/include/svx/rulritem.hxx +++ b/include/svx/rulritem.hxx @@ -38,7 +38,7 @@ class SVX_DLLPUBLIC SvxLongLRSpaceItem : public SfxPoolItem virtual bool GetPresentation( SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, - OUString &rText, const IntlWrapper * = nullptr ) const override; + OUString &rText, const IntlWrapper& ) const override; virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; @@ -71,7 +71,7 @@ class SVX_DLLPUBLIC SvxLongULSpaceItem : public SfxPoolItem virtual bool GetPresentation( SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, - OUString &rText, const IntlWrapper * = nullptr ) const override; + OUString &rText, const IntlWrapper& ) const override; virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; @@ -103,7 +103,7 @@ protected: virtual bool GetPresentation( SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, - OUString &rText, const IntlWrapper * = nullptr ) const override; + OUString &rText, const IntlWrapper& ) const override; virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; @@ -172,7 +172,7 @@ protected: MapUnit eCoreMetric, MapUnit ePresMetric, OUString &rText, - const IntlWrapper * = nullptr ) const override; + const IntlWrapper& ) const override; virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; @@ -226,7 +226,7 @@ protected: virtual bool GetPresentation( SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, - OUString &rText, const IntlWrapper * = nullptr ) const override; + OUString &rText, const IntlWrapper& ) const override; virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; diff --git a/include/svx/sdangitm.hxx b/include/svx/sdangitm.hxx index 977b1308b874..b923772cbe57 100644 --- a/include/svx/sdangitm.hxx +++ b/include/svx/sdangitm.hxx @@ -36,8 +36,7 @@ public: MapUnit eCoreMetric, MapUnit ePresMetric, OUString& rText, - const IntlWrapper * - pIntlWrapper = nullptr) const override; + const IntlWrapper& rIntlWrapper) const override; }; diff --git a/include/svx/sdasaitm.hxx b/include/svx/sdasaitm.hxx index 9b731fe8009b..98004ae52dd7 100644 --- a/include/svx/sdasaitm.hxx +++ b/include/svx/sdasaitm.hxx @@ -44,7 +44,7 @@ class SVX_DLLPUBLIC SdrCustomShapeAdjustmentItem : public SfxPoolItem virtual bool operator==( const SfxPoolItem& ) const override; virtual bool GetPresentation(SfxItemPresentation ePresentation, MapUnit eCoreMetric, MapUnit ePresentationMetric, - OUString &rText, const IntlWrapper * = nullptr) const override; + OUString &rText, const IntlWrapper&) const override; virtual SfxPoolItem* Create( SvStream&, sal_uInt16 nItem ) const override; virtual SvStream& Store( SvStream&, sal_uInt16 nVersion ) const override; virtual SfxPoolItem* Clone( SfxItemPool* pPool = nullptr ) const override; diff --git a/include/svx/sdasitm.hxx b/include/svx/sdasitm.hxx index 57e1e20d3adc..aaff619e0d30 100644 --- a/include/svx/sdasitm.hxx +++ b/include/svx/sdasitm.hxx @@ -58,7 +58,7 @@ private: virtual bool operator==( const SfxPoolItem& ) const override; virtual bool GetPresentation(SfxItemPresentation ePresentation, MapUnit eCoreMetric, MapUnit ePresentationMetric, - OUString &rText, const IntlWrapper * = nullptr) const override; + OUString &rText, const IntlWrapper&) const override; virtual SfxPoolItem* Create( SvStream&, sal_uInt16 nItem ) const override; virtual SvStream& Store( SvStream&, sal_uInt16 nVersion ) const override; diff --git a/include/svx/sdgmoitm.hxx b/include/svx/sdgmoitm.hxx index 2c7f13a2f9cd..dc4184976679 100644 --- a/include/svx/sdgmoitm.hxx +++ b/include/svx/sdgmoitm.hxx @@ -48,7 +48,7 @@ public: virtual bool GetPresentation( SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, - OUString& rText, const IntlWrapper * = nullptr) const override; + OUString& rText, const IntlWrapper& ) const override; }; #endif // INCLUDED_SVX_SDGMOITM_HXX diff --git a/include/svx/sdmetitm.hxx b/include/svx/sdmetitm.hxx index 6f8196e98819..eead867fc48e 100644 --- a/include/svx/sdmetitm.hxx +++ b/include/svx/sdmetitm.hxx @@ -39,7 +39,7 @@ public: virtual bool GetPresentation(SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, - OUString& rText, const IntlWrapper * = nullptr) const override; + OUString& rText, const IntlWrapper&) const override; }; diff --git a/include/svx/sdooitm.hxx b/include/svx/sdooitm.hxx index 293681c5daf4..974b1c804b34 100644 --- a/include/svx/sdooitm.hxx +++ b/include/svx/sdooitm.hxx @@ -36,7 +36,7 @@ public: virtual OUString GetValueTextByVal(bool bVal) const override; - virtual bool GetPresentation(SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, OUString& rText, const IntlWrapper * = nullptr) const override; + virtual bool GetPresentation(SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, OUString& rText, const IntlWrapper&) const override; }; diff --git a/include/svx/sdprcitm.hxx b/include/svx/sdprcitm.hxx index d4292bc5715d..6d3d11a5c6d7 100644 --- a/include/svx/sdprcitm.hxx +++ b/include/svx/sdprcitm.hxx @@ -35,7 +35,7 @@ public: virtual SfxPoolItem* Clone(SfxItemPool* pPool=nullptr) const override; virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const override; - virtual bool GetPresentation(SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, OUString& rText, const IntlWrapper * = nullptr) const override; + virtual bool GetPresentation(SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, OUString& rText, const IntlWrapper&) const override; }; @@ -51,7 +51,7 @@ public: virtual SfxPoolItem* Clone( SfxItemPool* pPool = nullptr ) const override; virtual SfxPoolItem* Create( SvStream& rIn, sal_uInt16 nVer ) const override; - virtual bool GetPresentation( SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, OUString& rText, const IntlWrapper * = nullptr ) const override; + virtual bool GetPresentation(SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, OUString& rText, const IntlWrapper&) const override; }; diff --git a/include/svx/sdtaaitm.hxx b/include/svx/sdtaaitm.hxx index ab997452ee9c..37a4b3c5f516 100644 --- a/include/svx/sdtaaitm.hxx +++ b/include/svx/sdtaaitm.hxx @@ -32,7 +32,7 @@ public: virtual bool HasMetrics() const override; virtual void ScaleMetrics(long nMul, long nDiv) override; - virtual bool GetPresentation(SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, OUString& rText, const IntlWrapper * = nullptr) const override; + virtual bool GetPresentation(SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, OUString& rText, const IntlWrapper&) const override; }; #endif diff --git a/include/svx/sdtaditm.hxx b/include/svx/sdtaditm.hxx index 84d0736c9e7e..7b6a65563e86 100644 --- a/include/svx/sdtaditm.hxx +++ b/include/svx/sdtaditm.hxx @@ -45,7 +45,7 @@ public: virtual OUString GetValueTextByPos(sal_uInt16 nPos) const override; - virtual bool GetPresentation(SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, OUString& rText, const IntlWrapper * = nullptr) const override; + virtual bool GetPresentation(SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, OUString& rText, const IntlWrapper&) const override; }; #endif diff --git a/include/svx/sdtaitm.hxx b/include/svx/sdtaitm.hxx index 7cc9fb84908e..3f542c77534f 100644 --- a/include/svx/sdtaitm.hxx +++ b/include/svx/sdtaitm.hxx @@ -46,7 +46,7 @@ public: virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override; virtual OUString GetValueTextByPos(sal_uInt16 nPos) const override; - virtual bool GetPresentation(SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, OUString& rText, const IntlWrapper * = nullptr) const override; + virtual bool GetPresentation(SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, OUString& rText, const IntlWrapper&) const override; virtual void dumpAsXml(struct _xmlTextWriter* pWriter) const override; }; @@ -72,7 +72,7 @@ public: virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override; virtual OUString GetValueTextByPos(sal_uInt16 nPos) const override; - virtual bool GetPresentation(SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, OUString& rText, const IntlWrapper * = nullptr) const override; + virtual bool GetPresentation(SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, OUString& rText, const IntlWrapper&) const override; }; #endif diff --git a/include/svx/sdtakitm.hxx b/include/svx/sdtakitm.hxx index 8d628ac2d3d0..5a8d020df091 100644 --- a/include/svx/sdtakitm.hxx +++ b/include/svx/sdtakitm.hxx @@ -88,7 +88,7 @@ public: virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override; virtual OUString GetValueTextByPos(sal_uInt16 nPos) const override; - virtual bool GetPresentation(SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, OUString& rText, const IntlWrapper * = nullptr) const override; + virtual bool GetPresentation(SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, OUString& rText, const IntlWrapper&) const override; }; #endif diff --git a/include/svx/sdtayitm.hxx b/include/svx/sdtayitm.hxx index 2bb331009147..88a5c5809aa5 100644 --- a/include/svx/sdtayitm.hxx +++ b/include/svx/sdtayitm.hxx @@ -29,7 +29,7 @@ public: SdrTextAniDelayItem(SvStream& rIn): SfxUInt16Item(SDRATTR_TEXT_ANIDELAY,rIn) {} virtual SfxPoolItem* Clone(SfxItemPool* pPool=nullptr) const override; virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const override; - virtual bool GetPresentation(SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, OUString& rText, const IntlWrapper * = nullptr) const override; + virtual bool GetPresentation(SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, OUString& rText, const IntlWrapper&) const override; }; #endif diff --git a/include/svx/sdtfchim.hxx b/include/svx/sdtfchim.hxx index 4637a9a100d4..401de27dc81e 100644 --- a/include/svx/sdtfchim.hxx +++ b/include/svx/sdtfchim.hxx @@ -30,7 +30,7 @@ public: SVX_DLLPRIVATE virtual bool GetPresentation(SfxItemPresentation ePresentation, MapUnit eCoreMetric, MapUnit ePresentationMetric, - OUString &rText, const IntlWrapper * = nullptr) const override; + OUString &rText, const IntlWrapper&) const override; SVX_DLLPRIVATE virtual SfxPoolItem* Create( SvStream&, sal_uInt16 nItem ) const override; SVX_DLLPRIVATE virtual SvStream& Store( SvStream&, sal_uInt16 nVersion ) const override; diff --git a/include/svx/sdtfsitm.hxx b/include/svx/sdtfsitm.hxx index ed024c85754e..3039de81343b 100644 --- a/include/svx/sdtfsitm.hxx +++ b/include/svx/sdtfsitm.hxx @@ -55,7 +55,7 @@ public: virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override; virtual OUString GetValueTextByPos(sal_uInt16 nPos) const override; - virtual bool GetPresentation(SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, OUString& rText, const IntlWrapper * = nullptr) const override; + virtual bool GetPresentation(SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, OUString& rText, const IntlWrapper&) const override; virtual bool HasBoolValue() const override; virtual bool GetBoolValue() const override; virtual void SetBoolValue(bool bVal) override; diff --git a/include/svx/sdynitm.hxx b/include/svx/sdynitm.hxx index 4af52a326560..61fa67f4a8ef 100644 --- a/include/svx/sdynitm.hxx +++ b/include/svx/sdynitm.hxx @@ -34,7 +34,7 @@ public: virtual SfxPoolItem* Clone(SfxItemPool* pPool=nullptr) const override; virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const override; virtual OUString GetValueTextByVal(bool bVal) const override; - virtual bool GetPresentation(SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, OUString& rText, const IntlWrapper * = nullptr) const override; + virtual bool GetPresentation(SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, OUString& rText, const IntlWrapper&) const override; }; diff --git a/include/svx/svdpool.hxx b/include/svx/svdpool.hxx index 7605fb50c879..f82f88643c04 100644 --- a/include/svx/svdpool.hxx +++ b/include/svx/svdpool.hxx @@ -41,7 +41,7 @@ public: virtual bool GetPresentation(const SfxPoolItem& rItem, MapUnit ePresentationMetric, OUString& rText, - const IntlWrapper * pIntlWrapper = nullptr) const override; + const IntlWrapper& rIntlWrapper) const override; static void TakeItemName(sal_uInt16 nWhich, OUString& rItemName); }; diff --git a/include/svx/sxcecitm.hxx b/include/svx/sxcecitm.hxx index a1b8ab41675b..3f51582bbe85 100644 --- a/include/svx/sxcecitm.hxx +++ b/include/svx/sxcecitm.hxx @@ -40,7 +40,7 @@ public: virtual OUString GetValueTextByPos(sal_uInt16 nPos) const override; - virtual bool GetPresentation(SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, OUString& rText, const IntlWrapper * = nullptr) const override; + virtual bool GetPresentation(SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, OUString& rText, const IntlWrapper&) const override; }; diff --git a/include/svx/sxctitm.hxx b/include/svx/sxctitm.hxx index d75e80b35200..58f5e979d75f 100644 --- a/include/svx/sxctitm.hxx +++ b/include/svx/sxctitm.hxx @@ -36,7 +36,7 @@ public: virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const override; virtual sal_uInt16 GetValueCount() const override; // { return 4; } virtual OUString GetValueTextByPos(sal_uInt16 nPos) const override; - virtual bool GetPresentation(SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, OUString& rText, const IntlWrapper * = nullptr) const override; + virtual bool GetPresentation(SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, OUString& rText, const IntlWrapper&) const override; }; #endif diff --git a/include/svx/sxekitm.hxx b/include/svx/sxekitm.hxx index 67a11d390b5a..922db82f09a1 100644 --- a/include/svx/sxekitm.hxx +++ b/include/svx/sxekitm.hxx @@ -41,7 +41,7 @@ public: 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; virtual OUString GetValueTextByPos(sal_uInt16 nPos) const override; - virtual bool GetPresentation(SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, OUString& rText, const IntlWrapper * = nullptr) const override; + virtual bool GetPresentation(SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, OUString& rText, const IntlWrapper&) const override; }; #endif diff --git a/include/svx/sxfiitm.hxx b/include/svx/sxfiitm.hxx index 16b3a1249863..2d89b4ef0497 100644 --- a/include/svx/sxfiitm.hxx +++ b/include/svx/sxfiitm.hxx @@ -32,7 +32,7 @@ public: SdrFractionItem(sal_uInt16 nId, const Fraction& rVal): SfxPoolItem(nId), nValue(rVal) {} SdrFractionItem(sal_uInt16 nId, SvStream& rIn); virtual bool operator==(const SfxPoolItem&) const override; - virtual bool GetPresentation(SfxItemPresentation ePresentation, MapUnit eCoreMetric, MapUnit ePresentationMetric, OUString &rText, const IntlWrapper * = nullptr) const override; + virtual bool GetPresentation(SfxItemPresentation ePresentation, MapUnit eCoreMetric, MapUnit ePresentationMetric, OUString &rText, const IntlWrapper&) const override; virtual SfxPoolItem* Create(SvStream&, sal_uInt16 nVer) const override; virtual SvStream& Store(SvStream&, sal_uInt16 nItemVers) const override; virtual SfxPoolItem* Clone(SfxItemPool *pPool=nullptr) const override; diff --git a/include/svx/sxmtpitm.hxx b/include/svx/sxmtpitm.hxx index a3692fbdd151..945710a11499 100644 --- a/include/svx/sxmtpitm.hxx +++ b/include/svx/sxmtpitm.hxx @@ -44,7 +44,7 @@ public: virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override; virtual OUString GetValueTextByPos(sal_uInt16 nPos) const override; - virtual bool GetPresentation(SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, OUString& rText, const IntlWrapper * = nullptr) const override; + virtual bool GetPresentation(SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, OUString& rText, const IntlWrapper&) const override; }; // class SdrMeasureTextVPosItem @@ -66,7 +66,7 @@ public: virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override; virtual OUString GetValueTextByPos(sal_uInt16 nPos) const override; - virtual bool GetPresentation(SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, OUString& rText, const IntlWrapper * = nullptr) const override; + virtual bool GetPresentation(SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, OUString& rText, const IntlWrapper&) const override; }; #endif diff --git a/include/svx/sxmuitm.hxx b/include/svx/sxmuitm.hxx index 46052c3b7dfe..7275505996a6 100644 --- a/include/svx/sxmuitm.hxx +++ b/include/svx/sxmuitm.hxx @@ -38,7 +38,7 @@ public: virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override; virtual OUString GetValueTextByPos(sal_uInt16 nPos) const override; - virtual bool GetPresentation(SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, OUString& rText, const IntlWrapper * = nullptr) const override; + virtual bool GetPresentation(SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, OUString& rText, const IntlWrapper&) const override; }; #endif diff --git a/include/svx/sxsiitm.hxx b/include/svx/sxsiitm.hxx index 8e840369334a..398ee298cc73 100644 --- a/include/svx/sxsiitm.hxx +++ b/include/svx/sxsiitm.hxx @@ -25,7 +25,7 @@ class SdrScaleItem: public SdrFractionItem { public: SdrScaleItem(sal_uInt16 nId, const Fraction& rVal): SdrFractionItem(nId,rVal) {} SdrScaleItem(sal_uInt16 nId, SvStream& rIn): SdrFractionItem(nId,rIn) {} - virtual bool GetPresentation(SfxItemPresentation ePresentation, MapUnit eCoreMetric, MapUnit ePresentationMetric, OUString &rText, const IntlWrapper * = nullptr) const override; + virtual bool GetPresentation(SfxItemPresentation ePresentation, MapUnit eCoreMetric, MapUnit ePresentationMetric, OUString &rText, const IntlWrapper&) const override; virtual SfxPoolItem* Create(SvStream&, sal_uInt16 nVer) const override; virtual SfxPoolItem* Clone(SfxItemPool *pPool=nullptr) const override; }; diff --git a/include/svx/xbtmpit.hxx b/include/svx/xbtmpit.hxx index e1e65229e60a..0180e3dbd0e0 100644 --- a/include/svx/xbtmpit.hxx +++ b/include/svx/xbtmpit.hxx @@ -63,7 +63,7 @@ public: virtual bool GetPresentation( SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, - OUString &rText, const IntlWrapper * = nullptr ) const override; + OUString &rText, const IntlWrapper& ) const override; const GraphicObject& GetGraphicObject() const { return maGraphicObject;} bool isPattern() const; diff --git a/include/svx/xfillit0.hxx b/include/svx/xfillit0.hxx index 53c946a18b15..7c16ffb14b3e 100644 --- a/include/svx/xfillit0.hxx +++ b/include/svx/xfillit0.hxx @@ -48,7 +48,7 @@ public: virtual bool GetPresentation( SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, - OUString &rText, const IntlWrapper * = nullptr ) const override; + OUString &rText, const IntlWrapper& ) const override; virtual sal_uInt16 GetValueCount() const override; void dumpAsXml(struct _xmlTextWriter* pWriter) const override; diff --git a/include/svx/xflbckit.hxx b/include/svx/xflbckit.hxx index deb80cda472e..50f9b0063a15 100644 --- a/include/svx/xflbckit.hxx +++ b/include/svx/xflbckit.hxx @@ -42,7 +42,7 @@ public: SVX_DLLPRIVATE virtual bool GetPresentation( SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, - OUString &rText, const IntlWrapper * = nullptr ) const override; + OUString &rText, const IntlWrapper& ) const override; }; #endif diff --git a/include/svx/xflbmpit.hxx b/include/svx/xflbmpit.hxx index d92cb5340dfa..d3b0fc95227e 100644 --- a/include/svx/xflbmpit.hxx +++ b/include/svx/xflbmpit.hxx @@ -36,7 +36,7 @@ public: SVX_DLLPRIVATE virtual bool GetPresentation( SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, - OUString &rText, const IntlWrapper * = nullptr ) const override; + OUString &rText, const IntlWrapper& ) const override; SVX_DLLPRIVATE virtual sal_uInt16 GetValueCount() const override; void dumpAsXml(struct _xmlTextWriter* pWriter) const override; diff --git a/include/svx/xflbmsli.hxx b/include/svx/xflbmsli.hxx index a279b20bfe23..7244c591cb95 100644 --- a/include/svx/xflbmsli.hxx +++ b/include/svx/xflbmsli.hxx @@ -35,7 +35,7 @@ public: SVX_DLLPRIVATE virtual bool GetPresentation( SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, - OUString &rText, const IntlWrapper * = nullptr ) const override; + OUString &rText, const IntlWrapper& ) const override; }; #endif diff --git a/include/svx/xflbmsxy.hxx b/include/svx/xflbmsxy.hxx index a715545093ba..eb5a8a0abf5f 100644 --- a/include/svx/xflbmsxy.hxx +++ b/include/svx/xflbmsxy.hxx @@ -35,7 +35,7 @@ public: SVX_DLLPRIVATE virtual bool GetPresentation( SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, - OUString &rText, const IntlWrapper * = nullptr ) const override; + OUString &rText, const IntlWrapper& ) const override; // This item records both metrical and percentage quotation (negative); // We have to consider that. SVX_DLLPRIVATE virtual bool HasMetrics() const override; @@ -53,7 +53,7 @@ public: SVX_DLLPRIVATE virtual bool GetPresentation( SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, - OUString &rText, const IntlWrapper * = nullptr ) const override; + OUString &rText, const IntlWrapper& ) const override; // This item records both metrical and percentage quotation (negative); // We have to consider that. SVX_DLLPRIVATE virtual bool HasMetrics() const override; diff --git a/include/svx/xflbmtit.hxx b/include/svx/xflbmtit.hxx index 713b05c7c853..d7d0ea66f0ae 100644 --- a/include/svx/xflbmtit.hxx +++ b/include/svx/xflbmtit.hxx @@ -35,7 +35,7 @@ public: virtual bool GetPresentation( SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, - OUString &rText, const IntlWrapper * = nullptr ) const override; + OUString &rText, const IntlWrapper& ) const override; void dumpAsXml(struct _xmlTextWriter* pWriter) const override; }; diff --git a/include/svx/xflboxy.hxx b/include/svx/xflboxy.hxx index 62a61db4301d..f0f3adf96ac1 100644 --- a/include/svx/xflboxy.hxx +++ b/include/svx/xflboxy.hxx @@ -35,7 +35,7 @@ public: SVX_DLLPRIVATE virtual bool GetPresentation( SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, - OUString &rText, const IntlWrapper * = nullptr ) const override; + OUString &rText, const IntlWrapper& ) const override; }; class SVX_DLLPUBLIC XFillBmpPosOffsetYItem : public SfxUInt16Item @@ -50,7 +50,7 @@ public: SVX_DLLPRIVATE virtual bool GetPresentation( SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, - OUString &rText, const IntlWrapper * = nullptr ) const override; + OUString &rText, const IntlWrapper& ) const override; }; #endif diff --git a/include/svx/xflbstit.hxx b/include/svx/xflbstit.hxx index 287d14091118..5d7a80712314 100644 --- a/include/svx/xflbstit.hxx +++ b/include/svx/xflbstit.hxx @@ -35,7 +35,7 @@ public: virtual bool GetPresentation( SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, - OUString &rText, const IntlWrapper * = nullptr ) const override; + OUString &rText, const IntlWrapper& ) const override; void dumpAsXml(struct _xmlTextWriter* pWriter) const override; }; diff --git a/include/svx/xflbtoxy.hxx b/include/svx/xflbtoxy.hxx index 95a48034cc95..61c2b2a054e5 100644 --- a/include/svx/xflbtoxy.hxx +++ b/include/svx/xflbtoxy.hxx @@ -35,7 +35,7 @@ public: SVX_DLLPRIVATE virtual bool GetPresentation( SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, - OUString &rText, const IntlWrapper * = nullptr ) const override; + OUString &rText, const IntlWrapper& ) const override; }; class SVX_DLLPUBLIC XFillBmpTileOffsetYItem : public SfxUInt16Item @@ -50,7 +50,7 @@ public: SVX_DLLPRIVATE virtual bool GetPresentation( SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, - OUString &rText, const IntlWrapper * = nullptr ) const override; + OUString &rText, const IntlWrapper& ) const override; }; #endif diff --git a/include/svx/xflclit.hxx b/include/svx/xflclit.hxx index 0caa9d7521f2..c3ea60c41f0f 100644 --- a/include/svx/xflclit.hxx +++ b/include/svx/xflclit.hxx @@ -48,7 +48,7 @@ public: virtual bool GetPresentation( SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, - OUString &rText, const IntlWrapper * = nullptr ) const override; + OUString &rText, const IntlWrapper& ) const override; void dumpAsXml(struct _xmlTextWriter* pWriter) const override; }; diff --git a/include/svx/xflftrit.hxx b/include/svx/xflftrit.hxx index 4d3154fa99ab..b8c4ed88c30a 100644 --- a/include/svx/xflftrit.hxx +++ b/include/svx/xflftrit.hxx @@ -48,7 +48,7 @@ public: virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override; virtual bool GetPresentation( SfxItemPresentation ePres, MapUnit eCoreMetric, - MapUnit ePresMetric, OUString &rText, const IntlWrapper * pIntlWrapper = nullptr ) const override; + MapUnit ePresMetric, OUString &rText, const IntlWrapper& rIntlWrapper ) const override; bool IsEnabled() const { return bEnabled; } void SetEnabled( bool bEnable ) { bEnabled = bEnable; } diff --git a/include/svx/xflgrit.hxx b/include/svx/xflgrit.hxx index 6f3d336f9d1a..12127adf32a5 100644 --- a/include/svx/xflgrit.hxx +++ b/include/svx/xflgrit.hxx @@ -53,7 +53,7 @@ public: virtual bool GetPresentation( SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, - OUString &rText, const IntlWrapper * = nullptr ) const override; + OUString &rText, const IntlWrapper& ) const override; const XGradient& GetGradientValue() const; // GetValue -> GetGradientValue void SetGradientValue(const XGradient& rNew) { aGradient = rNew; Detach(); } // SetValue -> SetGradientValue diff --git a/include/svx/xflhtit.hxx b/include/svx/xflhtit.hxx index 973de794b24d..24aac4076418 100644 --- a/include/svx/xflhtit.hxx +++ b/include/svx/xflhtit.hxx @@ -51,7 +51,7 @@ public: virtual bool GetPresentation( SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, - OUString &rText, const IntlWrapper * = nullptr ) const override; + OUString &rText, const IntlWrapper& ) const override; virtual bool HasMetrics() const override; virtual void ScaleMetrics(long nMul, long nDiv) override; diff --git a/include/svx/xfltrit.hxx b/include/svx/xfltrit.hxx index ce6552d72e3b..6cab8dcb8f48 100644 --- a/include/svx/xfltrit.hxx +++ b/include/svx/xfltrit.hxx @@ -39,7 +39,7 @@ public: virtual bool GetPresentation( SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, - OUString &rText, const IntlWrapper * = nullptr ) const override; + OUString &rText, const IntlWrapper& ) const override; void dumpAsXml(struct _xmlTextWriter* pWriter) const override; }; diff --git a/include/svx/xgrscit.hxx b/include/svx/xgrscit.hxx index 89ee4503bc00..3cae1e14635d 100644 --- a/include/svx/xgrscit.hxx +++ b/include/svx/xgrscit.hxx @@ -39,7 +39,7 @@ public: virtual bool GetPresentation( SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, - OUString &rText, const IntlWrapper * = nullptr ) const override; + OUString &rText, const IntlWrapper& ) const override; }; #endif diff --git a/include/svx/xlineit0.hxx b/include/svx/xlineit0.hxx index 6f6e2044ff50..612ec5f3a476 100644 --- a/include/svx/xlineit0.hxx +++ b/include/svx/xlineit0.hxx @@ -43,7 +43,7 @@ public: virtual bool GetPresentation( SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, - OUString &rText, const IntlWrapper * = nullptr ) const override; + OUString &rText, const IntlWrapper& ) const override; virtual sal_uInt16 GetValueCount() const override; }; diff --git a/include/svx/xlinjoit.hxx b/include/svx/xlinjoit.hxx index b9ac6f78f2b2..8111aed27f02 100644 --- a/include/svx/xlinjoit.hxx +++ b/include/svx/xlinjoit.hxx @@ -44,7 +44,7 @@ public: virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override; virtual bool GetPresentation( SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, - OUString &rText, const IntlWrapper * = nullptr ) const override; + OUString &rText, const IntlWrapper& ) const override; virtual sal_uInt16 GetValueCount() const override; }; diff --git a/include/svx/xlncapit.hxx b/include/svx/xlncapit.hxx index d42224cfa9a3..f7d525be6e4a 100644 --- a/include/svx/xlncapit.hxx +++ b/include/svx/xlncapit.hxx @@ -44,7 +44,7 @@ public: virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override; virtual bool GetPresentation( SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, - OUString &rText, const IntlWrapper * = nullptr ) const override; + OUString &rText, const IntlWrapper& ) const override; css::drawing::LineCap GetValue() const; virtual sal_uInt16 GetValueCount() const override; diff --git a/include/svx/xlnclit.hxx b/include/svx/xlnclit.hxx index 921fdbeb7898..85036a4db428 100644 --- a/include/svx/xlnclit.hxx +++ b/include/svx/xlnclit.hxx @@ -44,7 +44,7 @@ public: virtual bool GetPresentation( SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, - OUString &rText, const IntlWrapper * = nullptr ) const override; + OUString &rText, const IntlWrapper& ) const override; }; #endif diff --git a/include/svx/xlndsit.hxx b/include/svx/xlndsit.hxx index 8f783e4cf327..9a9cf63ad6b2 100644 --- a/include/svx/xlndsit.hxx +++ b/include/svx/xlndsit.hxx @@ -53,7 +53,7 @@ public: virtual bool GetPresentation( SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, - OUString &rText, const IntlWrapper * = nullptr ) const override; + OUString &rText, const IntlWrapper& ) const override; virtual bool HasMetrics() const override; virtual void ScaleMetrics(long nMul, long nDiv) override; diff --git a/include/svx/xlnedcit.hxx b/include/svx/xlnedcit.hxx index eb1aac54a761..8770976f2705 100644 --- a/include/svx/xlnedcit.hxx +++ b/include/svx/xlnedcit.hxx @@ -40,7 +40,7 @@ public: virtual bool GetPresentation( SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, - OUString &rText, const IntlWrapper * = nullptr ) const override; + OUString &rText, const IntlWrapper& ) const override; }; #endif diff --git a/include/svx/xlnedit.hxx b/include/svx/xlnedit.hxx index 1d6449bdd6cb..2e9e843fbdd7 100644 --- a/include/svx/xlnedit.hxx +++ b/include/svx/xlnedit.hxx @@ -52,7 +52,7 @@ public: virtual bool GetPresentation( SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, - OUString &rText, const IntlWrapper * = nullptr ) const override; + OUString &rText, const IntlWrapper& ) const override; const basegfx::B2DPolyPolygon& GetLineEndValue() const { return maPolyPolygon;} void SetLineEndValue(const basegfx::B2DPolyPolygon& rPolyPolygon) { maPolyPolygon = rPolyPolygon; Detach(); } diff --git a/include/svx/xlnedwit.hxx b/include/svx/xlnedwit.hxx index 60fd36c7816f..738bfc1e9939 100644 --- a/include/svx/xlnedwit.hxx +++ b/include/svx/xlnedwit.hxx @@ -43,7 +43,7 @@ public: virtual bool GetPresentation( SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, - OUString &rText, const IntlWrapper * = nullptr ) const override; + OUString &rText, const IntlWrapper& ) const override; }; #endif diff --git a/include/svx/xlnstcit.hxx b/include/svx/xlnstcit.hxx index a5dded2b3e3e..c5dd70c89262 100644 --- a/include/svx/xlnstcit.hxx +++ b/include/svx/xlnstcit.hxx @@ -40,7 +40,7 @@ public: virtual bool GetPresentation( SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, - OUString &rText, const IntlWrapper * = nullptr ) const override; + OUString &rText, const IntlWrapper& ) const override; }; #endif diff --git a/include/svx/xlnstit.hxx b/include/svx/xlnstit.hxx index a47d2ec5114f..c8ff1c2c6527 100644 --- a/include/svx/xlnstit.hxx +++ b/include/svx/xlnstit.hxx @@ -52,7 +52,7 @@ public: virtual bool GetPresentation( SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, - OUString &rText, const IntlWrapper * = nullptr ) const override; + OUString &rText, const IntlWrapper& ) const override; const basegfx::B2DPolyPolygon& GetLineStartValue() const { return maPolyPolygon;} void SetLineStartValue(const basegfx::B2DPolyPolygon& rPolyPolygon) { maPolyPolygon = rPolyPolygon; Detach(); } diff --git a/include/svx/xlnstwit.hxx b/include/svx/xlnstwit.hxx index 6a440b869fa1..3dde5e2e4d09 100644 --- a/include/svx/xlnstwit.hxx +++ b/include/svx/xlnstwit.hxx @@ -42,7 +42,7 @@ public: virtual bool GetPresentation( SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, - OUString &rText, const IntlWrapper * = nullptr ) const override; + OUString &rText, const IntlWrapper& ) const override; }; diff --git a/include/svx/xlntrit.hxx b/include/svx/xlntrit.hxx index a001114abf71..0876d77f56b7 100644 --- a/include/svx/xlntrit.hxx +++ b/include/svx/xlntrit.hxx @@ -39,7 +39,7 @@ public: virtual bool GetPresentation( SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, - OUString &rText, const IntlWrapper * = nullptr ) const override; + OUString &rText, const IntlWrapper& ) const override; }; #endif diff --git a/include/svx/xlnwtit.hxx b/include/svx/xlnwtit.hxx index 609660d856f0..56ed5f9cfc97 100644 --- a/include/svx/xlnwtit.hxx +++ b/include/svx/xlnwtit.hxx @@ -41,7 +41,7 @@ public: virtual bool GetPresentation( SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, - OUString &rText, const IntlWrapper * = nullptr ) const override; + OUString &rText, const IntlWrapper& ) const override; }; #endif diff --git a/include/svx/xsflclit.hxx b/include/svx/xsflclit.hxx index 061c2f573737..e37f2727c142 100644 --- a/include/svx/xsflclit.hxx +++ b/include/svx/xsflclit.hxx @@ -37,7 +37,7 @@ public: SVX_DLLPRIVATE virtual bool GetPresentation( SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, - OUString &rText, const IntlWrapper * = nullptr ) const override; + OUString &rText, const IntlWrapper& ) const override; SVX_DLLPRIVATE virtual sal_uInt16 GetVersion( sal_uInt16 nFileFormatVersion ) const override; 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; } diff --git a/sc/inc/attrib.hxx b/sc/inc/attrib.hxx index b2f82d2046d2..f1250400118c 100644 --- a/sc/inc/attrib.hxx +++ b/sc/inc/attrib.hxx @@ -128,7 +128,7 @@ public: MapUnit eCoreMetric, MapUnit ePresMetric, OUString& rText, - const IntlWrapper* pIntl = nullptr ) const override; + const IntlWrapper& rIntl ) const override; virtual bool operator==( const SfxPoolItem& ) const override; virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; @@ -170,7 +170,7 @@ public: MapUnit eCoreMetric, MapUnit ePresMetric, OUString &rText, - const IntlWrapper* pIntl = nullptr ) const override; + const IntlWrapper& rIntl ) const override; virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; private: @@ -209,7 +209,7 @@ public: MapUnit eCoreMetric, MapUnit ePresMetric, OUString &rText, - const IntlWrapper* pIntl = nullptr ) const override; + const IntlWrapper& rIntl ) const override; virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; public: @@ -271,7 +271,7 @@ public: MapUnit eCoreMetric, MapUnit ePresMetric, OUString& rText, - const IntlWrapper* pIntl = nullptr ) const override; + const IntlWrapper& rIntl ) const override; }; class ScDoubleItem : public SfxPoolItem @@ -322,7 +322,7 @@ public: virtual bool GetPresentation( SfxItemPresentation ePresentation, MapUnit, MapUnit, OUString& rText, - const IntlWrapper* = nullptr ) const override; + const IntlWrapper& ) const override; virtual bool QueryValue( css::uno::Any& rAny, sal_uInt8 nMemberId = 0 ) const override; virtual bool PutValue( const css::uno::Any& rAny, sal_uInt8 nMemberId ) override; diff --git a/sc/inc/docpool.hxx b/sc/inc/docpool.hxx index aacae2ce26a6..bafb72403692 100644 --- a/sc/inc/docpool.hxx +++ b/sc/inc/docpool.hxx @@ -61,7 +61,7 @@ public: virtual bool GetPresentation( const SfxPoolItem& rItem, MapUnit ePresentationMetric, OUString& rText, - const IntlWrapper* pIntl = nullptr ) const override; + const IntlWrapper& rIntl ) const override; static void InitVersionMaps(); static void DeleteVersionMaps(); diff --git a/sc/inc/global.hxx b/sc/inc/global.hxx index 3a3b879f47aa..861467f09862 100644 --- a/sc/inc/global.hxx +++ b/sc/inc/global.hxx @@ -549,7 +549,6 @@ public: static CalendarWrapper* GetCalendar(); SC_DLLPUBLIC static CollatorWrapper* GetCollator(); static CollatorWrapper* GetCaseCollator(); - static IntlWrapper* GetScIntlWrapper(); static css::lang::Locale* GetLocale(); SC_DLLPUBLIC static ::utl::TransliterationWrapper* GetpTransliteration(); diff --git a/sc/source/core/data/attrib.cxx b/sc/source/core/data/attrib.cxx index 157ee78ea1ab..bdf235088b00 100644 --- a/sc/source/core/data/attrib.cxx +++ b/sc/source/core/data/attrib.cxx @@ -310,7 +310,7 @@ bool ScProtectionAttr::GetPresentation MapUnit /* eCoreMetric */, MapUnit /* ePresMetric */, OUString& rText, - const IntlWrapper* /* pIntl */ + const IntlWrapper& /* rIntl */ ) const { const OUString aStrYes ( ScGlobal::GetRscString(STR_YES) ); @@ -417,7 +417,7 @@ bool ScRangeItem::GetPresentation MapUnit /* eCoreUnit */, MapUnit /* ePresUnit */, OUString& rText, - const IntlWrapper* /* pIntl */ + const IntlWrapper& /* rIntl */ ) const { rText.clear(); @@ -513,7 +513,7 @@ bool ScTableListItem::GetPresentation MapUnit /* eCoreUnit */, MapUnit /* ePresUnit */, OUString& rText, - const IntlWrapper* /* pIntl */ + const IntlWrapper& /* rIntl */ ) const { switch ( ePres ) @@ -844,7 +844,7 @@ bool ScViewObjectModeItem::GetPresentation MapUnit /* eCoreUnit */, MapUnit /* ePresUnit */, OUString& rText, - const IntlWrapper* /* pIntl */ + const IntlWrapper& /* rIntl */ ) const { OUString aDel(": "); @@ -1007,7 +1007,7 @@ void lclAppendScalePageCount( OUString& rText, sal_uInt16 nPages ) } // namespace bool ScPageScaleToItem::GetPresentation( - SfxItemPresentation ePres, MapUnit, MapUnit, OUString& rText, const IntlWrapper* ) const + SfxItemPresentation ePres, MapUnit, MapUnit, OUString& rText, const IntlWrapper& ) const { rText.clear(); if( !IsValid()) diff --git a/sc/source/core/data/docpool.cxx b/sc/source/core/data/docpool.cxx index 89bc7a80460c..fa44eb812358 100644 --- a/sc/source/core/data/docpool.cxx +++ b/sc/source/core/data/docpool.cxx @@ -659,7 +659,7 @@ static bool lcl_HFPresentation MapUnit eCoreMetric, MapUnit ePresentationMetric, OUString& rText, - const IntlWrapper* pIntl + const IntlWrapper& rIntl ) { const SfxItemSet& rSet = static_cast<const SfxSetItem&>(rItem).GetItemSet(); @@ -709,7 +709,7 @@ static bool lcl_HFPresentation else { aText += GetMetricText( (long)nLeftMargin, - eCoreMetric, ePresentationMetric, pIntl ); + eCoreMetric, ePresentationMetric, &rIntl ); aText += " " + EditResId(GetMetricId(ePresentationMetric)); } aText += cpDelim; @@ -724,16 +724,14 @@ static bool lcl_HFPresentation else { aText += GetMetricText( (long)nRightMargin, - eCoreMetric, ePresentationMetric, pIntl ); + eCoreMetric, ePresentationMetric, &rIntl ); aText += " " + EditResId(GetMetricId(ePresentationMetric)); } } break; default: - if ( !pIntl ) - pIntl = ScGlobal::GetScIntlWrapper(); - pItem->GetPresentation( SfxItemPresentation::Complete, eCoreMetric, ePresentationMetric, aText, pIntl ); + pItem->GetPresentation( SfxItemPresentation::Complete, eCoreMetric, ePresentationMetric, aText, rIntl ); } @@ -755,7 +753,7 @@ bool ScDocumentPool::GetPresentation( const SfxPoolItem& rItem, MapUnit ePresentationMetric, OUString& rText, - const IntlWrapper* pIntl ) const + const IntlWrapper& rIntl ) const { sal_uInt16 nW = rItem.Which(); OUString aStrYes ( ScGlobal::GetRscString(STR_YES) ); @@ -852,7 +850,7 @@ bool ScDocumentPool::GetPresentation( { OUString aBuffer; - if( lcl_HFPresentation( rItem, GetMetric( nW ), ePresentationMetric, aBuffer, pIntl ) ) + if( lcl_HFPresentation( rItem, GetMetric( nW ), ePresentationMetric, aBuffer, rIntl ) ) { rText = ScGlobal::GetRscString(STR_HEADER) + " ( " + aBuffer + " ) "; } @@ -863,7 +861,7 @@ bool ScDocumentPool::GetPresentation( { OUString aBuffer; - if( lcl_HFPresentation( rItem, GetMetric( nW ), ePresentationMetric, aBuffer, pIntl ) ) + if( lcl_HFPresentation( rItem, GetMetric( nW ), ePresentationMetric, aBuffer, rIntl ) ) { rText = ScGlobal::GetRscString(STR_FOOTER) + " ( " + aBuffer + " ) "; } @@ -871,9 +869,7 @@ bool ScDocumentPool::GetPresentation( break; default: - if ( !pIntl ) - pIntl = ScGlobal::GetScIntlWrapper(); - ePresentationRet = rItem.GetPresentation( SfxItemPresentation::Complete, GetMetric( nW ), ePresentationMetric, rText, pIntl ); + ePresentationRet = rItem.GetPresentation( SfxItemPresentation::Complete, GetMetric( nW ), ePresentationMetric, rText, rIntl ); break; } diff --git a/sc/source/core/data/global.cxx b/sc/source/core/data/global.cxx index a5b4e10bda3d..4a06ca612d6d 100644 --- a/sc/source/core/data/global.cxx +++ b/sc/source/core/data/global.cxx @@ -97,7 +97,6 @@ CollatorWrapper* ScGlobal::pCaseCollator = nullptr; ::utl::TransliterationWrapper* ScGlobal::pTransliteration = nullptr; ::utl::TransliterationWrapper* ScGlobal::pCaseTransliteration = nullptr; css::uno::Reference< css::i18n::XOrdinalSuffix> ScGlobal::xOrdinalSuffix = nullptr; -IntlWrapper* ScGlobal::pScIntlWrapper = nullptr; sal_Unicode ScGlobal::cListDelimiter = ','; OUString* ScGlobal::pEmptyOUString = nullptr; OUString* ScGlobal::pStrClipDocName = nullptr; @@ -576,7 +575,6 @@ void ScGlobal::Clear() pLocaleData = nullptr; DELETEZ(pSysLocale); DELETEZ(pLocale); - DELETEZ(pScIntlWrapper); DELETEZ(pStrClipDocName); DELETEZ(pUnitConverter); @@ -1039,14 +1037,6 @@ CollatorWrapper* ScGlobal::GetCaseCollator() } return pCaseTransliteration; } -IntlWrapper* ScGlobal::GetScIntlWrapper() -{ - if ( !pScIntlWrapper ) - { - pScIntlWrapper = new IntlWrapper( LanguageTag( *GetLocale()) ); - } - return pScIntlWrapper; -} css::lang::Locale* ScGlobal::GetLocale() { if ( !pLocale ) 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( diff --git a/svl/source/items/cenumitm.cxx b/svl/source/items/cenumitm.cxx index 4a0cbd41b8af..7bafa1a0efcb 100644 --- a/svl/source/items/cenumitm.cxx +++ b/svl/source/items/cenumitm.cxx @@ -38,7 +38,7 @@ bool SfxEnumItemInterface::operator ==(const SfxPoolItem & rItem) const // virtual bool SfxEnumItemInterface::GetPresentation(SfxItemPresentation, MapUnit, MapUnit, OUString & rText, - const IntlWrapper *) const + const IntlWrapper&) const { rText = OUString::number( GetEnumValue() ); return true; @@ -119,7 +119,7 @@ bool SfxBoolItem::operator ==(const SfxPoolItem & rItem) const bool SfxBoolItem::GetPresentation(SfxItemPresentation, MapUnit, MapUnit, OUString & rText, - const IntlWrapper *) const + const IntlWrapper&) const { rText = GetValueTextByVal(m_bValue); return true; diff --git a/svl/source/items/cintitem.cxx b/svl/source/items/cintitem.cxx index e6ef22205b85..a74fb1a92529 100644 --- a/svl/source/items/cintitem.cxx +++ b/svl/source/items/cintitem.cxx @@ -32,7 +32,7 @@ bool CntByteItem::operator ==(const SfxPoolItem & rItem) const // virtual bool CntByteItem::GetPresentation(SfxItemPresentation, MapUnit, MapUnit, OUString & rText, - const IntlWrapper *) const + const IntlWrapper&) const { rText = OUString::number( m_nValue ); return true; @@ -101,7 +101,7 @@ bool CntUInt16Item::operator ==(const SfxPoolItem & rItem) const bool CntUInt16Item::GetPresentation(SfxItemPresentation, MapUnit, MapUnit, OUString & rText, - const IntlWrapper *) + const IntlWrapper&) const { rText = OUString::number( m_nValue ); @@ -169,7 +169,7 @@ bool CntInt32Item::operator ==(const SfxPoolItem & rItem) const bool CntInt32Item::GetPresentation(SfxItemPresentation, MapUnit, MapUnit, OUString & rText, - const IntlWrapper *) const + const IntlWrapper&) const { rText = OUString::number( m_nValue ); return true; @@ -236,7 +236,7 @@ bool CntUInt32Item::operator ==(const SfxPoolItem & rItem) const bool CntUInt32Item::GetPresentation(SfxItemPresentation, MapUnit, MapUnit, OUString & rText, - const IntlWrapper *) + const IntlWrapper&) const { rText = OUString::number(m_nValue); diff --git a/svl/source/items/ctypeitm.cxx b/svl/source/items/ctypeitm.cxx index 654c4a453fc2..f0002e138f41 100644 --- a/svl/source/items/ctypeitm.cxx +++ b/svl/source/items/ctypeitm.cxx @@ -118,16 +118,12 @@ bool CntContentTypeItem::GetPresentation( MapUnit eCoreMetric, MapUnit ePresMetric, OUString & rText, - const IntlWrapper * pIntlWrapper) const + const IntlWrapper & rIntlWrapper) const { if (_aPresentation.isEmpty()) { - DBG_ASSERT(pIntlWrapper, - "CntContentTypeItem::GetPresentation(): No IntlWrapper"); - if (pIntlWrapper) - (const_cast< CntContentTypeItem * >(this))->_aPresentation - = INetContentTypes::GetPresentation(GetEnumValue(), - pIntlWrapper->getLanguageTag()); + (const_cast< CntContentTypeItem * >(this))->_aPresentation = + INetContentTypes::GetPresentation(GetEnumValue()); } if (!_aPresentation.isEmpty()) { @@ -137,7 +133,7 @@ bool CntContentTypeItem::GetPresentation( else return CntUnencodedStringItem::GetPresentation(ePres, eCoreMetric, ePresMetric, rText, - pIntlWrapper); + rIntlWrapper); } INetContentType CntContentTypeItem::GetEnumValue() const diff --git a/svl/source/items/custritm.cxx b/svl/source/items/custritm.cxx index b29a6813ecad..77b869f2f301 100644 --- a/svl/source/items/custritm.cxx +++ b/svl/source/items/custritm.cxx @@ -38,7 +38,7 @@ bool CntUnencodedStringItem::operator ==(const SfxPoolItem & rItem) const // virtual bool CntUnencodedStringItem::GetPresentation(SfxItemPresentation, MapUnit, MapUnit, OUString & rText, - const IntlWrapper *) const + const IntlWrapper&) const { rText = m_aValue; return true; diff --git a/svl/source/items/flagitem.cxx b/svl/source/items/flagitem.cxx index ee5ad34d1fb0..916c94ef961b 100644 --- a/svl/source/items/flagitem.cxx +++ b/svl/source/items/flagitem.cxx @@ -50,7 +50,7 @@ bool SfxFlagItem::GetPresentation MapUnit /*eCoreMetric*/, MapUnit /*ePresentationMetric*/, OUString& rText, - const IntlWrapper * + const IntlWrapper& ) const { rText.clear(); diff --git a/svl/source/items/int64item.cxx b/svl/source/items/int64item.cxx index 6cfc0036c619..afe284520bb8 100644 --- a/svl/source/items/int64item.cxx +++ b/svl/source/items/int64item.cxx @@ -35,7 +35,7 @@ bool SfxInt64Item::operator== ( const SfxPoolItem& rItem ) const bool SfxInt64Item::GetPresentation( SfxItemPresentation, MapUnit, MapUnit, OUString& rText, - const IntlWrapper* /*pIntlWrapper*/ ) const + const IntlWrapper& /*rIntlWrapper*/ ) const { rText = OUString::number(mnValue); return true; diff --git a/svl/source/items/intitem.cxx b/svl/source/items/intitem.cxx index 09d31f860436..9d1eee2db3c8 100644 --- a/svl/source/items/intitem.cxx +++ b/svl/source/items/intitem.cxx @@ -68,7 +68,7 @@ bool SfxInt16Item::operator ==(const SfxPoolItem & rItem) const bool SfxInt16Item::GetPresentation(SfxItemPresentation, MapUnit, MapUnit, OUString & rText, - const IntlWrapper *) const + const IntlWrapper&) const { rText = OUString::number(m_nValue); return true; diff --git a/svl/source/items/itempool.cxx b/svl/source/items/itempool.cxx index 1327a2bfea9c..a914bd6d24c5 100644 --- a/svl/source/items/itempool.cxx +++ b/svl/source/items/itempool.cxx @@ -475,11 +475,11 @@ bool SfxItemPool::GetPresentation const SfxPoolItem& rItem, MapUnit eMetric, OUString& rText, - const IntlWrapper * pIntlWrapper + const IntlWrapper& rIntlWrapper ) const { return rItem.GetPresentation( - SfxItemPresentation::Complete, GetMetric(rItem.Which()), eMetric, rText, pIntlWrapper ); + SfxItemPresentation::Complete, GetMetric(rItem.Which()), eMetric, rText, rIntlWrapper ); } diff --git a/svl/source/items/macitem.cxx b/svl/source/items/macitem.cxx index 9bf75713b6d9..505039c86d71 100644 --- a/svl/source/items/macitem.cxx +++ b/svl/source/items/macitem.cxx @@ -223,7 +223,7 @@ bool SvxMacroItem::GetPresentation MapUnit /*eCoreUnit*/, MapUnit /*ePresUnit*/, OUString& rText, - const IntlWrapper * + const IntlWrapper& ) const { /*!!! diff --git a/svl/source/items/poolitem.cxx b/svl/source/items/poolitem.cxx index 5c2c77cae919..fb0ef21446d0 100644 --- a/svl/source/items/poolitem.cxx +++ b/svl/source/items/poolitem.cxx @@ -20,6 +20,8 @@ #include <svl/poolitem.hxx> #include <tools/stream.hxx> +#include <unotools/intlwrapper.hxx> +#include <unotools/syslocale.hxx> #include <osl/diagnose.h> #include <libxml/xmlwriter.h> #include <typeinfo> @@ -112,7 +114,7 @@ bool SfxPoolItem::GetPresentation MapUnit /*eCoreMetric*/, // IN: current metric of the SfxPoolItems MapUnit /*ePresentationMetric*/, // IN: target metric of the presentation OUString& /*rText*/, // OUT: textual representation - const IntlWrapper * + const IntlWrapper& ) const { return false; @@ -124,7 +126,8 @@ void SfxPoolItem::dumpAsXml(xmlTextWriterPtr pWriter) const xmlTextWriterWriteAttribute(pWriter, BAD_CAST("whichId"), BAD_CAST(OString::number(Which()).getStr())); xmlTextWriterWriteAttribute(pWriter, BAD_CAST("typeName"), BAD_CAST(typeid(*this).name())); OUString rText; - if (GetPresentation( SfxItemPresentation::Complete, MapUnit::Map100thMM, MapUnit::Map100thMM, rText)) + IntlWrapper aIntlWrapper(SvtSysLocale().GetUILanguageTag()); + if (GetPresentation( SfxItemPresentation::Complete, MapUnit::Map100thMM, MapUnit::Map100thMM, rText, aIntlWrapper)) xmlTextWriterWriteAttribute(pWriter, BAD_CAST("presentation"), BAD_CAST(rText.getStr())); xmlTextWriterEndElement(pWriter); } @@ -171,7 +174,7 @@ bool SfxVoidItem::GetPresentation MapUnit /*eCoreMetric*/, MapUnit /*ePresentationMetric*/, OUString& rText, - const IntlWrapper * + const IntlWrapper& ) const { rText = "Void"; diff --git a/svl/source/items/ptitem.cxx b/svl/source/items/ptitem.cxx index 41c0e4922ece..dd6f3a6bd3bb 100644 --- a/svl/source/items/ptitem.cxx +++ b/svl/source/items/ptitem.cxx @@ -59,7 +59,7 @@ bool SfxPointItem::GetPresentation MapUnit /*eCoreMetric*/, MapUnit /*ePresentationMetric*/, OUString& rText, - const IntlWrapper * + const IntlWrapper& ) const { rText = OUString::number(aVal.X()) + ", " + OUString::number(aVal.Y()) + ", "; diff --git a/svl/source/items/rectitem.cxx b/svl/source/items/rectitem.cxx index 56ceccebce47..e4bd0d9b97c2 100644 --- a/svl/source/items/rectitem.cxx +++ b/svl/source/items/rectitem.cxx @@ -56,7 +56,7 @@ bool SfxRectangleItem::GetPresentation MapUnit /*eCoreMetric*/, MapUnit /*ePresentationMetric*/, OUString& rText, - const IntlWrapper * + const IntlWrapper& ) const { rText = OUString::number(aVal.Top()) + ", " + diff --git a/svl/source/items/rngitem.cxx b/svl/source/items/rngitem.cxx index be60ce3bf204..efb837eaab98 100644 --- a/svl/source/items/rngitem.cxx +++ b/svl/source/items/rngitem.cxx @@ -46,7 +46,7 @@ bool SfxRangeItem::GetPresentation MapUnit /*eCoreMetric*/, MapUnit /*ePresentationMetric*/, OUString& rText, - const IntlWrapper * + const IntlWrapper& ) const { rText = OUString::number(nFrom) + ":" + OUString::number(nTo); diff --git a/svl/source/items/sitem.cxx b/svl/source/items/sitem.cxx index fdfbe7870450..d209565f0d5d 100644 --- a/svl/source/items/sitem.cxx +++ b/svl/source/items/sitem.cxx @@ -66,7 +66,7 @@ bool SfxSetItem::GetPresentation MapUnit /*eCoreMetric*/, MapUnit /*ePresentationMetric*/, OUString& /*rText*/, - const IntlWrapper * + const IntlWrapper& ) const { return false; diff --git a/svl/source/items/slstitm.cxx b/svl/source/items/slstitm.cxx index 34399ee2f3e8..81025401e379 100644 --- a/svl/source/items/slstitm.cxx +++ b/svl/source/items/slstitm.cxx @@ -115,7 +115,7 @@ bool SfxStringListItem::GetPresentation MapUnit /*eCoreMetric*/, MapUnit /*ePresentationMetric*/, OUString& rText, - const IntlWrapper * + const IntlWrapper& ) const { rText = "(List)"; diff --git a/svl/source/items/srchitem.cxx b/svl/source/items/srchitem.cxx index 71584443a29c..0bfa0a9eea71 100644 --- a/svl/source/items/srchitem.cxx +++ b/svl/source/items/srchitem.cxx @@ -284,7 +284,7 @@ bool SvxSearchItem::GetPresentation MapUnit , MapUnit , OUString& , - const IntlWrapper * + const IntlWrapper& ) const { return false; diff --git a/svl/source/items/style.cxx b/svl/source/items/style.cxx index 1a54081eab52..ec5de87916e8 100644 --- a/svl/source/items/style.cxx +++ b/svl/source/items/style.cxx @@ -344,14 +344,14 @@ OUString SfxStyleSheetBase::GetDescription( MapUnit eMetric ) OUString aDesc; const SfxPoolItem* pItem = aIter.FirstItem(); - IntlWrapper aIntlWrapper( SvtSysLocale().GetLanguageTag() ); + IntlWrapper aIntlWrapper(SvtSysLocale().GetUILanguageTag()); while ( pItem ) { OUString aItemPresentation; if ( !IsInvalidItem( pItem ) && pPool->GetPool().GetPresentation( - *pItem, eMetric, aItemPresentation, &aIntlWrapper ) ) + *pItem, eMetric, aItemPresentation, aIntlWrapper ) ) { if ( !aDesc.isEmpty() && !aItemPresentation.isEmpty() ) aDesc += " + "; diff --git a/svl/source/items/szitem.cxx b/svl/source/items/szitem.cxx index d983fcc0f943..ca7bac49880d 100644 --- a/svl/source/items/szitem.cxx +++ b/svl/source/items/szitem.cxx @@ -48,7 +48,7 @@ bool SfxSizeItem::GetPresentation MapUnit /*eCoreMetric*/, MapUnit /*ePresentationMetric*/, OUString& rText, - const IntlWrapper * + const IntlWrapper& ) const { rText = OUString::number(aVal.Width()) + ", " + OUString::number(aVal.Height()) + ", "; diff --git a/svl/source/items/visitem.cxx b/svl/source/items/visitem.cxx index d2952099e2c3..d0e58656ddd3 100644 --- a/svl/source/items/visitem.cxx +++ b/svl/source/items/visitem.cxx @@ -43,7 +43,7 @@ bool SfxVisibilityItem::operator ==(const SfxPoolItem & rItem) const bool SfxVisibilityItem::GetPresentation(SfxItemPresentation, MapUnit, MapUnit, OUString & rText, - const IntlWrapper *) const + const IntlWrapper&) const { rText = m_nValue.bVisible ? OUString("TRUE") : OUString("FALSE"); return true; diff --git a/svl/source/misc/getstringresource.cxx b/svl/source/misc/getstringresource.cxx index 98c7d4a26ac4..59ee843391cb 100644 --- a/svl/source/misc/getstringresource.cxx +++ b/svl/source/misc/getstringresource.cxx @@ -22,56 +22,18 @@ #include <map> #include <memory> #include <i18nlangtag/languagetag.hxx> -#include <rtl/instance.hxx> #include <rtl/ustrbuf.hxx> #include <rtl/ustring.hxx> #include <sal/types.h> #include <tools/resmgr.hxx> +#include <unotools/syslocale.hxx> #include "getstringresource.hxx" -namespace { - -class ResMgrMap { -public: - ResMgrMap() = default; - ResMgrMap(const ResMgrMap&) = delete; - ResMgrMap& operator=(const ResMgrMap&) = delete; - - const std::locale& get(LanguageTag const & locale); - -private: - typedef std::map<OUString, std::locale> Map; - - Map map_; - // one SimpleResMgr for each language for which a resource was requested - // (when using the "non-simple" resmgr, the first request for any - // language wins, any further requests for any other languages supply - // the resmgr of the first call; for the simple resmgr we have a mgr - // for each language ever requested) -}; - -const std::locale& ResMgrMap::get(LanguageTag const & locale) { - OUString code( locale.getBcp47()); - Map::iterator i(map_.find(code)); - if (i == map_.end()) { - std::locale loc = Translate::Create("svl", locale); - i = map_.insert(Map::value_type(code, loc)).first; - } - return i->second; -} - -struct theResMgrMap: public rtl::Static< ResMgrMap, theResMgrMap > {}; - -} - -namespace svl { - -OUString getStringResource(const char* id, LanguageTag const & locale) +OUString SvlResId(const char* id) { - return Translate::get(id, theResMgrMap::get().get(locale)); -} - + static std::locale loc = Translate::Create("svl", SvtSysLocale().GetUILanguageTag()); + return Translate::get(id, loc); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svl/source/misc/getstringresource.hxx b/svl/source/misc/getstringresource.hxx index 4776c1572754..b04553bc13e5 100644 --- a/svl/source/misc/getstringresource.hxx +++ b/svl/source/misc/getstringresource.hxx @@ -24,15 +24,7 @@ #include <sal/types.h> -namespace com { namespace sun { namespace star { namespace lang { - struct Locale; -} } } } - -namespace svl { - -OUString getStringResource( - const char* id, LanguageTag const & locale); -} +OUString SvlResId(const char* id); #endif diff --git a/svl/source/misc/inettype.cxx b/svl/source/misc/inettype.cxx index 3da903827455..e34d41051588 100644 --- a/svl/source/misc/inettype.cxx +++ b/svl/source/misc/inettype.cxx @@ -601,8 +601,7 @@ OUString INetContentTypes::GetContentType(INetContentType eTypeID) } //static -OUString INetContentTypes::GetPresentation(INetContentType eTypeID, - const LanguageTag& aLocale) +OUString INetContentTypes::GetPresentation(INetContentType eTypeID) { const char* pResID = nullptr; if (eTypeID <= CONTENT_TYPE_LAST) @@ -615,7 +614,7 @@ OUString INetContentTypes::GetPresentation(INetContentType eTypeID, else return aPresentation; } - return svl::getStringResource(pResID, aLocale); + return SvlResId(pResID); } //static diff --git a/svtools/source/contnr/simptabl.cxx b/svtools/source/contnr/simptabl.cxx index 0d910049248f..0b59579b4598 100644 --- a/svtools/source/contnr/simptabl.cxx +++ b/svtools/source/contnr/simptabl.cxx @@ -103,7 +103,7 @@ SvSimpleTable::SvSimpleTable(SvSimpleTableContainer& rParent, WinBits nBits): aHeaderBar(VclPtr<HeaderBar>::Create(&rParent,WB_BUTTONSTYLE | WB_BORDER | WB_TABSTOP)), nHeaderItemId(1), bPaintFlag(true), - aCollator(*(IntlWrapper( Application::GetSettings().GetLanguageTag() ).getCaseCollator())) + aCollator(*(IntlWrapper(SvtSysLocale().GetUILanguageTag()).getCaseCollator())) { m_rParentTableContainer.SetTable(this); diff --git a/svtools/source/misc/svtresid.cxx b/svtools/source/misc/svtresid.cxx index dff8d906abcf..c3e5ecbd1239 100644 --- a/svtools/source/misc/svtresid.cxx +++ b/svtools/source/misc/svtresid.cxx @@ -24,19 +24,11 @@ static std::locale* pResLocale=nullptr; -namespace -{ - std::locale* getResLocale(const LanguageTag& aLocale) - { - if (!pResLocale) - pResLocale = new std::locale(Translate::Create("svt", aLocale)); - return pResLocale; - } -} - std::locale* SvtResLocale::GetResLocale() { - return getResLocale(Application::GetSettings().GetUILanguageTag()); + if (!pResLocale) + pResLocale = new std::locale(Translate::Create("svt", SvtSysLocale().GetUILanguageTag())); + return pResLocale; } void SvtResLocale::DeleteResLocale() diff --git a/svx/inc/sxcikitm.hxx b/svx/inc/sxcikitm.hxx index 5f918c28bcd8..0c9352ef658e 100644 --- a/svx/inc/sxcikitm.hxx +++ b/svx/inc/sxcikitm.hxx @@ -39,7 +39,7 @@ public: virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override; virtual OUString GetValueTextByPos(sal_uInt16 nPos) const override; - virtual bool GetPresentation(SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, OUString& rText, const IntlWrapper * = nullptr) const override; + virtual bool GetPresentation(SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, OUString& rText, const IntlWrapper&) const override; }; #endif diff --git a/svx/inc/sxmkitm.hxx b/svx/inc/sxmkitm.hxx index cc52193990cc..0362f8537353 100644 --- a/svx/inc/sxmkitm.hxx +++ b/svx/inc/sxmkitm.hxx @@ -39,7 +39,7 @@ public: virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override; virtual OUString GetValueTextByPos(sal_uInt16 nPos) const override; - virtual bool GetPresentation(SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, OUString& rText, const IntlWrapper * = nullptr) const override; + virtual bool GetPresentation(SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, OUString& rText, const IntlWrapper&) const override; }; #endif diff --git a/svx/source/dialog/optgrid.cxx b/svx/source/dialog/optgrid.cxx index 53521b4178bc..248d741e1c27 100644 --- a/svx/source/dialog/optgrid.cxx +++ b/svx/source/dialog/optgrid.cxx @@ -103,7 +103,7 @@ bool SvxGridItem::GetPresentation SfxItemPresentation /*ePres*/, MapUnit /*eCoreUnit*/, MapUnit /*ePresUnit*/, - OUString& rText, const IntlWrapper * + OUString& rText, const IntlWrapper& ) const { rText = "SvxGridItem"; diff --git a/svx/source/dialog/rulritem.cxx b/svx/source/dialog/rulritem.cxx index 02b9f1fdf345..a74c55703c8f 100644 --- a/svx/source/dialog/rulritem.cxx +++ b/svx/source/dialog/rulritem.cxx @@ -121,7 +121,7 @@ bool SvxLongLRSpaceItem::GetPresentation( MapUnit /*eCoreUnit*/, MapUnit /*ePresUnit*/, OUString& /*rText*/, - const IntlWrapper* /*pWrapper*/) const + const IntlWrapper& /*rWrapper*/) const { return false; } @@ -247,7 +247,7 @@ bool SvxLongULSpaceItem::GetPresentation( MapUnit /*eCoreUnit*/, MapUnit /*ePresUnit*/, OUString& /*rText*/, - const IntlWrapper* /*pWrapper*/ ) const + const IntlWrapper& /*rWrapper*/ ) const { return false; } @@ -368,7 +368,7 @@ bool SvxPagePosSizeItem::GetPresentation( MapUnit /*eCoreUnit*/, MapUnit /*ePresUnit*/, OUString& /*rText*/, - const IntlWrapper* /*pWrapper*/ ) const + const IntlWrapper& /*rWrapper*/ ) const { return false; } @@ -459,7 +459,7 @@ bool SvxColumnItem::GetPresentation( MapUnit /*eCoreUnit*/, MapUnit /*ePresUnit*/, OUString& /*rText*/, - const IntlWrapper* /*pWrapper*/ ) const + const IntlWrapper& /*rWrapper*/ ) const { return false; } @@ -694,7 +694,7 @@ bool SvxObjectItem::GetPresentation( MapUnit /*eCoreUnit*/, MapUnit /*ePresUnit*/, OUString& /*rText*/, - const IntlWrapper* /*pWrapper*/ ) const + const IntlWrapper& /*rWrapper*/ ) const { return false; } diff --git a/svx/source/dialog/srchdlg.cxx b/svx/source/dialog/srchdlg.cxx index 37b0b289dacf..47c409718971 100644 --- a/svx/source/dialog/srchdlg.cxx +++ b/svx/source/dialog/srchdlg.cxx @@ -26,6 +26,7 @@ #include <svl/slstitm.hxx> #include <svl/itemiter.hxx> #include <svl/style.hxx> +#include <unotools/intlwrapper.hxx> #include <unotools/moduleoptions.hxx> #include <unotools/searchopt.hxx> #include <sfx2/dispatch.hxx> @@ -2155,6 +2156,7 @@ OUString& SvxSearchDialog::BuildAttrText_Impl( OUString& rStr, default: ;//prevent warning } + IntlWrapper aIntlWrapper(SvtSysLocale().GetUILanguageTag()); for ( sal_uInt16 i = 0; i < pList->Count(); ++i ) { const SearchAttrItem& rItem = pList->GetObject(i); @@ -2165,8 +2167,7 @@ OUString& SvxSearchDialog::BuildAttrText_Impl( OUString& rStr, if ( !IsInvalidItem( rItem.pItem ) ) { OUString aStr; - rPool.GetPresentation( *rItem.pItem, - eMapUnit, aStr ); + rPool.GetPresentation(*rItem.pItem, eMapUnit, aStr, aIntlWrapper); rStr += aStr; } else if ( rItem.nSlot == SID_ATTR_BRUSH_CHAR ) diff --git a/svx/source/items/algitem.cxx b/svx/source/items/algitem.cxx index b06b0e482cdd..ca821835452a 100644 --- a/svx/source/items/algitem.cxx +++ b/svx/source/items/algitem.cxx @@ -71,7 +71,7 @@ bool SvxOrientationItem::GetPresentation SfxItemPresentation /*ePres*/, MapUnit /*eCoreUnit*/, MapUnit /*ePresUnit*/, - OUString& rText, const IntlWrapper * ) const + OUString& rText, const IntlWrapper& ) const { rText = GetValueText( GetValue() ); return true; @@ -203,7 +203,7 @@ bool SvxMarginItem::GetPresentation SfxItemPresentation ePres, MapUnit eCoreUnit, MapUnit ePresUnit, - OUString& rText, const IntlWrapper *pIntl + OUString& rText, const IntlWrapper& rIntl ) const { OUString cpDelimTmp = OUString(cpDelim); @@ -212,31 +212,31 @@ bool SvxMarginItem::GetPresentation { case SfxItemPresentation::Nameless: { - rText = GetMetricText( (long)nLeftMargin, eCoreUnit, ePresUnit, pIntl ) + + rText = GetMetricText( (long)nLeftMargin, eCoreUnit, ePresUnit, &rIntl ) + cpDelimTmp + - GetMetricText( (long)nTopMargin, eCoreUnit, ePresUnit, pIntl ) + + GetMetricText( (long)nTopMargin, eCoreUnit, ePresUnit, &rIntl ) + cpDelimTmp + - GetMetricText( (long)nRightMargin, eCoreUnit, ePresUnit, pIntl ) + + GetMetricText( (long)nRightMargin, eCoreUnit, ePresUnit, &rIntl ) + cpDelimTmp + - GetMetricText( (long)nBottomMargin, eCoreUnit, ePresUnit, pIntl ); + GetMetricText( (long)nBottomMargin, eCoreUnit, ePresUnit, &rIntl ); return true; } case SfxItemPresentation::Complete: { rText = SvxResId(RID_SVXITEMS_MARGIN_LEFT) + - GetMetricText( (long)nLeftMargin, eCoreUnit, ePresUnit, pIntl ) + + GetMetricText( (long)nLeftMargin, eCoreUnit, ePresUnit, &rIntl ) + " " + EditResId(GetMetricId(ePresUnit)) + cpDelimTmp + SvxResId(RID_SVXITEMS_MARGIN_TOP) + - GetMetricText( (long)nTopMargin, eCoreUnit, ePresUnit, pIntl ) + + GetMetricText( (long)nTopMargin, eCoreUnit, ePresUnit, &rIntl ) + " " + EditResId(GetMetricId(ePresUnit)) + cpDelimTmp + SvxResId(RID_SVXITEMS_MARGIN_RIGHT) + - GetMetricText( (long)nRightMargin, eCoreUnit, ePresUnit, pIntl ) + + GetMetricText( (long)nRightMargin, eCoreUnit, ePresUnit, &rIntl ) + " " + EditResId(GetMetricId(ePresUnit)) + cpDelimTmp + SvxResId(RID_SVXITEMS_MARGIN_BOTTOM) + - GetMetricText( (long)nBottomMargin, eCoreUnit, ePresUnit, pIntl ) + + GetMetricText( (long)nBottomMargin, eCoreUnit, ePresUnit, &rIntl ) + " " + EditResId(GetMetricId(ePresUnit)); return true; } diff --git a/svx/source/items/chrtitem.cxx b/svx/source/items/chrtitem.cxx index 4680ddefb144..e6150b94494c 100644 --- a/svx/source/items/chrtitem.cxx +++ b/svx/source/items/chrtitem.cxx @@ -121,43 +121,32 @@ SvxDoubleItem::SvxDoubleItem(double fValue, sal_uInt16 nId) : { } - SvxDoubleItem::SvxDoubleItem(const SvxDoubleItem& rItem) : SfxPoolItem(rItem), fVal(rItem.fVal) { } - bool SvxDoubleItem::GetPresentation ( SfxItemPresentation /*ePresentation*/, MapUnit /*eCoreMetric*/, MapUnit /*ePresentationMetric*/, OUString& rText, - const IntlWrapper * pIntlWrapper) const + const IntlWrapper& rIntlWrapper) const { - DBG_ASSERT( pIntlWrapper, "SvxDoubleItem::GetPresentation: no IntlWrapper" ); - if ( pIntlWrapper ) - { - rText = ::rtl::math::doubleToUString( fVal, rtl_math_StringFormat_E, 4, - pIntlWrapper->getLocaleData()->getNumDecimalSep()[0], true ); - } - else - rText = rtl::math::doubleToUString( fVal, rtl_math_StringFormat_E, 4, '.' ); + rText = ::rtl::math::doubleToUString( fVal, rtl_math_StringFormat_E, 4, + rIntlWrapper.getLocaleData()->getNumDecimalSep()[0], true ); return true; } - bool SvxDoubleItem::operator == (const SfxPoolItem& rItem) const { return static_cast<const SvxDoubleItem&>(rItem).fVal == fVal; } - SfxPoolItem* SvxDoubleItem::Clone(SfxItemPool* /*pPool*/) const { return new SvxDoubleItem(*this); } - SfxPoolItem* SvxDoubleItem::Create(SvStream& rIn, sal_uInt16 /*nVersion*/) const { double _fVal; diff --git a/svx/source/items/customshapeitem.cxx b/svx/source/items/customshapeitem.cxx index 9efc2c3eb01a..4c898344daab 100644 --- a/svx/source/items/customshapeitem.cxx +++ b/svx/source/items/customshapeitem.cxx @@ -253,7 +253,7 @@ bool SdrCustomShapeGeometryItem::operator==( const SfxPoolItem& rCmp ) const bool SdrCustomShapeGeometryItem::GetPresentation( SfxItemPresentation ePresentation, MapUnit /*eCoreMetric*/, - MapUnit /*ePresentationMetric*/, OUString &rText, const IntlWrapper *) const + MapUnit /*ePresentationMetric*/, OUString &rText, const IntlWrapper&) const { rText += " "; if ( ePresentation == SfxItemPresentation::Complete ) diff --git a/svx/source/items/drawitem.cxx b/svx/source/items/drawitem.cxx index ce1864fc1d31..e3a850c25d75 100644 --- a/svx/source/items/drawitem.cxx +++ b/svx/source/items/drawitem.cxx @@ -55,7 +55,7 @@ bool SvxColorListItem::GetPresentation SfxItemPresentation /*ePres*/, MapUnit /*eCoreUnit*/, MapUnit /*ePresUnit*/, - OUString& rText, const IntlWrapper * + OUString& rText, const IntlWrapper& ) const { rText.clear(); @@ -117,7 +117,7 @@ bool SvxGradientListItem::GetPresentation SfxItemPresentation /*ePres*/, MapUnit /*eCoreUnit*/, MapUnit /*ePresUnit*/, - OUString& rText, const IntlWrapper * + OUString& rText, const IntlWrapper& ) const { rText.clear(); @@ -164,7 +164,7 @@ bool SvxHatchListItem::GetPresentation SfxItemPresentation /*ePres*/, MapUnit /*eCoreUnit*/, MapUnit /*ePresUnit*/, - OUString& rText, const IntlWrapper * + OUString& rText, const IntlWrapper& ) const { rText.clear(); @@ -207,7 +207,7 @@ bool SvxBitmapListItem::GetPresentation SfxItemPresentation /*ePres*/, MapUnit /*eCoreUnit*/, MapUnit /*ePresUnit*/, - OUString& rText, const IntlWrapper * + OUString& rText, const IntlWrapper& ) const { rText.clear(); @@ -248,7 +248,7 @@ bool SvxPatternListItem::GetPresentation SfxItemPresentation /*ePres*/, MapUnit /*eCoreUnit*/, MapUnit /*ePresUnit*/, - OUString& rText, const IntlWrapper * + OUString& rText, const IntlWrapper& ) const { rText.clear(); @@ -290,7 +290,7 @@ bool SvxDashListItem::GetPresentation SfxItemPresentation /*ePres*/, MapUnit /*eCoreUnit*/, MapUnit /*ePresUnit*/, - OUString& rText, const IntlWrapper * + OUString& rText, const IntlWrapper& ) const { rText.clear(); @@ -331,7 +331,7 @@ bool SvxLineEndListItem::GetPresentation SfxItemPresentation /*ePres*/, MapUnit /*eCoreUnit*/, MapUnit /*ePresUnit*/, - OUString& rText, const IntlWrapper * + OUString& rText, const IntlWrapper& ) const { rText.clear(); diff --git a/svx/source/items/grfitem.cxx b/svx/source/items/grfitem.cxx index 96bb8bf660ca..8f2d989e03ff 100644 --- a/svx/source/items/grfitem.cxx +++ b/svx/source/items/grfitem.cxx @@ -137,7 +137,7 @@ bool SvxGrfCrop::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId ) bool SvxGrfCrop::GetPresentation( SfxItemPresentation ePres, MapUnit eCoreUnit, MapUnit /*ePresUnit*/, - OUString &rText, const IntlWrapper* pIntl ) const + OUString &rText, const IntlWrapper& rIntl ) const { rText.clear(); switch( ePres ) @@ -145,10 +145,10 @@ bool SvxGrfCrop::GetPresentation( case SfxItemPresentation::Nameless: return true; case SfxItemPresentation::Complete: - rText = "L: " + ::GetMetricText( GetLeft(), eCoreUnit, MapUnit::MapMM, pIntl ) + - " R: " + ::GetMetricText( GetRight(), eCoreUnit, MapUnit::MapMM, pIntl ) + - " T: " + ::GetMetricText( GetTop(), eCoreUnit, MapUnit::MapMM, pIntl ) + - " B: " + ::GetMetricText( GetBottom(), eCoreUnit, MapUnit::MapMM, pIntl ); + rText = "L: " + ::GetMetricText( GetLeft(), eCoreUnit, MapUnit::MapMM, &rIntl ) + + " R: " + ::GetMetricText( GetRight(), eCoreUnit, MapUnit::MapMM, &rIntl ) + + " T: " + ::GetMetricText( GetTop(), eCoreUnit, MapUnit::MapMM, &rIntl ) + + " B: " + ::GetMetricText( GetBottom(), eCoreUnit, MapUnit::MapMM, &rIntl ); return true; break; diff --git a/svx/source/items/numinf.cxx b/svx/source/items/numinf.cxx index faefb80839b4..ec538b89119f 100644 --- a/svx/source/items/numinf.cxx +++ b/svx/source/items/numinf.cxx @@ -109,7 +109,7 @@ bool SvxNumberInfoItem::GetPresentation SfxItemPresentation /*ePres*/, MapUnit /*eCoreUnit*/, MapUnit /*ePresUnit*/, - OUString& rText, const IntlWrapper * + OUString& rText, const IntlWrapper& ) const { rText.clear(); diff --git a/svx/source/items/pageitem.cxx b/svx/source/items/pageitem.cxx index fc288024393a..0e59f4e72555 100644 --- a/svx/source/items/pageitem.cxx +++ b/svx/source/items/pageitem.cxx @@ -100,7 +100,7 @@ bool SvxPageItem::GetPresentation SfxItemPresentation ePres, MapUnit /*eCoreUnit*/, MapUnit /*ePresUnit*/, - OUString& rText, const IntlWrapper * + OUString& rText, const IntlWrapper& ) const { rText.clear(); @@ -291,7 +291,7 @@ bool SvxSetItem::GetPresentation SfxItemPresentation /*ePres*/, MapUnit /*eCoreUnit*/, MapUnit /*ePresUnit*/, - OUString& rText, const IntlWrapper * + OUString& rText, const IntlWrapper& ) const { rText.clear(); diff --git a/svx/source/items/postattr.cxx b/svx/source/items/postattr.cxx index 9a3f4127e14b..282631f22ca4 100644 --- a/svx/source/items/postattr.cxx +++ b/svx/source/items/postattr.cxx @@ -46,7 +46,7 @@ bool SvxPostItAuthorItem::GetPresentation SfxItemPresentation ePres, MapUnit /*eCoreUnit*/, MapUnit /*ePresUnit*/, - OUString& rText, const IntlWrapper * + OUString& rText, const IntlWrapper& ) const { switch ( ePres ) @@ -86,7 +86,7 @@ bool SvxPostItDateItem::GetPresentation SfxItemPresentation ePres, MapUnit /*eCoreUnit*/, MapUnit /*ePresUnit*/, - OUString& rText, const IntlWrapper * + OUString& rText, const IntlWrapper& ) const { switch ( ePres ) @@ -124,7 +124,7 @@ bool SvxPostItTextItem::GetPresentation SfxItemPresentation ePres, MapUnit /*eCoreUnit*/, MapUnit /*ePresUnit*/, - OUString& rText, const IntlWrapper * + OUString& rText, const IntlWrapper& ) const { switch ( ePres ) diff --git a/svx/source/items/rotmodit.cxx b/svx/source/items/rotmodit.cxx index dc4de5d8e1db..0a7b87322860 100644 --- a/svx/source/items/rotmodit.cxx +++ b/svx/source/items/rotmodit.cxx @@ -66,7 +66,7 @@ SfxPoolItem* SvxRotateModeItem::Create( SvStream& rStream, sal_uInt16 ) const bool SvxRotateModeItem::GetPresentation( SfxItemPresentation ePres, MapUnit /*eCoreUnit*/, MapUnit /*ePresUnit*/, - OUString& rText, const IntlWrapper * ) const + OUString& rText, const IntlWrapper& ) const { rText.clear(); diff --git a/svx/source/svdraw/svdattr.cxx b/svx/source/svdraw/svdattr.cxx index 9c55222fd98f..34400847bd6d 100644 --- a/svx/source/svdraw/svdattr.cxx +++ b/svx/source/svdraw/svdattr.cxx @@ -364,14 +364,14 @@ SdrItemPool::~SdrItemPool() bool SdrItemPool::GetPresentation( const SfxPoolItem& rItem, MapUnit ePresentationMetric, OUString& rText, - const IntlWrapper * pIntlWrapper) const + const IntlWrapper& rIntlWrapper) const { if (!IsInvalidItem(&rItem)) { sal_uInt16 nWhich=rItem.Which(); if (nWhich>=SDRATTR_SHADOW_FIRST && nWhich<=SDRATTR_END) { rItem.GetPresentation(SfxItemPresentation::Nameless, GetMetric(nWhich),ePresentationMetric,rText, - pIntlWrapper); + rIntlWrapper); OUString aStr; TakeItemName(nWhich, aStr); @@ -380,7 +380,7 @@ bool SdrItemPool::GetPresentation( return true; } } - return XOutdevItemPool::GetPresentation(rItem,ePresentationMetric,rText,pIntlWrapper); + return XOutdevItemPool::GetPresentation(rItem,ePresentationMetric,rText,rIntlWrapper); } void SdrItemPool::TakeItemName(sal_uInt16 nWhich, OUString& rItemName) @@ -627,7 +627,7 @@ bool SdrFractionItem::operator==(const SfxPoolItem& rCmp) const bool SdrFractionItem::GetPresentation( SfxItemPresentation ePresentation, MapUnit /*eCoreMetric*/, - MapUnit /*ePresentationMetric*/, OUString &rText, const IntlWrapper *) const + MapUnit /*ePresentationMetric*/, OUString &rText, const IntlWrapper&) const { if(nValue.IsValid()) { @@ -681,7 +681,7 @@ SfxPoolItem* SdrFractionItem::Clone(SfxItemPool * /*pPool*/) const bool SdrScaleItem::GetPresentation( SfxItemPresentation ePresentation, MapUnit /*eCoreMetric*/, - MapUnit /*ePresentationMetric*/, OUString &rText, const IntlWrapper *) const + MapUnit /*ePresentationMetric*/, OUString &rText, const IntlWrapper&) const { if(GetValue().IsValid()) { @@ -737,7 +737,7 @@ OUString SdrOnOffItem::GetValueTextByVal(bool bVal) const } bool SdrOnOffItem::GetPresentation(SfxItemPresentation ePres, - MapUnit /*eCoreMetric*/, MapUnit /*ePresMetric*/, OUString& rText, const IntlWrapper *) const + MapUnit /*eCoreMetric*/, MapUnit /*ePresMetric*/, OUString& rText, const IntlWrapper&) const { rText=GetValueTextByVal(GetValue()); if (ePres==SfxItemPresentation::Complete) { @@ -768,7 +768,7 @@ OUString SdrYesNoItem::GetValueTextByVal(bool bVal) const } bool SdrYesNoItem::GetPresentation(SfxItemPresentation ePres, - MapUnit /*eCoreMetric*/, MapUnit /*ePresMetric*/, OUString& rText, const IntlWrapper *) const + MapUnit /*eCoreMetric*/, MapUnit /*ePresMetric*/, OUString& rText, const IntlWrapper&) const { rText=GetValueTextByVal(GetValue()); if (ePres==SfxItemPresentation::Complete) { @@ -796,7 +796,7 @@ SfxPoolItem* SdrPercentItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const bool SdrPercentItem::GetPresentation( SfxItemPresentation ePres, MapUnit /*eCoreMetric*/, - MapUnit /*ePresMetric*/, OUString& rText, const IntlWrapper *) const + MapUnit /*ePresMetric*/, OUString& rText, const IntlWrapper&) const { rText = unicode::formatPercent(GetValue(), Application::GetSettings().GetUILanguageTag()); @@ -828,7 +828,7 @@ SfxPoolItem* SdrAngleItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const bool SdrAngleItem::GetPresentation( SfxItemPresentation ePres, MapUnit /*eCoreMetric*/, MapUnit /*ePresMetric*/, - OUString& rText, const IntlWrapper * pIntlWrapper) const + OUString& rText, const IntlWrapper& rIntlWrapper) const { sal_Int32 nValue(GetValue()); bool bNeg(nValue < 0); @@ -843,11 +843,6 @@ bool SdrAngleItem::GetPresentation( sal_Unicode aUnicodeNull('0'); sal_Int32 nCount(2); - const IntlWrapper* pMyIntlWrapper = nullptr; - if(!pIntlWrapper) - pIntlWrapper = pMyIntlWrapper = new IntlWrapper( - Application::GetSettings().GetLanguageTag() ); - if(LocaleDataWrapper::isNumLeadingZero()) nCount++; @@ -867,7 +862,7 @@ bool SdrAngleItem::GetPresentation( else { sal_Unicode cDec = - pIntlWrapper->getLocaleData()->getNumDecimalSep()[0]; + rIntlWrapper.getLocaleData()->getNumDecimalSep()[0]; aText.insert(nLen-2, cDec); if(bNull1) @@ -876,12 +871,6 @@ bool SdrAngleItem::GetPresentation( if(bNeg) aText.insert(0, '-'); - - if ( pMyIntlWrapper ) - { - delete pMyIntlWrapper; - pIntlWrapper = nullptr; - } } aText.insert(aText.getLength(), sal_Unicode(DEGREE_CHAR)); @@ -930,7 +919,7 @@ void SdrMetricItem::ScaleMetrics(long nMul, long nDiv) } bool SdrMetricItem::GetPresentation(SfxItemPresentation ePres, - MapUnit eCoreMetric, MapUnit ePresMetric, OUString& rText, const IntlWrapper *) const + MapUnit eCoreMetric, MapUnit ePresMetric, OUString& rText, const IntlWrapper&) const { long nValue=GetValue(); SdrFormatter aFmt(eCoreMetric,ePresMetric); @@ -963,7 +952,7 @@ OUString SdrCaptionTypeItem::GetValueTextByPos(sal_uInt16 nPos) const } bool SdrCaptionTypeItem::GetPresentation(SfxItemPresentation ePres, - MapUnit /*eCoreMetric*/, MapUnit /*ePresMetric*/, OUString& rText, const IntlWrapper *) const + MapUnit /*eCoreMetric*/, MapUnit /*ePresMetric*/, OUString& rText, const IntlWrapper&) const { rText=GetValueTextByPos(sal::static_int_cast< sal_uInt16 >(GetValue())); if (ePres==SfxItemPresentation::Complete) { @@ -988,7 +977,7 @@ OUString SdrCaptionEscDirItem::GetValueTextByPos(sal_uInt16 nPos) const } bool SdrCaptionEscDirItem::GetPresentation(SfxItemPresentation ePres, - MapUnit /*eCoreMetric*/, MapUnit /*ePresMetric*/, OUString& rText, const IntlWrapper *) const + MapUnit /*eCoreMetric*/, MapUnit /*ePresMetric*/, OUString& rText, const IntlWrapper&) const { rText=GetValueTextByPos(sal::static_int_cast< sal_uInt16 >(GetValue())); if (ePres==SfxItemPresentation::Complete) { @@ -1020,7 +1009,7 @@ OUString SdrTextFitToSizeTypeItem::GetValueTextByPos(sal_uInt16 nPos) const } bool SdrTextFitToSizeTypeItem::GetPresentation(SfxItemPresentation ePres, - MapUnit /*eCoreMetric*/, MapUnit /*ePresMetric*/, OUString& rText, const IntlWrapper *) const + MapUnit /*eCoreMetric*/, MapUnit /*ePresMetric*/, OUString& rText, const IntlWrapper&) const { rText=GetValueTextByPos(sal::static_int_cast< sal_uInt16 >(GetValue())); if (ePres==SfxItemPresentation::Complete) { @@ -1079,7 +1068,7 @@ OUString SdrTextVertAdjustItem::GetValueTextByPos(sal_uInt16 nPos) const } bool SdrTextVertAdjustItem::GetPresentation(SfxItemPresentation ePres, - MapUnit /*eCoreMetric*/, MapUnit /*ePresMetric*/, OUString& rText, const IntlWrapper *) const + MapUnit /*eCoreMetric*/, MapUnit /*ePresMetric*/, OUString& rText, const IntlWrapper&) const { rText=GetValueTextByPos(sal::static_int_cast< sal_uInt16 >(GetValue())); if (ePres==SfxItemPresentation::Complete) { @@ -1134,7 +1123,7 @@ OUString SdrTextHorzAdjustItem::GetValueTextByPos(sal_uInt16 nPos) const } bool SdrTextHorzAdjustItem::GetPresentation(SfxItemPresentation ePres, - MapUnit /*eCoreMetric*/, MapUnit /*ePresMetric*/, OUString& rText, const IntlWrapper *) const + MapUnit /*eCoreMetric*/, MapUnit /*ePresMetric*/, OUString& rText, const IntlWrapper&) const { rText=GetValueTextByPos(sal::static_int_cast< sal_uInt16 >(GetValue())); if (ePres==SfxItemPresentation::Complete) { @@ -1182,7 +1171,7 @@ OUString SdrTextAniKindItem::GetValueTextByPos(sal_uInt16 nPos) const } bool SdrTextAniKindItem::GetPresentation(SfxItemPresentation ePres, - MapUnit /*eCoreMetric*/, MapUnit /*ePresMetric*/, OUString& rText, const IntlWrapper *) const + MapUnit /*eCoreMetric*/, MapUnit /*ePresMetric*/, OUString& rText, const IntlWrapper&) const { rText=GetValueTextByPos(sal::static_int_cast< sal_uInt16 >(GetValue())); if (ePres==SfxItemPresentation::Complete) { @@ -1229,7 +1218,7 @@ OUString SdrTextAniDirectionItem::GetValueTextByPos(sal_uInt16 nPos) const } bool SdrTextAniDirectionItem::GetPresentation(SfxItemPresentation ePres, - MapUnit /*eCoreMetric*/, MapUnit /*ePresMetric*/, OUString& rText, const IntlWrapper *) const + MapUnit /*eCoreMetric*/, MapUnit /*ePresMetric*/, OUString& rText, const IntlWrapper&) const { rText=GetValueTextByPos(sal::static_int_cast< sal_uInt16 >(GetValue())); if (ePres==SfxItemPresentation::Complete) { @@ -1271,7 +1260,7 @@ SfxPoolItem* SdrTextAniDelayItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) con bool SdrTextAniDelayItem::GetPresentation( SfxItemPresentation ePres, MapUnit /*eCoreMetric*/, MapUnit /*ePresMetric*/, - OUString& rText, const IntlWrapper *) const + OUString& rText, const IntlWrapper&) const { rText = OUString::number(GetValue()) + "ms"; @@ -1309,7 +1298,7 @@ void SdrTextAniAmountItem::ScaleMetrics(long nMul, long nDiv) bool SdrTextAniAmountItem::GetPresentation( SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, - OUString& rText, const IntlWrapper *) const + OUString& rText, const IntlWrapper&) const { sal_Int32 nValue(GetValue()); @@ -1358,7 +1347,7 @@ SdrTextFixedCellHeightItem::SdrTextFixedCellHeightItem( SvStream & rStream, sal_ } bool SdrTextFixedCellHeightItem::GetPresentation( SfxItemPresentation ePres, MapUnit /*eCoreMetric*/, MapUnit /*ePresentationMetric*/, - OUString &rText, const IntlWrapper * ) const + OUString &rText, const IntlWrapper& ) const { rText = GetValueTextByVal( GetValue() ); if (ePres==SfxItemPresentation::Complete) @@ -1449,7 +1438,7 @@ bool SdrCustomShapeAdjustmentItem::operator==( const SfxPoolItem& rCmp ) const bool SdrCustomShapeAdjustmentItem::GetPresentation( SfxItemPresentation ePresentation, MapUnit /*eCoreMetric*/, - MapUnit /*ePresentationMetric*/, OUString &rText, const IntlWrapper *) const + MapUnit /*ePresentationMetric*/, OUString &rText, const IntlWrapper&) const { sal_uInt32 i, nCount = GetCount(); rText += OUString::number( nCount ); @@ -1563,7 +1552,7 @@ OUString SdrEdgeKindItem::GetValueTextByPos(sal_uInt16 nPos) const } bool SdrEdgeKindItem::GetPresentation(SfxItemPresentation ePres, - MapUnit /*eCoreMetric*/, MapUnit /*ePresMetric*/, OUString& rText, const IntlWrapper *) const + MapUnit /*eCoreMetric*/, MapUnit /*ePresMetric*/, OUString& rText, const IntlWrapper&) const { rText=GetValueTextByPos(sal::static_int_cast< sal_uInt16 >(GetValue())); if (ePres==SfxItemPresentation::Complete) { @@ -1728,7 +1717,7 @@ OUString SdrMeasureKindItem::GetValueTextByPos(sal_uInt16 nPos) const } bool SdrMeasureKindItem::GetPresentation(SfxItemPresentation ePres, - MapUnit /*eCoreMetric*/, MapUnit /*ePresMetric*/, OUString& rText, const IntlWrapper *) const + MapUnit /*eCoreMetric*/, MapUnit /*ePresMetric*/, OUString& rText, const IntlWrapper&) const { rText=GetValueTextByPos(sal::static_int_cast< sal_uInt16 >(GetValue())); if (ePres==SfxItemPresentation::Complete) { @@ -1775,7 +1764,7 @@ OUString SdrMeasureTextHPosItem::GetValueTextByPos(sal_uInt16 nPos) const } bool SdrMeasureTextHPosItem::GetPresentation(SfxItemPresentation ePres, - MapUnit /*eCoreMetric*/, MapUnit /*ePresMetric*/, OUString& rText, const IntlWrapper *) const + MapUnit /*eCoreMetric*/, MapUnit /*ePresMetric*/, OUString& rText, const IntlWrapper&) const { rText=GetValueTextByPos(sal::static_int_cast< sal_uInt16 >(GetValue())); if (ePres==SfxItemPresentation::Complete) { @@ -1822,7 +1811,7 @@ OUString SdrMeasureTextVPosItem::GetValueTextByPos(sal_uInt16 nPos) const } bool SdrMeasureTextVPosItem::GetPresentation(SfxItemPresentation ePres, - MapUnit /*eCoreMetric*/, MapUnit /*ePresMetric*/, OUString& rText, const IntlWrapper *) const + MapUnit /*eCoreMetric*/, MapUnit /*ePresMetric*/, OUString& rText, const IntlWrapper&) const { rText=GetValueTextByPos(sal::static_int_cast< sal_uInt16 >(GetValue())); if (ePres==SfxItemPresentation::Complete) { @@ -1875,7 +1864,7 @@ OUString SdrMeasureUnitItem::GetValueTextByPos(sal_uInt16 nPos) const } bool SdrMeasureUnitItem::GetPresentation(SfxItemPresentation ePres, - MapUnit /*eCoreMetric*/, MapUnit /*ePresMetric*/, OUString& rText, const IntlWrapper *) const + MapUnit /*eCoreMetric*/, MapUnit /*ePresMetric*/, OUString& rText, const IntlWrapper&) const { rText=GetValueTextByPos(sal::static_int_cast< sal_uInt16 >(GetValue())); if (ePres==SfxItemPresentation::Complete) { @@ -1916,7 +1905,7 @@ OUString SdrCircKindItem::GetValueTextByPos(sal_uInt16 nPos) const } bool SdrCircKindItem::GetPresentation(SfxItemPresentation ePres, - MapUnit /*eCoreMetric*/, MapUnit /*ePresMetric*/, OUString& rText, const IntlWrapper *) const + MapUnit /*eCoreMetric*/, MapUnit /*ePresMetric*/, OUString& rText, const IntlWrapper&) const { rText=GetValueTextByPos(sal::static_int_cast< sal_uInt16 >(GetValue())); if (ePres==SfxItemPresentation::Complete) { @@ -1966,7 +1955,7 @@ SfxPoolItem* SdrSignedPercentItem::Create( SvStream& rIn, sal_uInt16 /*nVer*/) c bool SdrSignedPercentItem::GetPresentation( SfxItemPresentation ePres, MapUnit /*eCoreMetric*/, MapUnit /*ePresMetric*/, - OUString& rText, const IntlWrapper *) const + OUString& rText, const IntlWrapper&) const { rText = unicode::formatPercent(GetValue(), Application::GetSettings().GetUILanguageTag()); @@ -2135,7 +2124,7 @@ OUString SdrGrafModeItem::GetValueTextByPos(sal_uInt16 nPos) const bool SdrGrafModeItem::GetPresentation( SfxItemPresentation ePres, MapUnit /*eCoreMetric*/, MapUnit /*ePresMetric*/, - OUString& rText, const IntlWrapper *) const + OUString& rText, const IntlWrapper&) const { rText = GetValueTextByPos( sal::static_int_cast< sal_uInt16 >( GetValue() ) ); diff --git a/svx/source/svdraw/svdibrow.cxx b/svx/source/svdraw/svdibrow.cxx index 769eac8311fa..b7bd3b4388de 100644 --- a/svx/source/svdraw/svdibrow.cxx +++ b/svx/source/svdraw/svdibrow.cxx @@ -55,6 +55,7 @@ #include <svx/xlnedwit.hxx> #include <svx/xlnstwit.hxx> #include <svx/xtextit0.hxx> +#include <unotools/intlwrapper.hxx> using namespace com::sun::star; @@ -887,6 +888,7 @@ void SdrItemBrowserControl::SetAttributes(const SfxItemSet* pSet, const SfxItemS { SetMode(MYBROWSEMODE & BrowserMode(~BrowserMode::KEEPHIGHLIGHT)); if (pSet!=nullptr) { + IntlWrapper aIntlWrapper(SvtSysLocale().GetUILanguageTag()); sal_uInt16 nEntryNum=0; SfxWhichIter aIter(*pSet); const SfxItemPool* pPool=pSet->GetPool(); @@ -989,7 +991,7 @@ void SdrItemBrowserControl::SetAttributes(const SfxItemSet* pSet, const SfxItemS rItem.GetPresentation(SfxItemPresentation::Nameless, pPool->GetMetric(nWhich), - MapUnit::MapMM, aEntry.aValue); + MapUnit::MapMM, aEntry.aValue, aIntlWrapper); if (aEntry.bCanNum) { aEntry.aValue = OUString::number(aEntry.nVal) + ": " + aEntry.aValue; diff --git a/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx b/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx index 3621d7f0938c..9e9152304ecc 100644 --- a/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx +++ b/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx @@ -311,7 +311,7 @@ sal_Int32 DictionaryList::ColumnCompare( SvTreeListEntry* pLeft, SvTreeListEntry if (nRightKind == SvLBoxItemType::String && nLeftKind == SvLBoxItemType::String) { - IntlWrapper aIntlWrapper( Application::GetSettings().GetLanguageTag() ); + IntlWrapper aIntlWrapper(SvtSysLocale().GetUILanguageTag()); const CollatorWrapper* pCollator = aIntlWrapper.getCaseCollator(); nCompare = pCollator->compareString( static_cast<SvLBoxString*>(pLeftItem)->GetText(), diff --git a/svx/source/xoutdev/xattr.cxx b/svx/source/xoutdev/xattr.cxx index 0ef8ede2fdea..17d40cccc111 100644 --- a/svx/source/xoutdev/xattr.cxx +++ b/svx/source/xoutdev/xattr.cxx @@ -56,6 +56,7 @@ #include <basegfx/point/b2dpoint.hxx> #include <basegfx/vector/b2dvector.hxx> #include <basegfx/tools/unotools.hxx> +#include <unotools/intlwrapper.hxx> #include <vcl/gradient.hxx> #include <libxml/xmlwriter.h> @@ -386,7 +387,7 @@ bool XLineStyleItem::GetPresentation SfxItemPresentation /*ePres*/, MapUnit /*eCoreUnit*/, MapUnit /*ePresUnit*/, - OUString& rText, const IntlWrapper * + OUString& rText, const IntlWrapper& ) const { rText.clear(); @@ -728,7 +729,7 @@ bool XLineDashItem::GetPresentation SfxItemPresentation /*ePres*/, MapUnit /*eCoreUnit*/, MapUnit /*ePresUnit*/, - OUString& rText, const IntlWrapper * + OUString& rText, const IntlWrapper& ) const { rText = GetName(); @@ -1043,11 +1044,11 @@ bool XLineWidthItem::GetPresentation SfxItemPresentation /*ePres*/, MapUnit eCoreUnit, MapUnit ePresUnit, - OUString& rText, const IntlWrapper * pIntl + OUString& rText, const IntlWrapper& rIntl ) const { rText = GetMetricText( (long) GetValue(), - eCoreUnit, ePresUnit, pIntl) + + eCoreUnit, ePresUnit, &rIntl) + " " + EditResId( GetMetricId( ePresUnit) ); return true; } @@ -1105,7 +1106,7 @@ bool XLineColorItem::GetPresentation SfxItemPresentation /*ePres*/, MapUnit /*eCoreUnit*/, MapUnit /*ePresUnit*/, - OUString& rText, const IntlWrapper * + OUString& rText, const IntlWrapper& ) const { rText = GetName(); @@ -1291,7 +1292,7 @@ bool XLineStartItem::GetPresentation SfxItemPresentation /*ePres*/, MapUnit /*eCoreUnit*/, MapUnit /*ePresUnit*/, - OUString& rText, const IntlWrapper * + OUString& rText, const IntlWrapper& ) const { rText = GetName(); @@ -1853,7 +1854,7 @@ bool XLineEndItem::GetPresentation SfxItemPresentation /*ePres*/, MapUnit /*eCoreUnit*/, MapUnit /*ePresUnit*/, - OUString& rText, const IntlWrapper * + OUString& rText, const IntlWrapper& ) const { rText = GetName(); @@ -1932,11 +1933,11 @@ bool XLineStartWidthItem::GetPresentation SfxItemPresentation /*ePres*/, MapUnit eCoreUnit, MapUnit ePresUnit, - OUString& rText, const IntlWrapper * pIntl + OUString& rText, const IntlWrapper& rIntl ) const { rText = GetMetricText( (long) GetValue(), - eCoreUnit, ePresUnit, pIntl) + + eCoreUnit, ePresUnit, &rIntl) + " " + EditResId( GetMetricId( ePresUnit) ); return true; } @@ -1980,11 +1981,11 @@ bool XLineEndWidthItem::GetPresentation SfxItemPresentation /*ePres*/, MapUnit eCoreUnit, MapUnit ePresUnit, - OUString& rText, const IntlWrapper *pIntl + OUString& rText, const IntlWrapper& rIntl ) const { rText = GetMetricText( (long) GetValue(), - eCoreUnit, ePresUnit, pIntl) + + eCoreUnit, ePresUnit, &rIntl) + " " + EditResId( GetMetricId( ePresUnit) ); return true; } @@ -2028,7 +2029,7 @@ bool XLineStartCenterItem::GetPresentation SfxItemPresentation /*ePres*/, MapUnit /*eCoreUnit*/, MapUnit /*ePresUnit*/, - OUString& rText, const IntlWrapper * + OUString& rText, const IntlWrapper& ) const { rText = SvxResId(GetValue() ? RID_SVXSTR_CENTERED : RID_SVXSTR_NOTCENTERED); @@ -2077,7 +2078,7 @@ bool XLineEndCenterItem::GetPresentation SfxItemPresentation /*ePres*/, MapUnit /*eCoreUnit*/, MapUnit /*ePresUnit*/, - OUString& rText, const IntlWrapper * + OUString& rText, const IntlWrapper& ) const { rText = SvxResId(GetValue() ? RID_SVXSTR_CENTERED : RID_SVXSTR_NOTCENTERED); @@ -2131,7 +2132,7 @@ bool XFillStyleItem::GetPresentation SfxItemPresentation /*ePres*/, MapUnit /*eCoreUnit*/, MapUnit /*ePresUnit*/, - OUString& rText, const IntlWrapper * + OUString& rText, const IntlWrapper& ) const { rText.clear(); @@ -2201,7 +2202,8 @@ void XFillStyleItem::dumpAsXml(xmlTextWriterPtr pWriter) const xmlTextWriterWriteAttribute(pWriter, BAD_CAST("value"), BAD_CAST(OString::number((sal_Int16)GetValue()).getStr())); OUString aPresentation; - GetPresentation(SfxItemPresentation::Nameless, MapUnit::Map100thMM, MapUnit::Map100thMM, aPresentation); + IntlWrapper aIntlWrapper(SvtSysLocale().GetUILanguageTag()); + GetPresentation(SfxItemPresentation::Nameless, MapUnit::Map100thMM, MapUnit::Map100thMM, aPresentation, aIntlWrapper); xmlTextWriterWriteAttribute(pWriter, BAD_CAST("presentation"), BAD_CAST(aPresentation.toUtf8().getStr())); xmlTextWriterEndElement(pWriter); @@ -2240,7 +2242,7 @@ bool XFillColorItem::GetPresentation SfxItemPresentation /*ePres*/, MapUnit /*eCoreUnit*/, MapUnit /*ePresUnit*/, - OUString& rText, const IntlWrapper * + OUString& rText, const IntlWrapper& ) const { rText = GetName(); @@ -2305,7 +2307,7 @@ bool XSecondaryFillColorItem::GetPresentation SfxItemPresentation /*ePres*/, MapUnit /*eCoreUnit*/, MapUnit /*ePresUnit*/, - OUString& rText, const IntlWrapper * + OUString& rText, const IntlWrapper& ) const { rText = GetName(); @@ -2495,7 +2497,7 @@ bool XFillGradientItem::GetPresentation SfxItemPresentation /*ePres*/, MapUnit /*eCoreUnit*/, MapUnit /*ePresUnit*/, - OUString& rText, const IntlWrapper * + OUString& rText, const IntlWrapper& ) const { rText = GetName(); @@ -2806,9 +2808,9 @@ bool XFillFloatTransparenceItem::PutValue( const css::uno::Any& rVal, sal_uInt8 bool XFillFloatTransparenceItem::GetPresentation( SfxItemPresentation ePres, MapUnit eCoreUnit, MapUnit ePresUnit, OUString& rText, - const IntlWrapper * pIntlWrapper ) const + const IntlWrapper& rIntlWrapper ) const { - return XFillGradientItem::GetPresentation( ePres, eCoreUnit, ePresUnit, rText, pIntlWrapper ); + return XFillGradientItem::GetPresentation( ePres, eCoreUnit, ePresUnit, rText, rIntlWrapper ); } bool XFillFloatTransparenceItem::CompareValueFunc( const NameOrIndex* p1, const NameOrIndex* p2 ) @@ -2956,7 +2958,7 @@ bool XFillHatchItem::GetPresentation SfxItemPresentation /*ePres*/, MapUnit /*eCoreUnit*/, MapUnit /*ePresUnit*/, - OUString& rText, const IntlWrapper * + OUString& rText, const IntlWrapper& ) const { rText = GetName(); diff --git a/svx/source/xoutdev/xattr2.cxx b/svx/source/xoutdev/xattr2.cxx index 8bd12e6682df..7d7114c56d84 100644 --- a/svx/source/xoutdev/xattr2.cxx +++ b/svx/source/xoutdev/xattr2.cxx @@ -60,7 +60,7 @@ bool XLineTransparenceItem::GetPresentation SfxItemPresentation ePres, MapUnit /*eCoreUnit*/, MapUnit /*ePresUnit*/, - OUString& rText, const IntlWrapper * + OUString& rText, const IntlWrapper& ) const { rText.clear(); @@ -113,7 +113,7 @@ SfxPoolItem* XLineJointItem::Clone(SfxItemPool* /*pPool*/) const } bool XLineJointItem::GetPresentation( SfxItemPresentation /*ePres*/, MapUnit /*eCoreUnit*/, - MapUnit /*ePresUnit*/, OUString& rText, const IntlWrapper*) const + MapUnit /*ePresUnit*/, OUString& rText, const IntlWrapper&) const { rText.clear(); @@ -317,7 +317,7 @@ SfxPoolItem* XLineCapItem::Clone(SfxItemPool* /*pPool*/) const } bool XLineCapItem::GetPresentation( SfxItemPresentation /*ePres*/, MapUnit /*eCoreUnit*/, - MapUnit /*ePresUnit*/, OUString& rText, const IntlWrapper*) const + MapUnit /*ePresUnit*/, OUString& rText, const IntlWrapper&) const { rText.clear(); @@ -418,7 +418,7 @@ bool XFillTransparenceItem::GetPresentation SfxItemPresentation ePres, MapUnit /*eCoreUnit*/, MapUnit /*ePresUnit*/, - OUString& rText, const IntlWrapper * + OUString& rText, const IntlWrapper& ) const { rText.clear(); @@ -493,7 +493,7 @@ bool XGradientStepCountItem::GetPresentation SfxItemPresentation /*ePres*/, MapUnit /*eCoreUnit*/, MapUnit /*ePresUnit*/, - OUString& rText, const IntlWrapper * + OUString& rText, const IntlWrapper& ) const { rText.clear(); @@ -528,7 +528,7 @@ bool XFillBmpTileItem::GetPresentation SfxItemPresentation /*ePres*/, MapUnit /*eCoreUnit*/, MapUnit /*ePresUnit*/, - OUString& rText, const IntlWrapper * + OUString& rText, const IntlWrapper& ) const { rText.clear(); @@ -571,7 +571,7 @@ bool XFillBmpPosItem::GetPresentation SfxItemPresentation /*ePres*/, MapUnit /*eCoreUnit*/, MapUnit /*ePresUnit*/, - OUString& rText, const IntlWrapper * + OUString& rText, const IntlWrapper& ) const { rText.clear(); @@ -618,7 +618,7 @@ bool XFillBmpSizeXItem::GetPresentation SfxItemPresentation /*ePres*/, MapUnit /*eCoreUnit*/, MapUnit /*ePresUnit*/, - OUString& rText, const IntlWrapper * + OUString& rText, const IntlWrapper& ) const { rText.clear(); @@ -658,7 +658,7 @@ bool XFillBmpSizeYItem::GetPresentation SfxItemPresentation /*ePres*/, MapUnit /*eCoreUnit*/, MapUnit /*ePresUnit*/, - OUString& rText, const IntlWrapper * + OUString& rText, const IntlWrapper& ) const { rText.clear(); @@ -697,7 +697,7 @@ bool XFillBmpSizeLogItem::GetPresentation SfxItemPresentation /*ePres*/, MapUnit /*eCoreUnit*/, MapUnit /*ePresUnit*/, - OUString& rText, const IntlWrapper * + OUString& rText, const IntlWrapper& ) const { rText.clear(); @@ -732,7 +732,7 @@ bool XFillBmpTileOffsetXItem::GetPresentation SfxItemPresentation /*ePres*/, MapUnit /*eCoreUnit*/, MapUnit /*ePresUnit*/, - OUString& rText, const IntlWrapper * + OUString& rText, const IntlWrapper& ) const { rText.clear(); @@ -766,7 +766,7 @@ bool XFillBmpTileOffsetYItem::GetPresentation SfxItemPresentation /*ePres*/, MapUnit /*eCoreUnit*/, MapUnit /*ePresUnit*/, - OUString& rText, const IntlWrapper * + OUString& rText, const IntlWrapper& ) const { rText.clear(); @@ -798,7 +798,7 @@ bool XFillBmpStretchItem::GetPresentation SfxItemPresentation /*ePres*/, MapUnit /*eCoreUnit*/, MapUnit /*ePresUnit*/, - OUString& rText, const IntlWrapper * + OUString& rText, const IntlWrapper& ) const { rText.clear(); @@ -840,7 +840,7 @@ bool XFillBmpPosOffsetXItem::GetPresentation SfxItemPresentation /*ePres*/, MapUnit /*eCoreUnit*/, MapUnit /*ePresUnit*/, - OUString& rText, const IntlWrapper * + OUString& rText, const IntlWrapper& ) const { rText.clear(); @@ -874,7 +874,7 @@ bool XFillBmpPosOffsetYItem::GetPresentation SfxItemPresentation /*ePres*/, MapUnit /*eCoreUnit*/, MapUnit /*ePresUnit*/, - OUString& rText, const IntlWrapper * + OUString& rText, const IntlWrapper& ) const { rText.clear(); @@ -902,7 +902,7 @@ SfxPoolItem* XFillBackgroundItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) con } bool XFillBackgroundItem::GetPresentation( SfxItemPresentation /*ePres*/, MapUnit /*eCoreUnit*/, - MapUnit /*ePresUnit*/, OUString& rText, const IntlWrapper*) const + MapUnit /*ePresUnit*/, OUString& rText, const IntlWrapper&) const { rText.clear(); return true; diff --git a/svx/source/xoutdev/xattrbmp.cxx b/svx/source/xoutdev/xattrbmp.cxx index c8de391e6fee..e3e51300469c 100644 --- a/svx/source/xoutdev/xattrbmp.cxx +++ b/svx/source/xoutdev/xattrbmp.cxx @@ -327,7 +327,7 @@ bool XFillBitmapItem::GetPresentation( MapUnit /*eCoreUnit*/, MapUnit /*ePresUnit*/, OUString& rText, - const IntlWrapper*) const + const IntlWrapper&) const { rText += GetName(); return true; diff --git a/sw/inc/fchrfmt.hxx b/sw/inc/fchrfmt.hxx index 90314b18d437..982346afd9c5 100644 --- a/sw/inc/fchrfmt.hxx +++ b/sw/inc/fchrfmt.hxx @@ -55,7 +55,7 @@ public: MapUnit eCoreMetric, MapUnit ePresMetric, 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; diff --git a/sw/inc/fmtanchr.hxx b/sw/inc/fmtanchr.hxx index f96cff887334..3f92bede38a2 100644 --- a/sw/inc/fmtanchr.hxx +++ b/sw/inc/fmtanchr.hxx @@ -57,7 +57,7 @@ public: MapUnit eCoreMetric, MapUnit ePresMetric, 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; diff --git a/sw/inc/fmtautofmt.hxx b/sw/inc/fmtautofmt.hxx index de022f122031..566fc384788c 100644 --- a/sw/inc/fmtautofmt.hxx +++ b/sw/inc/fmtautofmt.hxx @@ -48,7 +48,7 @@ public: MapUnit eCoreMetric, MapUnit ePresMetric, 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; diff --git a/sw/inc/fmtclds.hxx b/sw/inc/fmtclds.hxx index e493ed087935..43a853f1519a 100644 --- a/sw/inc/fmtclds.hxx +++ b/sw/inc/fmtclds.hxx @@ -103,7 +103,7 @@ public: MapUnit eCoreMetric, MapUnit ePresMetric, 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; diff --git a/sw/inc/fmtcnct.hxx b/sw/inc/fmtcnct.hxx index 78bc27a487e5..5da8d3c87d01 100644 --- a/sw/inc/fmtcnct.hxx +++ b/sw/inc/fmtcnct.hxx @@ -46,7 +46,7 @@ public: MapUnit eCoreMetric, MapUnit ePresMetric, 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; diff --git a/sw/inc/fmteiro.hxx b/sw/inc/fmteiro.hxx index f90ba26f3f12..d02b8fb07b0e 100644 --- a/sw/inc/fmteiro.hxx +++ b/sw/inc/fmteiro.hxx @@ -38,7 +38,7 @@ public: MapUnit eCoreMetric, MapUnit ePresMetric, OUString &rText, - const IntlWrapper* pIntl = nullptr ) const override; + const IntlWrapper& rIntl ) const override; void dumpAsXml(struct _xmlTextWriter* pWriter) const override; }; diff --git a/sw/inc/fmtfollowtextflow.hxx b/sw/inc/fmtfollowtextflow.hxx index ef73d87c4271..a259c9ba9ff7 100644 --- a/sw/inc/fmtfollowtextflow.hxx +++ b/sw/inc/fmtfollowtextflow.hxx @@ -39,7 +39,7 @@ public: MapUnit eCoreMetric, MapUnit ePresMetric, OUString &rText, - const IntlWrapper* pIntl = nullptr ) const override; + const IntlWrapper& rIntl ) const override; void dumpAsXml(struct _xmlTextWriter* pWriter) const override; }; diff --git a/sw/inc/fmtfsize.hxx b/sw/inc/fmtfsize.hxx index 944367fe812d..4bb829c01b71 100644 --- a/sw/inc/fmtfsize.hxx +++ b/sw/inc/fmtfsize.hxx @@ -71,7 +71,7 @@ public: MapUnit eCoreMetric, MapUnit ePresMetric, 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; diff --git a/sw/inc/fmtftntx.hxx b/sw/inc/fmtftntx.hxx index 2e928eaa8e9f..40dcae1bcd1c 100644 --- a/sw/inc/fmtftntx.hxx +++ b/sw/inc/fmtftntx.hxx @@ -63,7 +63,7 @@ public: MapUnit eCoreMetric, MapUnit ePresMetric, OUString &rText, - const IntlWrapper* pIntl = nullptr ) const override; + const IntlWrapper& rIntl ) const override; bool IsAtEnd() const { return FTNEND_ATPGORDOCEND != GetValue(); } diff --git a/sw/inc/fmthdft.hxx b/sw/inc/fmthdft.hxx index 26dc69ba7b67..59d999a421f5 100644 --- a/sw/inc/fmthdft.hxx +++ b/sw/inc/fmthdft.hxx @@ -50,7 +50,7 @@ public: MapUnit eCoreMetric, MapUnit ePresMetric, OUString &rText, - const IntlWrapper* pIntl = nullptr ) const override; + const IntlWrapper& rIntl ) const override; const SwFrameFormat *GetHeaderFormat() const { return static_cast<const SwFrameFormat*>(GetRegisteredIn()); } SwFrameFormat *GetHeaderFormat() { return static_cast<SwFrameFormat*>(GetRegisteredIn()); } @@ -81,7 +81,7 @@ public: MapUnit eCoreMetric, MapUnit ePresMetric, OUString &rText, - const IntlWrapper* pIntl = nullptr ) const override; + const IntlWrapper& rIntl ) const override; const SwFrameFormat *GetFooterFormat() const { return static_cast<const SwFrameFormat*>(GetRegisteredIn()); } SwFrameFormat *GetFooterFormat() { return static_cast<SwFrameFormat*>(GetRegisteredIn()); } diff --git a/sw/inc/fmtinfmt.hxx b/sw/inc/fmtinfmt.hxx index 48f0e2aaefad..1b2d150c1049 100644 --- a/sw/inc/fmtinfmt.hxx +++ b/sw/inc/fmtinfmt.hxx @@ -59,7 +59,7 @@ public: MapUnit eCoreMetric, MapUnit ePresMetric, 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; diff --git a/sw/inc/fmtline.hxx b/sw/inc/fmtline.hxx index e510ea3ab819..fac0c269b6b4 100644 --- a/sw/inc/fmtline.hxx +++ b/sw/inc/fmtline.hxx @@ -44,7 +44,7 @@ public: MapUnit eCoreMetric, MapUnit ePresMetric, 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; diff --git a/sw/inc/fmtlsplt.hxx b/sw/inc/fmtlsplt.hxx index 74ce7b32894c..0a6524804073 100644 --- a/sw/inc/fmtlsplt.hxx +++ b/sw/inc/fmtlsplt.hxx @@ -37,7 +37,7 @@ public: MapUnit eCoreMetric, MapUnit ePresMetric, OUString &rText, - const IntlWrapper* pIntl = nullptr ) const override; + const IntlWrapper& rIntl ) const override; }; inline const SwFormatLayoutSplit &SwAttrSet::GetLayoutSplit(bool bInP) const diff --git a/sw/inc/fmtornt.hxx b/sw/inc/fmtornt.hxx index e713207c2647..7dbd5889d1ad 100644 --- a/sw/inc/fmtornt.hxx +++ b/sw/inc/fmtornt.hxx @@ -47,7 +47,7 @@ public: MapUnit eCoreMetric, MapUnit ePresMetric, 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; @@ -83,7 +83,7 @@ public: MapUnit eCoreMetric, MapUnit ePresMetric, 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; diff --git a/sw/inc/fmtpdsc.hxx b/sw/inc/fmtpdsc.hxx index 98bb1bdf5dec..12fc58467676 100644 --- a/sw/inc/fmtpdsc.hxx +++ b/sw/inc/fmtpdsc.hxx @@ -59,7 +59,7 @@ public: MapUnit eCoreMetric, MapUnit ePresMetric, 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; diff --git a/sw/inc/fmtrowsplt.hxx b/sw/inc/fmtrowsplt.hxx index f5370f0ecab3..c045cea1b9b2 100644 --- a/sw/inc/fmtrowsplt.hxx +++ b/sw/inc/fmtrowsplt.hxx @@ -37,7 +37,7 @@ public: MapUnit eCoreMetric, MapUnit ePresMetric, OUString &rText, - const IntlWrapper* pIntl = nullptr ) const override; + const IntlWrapper& rIntl ) const override; }; inline const SwFormatRowSplit &SwAttrSet::GetRowSplit(bool bInP) const diff --git a/sw/inc/fmtruby.hxx b/sw/inc/fmtruby.hxx index 646a26f7df43..dcd8cfe6caf8 100644 --- a/sw/inc/fmtruby.hxx +++ b/sw/inc/fmtruby.hxx @@ -50,7 +50,7 @@ public: MapUnit eCoreMetric, MapUnit ePresMetric, 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; diff --git a/sw/inc/fmtsrnd.hxx b/sw/inc/fmtsrnd.hxx index 74e429d4c9d5..e8b30f518a4d 100644 --- a/sw/inc/fmtsrnd.hxx +++ b/sw/inc/fmtsrnd.hxx @@ -46,7 +46,7 @@ public: MapUnit eCoreMetric, MapUnit ePresMetric, 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; diff --git a/sw/inc/fmturl.hxx b/sw/inc/fmturl.hxx index fc062e3b9c64..371ce466e2ea 100644 --- a/sw/inc/fmturl.hxx +++ b/sw/inc/fmturl.hxx @@ -57,7 +57,7 @@ public: MapUnit eCoreMetric, MapUnit ePresMetric, 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; diff --git a/sw/inc/grfatr.hxx b/sw/inc/grfatr.hxx index b04b127d85ff..af5d606f4498 100644 --- a/sw/inc/grfatr.hxx +++ b/sw/inc/grfatr.hxx @@ -60,7 +60,7 @@ public: MapUnit eCoreMetric, MapUnit ePresMetric, 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; @@ -107,7 +107,7 @@ public: MapUnit eCoreMetric, MapUnit ePresMetric, 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, @@ -129,7 +129,7 @@ public: MapUnit eCoreMetric, MapUnit ePresMetric, OUString &rText, - const IntlWrapper* pIntl = nullptr ) const override; + const IntlWrapper& rIntl ) const override; }; class SW_DLLPUBLIC SwContrastGrf : public SfxInt16Item @@ -145,7 +145,7 @@ public: MapUnit eCoreMetric, MapUnit ePresMetric, OUString &rText, - const IntlWrapper* pIntl = nullptr ) const override; + const IntlWrapper& rIntl ) const override; }; class SwChannelGrf : public SfxInt16Item @@ -161,7 +161,7 @@ public: MapUnit eCoreMetric, MapUnit ePresMetric, OUString &rText, - const IntlWrapper* pIntl = nullptr ) const override; + const IntlWrapper& rIntl ) const override; }; class SwChannelRGrf : public SwChannelGrf @@ -213,7 +213,7 @@ public: MapUnit eCoreMetric, MapUnit ePresMetric, 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; @@ -236,7 +236,7 @@ public: MapUnit eCoreMetric, MapUnit ePresMetric, OUString &rText, - const IntlWrapper* pIntl = nullptr ) const override; + const IntlWrapper& rIntl ) const override; }; class SwTransparencyGrf : public SfxByteItem @@ -252,7 +252,7 @@ public: MapUnit eCoreMetric, MapUnit ePresMetric, 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, @@ -282,7 +282,7 @@ public: MapUnit eCoreMetric, MapUnit ePresMetric, 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; diff --git a/sw/inc/hfspacingitem.hxx b/sw/inc/hfspacingitem.hxx index 137133d6a4ad..5e7df9eb234f 100644 --- a/sw/inc/hfspacingitem.hxx +++ b/sw/inc/hfspacingitem.hxx @@ -37,7 +37,7 @@ public: MapUnit eCoreMetric, MapUnit ePresMetric, OUString &rText, - const IntlWrapper* pIntl = nullptr ) const override; + const IntlWrapper& rIntl ) const override; }; inline const SwHeaderAndFooterEatSpacingItem &SwAttrSet::GetHeaderAndFooterEatSpacing(bool bInP) const diff --git a/sw/inc/paratr.hxx b/sw/inc/paratr.hxx index 6bc9f694c336..8bdb8eef7410 100644 --- a/sw/inc/paratr.hxx +++ b/sw/inc/paratr.hxx @@ -81,7 +81,7 @@ public: MapUnit eCoreMetric, MapUnit ePresMetric, 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; @@ -125,7 +125,7 @@ public: MapUnit eCoreMetric, MapUnit ePresMetric, OUString &rText, - const IntlWrapper* pIntl = nullptr ) const override; + const IntlWrapper& rIntl ) const override; }; inline SwRegisterItem::SwRegisterItem( const bool bRegister ) : @@ -163,7 +163,7 @@ public: MapUnit eCoreMetric, MapUnit ePresMetric, 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; @@ -186,7 +186,7 @@ public: MapUnit eCoreMetric, MapUnit ePresMetric, OUString &rText, - const IntlWrapper* pIntl = nullptr ) const override; + const IntlWrapper& rIntl ) const override; }; inline SwParaConnectBorderItem::SwParaConnectBorderItem( const bool bConnect ) : diff --git a/sw/inc/tgrditem.hxx b/sw/inc/tgrditem.hxx index e163a042e165..dc9f3696b383 100644 --- a/sw/inc/tgrditem.hxx +++ b/sw/inc/tgrditem.hxx @@ -57,7 +57,7 @@ public: MapUnit eCoreMetric, MapUnit ePresMetric, 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; diff --git a/sw/source/core/crsr/crstrvl.cxx b/sw/source/core/crsr/crstrvl.cxx index 7df6263076c2..6bcdcae93bd3 100644 --- a/sw/source/core/crsr/crstrvl.cxx +++ b/sw/source/core/crsr/crstrvl.cxx @@ -67,6 +67,7 @@ #include "txtfrm.hxx" #include <wrong.hxx> #include <calbck.hxx> +#include <unotools/intlwrapper.hxx> #include <vcl/window.hxx> #include <docufld.hxx> @@ -1615,13 +1616,14 @@ bool SwCursorShell::GetContentAtPos( const Point& rPt, OUString sAttrs; SfxItemIter aIter( aSet ); const SfxPoolItem* pItem = aIter.FirstItem(); + const IntlWrapper aInt(SvtSysLocale().GetUILanguageTag()); while( true ) { if( !IsInvalidItem( pItem )) { OUString aStr; - GetDoc()->GetAttrPool().GetPresentation( *pItem, - MapUnit::MapCM, aStr ); + GetDoc()->GetAttrPool().GetPresentation(*pItem, + MapUnit::MapCM, aStr, aInt); if (!sAttrs.isEmpty()) sAttrs += ", "; sAttrs += aStr; diff --git a/sw/source/core/layout/atrfrm.cxx b/sw/source/core/layout/atrfrm.cxx index 2fc3dfcac906..f0e29e9e906b 100644 --- a/sw/source/core/layout/atrfrm.cxx +++ b/sw/source/core/layout/atrfrm.cxx @@ -25,6 +25,7 @@ #include <svtools/unoimap.hxx> #include <svtools/imap.hxx> #include <svtools/imapobj.hxx> +#include <unotools/intlwrapper.hxx> #include <frmfmt.hxx> #include <unocoll.hxx> #include <unosett.hxx> @@ -1242,7 +1243,8 @@ void SwFormatSurround::dumpAsXml(xmlTextWriterPtr pWriter) const xmlTextWriterWriteAttribute(pWriter, BAD_CAST("value"), BAD_CAST(OString::number((sal_Int32)GetValue()).getStr())); OUString aPresentation; - GetPresentation(SfxItemPresentation::Nameless, MapUnit::Map100thMM, MapUnit::Map100thMM, aPresentation); + IntlWrapper aIntlWrapper(SvtSysLocale().GetUILanguageTag()); + GetPresentation(SfxItemPresentation::Nameless, MapUnit::Map100thMM, MapUnit::Map100thMM, aPresentation, aIntlWrapper); xmlTextWriterWriteAttribute(pWriter, BAD_CAST("presentation"), BAD_CAST(aPresentation.toUtf8().getStr())); xmlTextWriterWriteAttribute(pWriter, BAD_CAST("bAnchorOnly"), BAD_CAST(OString::boolean(bAnchorOnly).getStr())); @@ -1695,7 +1697,8 @@ void SwFormatAnchor::dumpAsXml(xmlTextWriterPtr pWriter) const xmlTextWriterWriteAttribute(pWriter, BAD_CAST("m_nOrder"), BAD_CAST(OString::number(m_nOrder).getStr())); xmlTextWriterWriteAttribute(pWriter, BAD_CAST("m_nOrderCounter"), BAD_CAST(OString::number(m_nOrderCounter).getStr())); OUString aPresentation; - GetPresentation(SfxItemPresentation::Nameless, MapUnit::Map100thMM, MapUnit::Map100thMM, aPresentation); + IntlWrapper aIntlWrapper(SvtSysLocale().GetUILanguageTag()); + GetPresentation(SfxItemPresentation::Nameless, MapUnit::Map100thMM, MapUnit::Map100thMM, aPresentation, aIntlWrapper); xmlTextWriterWriteAttribute(pWriter, BAD_CAST("presentation"), BAD_CAST(aPresentation.toUtf8().getStr())); xmlTextWriterEndElement(pWriter); diff --git a/sw/source/uibase/app/docstyle.cxx b/sw/source/uibase/app/docstyle.cxx index 2d27a10a433f..09ed6e7393ff 100644 --- a/sw/source/uibase/app/docstyle.cxx +++ b/sw/source/uibase/app/docstyle.cxx @@ -833,7 +833,7 @@ bool SwDocStyleSheet::HasClearParentSupport() const // determine textual description OUString SwDocStyleSheet::GetDescription(MapUnit eUnit) { - IntlWrapper aIntlWrapper( SvtSysLocale().GetLanguageTag() ); + IntlWrapper aIntlWrapper(SvtSysLocale().GetUILanguageTag()); const OUString sPlus(" + "); if ( SfxStyleFamily::Page == nFamily ) @@ -861,7 +861,7 @@ OUString SwDocStyleSheet::GetDescription(MapUnit eUnit) OUString aItemPresentation; if ( !IsInvalidItem( pItem ) && pPool->GetPool().GetPresentation( - *pItem, eUnit, aItemPresentation, &aIntlWrapper ) ) + *pItem, eUnit, aItemPresentation, aIntlWrapper ) ) { if ( !aDesc.isEmpty() && !aItemPresentation.isEmpty() ) aDesc += sPlus; @@ -913,7 +913,7 @@ OUString SwDocStyleSheet::GetDescription(MapUnit eUnit) OUString aItemPresentation; if ( !IsInvalidItem( pItem ) && pPool->GetPool().GetPresentation( - *pItem, eUnit, aItemPresentation, &aIntlWrapper ) ) + *pItem, eUnit, aItemPresentation, aIntlWrapper ) ) { bool bIsDefault = false; switch ( pItem->Which() ) diff --git a/sw/source/uibase/app/swmodule.cxx b/sw/source/uibase/app/swmodule.cxx index 0da9c3a8bff0..40cb9aa2135c 100644 --- a/sw/source/uibase/app/swmodule.cxx +++ b/sw/source/uibase/app/swmodule.cxx @@ -146,7 +146,7 @@ using namespace ::com::sun::star::uno; SwModule::SwModule( SfxObjectFactory* pWebFact, SfxObjectFactory* pFact, SfxObjectFactory* pGlobalFact ) - : SfxModule( Translate::Create("sw", Application::GetSettings().GetUILanguageTag()), {pWebFact, pFact, pGlobalFact} ), + : SfxModule( Translate::Create("sw", SvtSysLocale().GetUILanguageTag()), {pWebFact, pFact, pGlobalFact} ), m_pModuleConfig(nullptr), m_pUsrPref(nullptr), m_pWebUsrPref(nullptr), diff --git a/sw/source/uibase/inc/uiitems.hxx b/sw/source/uibase/inc/uiitems.hxx index 6cb33a60a9a0..ec02154de2b3 100644 --- a/sw/source/uibase/inc/uiitems.hxx +++ b/sw/source/uibase/inc/uiitems.hxx @@ -46,7 +46,7 @@ public: MapUnit eCoreMetric, MapUnit ePresMetric, 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; diff --git a/sw/source/uibase/utlui/attrdesc.cxx b/sw/source/uibase/utlui/attrdesc.cxx index f2077c883be9..4e10f8527d88 100644 --- a/sw/source/uibase/utlui/attrdesc.cxx +++ b/sw/source/uibase/utlui/attrdesc.cxx @@ -72,13 +72,12 @@ void SwAttrSet::GetPresentation( if( Count() ) { SfxItemIter aIter( *this ); - const IntlWrapper rInt( ::comphelper::getProcessComponentContext(), - GetAppLanguageTag() ); + const IntlWrapper aInt(SvtSysLocale().GetUILanguageTag()); while( true ) { aIter.GetCurItem()->GetPresentation( ePres, eCoreMetric, ePresMetric, aStr, - &rInt ); + aInt ); if( rText.getLength() && aStr.getLength() ) rText += ", "; rText += aStr; @@ -95,7 +94,7 @@ bool SwFormatCharFormat::GetPresentation MapUnit eCoreUnit, MapUnit ePresUnit, OUString& rText, - const IntlWrapper* /*pIntl*/ + const IntlWrapper& /*rIntl*/ ) const { const SwCharFormat *pCharFormat = GetCharFormat(); @@ -117,7 +116,7 @@ bool SwFormatAutoFormat::GetPresentation MapUnit /*eCoreUnit*/, MapUnit /*ePresUnit*/, OUString& rText, - const IntlWrapper* /*pIntl*/ + const IntlWrapper& /*rIntl*/ ) const { rText.clear(); //TODO @@ -130,7 +129,7 @@ bool SwFormatINetFormat::GetPresentation MapUnit /*eCoreUnit*/, MapUnit /*ePresUnit*/, OUString& rText, - const IntlWrapper* /*pIntl*/ + const IntlWrapper& /*rIntl*/ ) const { rText = GetValue(); @@ -139,7 +138,7 @@ bool SwFormatINetFormat::GetPresentation bool SwFormatRuby::GetPresentation( SfxItemPresentation /*ePres*/, MapUnit /*eCoreMetric*/, MapUnit /*ePresMetric*/, - OUString &rText, const IntlWrapper* /*pIntl*/ ) const + OUString &rText, const IntlWrapper& /*rIntl*/ ) const { rText.clear(); return true; @@ -151,7 +150,7 @@ bool SwFormatDrop::GetPresentation MapUnit /*eCoreUnit*/, MapUnit /*ePresUnit*/, OUString& rText, - const IntlWrapper* /*pIntl*/ + const IntlWrapper& /*rIntl*/ ) const { rText.clear(); @@ -179,7 +178,7 @@ bool SwRegisterItem::GetPresentation MapUnit /*eCoreUnit*/, MapUnit /*ePresUnit*/, OUString& rText, - const IntlWrapper* /*pIntl*/ + const IntlWrapper& /*rIntl*/ ) const { const char* pId = GetValue() ? STR_REGISTER_ON : STR_REGISTER_OFF; @@ -193,7 +192,7 @@ bool SwNumRuleItem::GetPresentation MapUnit /*eCoreUnit*/, MapUnit /*ePresUnit*/, OUString& rText, - const IntlWrapper* /*pIntl*/ + const IntlWrapper& /*rIntl*/ ) const { if( !GetValue().isEmpty() ) @@ -210,7 +209,7 @@ bool SwParaConnectBorderItem::GetPresentation MapUnit /*eCoreUnit*/, MapUnit /*ePresUnit*/, OUString& rText, - const IntlWrapper* /*pIntl*/ + const IntlWrapper& /*rIntl*/ ) const { const char* pId = GetValue() ? STR_CONNECT_BORDER_ON : STR_CONNECT_BORDER_OFF; @@ -226,7 +225,7 @@ bool SwFormatFrameSize::GetPresentation MapUnit eCoreUnit, MapUnit ePresUnit, OUString& rText, - const IntlWrapper* pIntl + const IntlWrapper& rIntl ) const { rText = SwResId( STR_FRM_WIDTH ) + " "; @@ -237,7 +236,7 @@ bool SwFormatFrameSize::GetPresentation } else { - rText = rText + ::GetMetricText( GetWidth(), eCoreUnit, ePresUnit, pIntl ) + + rText = rText + ::GetMetricText( GetWidth(), eCoreUnit, ePresUnit, &rIntl ) + " " + ::GetSvxString( ::GetMetricId( ePresUnit ) ); } if ( ATT_VAR_SIZE != GetHeightSizeType() ) @@ -252,7 +251,7 @@ bool SwFormatFrameSize::GetPresentation } else { - rText = ::GetMetricText( GetHeight(), eCoreUnit, ePresUnit, pIntl ) + + rText = ::GetMetricText( GetHeight(), eCoreUnit, ePresUnit, &rIntl ) + " " + ::GetSvxString( ::GetMetricId( ePresUnit ) ); } } @@ -268,7 +267,7 @@ bool SwFormatHeader::GetPresentation MapUnit /*eCoreUnit*/, MapUnit /*ePresUnit*/, OUString& rText, - const IntlWrapper* /*pIntl*/ + const IntlWrapper& /*rIntl*/ ) const { const char* pId = GetHeaderFormat() ? STR_HEADER : STR_NO_HEADER; @@ -285,7 +284,7 @@ bool SwFormatFooter::GetPresentation MapUnit /*eCoreUnit*/, MapUnit /*ePresUnit*/, OUString& rText, - const IntlWrapper* /*pIntl*/ + const IntlWrapper& /*rIntl*/ ) const { const char* pId = GetFooterFormat() ? STR_FOOTER : STR_NO_FOOTER; @@ -299,7 +298,7 @@ bool SwFormatSurround::GetPresentation MapUnit /*eCoreUnit*/, MapUnit /*ePresUnit*/, OUString& rText, - const IntlWrapper* /*pIntl*/ + const IntlWrapper& /*rIntl*/ ) const { const char* pId = nullptr; @@ -343,7 +342,7 @@ bool SwFormatVertOrient::GetPresentation MapUnit eCoreUnit, MapUnit ePresUnit, OUString& rText, - const IntlWrapper* pIntl + const IntlWrapper& rIntl ) const { const char* pId = nullptr; @@ -352,7 +351,7 @@ bool SwFormatVertOrient::GetPresentation case text::VertOrientation::NONE: { rText = rText + SwResId( STR_POS_Y ) + " " + - ::GetMetricText( GetPos(), eCoreUnit, ePresUnit, pIntl ) + + ::GetMetricText( GetPos(), eCoreUnit, ePresUnit, &rIntl ) + " " + ::GetSvxString( ::GetMetricId( ePresUnit ) ); } break; @@ -389,7 +388,7 @@ bool SwFormatHoriOrient::GetPresentation MapUnit eCoreUnit, MapUnit ePresUnit, OUString& rText, - const IntlWrapper* pIntl + const IntlWrapper& rIntl ) const { const char* pId = nullptr; @@ -398,7 +397,7 @@ bool SwFormatHoriOrient::GetPresentation case text::HoriOrientation::NONE: { rText = rText + SwResId( STR_POS_X ) + " " + - ::GetMetricText( GetPos(), eCoreUnit, ePresUnit, pIntl ) + + ::GetMetricText( GetPos(), eCoreUnit, ePresUnit, &rIntl ) + " " + ::GetSvxString( ::GetMetricId( ePresUnit ) ); } break; @@ -435,7 +434,7 @@ bool SwFormatAnchor::GetPresentation MapUnit /*eCoreUnit*/, MapUnit /*ePresUnit*/, OUString& rText, - const IntlWrapper* /*pIntl*/ + const IntlWrapper& /*rIntl*/ ) const { const char* pId = nullptr; @@ -463,7 +462,7 @@ bool SwFormatPageDesc::GetPresentation MapUnit /*eCoreUnit*/, MapUnit /*ePresUnit*/, OUString& rText, - const IntlWrapper* /*pIntl*/ + const IntlWrapper& /*rIntl*/ ) const { const SwPageDesc *pPageDesc = GetPageDesc(); @@ -482,7 +481,7 @@ bool SwFormatCol::GetPresentation MapUnit eCoreUnit, MapUnit /*ePresUnit*/, OUString& rText, - const IntlWrapper* pIntl + const IntlWrapper& rIntl ) const { sal_uInt16 nCnt = GetNumCols(); @@ -494,7 +493,7 @@ bool SwFormatCol::GetPresentation const long nWdth = static_cast<long>(GetLineWidth()); rText = rText + " " + SwResId( STR_LINE_WIDTH ) + " " + ::GetMetricText( nWdth, eCoreUnit, - MapUnit::MapPoint, pIntl ); + MapUnit::MapPoint, &rIntl ); } } else @@ -510,7 +509,7 @@ bool SwFormatURL::GetPresentation MapUnit /*eCoreUnit*/, MapUnit /*ePresUnit*/, OUString& rText, - const IntlWrapper* /*pIntl*/ + const IntlWrapper& /*rIntl*/ ) const { rText.clear(); @@ -537,7 +536,7 @@ bool SwFormatEditInReadonly::GetPresentation MapUnit /*eCoreUnit*/, MapUnit /*ePresUnit*/, OUString& rText, - const IntlWrapper* /*pIntl*/ + const IntlWrapper& /*rIntl*/ ) const { rText.clear(); @@ -560,7 +559,7 @@ bool SwFormatLayoutSplit::GetPresentation MapUnit /*eCoreUnit*/, MapUnit /*ePresUnit*/, OUString& rText, - const IntlWrapper* /*pIntl*/ + const IntlWrapper& /*rIntl*/ ) const { if ( GetValue() ) @@ -574,7 +573,7 @@ bool SwFormatRowSplit::GetPresentation MapUnit /*eCoreUnit*/, MapUnit /*ePresUnit*/, OUString& /*rText*/, - const IntlWrapper* /*pIntl*/ + const IntlWrapper& /*rIntl*/ ) const { return false; @@ -586,7 +585,7 @@ bool SwFormatFootnoteEndAtTextEnd::GetPresentation MapUnit /*eCoreUnit*/, MapUnit /*ePresUnit*/, OUString& /*rText*/, - const IntlWrapper* /*pIntl*/ + const IntlWrapper& /*rIntl*/ ) const { return true; @@ -598,7 +597,7 @@ bool SwFormatChain::GetPresentation MapUnit /*eCoreUnit*/, MapUnit /*ePresUnit*/, OUString& rText, - const IntlWrapper* /*pIntl*/ + const IntlWrapper& /*rIntl*/ ) const { if ( GetPrev() || GetNext() ) @@ -622,7 +621,7 @@ bool SwFormatLineNumber::GetPresentation MapUnit /*eCoreUnit*/, MapUnit /*ePresUnit*/, OUString& rText, - const IntlWrapper* /*pIntl*/ + const IntlWrapper& /*rIntl*/ ) const { if ( IsCount() ) @@ -643,7 +642,7 @@ bool SwTextGridItem::GetPresentation MapUnit /*eCoreUnit*/, MapUnit /*ePresUnit*/, OUString& rText, - const IntlWrapper* /*pIntl*/ + const IntlWrapper& /*rIntl*/ ) const { const char* pId = nullptr; @@ -671,7 +670,7 @@ bool SwHeaderAndFooterEatSpacingItem::GetPresentation MapUnit /*eCoreUnit*/, MapUnit /*ePresUnit*/, OUString& /*rText*/, - const IntlWrapper* /*pIntl*/ + const IntlWrapper& /*rIntl*/ ) const { return false; @@ -681,7 +680,7 @@ bool SwHeaderAndFooterEatSpacingItem::GetPresentation bool SwMirrorGrf::GetPresentation( SfxItemPresentation /*ePres*/, MapUnit /*eCoreUnit*/, MapUnit /*ePresUnit*/, - OUString& rText, const IntlWrapper* /*pIntl*/ ) const + OUString& rText, const IntlWrapper& /*rIntl*/ ) const { const char* pId; switch( GetValue() ) @@ -703,7 +702,7 @@ bool SwMirrorGrf::GetPresentation( bool SwRotationGrf::GetPresentation( SfxItemPresentation ePres, MapUnit /*eCoreUnit*/, MapUnit /*ePresUnit*/, - OUString &rText, const IntlWrapper* /*pIntl*/) const + OUString &rText, const IntlWrapper& /*rIntl*/) const { if( SfxItemPresentation::Complete == ePres ) rText = SwResId( STR_ROTATION ); @@ -715,7 +714,7 @@ bool SwRotationGrf::GetPresentation( bool SwLuminanceGrf::GetPresentation( SfxItemPresentation ePres, MapUnit /*eCoreUnit*/, MapUnit /*ePresUnit*/, - OUString &rText, const IntlWrapper* /*pIntl*/) const + OUString &rText, const IntlWrapper& /*rIntl*/) const { if( SfxItemPresentation::Complete == ePres ) rText = SwResId( STR_LUMINANCE ); @@ -728,7 +727,7 @@ bool SwLuminanceGrf::GetPresentation( bool SwContrastGrf::GetPresentation( SfxItemPresentation ePres, MapUnit /*eCoreUnit*/, MapUnit /*ePresUnit*/, - OUString &rText, const IntlWrapper* /*pIntl*/) const + OUString &rText, const IntlWrapper& /*rIntl*/) const { if( SfxItemPresentation::Complete == ePres ) rText = SwResId( STR_CONTRAST ); @@ -741,7 +740,7 @@ bool SwContrastGrf::GetPresentation( bool SwChannelGrf::GetPresentation( SfxItemPresentation ePres, MapUnit /*eCoreUnit*/, MapUnit /*ePresUnit*/, - OUString &rText, const IntlWrapper* /*pIntl*/) const + OUString &rText, const IntlWrapper& /*rIntl*/) const { if( SfxItemPresentation::Complete == ePres ) { @@ -767,7 +766,7 @@ bool SwChannelGrf::GetPresentation( bool SwGammaGrf::GetPresentation( SfxItemPresentation ePres, MapUnit /*eCoreUnit*/, MapUnit /*ePresUnit*/, - OUString &rText, const IntlWrapper* /*pIntl*/) const + OUString &rText, const IntlWrapper& /*rIntl*/) const { OUStringBuffer aText; if( SfxItemPresentation::Complete == ePres ) @@ -780,7 +779,7 @@ bool SwGammaGrf::GetPresentation( bool SwInvertGrf::GetPresentation( SfxItemPresentation ePres, MapUnit /*eCoreUnit*/, MapUnit /*ePresUnit*/, - OUString &rText, const IntlWrapper* /*pIntl*/) const + OUString &rText, const IntlWrapper& /*rIntl*/) const { rText.clear(); if( SfxItemPresentation::Complete == ePres ) @@ -793,7 +792,7 @@ bool SwInvertGrf::GetPresentation( bool SwTransparencyGrf::GetPresentation( SfxItemPresentation ePres, MapUnit /*eCoreUnit*/, MapUnit /*ePresUnit*/, - OUString &rText, const IntlWrapper* /*pIntl*/) const + OUString &rText, const IntlWrapper& /*rIntl*/) const { if( SfxItemPresentation::Complete == ePres ) rText = SwResId( STR_TRANSPARENCY ); @@ -806,7 +805,7 @@ bool SwTransparencyGrf::GetPresentation( bool SwDrawModeGrf::GetPresentation( SfxItemPresentation ePres, MapUnit /*eCoreUnit*/, MapUnit /*ePresUnit*/, - OUString &rText, const IntlWrapper* /*pIntl*/) const + OUString &rText, const IntlWrapper& /*rIntl*/) const { rText.clear(); if( SfxItemPresentation::Complete == ePres ) @@ -829,7 +828,7 @@ bool SwFormatFollowTextFlow::GetPresentation( SfxItemPresentation ePres, MapUnit /*eCoreMetric*/, MapUnit /*ePresMetric*/, OUString &rText, - const IntlWrapper* /*pIntl*/ ) const + const IntlWrapper& /*rIntl*/ ) const { rText.clear(); if( SfxItemPresentation::Complete == ePres ) diff --git a/sw/source/uibase/utlui/uiitems.cxx b/sw/source/uibase/utlui/uiitems.cxx index ad4fefb2167c..da7c0e6b61e0 100644 --- a/sw/source/uibase/utlui/uiitems.cxx +++ b/sw/source/uibase/utlui/uiitems.cxx @@ -64,14 +64,14 @@ bool SwPageFootnoteInfoItem::GetPresentation MapUnit eCoreUnit, MapUnit ePresUnit, OUString& rText, - const IntlWrapper* pIntl + const IntlWrapper& rIntl ) const { const SwTwips nHght = GetPageFootnoteInfo().GetHeight(); if ( nHght ) { rText = SwResId( STR_MAX_FTN_HEIGHT ) + " " + - ::GetMetricText( nHght, eCoreUnit, ePresUnit, pIntl ) + " " + + ::GetMetricText( nHght, eCoreUnit, ePresUnit, &rIntl ) + " " + ::GetSvxString( ::GetMetricId( ePresUnit ) ); } return true; diff --git a/unotools/source/i18n/intlwrapper.cxx b/unotools/source/i18n/intlwrapper.cxx index d8e3760598a6..63e47c71aed4 100644 --- a/unotools/source/i18n/intlwrapper.cxx +++ b/unotools/source/i18n/intlwrapper.cxx @@ -23,18 +23,6 @@ #include <comphelper/processfactory.hxx> IntlWrapper::IntlWrapper( - const css::uno::Reference< css::uno::XComponentContext > & rxContext, - const LanguageTag& rLanguageTag ) - : - maLanguageTag( rLanguageTag ), - m_xContext( rxContext ), - pLocaleData( nullptr ), - pCollator( nullptr ), - pCaseCollator( nullptr ) -{ -} - -IntlWrapper::IntlWrapper( const LanguageTag& rLanguageTag ) : maLanguageTag( rLanguageTag ), |