diff options
author | Luboš Luňák <l.lunak@suse.cz> | 2013-04-07 12:06:47 +0200 |
---|---|---|
committer | Luboš Luňák <l.lunak@suse.cz> | 2013-04-07 14:23:11 +0200 |
commit | 1946794ae09ba732022fe6a74ea45e304ab70b84 (patch) | |
tree | e32bd7ba61fa021ecc7f8c85959df8ca837d6e81 /svx/source/items | |
parent | 5b08c6e7a21dda94d5b755eea0b1ed1e9c199bec (diff) |
mass removal of rtl:: prefixes for O(U)String*
Modules sal, salhelper, cppu, cppuhelper, codemaker (selectively) and odk
have kept them, in order not to break external API (the automatic using declaration
is LO-internal).
Change-Id: I588fc9e0c45b914f824f91c0376980621d730f09
Diffstat (limited to 'svx/source/items')
-rw-r--r-- | svx/source/items/SmartTagItem.cxx | 4 | ||||
-rw-r--r-- | svx/source/items/chrtitem.cxx | 2 | ||||
-rw-r--r-- | svx/source/items/clipfmtitem.cxx | 10 | ||||
-rw-r--r-- | svx/source/items/customshapeitem.cxx | 10 | ||||
-rw-r--r-- | svx/source/items/hlnkitem.cxx | 10 | ||||
-rw-r--r-- | svx/source/items/numfmtsh.cxx | 8 | ||||
-rw-r--r-- | svx/source/items/viewlayoutitem.cxx | 4 | ||||
-rw-r--r-- | svx/source/items/zoomslideritem.cxx | 8 |
8 files changed, 28 insertions, 28 deletions
diff --git a/svx/source/items/SmartTagItem.cxx b/svx/source/items/SmartTagItem.cxx index 742f1cf19292..57c6588e6d70 100644 --- a/svx/source/items/SmartTagItem.cxx +++ b/svx/source/items/SmartTagItem.cxx @@ -36,8 +36,8 @@ SvxSmartTagItem::SvxSmartTagItem( const sal_uInt16 nId, const com::sun::star::uno::Reference<com::sun::star::text::XTextRange> rRange, const com::sun::star::uno::Reference<com::sun::star::frame::XController> rController, const com::sun::star::lang::Locale rLocale, - const rtl::OUString& rApplicationName, - const rtl::OUString& rRangeText ) : + const OUString& rApplicationName, + const OUString& rRangeText ) : SfxPoolItem( nId ), maActionComponentsSequence( rActionComponentsSequence ), maActionIndicesSequence( rActionIndicesSequence ), diff --git a/svx/source/items/chrtitem.cxx b/svx/source/items/chrtitem.cxx index ca6d4a7e0e75..33fff149cf80 100644 --- a/svx/source/items/chrtitem.cxx +++ b/svx/source/items/chrtitem.cxx @@ -244,7 +244,7 @@ SvxDoubleItem::SvxDoubleItem(const SvxDoubleItem& rItem) : XubString SvxDoubleItem::GetValueText() const { - rtl::OString aOStr( rtl::math::doubleToString( fVal, rtl_math_StringFormat_E, 4, '.', false ) ); + OString aOStr( rtl::math::doubleToString( fVal, rtl_math_StringFormat_E, 4, '.', false ) ); return String( aOStr.getStr(), (sal_uInt16)aOStr.getLength() ); } diff --git a/svx/source/items/clipfmtitem.cxx b/svx/source/items/clipfmtitem.cxx index e2f863d5d472..af6236d72645 100644 --- a/svx/source/items/clipfmtitem.cxx +++ b/svx/source/items/clipfmtitem.cxx @@ -24,7 +24,7 @@ struct SvxClipboardFmtItem_Impl { - boost::ptr_vector< boost::nullable<rtl::OUString> > aFmtNms; + boost::ptr_vector< boost::nullable<OUString> > aFmtNms; std::vector<sal_uIntPtr> aFmtIds; SvxClipboardFmtItem_Impl() {} @@ -127,13 +127,13 @@ void SvxClipboardFmtItem::AddClipbrdFormat( sal_uIntPtr nId, sal_uInt16 nPos ) pImpl->aFmtIds.insert( pImpl->aFmtIds.begin()+nPos, nId ); } -void SvxClipboardFmtItem::AddClipbrdFormat( sal_uIntPtr nId, const rtl::OUString& rName, +void SvxClipboardFmtItem::AddClipbrdFormat( sal_uIntPtr nId, const OUString& rName, sal_uInt16 nPos ) { if( nPos > pImpl->aFmtNms.size() ) nPos = pImpl->aFmtNms.size(); - pImpl->aFmtNms.insert(pImpl->aFmtNms.begin() + nPos, new rtl::OUString(rName)); + pImpl->aFmtNms.insert(pImpl->aFmtNms.begin() + nPos, new OUString(rName)); pImpl->aFmtIds.insert( pImpl->aFmtIds.begin()+nPos, nId ); } @@ -147,9 +147,9 @@ sal_uIntPtr SvxClipboardFmtItem::GetClipbrdFormatId( sal_uInt16 nPos ) const return pImpl->aFmtIds[ nPos ]; } -const rtl::OUString SvxClipboardFmtItem::GetClipbrdFormatName( sal_uInt16 nPos ) const +const OUString SvxClipboardFmtItem::GetClipbrdFormatName( sal_uInt16 nPos ) const { - return pImpl->aFmtNms.is_null(nPos) ? rtl::OUString() : pImpl->aFmtNms[nPos]; + return pImpl->aFmtNms.is_null(nPos) ? OUString() : pImpl->aFmtNms[nPos]; } diff --git a/svx/source/items/customshapeitem.cxx b/svx/source/items/customshapeitem.cxx index 119de61bd20f..5b8ed9f51c50 100644 --- a/svx/source/items/customshapeitem.cxx +++ b/svx/source/items/customshapeitem.cxx @@ -31,7 +31,7 @@ SdrCustomShapeDataItem::SdrCustomShapeDataItem() : SfxStringItem( SDRATTR_CUSTOMSHAPE_DATA, String() ) {} -bool SdrCustomShapeGeometryItem::PropertyEq::operator()( const rtl::OUString& r1, const rtl::OUString& r2 ) const +bool SdrCustomShapeGeometryItem::PropertyEq::operator()( const OUString& r1, const OUString& r2 ) const { return r1.equals( r2 ); } @@ -70,7 +70,7 @@ SdrCustomShapeGeometryItem::SdrCustomShapeGeometryItem( const uno::Sequence< bea } } -com::sun::star::uno::Any* SdrCustomShapeGeometryItem::GetPropertyValueByName( const rtl::OUString& rPropName ) +com::sun::star::uno::Any* SdrCustomShapeGeometryItem::GetPropertyValueByName( const OUString& rPropName ) { com::sun::star::uno::Any* pRet = NULL; PropertyHashMap::iterator aHashIter( aPropHashMap.find( rPropName ) ); @@ -79,7 +79,7 @@ com::sun::star::uno::Any* SdrCustomShapeGeometryItem::GetPropertyValueByName( co return pRet; } -com::sun::star::uno::Any* SdrCustomShapeGeometryItem::GetPropertyValueByName( const rtl::OUString& rSequenceName, const rtl::OUString& rPropName ) +com::sun::star::uno::Any* SdrCustomShapeGeometryItem::GetPropertyValueByName( const OUString& rSequenceName, const OUString& rPropName ) { com::sun::star::uno::Any* pRet = NULL; com::sun::star::uno::Any* pSeqAny = GetPropertyValueByName( rSequenceName ); @@ -138,7 +138,7 @@ void SdrCustomShapeGeometryItem::SetPropertyValue( const com::sun::star::beans:: } } -void SdrCustomShapeGeometryItem::SetPropertyValue( const rtl::OUString& rSequenceName, const com::sun::star::beans::PropertyValue& rPropVal ) +void SdrCustomShapeGeometryItem::SetPropertyValue( const OUString& rSequenceName, const com::sun::star::beans::PropertyValue& rPropVal ) { com::sun::star::uno::Any* pAny = GetPropertyValueByName( rSequenceName, rPropVal.Name ); if ( pAny ) // just replacing @@ -190,7 +190,7 @@ void SdrCustomShapeGeometryItem::SetPropertyValue( const rtl::OUString& rSequenc } } -void SdrCustomShapeGeometryItem::ClearPropertyValue( const rtl::OUString& rPropName ) +void SdrCustomShapeGeometryItem::ClearPropertyValue( const OUString& rPropName ) { if ( aPropSeq.getLength() ) { diff --git a/svx/source/items/hlnkitem.cxx b/svx/source/items/hlnkitem.cxx index a2181a2a626f..1de41eb9fa0f 100644 --- a/svx/source/items/hlnkitem.cxx +++ b/svx/source/items/hlnkitem.cxx @@ -295,16 +295,16 @@ bool SvxHyperlinkItem::QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMe switch(nMemberId) { case MID_HLINK_NAME : - rVal <<= ::rtl::OUString(sIntName.GetBuffer()); + rVal <<= OUString(sIntName.GetBuffer()); break; case MID_HLINK_TEXT : - rVal <<= ::rtl::OUString(sName.GetBuffer()); + rVal <<= OUString(sName.GetBuffer()); break; case MID_HLINK_URL: - rVal <<= ::rtl::OUString(sURL.GetBuffer()); + rVal <<= OUString(sURL.GetBuffer()); break; case MID_HLINK_TARGET: - rVal <<= ::rtl::OUString(sTarget.GetBuffer()); + rVal <<= OUString(sTarget.GetBuffer()); break; case MID_HLINK_TYPE: rVal <<= (sal_Int32) eType; @@ -320,7 +320,7 @@ bool SvxHyperlinkItem::PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 { // sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS); nMemberId &= ~CONVERT_TWIPS; - ::rtl::OUString aStr; + OUString aStr; sal_Int32 nVal = 0; switch(nMemberId) { diff --git a/svx/source/items/numfmtsh.cxx b/svx/source/items/numfmtsh.cxx index d33ca4ca0564..2616f7391ff2 100644 --- a/svx/source/items/numfmtsh.cxx +++ b/svx/source/items/numfmtsh.cxx @@ -1502,7 +1502,7 @@ String SvxNumberFormatShell::GetStandardName() const return pFormatter->GetStandardName( eCurLanguage); } -void SvxNumberFormatShell::GetCurrencySymbols(std::vector<rtl::OUString>& rList, sal_uInt16* pPos) +void SvxNumberFormatShell::GetCurrencySymbols(std::vector<OUString>& rList, sal_uInt16* pPos) { const NfCurrencyEntry* pTmpCurrencyEntry=SvNumberFormatter::MatchSystemCurrency(); @@ -1541,7 +1541,7 @@ void SvxNumberFormatShell::GetCurrencySymbols(std::vector<rtl::OUString>& rList, } -void SvxNumberFormatShell::GetCurrencySymbols(std::vector<rtl::OUString>& rList, bool bFlag) +void SvxNumberFormatShell::GetCurrencySymbols(std::vector<OUString>& rList, bool bFlag) { aCurCurrencyList.clear(); @@ -1597,7 +1597,7 @@ void SvxNumberFormatShell::GetCurrencySymbols(std::vector<rtl::OUString>& rList, for(sal_uInt16 i = 1; i < nCount; ++i) { bool bInsert = true; - rtl::OUString aStr(ApplyLreOrRleEmbedding(rCurrencyTable[i].GetBankSymbol())); + OUString aStr(ApplyLreOrRleEmbedding(rCurrencyTable[i].GetBankSymbol())); sal_uInt16 j = nCont; for(; j < rList.size() && bInsert; ++j) @@ -1771,7 +1771,7 @@ sal_uInt16 SvxNumberFormatShell::FindCurrencyFormat(const NfCurrencyEntry* pTmpC } bool SvxNumberFormatShell::IsInTable(sal_uInt16 const nPos, - bool const bTmpBanking, ::rtl::OUString const& rFmtString) + bool const bTmpBanking, OUString const& rFmtString) { bool bFlag=false; diff --git a/svx/source/items/viewlayoutitem.cxx b/svx/source/items/viewlayoutitem.cxx index d84ade527f8c..94d88e8562fd 100644 --- a/svx/source/items/viewlayoutitem.cxx +++ b/svx/source/items/viewlayoutitem.cxx @@ -99,9 +99,9 @@ bool SvxViewLayoutItem::QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nM case 0 : { ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > aSeq( VIEWLAYOUT_PARAMS ); - aSeq[0].Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( VIEWLAYOUT_PARAM_COLUMNS )); + aSeq[0].Name = OUString( RTL_CONSTASCII_USTRINGPARAM( VIEWLAYOUT_PARAM_COLUMNS )); aSeq[0].Value <<= sal_Int32( GetValue() ); - aSeq[1].Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( VIEWLAYOUT_PARAM_BOOKMODE )); + aSeq[1].Name = OUString( RTL_CONSTASCII_USTRINGPARAM( VIEWLAYOUT_PARAM_BOOKMODE )); aSeq[1].Value <<= sal_Bool( mbBookMode ); rVal <<= aSeq; } diff --git a/svx/source/items/zoomslideritem.cxx b/svx/source/items/zoomslideritem.cxx index f6cfcc7d5b43..ef19d6dc52a3 100644 --- a/svx/source/items/zoomslideritem.cxx +++ b/svx/source/items/zoomslideritem.cxx @@ -96,13 +96,13 @@ bool SvxZoomSliderItem::QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nM case 0 : { ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > aSeq( ZOOMSLIDER_PARAMS ); - aSeq[0].Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ZOOMSLIDER_PARAM_CURRENTZOOM )); + aSeq[0].Name = OUString( RTL_CONSTASCII_USTRINGPARAM( ZOOMSLIDER_PARAM_CURRENTZOOM )); aSeq[0].Value <<= sal_Int32( GetValue() ); - aSeq[1].Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ZOOMSLIDER_PARAM_SNAPPINGPOINTS )); + aSeq[1].Name = OUString( RTL_CONSTASCII_USTRINGPARAM( ZOOMSLIDER_PARAM_SNAPPINGPOINTS )); aSeq[1].Value <<= maValues; - aSeq[2].Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ZOOMSLIDER_PARAM_MINZOOM ) ); + aSeq[2].Name = OUString( RTL_CONSTASCII_USTRINGPARAM( ZOOMSLIDER_PARAM_MINZOOM ) ); aSeq[2].Value <<= mnMinZoom; - aSeq[3].Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ZOOMSLIDER_PARAM_MAXZOOM ) ); + aSeq[3].Name = OUString( RTL_CONSTASCII_USTRINGPARAM( ZOOMSLIDER_PARAM_MAXZOOM ) ); aSeq[3].Value <<= mnMaxZoom; rVal <<= aSeq; } |