summaryrefslogtreecommitdiff
path: root/svl/source/items
diff options
context:
space:
mode:
authorLuboš Luňák <l.lunak@suse.cz>2013-04-07 12:06:47 +0200
committerLuboš Luňák <l.lunak@suse.cz>2013-04-07 14:23:11 +0200
commit1946794ae09ba732022fe6a74ea45e304ab70b84 (patch)
treee32bd7ba61fa021ecc7f8c85959df8ca837d6e81 /svl/source/items
parent5b08c6e7a21dda94d5b755eea0b1ed1e9c199bec (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 'svl/source/items')
-rw-r--r--svl/source/items/aeitem.cxx6
-rw-r--r--svl/source/items/cenumitm.cxx8
-rw-r--r--svl/source/items/ctypeitm.cxx6
-rw-r--r--svl/source/items/imageitm.cxx4
-rw-r--r--svl/source/items/itempool.cxx4
-rw-r--r--svl/source/items/itemprop.cxx30
-rw-r--r--svl/source/items/macitem.cxx10
-rw-r--r--svl/source/items/poolio.cxx8
-rw-r--r--svl/source/items/poolitem.cxx8
-rw-r--r--svl/source/items/slstitm.cxx8
-rw-r--r--svl/source/items/srchitem.cxx42
-rw-r--r--svl/source/items/style.cxx6
-rw-r--r--svl/source/items/stylepool.cxx10
13 files changed, 75 insertions, 75 deletions
diff --git a/svl/source/items/aeitem.cxx b/svl/source/items/aeitem.cxx
index a079d99d301e..e699bd07fe1f 100644
--- a/svl/source/items/aeitem.cxx
+++ b/svl/source/items/aeitem.cxx
@@ -34,7 +34,7 @@ TYPEINIT1_AUTOFACTORY(SfxAllEnumItem, SfxEnumItem)
struct SfxAllEnumValue_Impl
{
sal_uInt16 nValue;
- rtl::OUString aText;
+ OUString aText;
};
class SfxAllEnumValueArr : public std::vector<SfxAllEnumValue_Impl*>
@@ -136,7 +136,7 @@ sal_uInt16 SfxAllEnumItem::GetValueCount() const
// -----------------------------------------------------------------------
-rtl::OUString SfxAllEnumItem::GetValueTextByPos( sal_uInt16 nPos ) const
+OUString SfxAllEnumItem::GetValueTextByPos( sal_uInt16 nPos ) const
{
DBG_CHKTHIS(SfxAllEnumItem, 0);
DBG_ASSERT( pValues && nPos < pValues->size(), "enum overflow" );
@@ -216,7 +216,7 @@ sal_uInt16 SfxAllEnumItem::GetPosByValue( sal_uInt16 nValue ) const
// -----------------------------------------------------------------------
-void SfxAllEnumItem::InsertValue( sal_uInt16 nValue, const rtl::OUString &rValue )
+void SfxAllEnumItem::InsertValue( sal_uInt16 nValue, const OUString &rValue )
{
DBG_CHKTHIS(SfxAllEnumItem, 0);
SfxAllEnumValue_Impl *pVal = new SfxAllEnumValue_Impl;
diff --git a/svl/source/items/cenumitm.cxx b/svl/source/items/cenumitm.cxx
index 200618e7d206..e9cb52366ba6 100644
--- a/svl/source/items/cenumitm.cxx
+++ b/svl/source/items/cenumitm.cxx
@@ -82,10 +82,10 @@ bool SfxEnumItemInterface::PutValue(const com::sun::star::uno::Any& rVal,
}
//============================================================================
-rtl::OUString SfxEnumItemInterface::GetValueTextByPos(sal_uInt16) const
+OUString SfxEnumItemInterface::GetValueTextByPos(sal_uInt16) const
{
DBG_WARNING("SfxEnumItemInterface::GetValueTextByPos(): Pure virtual");
- return rtl::OUString();
+ return OUString();
}
//============================================================================
@@ -272,9 +272,9 @@ sal_uInt16 CntBoolItem::GetValueCount() const
//============================================================================
// virtual
-rtl::OUString CntBoolItem::GetValueTextByVal(sal_Bool bTheValue) const
+OUString CntBoolItem::GetValueTextByVal(sal_Bool bTheValue) const
{
- return bTheValue ? rtl::OUString("TRUE") : rtl::OUString("FALSE");
+ return bTheValue ? OUString("TRUE") : OUString("FALSE");
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svl/source/items/ctypeitm.cxx b/svl/source/items/ctypeitm.cxx
index b62254c4bf72..285f07bc30e1 100644
--- a/svl/source/items/ctypeitm.cxx
+++ b/svl/source/items/ctypeitm.cxx
@@ -74,7 +74,7 @@ SfxPoolItem* CntContentTypeItem::Create( SvStream& rStream,
{
// CntContentTypeItem used to be derived from CntStringItem, so take that
// into account:
- rtl::OUString aValue = readUnicodeString(rStream, nItemVersion >= 1);
+ OUString aValue = readUnicodeString(rStream, nItemVersion >= 1);
sal_uInt32 nMagic = 0;
rStream >> nMagic;
if (nMagic == CNTSTRINGITEM_STREAM_MAGIC)
@@ -199,7 +199,7 @@ void CntContentTypeItem::SetValue( const INetContentType eType )
// virtual
bool CntContentTypeItem::QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8) const
{
- rVal <<= rtl::OUString(GetValue());
+ rVal <<= OUString(GetValue());
return true;
}
@@ -207,7 +207,7 @@ bool CntContentTypeItem::QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8)
// virtual
bool CntContentTypeItem::PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8)
{
- rtl::OUString aValue;
+ OUString aValue;
if ( rVal >>= aValue )
{
// SetValue with an empty string resets the item; so call that
diff --git a/svl/source/items/imageitm.cxx b/svl/source/items/imageitm.cxx
index 7db9160139c0..9a127754ed16 100644
--- a/svl/source/items/imageitm.cxx
+++ b/svl/source/items/imageitm.cxx
@@ -74,7 +74,7 @@ bool SfxImageItem::QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 ) const
aSeq[0] = ::com::sun::star::uno::makeAny( GetValue() );
aSeq[1] = ::com::sun::star::uno::makeAny( pImp->nAngle );
aSeq[2] = ::com::sun::star::uno::makeAny( pImp->bMirrored );
- aSeq[3] = ::com::sun::star::uno::makeAny( rtl::OUString( pImp->aURL ));
+ aSeq[3] = ::com::sun::star::uno::makeAny( OUString( pImp->aURL ));
rVal = ::com::sun::star::uno::makeAny( aSeq );
return true;
@@ -86,7 +86,7 @@ bool SfxImageItem::PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 )
if (( rVal >>= aSeq ) && ( aSeq.getLength() == 4 ))
{
sal_Int16 nVal = sal_Int16();
- rtl::OUString aURL;
+ OUString aURL;
if ( aSeq[0] >>= nVal )
SetValue( nVal );
aSeq[1] >>= pImp->nAngle;
diff --git a/svl/source/items/itempool.cxx b/svl/source/items/itempool.cxx
index 54593b34be82..89a661858167 100644
--- a/svl/source/items/itempool.cxx
+++ b/svl/source/items/itempool.cxx
@@ -94,7 +94,7 @@ SfxBroadcaster& SfxItemPool::BC()
SfxItemPool::SfxItemPool
(
- const rtl::OUString& rName, /* Name des Pools zur Idetifikation
+ const OUString& rName, /* Name des Pools zur Idetifikation
im File-Format */
sal_uInt16 nStartWhich, /* erste Which-Id des Pools */
sal_uInt16 nEndWhich, /* letzte Which-Id des Pools */
@@ -454,7 +454,7 @@ void SfxItemPool::SetDefaultMetric( SfxMapUnit eNewMetric )
pImp->eDefMetric = eNewMetric;
}
-const rtl::OUString& SfxItemPool::GetName() const
+const OUString& SfxItemPool::GetName() const
{
return pImp->aName;
}
diff --git a/svl/source/items/itemprop.cxx b/svl/source/items/itemprop.cxx
index b9a4cc6a4918..001ed129960c 100644
--- a/svl/source/items/itemprop.cxx
+++ b/svl/source/items/itemprop.cxx
@@ -33,15 +33,15 @@ using namespace com::sun::star::uno;
struct equalOUString
{
- bool operator()(const ::rtl::OUString& r1, const ::rtl::OUString& r2) const
+ bool operator()(const OUString& r1, const OUString& r2) const
{
return r1.equals( r2 );
}
};
-typedef ::boost::unordered_map< ::rtl::OUString,
+typedef ::boost::unordered_map< OUString,
SfxItemPropertySimpleEntry,
- ::rtl::OUStringHash,
+ OUStringHash,
equalOUString > SfxItemPropertyHashMap_t;
class SfxItemPropertyMap_Impl : public SfxItemPropertyHashMap_t
@@ -64,7 +64,7 @@ SfxItemPropertyMap::SfxItemPropertyMap( const SfxItemPropertyMapEntry* pEntries
{
while( pEntries->pName )
{
- ::rtl::OUString sEntry(pEntries->pName, pEntries->nNameLen, RTL_TEXTENCODING_ASCII_US );
+ OUString sEntry(pEntries->pName, pEntries->nNameLen, RTL_TEXTENCODING_ASCII_US );
(*m_pImpl) [ sEntry ] = pEntries;
++pEntries;
}
@@ -80,7 +80,7 @@ SfxItemPropertyMap::~SfxItemPropertyMap()
delete m_pImpl;
}
-const SfxItemPropertySimpleEntry* SfxItemPropertyMap::getByName( const ::rtl::OUString &rName ) const
+const SfxItemPropertySimpleEntry* SfxItemPropertyMap::getByName( const OUString &rName ) const
{
SfxItemPropertyHashMap_t::const_iterator aIter = m_pImpl->find(rName);
if( aIter == m_pImpl->end() )
@@ -114,7 +114,7 @@ uno::Sequence<beans::Property> SfxItemPropertyMap::getProperties() const
return m_pImpl->m_aPropSeq;
}
-beans::Property SfxItemPropertyMap::getPropertyByName( const ::rtl::OUString rName ) const
+beans::Property SfxItemPropertyMap::getPropertyByName( const OUString rName ) const
throw( beans::UnknownPropertyException )
{
SfxItemPropertyHashMap_t::const_iterator aIter = m_pImpl->find(rName);
@@ -130,7 +130,7 @@ beans::Property SfxItemPropertyMap::getPropertyByName( const ::rtl::OUString rNa
return aProp;
}
-sal_Bool SfxItemPropertyMap::hasPropertyByName( const ::rtl::OUString& rName ) const
+sal_Bool SfxItemPropertyMap::hasPropertyByName( const OUString& rName ) const
{
SfxItemPropertyHashMap_t::const_iterator aIter = m_pImpl->find(rName);
return aIter != m_pImpl->end();
@@ -217,7 +217,7 @@ void SfxItemPropertySet::getPropertyValue( const SfxItemPropertySimpleEntry& rEn
}
}
-void SfxItemPropertySet::getPropertyValue( const rtl::OUString &rName,
+void SfxItemPropertySet::getPropertyValue( const OUString &rName,
const SfxItemSet& rSet, Any& rAny ) const
throw(RuntimeException, UnknownPropertyException)
{
@@ -228,7 +228,7 @@ void SfxItemPropertySet::getPropertyValue( const rtl::OUString &rName,
getPropertyValue( *pEntry,rSet, rAny );
}
-Any SfxItemPropertySet::getPropertyValue( const rtl::OUString &rName,
+Any SfxItemPropertySet::getPropertyValue( const OUString &rName,
const SfxItemSet& rSet ) const
throw(RuntimeException, UnknownPropertyException)
{
@@ -276,7 +276,7 @@ void SfxItemPropertySet::setPropertyValue( const SfxItemPropertySimpleEntry& rEn
}
}
-void SfxItemPropertySet::setPropertyValue( const rtl::OUString &rName,
+void SfxItemPropertySet::setPropertyValue( const OUString &rName,
const Any& aVal,
SfxItemSet& rSet ) const
throw(RuntimeException,
@@ -307,7 +307,7 @@ PropertyState SfxItemPropertySet::getPropertyState(const SfxItemPropertySimpleEn
return eRet;
}
PropertyState SfxItemPropertySet::getPropertyState(
- const rtl::OUString& rName, const SfxItemSet& rSet) const
+ const OUString& rName, const SfxItemSet& rSet) const
throw(UnknownPropertyException)
{
PropertyState eRet = PropertyState_DIRECT_VALUE;
@@ -372,14 +372,14 @@ SfxItemPropertySetInfo::~SfxItemPropertySetInfo()
}
Property SAL_CALL
- SfxItemPropertySetInfo::getPropertyByName( const ::rtl::OUString& rName )
+ SfxItemPropertySetInfo::getPropertyByName( const OUString& rName )
throw(UnknownPropertyException, RuntimeException)
{
return m_pImpl->m_pOwnMap->getPropertyByName( rName );
}
sal_Bool SAL_CALL
- SfxItemPropertySetInfo::hasPropertyByName( const ::rtl::OUString& rName )
+ SfxItemPropertySetInfo::hasPropertyByName( const OUString& rName )
throw(RuntimeException)
{
return m_pImpl->m_pOwnMap->hasPropertyByName( rName );
@@ -404,14 +404,14 @@ Sequence< Property > SAL_CALL
}
Property SAL_CALL
-SfxExtItemPropertySetInfo::getPropertyByName( const rtl::OUString& rPropertyName )
+SfxExtItemPropertySetInfo::getPropertyByName( const OUString& rPropertyName )
throw(UnknownPropertyException, RuntimeException)
{
return aExtMap.getPropertyByName( rPropertyName );
}
sal_Bool SAL_CALL
-SfxExtItemPropertySetInfo::hasPropertyByName( const rtl::OUString& rPropertyName )
+SfxExtItemPropertySetInfo::hasPropertyByName( const OUString& rPropertyName )
throw(RuntimeException)
{
return aExtMap.hasPropertyByName( rPropertyName );
diff --git a/svl/source/items/macitem.cxx b/svl/source/items/macitem.cxx
index 3bed1d719c4a..cd812c6c16d0 100644
--- a/svl/source/items/macitem.cxx
+++ b/svl/source/items/macitem.cxx
@@ -41,7 +41,7 @@ SjJSbxObjectBase* SjJSbxObjectBase::Clone( void )
return NULL;
}
-SvxMacro::SvxMacro( const ::rtl::OUString &rMacName, const ::rtl::OUString &rLanguage)
+SvxMacro::SvxMacro( const OUString &rMacName, const OUString &rLanguage)
: aMacName( rMacName ), aLibName( rLanguage),
pFunctionObject(NULL), eType( EXTENDED_STYPE)
{
@@ -57,19 +57,19 @@ SvxMacro::~SvxMacro()
delete pFunctionObject;
}
-::rtl::OUString SvxMacro::GetLanguage()const
+OUString SvxMacro::GetLanguage()const
{
if(eType==STARBASIC)
{
- return ::rtl::OUString(SVX_MACRO_LANGUAGE_STARBASIC);
+ return OUString(SVX_MACRO_LANGUAGE_STARBASIC);
}
else if(eType==JAVASCRIPT)
{
- return ::rtl::OUString(SVX_MACRO_LANGUAGE_JAVASCRIPT);
+ return OUString(SVX_MACRO_LANGUAGE_JAVASCRIPT);
}
else if(eType==EXTENDED_STYPE)
{
- return ::rtl::OUString(SVX_MACRO_LANGUAGE_SF);
+ return OUString(SVX_MACRO_LANGUAGE_SF);
}
return aLibName;
diff --git a/svl/source/items/poolio.cxx b/svl/source/items/poolio.cxx
index dc9bcc42948e..76ce00819a6d 100644
--- a/svl/source/items/poolio.cxx
+++ b/svl/source/items/poolio.cxx
@@ -550,7 +550,7 @@ SvStream &SfxItemPool::Load(SvStream &rStream)
// Einzel-Header
int bOwnPool = sal_True;
- rtl::OUString aExternName;
+ OUString aExternName;
{
// Header-Record suchen
SfxMiniRecordReader aPoolHeaderRec( &rStream, SFX_ITEMPOOL_REC_HEADER );
@@ -705,7 +705,7 @@ SvStream &SfxItemPool::Load(SvStream &rStream)
// wenn nicht own-Pool, dann kein Name
if ( aExternName != pImp->aName )
- pImp->aName = rtl::OUString();
+ pImp->aName = OUString();
pImp->bStreaming = sal_False;
return rStream;
@@ -734,7 +734,7 @@ SvStream &SfxItemPool::Load1_Impl(SvStream &rStream)
}
sal_uInt32 nAttribSize(0);
int bOwnPool = sal_True;
- rtl::OUString aExternName;
+ OUString aExternName;
if ( pImp->nMajorVer > 1 || pImp->nMinorVer >= 2 )
rStream >> pImp->nLoadingVersion;
aExternName = SfxPoolItem::readByteString(rStream);
@@ -1011,7 +1011,7 @@ SvStream &SfxItemPool::Load1_Impl(SvStream &rStream)
}
if ( aExternName != pImp->aName )
- pImp->aName = rtl::OUString();
+ pImp->aName = OUString();
pImp->bStreaming = sal_False;
return rStream;
diff --git a/svl/source/items/poolitem.cxx b/svl/source/items/poolitem.cxx
index 532107f7b14f..6fc44fbe03be 100644
--- a/svl/source/items/poolitem.cxx
+++ b/svl/source/items/poolitem.cxx
@@ -177,21 +177,21 @@ SvStream& SfxPoolItem::Store(SvStream &rStream, sal_uInt16 ) const
//============================================================================
// static
-rtl::OUString SfxPoolItem::readByteString(SvStream& rStream)
+OUString SfxPoolItem::readByteString(SvStream& rStream)
{
return rStream.ReadUniOrByteString(rStream.GetStreamCharSet());
}
//============================================================================
// static
-void SfxPoolItem::writeByteString(SvStream & rStream, const rtl::OUString& rString)
+void SfxPoolItem::writeByteString(SvStream & rStream, const OUString& rString)
{
rStream.WriteUniOrByteString(rString, rStream.GetStreamCharSet());
}
//============================================================================
// static
-rtl::OUString SfxPoolItem::readUnicodeString(SvStream & rStream, bool bUnicode)
+OUString SfxPoolItem::readUnicodeString(SvStream & rStream, bool bUnicode)
{
return rStream.ReadUniOrByteString(bUnicode ? RTL_TEXTENCODING_UCS2 :
rStream.GetStreamCharSet());
@@ -199,7 +199,7 @@ rtl::OUString SfxPoolItem::readUnicodeString(SvStream & rStream, bool bUnicode)
//============================================================================
// static
-void SfxPoolItem::writeUnicodeString(SvStream & rStream, const rtl::OUString& rString)
+void SfxPoolItem::writeUnicodeString(SvStream & rStream, const OUString& rString)
{
rStream.WriteUniOrByteString(rString, RTL_TEXTENCODING_UCS2);
}
diff --git a/svl/source/items/slstitm.cxx b/svl/source/items/slstitm.cxx
index ea34fde877e8..7e7ab2ea4df1 100644
--- a/svl/source/items/slstitm.cxx
+++ b/svl/source/items/slstitm.cxx
@@ -271,7 +271,7 @@ XubString SfxStringListItem::GetString()
//------------------------------------------------------------------------
-void SfxStringListItem::SetStringList( const com::sun::star::uno::Sequence< rtl::OUString >& rList )
+void SfxStringListItem::SetStringList( const com::sun::star::uno::Sequence< OUString >& rList )
{
DBG_ASSERT(GetRefCount()==0,"SetString:RefCount!=0");
@@ -290,7 +290,7 @@ void SfxStringListItem::SetStringList( const com::sun::star::uno::Sequence< rtl:
}
//----------------------------------------------------------------------------
-void SfxStringListItem::GetStringList( com::sun::star::uno::Sequence< rtl::OUString >& rList ) const
+void SfxStringListItem::GetStringList( com::sun::star::uno::Sequence< OUString >& rList ) const
{
long nCount = pImp->aList.size();
@@ -303,7 +303,7 @@ void SfxStringListItem::GetStringList( com::sun::star::uno::Sequence< rtl::OUStr
// virtual
bool SfxStringListItem::PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 )
{
- com::sun::star::uno::Sequence< rtl::OUString > aValue;
+ com::sun::star::uno::Sequence< OUString > aValue;
if ( rVal >>= aValue )
{
SetStringList( aValue );
@@ -321,7 +321,7 @@ bool SfxStringListItem::QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 )
// GetString() is not const!!!
SfxStringListItem* pThis = const_cast< SfxStringListItem * >( this );
- com::sun::star::uno::Sequence< rtl::OUString > aStringList;
+ com::sun::star::uno::Sequence< OUString > aStringList;
pThis->GetStringList( aStringList );
rVal = ::com::sun::star::uno::makeAny( aStringList );
return true;
diff --git a/svl/source/items/srchitem.cxx b/svl/source/items/srchitem.cxx
index 2560b0b78cda..e3212da4f9f8 100644
--- a/svl/source/items/srchitem.cxx
+++ b/svl/source/items/srchitem.cxx
@@ -59,7 +59,7 @@ TYPEINIT1_FACTORY(SvxSearchItem, SfxPoolItem, new SvxSearchItem(0));
// -----------------------------------------------------------------------
-static Sequence< ::rtl::OUString > lcl_GetNotifyNames()
+static Sequence< OUString > lcl_GetNotifyNames()
{
// names of transliteration relevant properties
static const char* aTranslitNames[] =
@@ -86,10 +86,10 @@ static Sequence< ::rtl::OUString > lcl_GetNotifyNames()
};
const int nCount = SAL_N_ELEMENTS( aTranslitNames );
- Sequence< ::rtl::OUString > aNames( nCount );
- ::rtl::OUString* pNames = aNames.getArray();
+ Sequence< OUString > aNames( nCount );
+ OUString* pNames = aNames.getArray();
for (sal_Int32 i = 0; i < nCount; ++i)
- pNames[i] = ::rtl::OUString::createFromAscii( aTranslitNames[i] );
+ pNames[i] = OUString::createFromAscii( aTranslitNames[i] );
return aNames;
}
@@ -98,12 +98,12 @@ static Sequence< ::rtl::OUString > lcl_GetNotifyNames()
SvxSearchItem::SvxSearchItem( const sal_uInt16 nId ) :
SfxPoolItem( nId ),
- ConfigItem( ::rtl::OUString(CFG_ROOT_NODE ) ),
+ ConfigItem( OUString(CFG_ROOT_NODE ) ),
aSearchOpt ( SearchAlgorithms_ABSOLUTE,
SearchFlags::LEV_RELAXED,
- ::rtl::OUString(),
- ::rtl::OUString(),
+ OUString(),
+ OUString(),
Locale(),
2, 2, 2,
TransliterationModules_IGNORE_CASE ),
@@ -186,7 +186,7 @@ SvxSearchItem::SvxSearchItem( const sal_uInt16 nId ) :
SvxSearchItem::SvxSearchItem( const SvxSearchItem& rItem ) :
SfxPoolItem ( rItem ),
- ConfigItem( ::rtl::OUString(CFG_ROOT_NODE ) ),
+ ConfigItem( OUString(CFG_ROOT_NODE ) ),
aSearchOpt ( rItem.aSearchOpt ),
eFamily ( rItem.eFamily ),
@@ -268,7 +268,7 @@ SfxItemPresentation SvxSearchItem::GetPresentation
return SFX_ITEM_PRESENTATION_NONE;
}
-void SvxSearchItem::Notify( const Sequence< ::rtl::OUString > & )
+void SvxSearchItem::Notify( const Sequence< OUString > & )
{
// applies transliteration changes in the configuration database
// to the current SvxSearchItem
@@ -361,29 +361,29 @@ bool SvxSearchItem::QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMembe
case 0 :
{
Sequence< PropertyValue > aSeq( SRCH_PARAMS );
- aSeq[0].Name = rtl::OUString( SRCH_PARA_OPTIONS );
+ aSeq[0].Name = OUString( SRCH_PARA_OPTIONS );
aSeq[0].Value <<= aSearchOpt;
- aSeq[1].Name = rtl::OUString( SRCH_PARA_FAMILY );
+ aSeq[1].Name = OUString( SRCH_PARA_FAMILY );
aSeq[1].Value <<= sal_Int16( eFamily );
- aSeq[2].Name = rtl::OUString( SRCH_PARA_COMMAND );
+ aSeq[2].Name = OUString( SRCH_PARA_COMMAND );
aSeq[2].Value <<= nCommand;
- aSeq[3].Name = rtl::OUString( SRCH_PARA_CELLTYPE );
+ aSeq[3].Name = OUString( SRCH_PARA_CELLTYPE );
aSeq[3].Value <<= nCellType;
- aSeq[4].Name = rtl::OUString( SRCH_PARA_APPFLAG );
+ aSeq[4].Name = OUString( SRCH_PARA_APPFLAG );
aSeq[4].Value <<= nAppFlag;
- aSeq[5].Name = rtl::OUString( SRCH_PARA_ROWDIR );
+ aSeq[5].Name = OUString( SRCH_PARA_ROWDIR );
aSeq[5].Value <<= bRowDirection;
- aSeq[6].Name = rtl::OUString( SRCH_PARA_ALLTABLES );
+ aSeq[6].Name = OUString( SRCH_PARA_ALLTABLES );
aSeq[6].Value <<= bAllTables;
- aSeq[6].Name = rtl::OUString( SRCH_PARA_SEARCHFILTERED );
+ aSeq[6].Name = OUString( SRCH_PARA_SEARCHFILTERED );
aSeq[6].Value <<= bSearchFiltered;
- aSeq[7].Name = rtl::OUString( SRCH_PARA_BACKWARD );
+ aSeq[7].Name = OUString( SRCH_PARA_BACKWARD );
aSeq[7].Value <<= bBackward;
- aSeq[8].Name = rtl::OUString( SRCH_PARA_PATTERN );
+ aSeq[8].Name = OUString( SRCH_PARA_PATTERN );
aSeq[8].Value <<= bPattern;
- aSeq[9].Name = rtl::OUString( SRCH_PARA_CONTENT );
+ aSeq[9].Name = OUString( SRCH_PARA_CONTENT );
aSeq[9].Value <<= bContent;
- aSeq[10].Name = rtl::OUString( SRCH_PARA_ASIANOPT );
+ aSeq[10].Name = OUString( SRCH_PARA_ASIANOPT );
aSeq[10].Value <<= bAsianOptions;
rVal <<= aSeq;
}
diff --git a/svl/source/items/style.cxx b/svl/source/items/style.cxx
index 3e0651257511..cd44bea2bbb7 100644
--- a/svl/source/items/style.cxx
+++ b/svl/source/items/style.cxx
@@ -182,7 +182,7 @@ bool SfxStyleSheetBase::SetName( const XubString& rName )
return sal_True;
}
-rtl::OUString SfxStyleSheetBase::GetDisplayName() const
+OUString SfxStyleSheetBase::GetDisplayName() const
{
if( maDisplayName.isEmpty() )
{
@@ -194,7 +194,7 @@ rtl::OUString SfxStyleSheetBase::GetDisplayName() const
}
}
-void SfxStyleSheetBase::SetDisplayName( const rtl::OUString& rDisplayName )
+void SfxStyleSheetBase::SetDisplayName( const OUString& rDisplayName )
{
maDisplayName = rDisplayName;
}
@@ -491,7 +491,7 @@ SfxStyleSheetBase* SfxStyleSheetIterator::Next()
}
-SfxStyleSheetBase* SfxStyleSheetIterator::Find(const rtl::OUString& rStr)
+SfxStyleSheetBase* SfxStyleSheetIterator::Find(const OUString& rStr)
{
for ( sal_uInt16 n = 0; n < pBasePool->aStyles.size(); ++n )
{
diff --git a/svl/source/items/stylepool.cxx b/svl/source/items/stylepool.cxx
index 3fdc6e8dfae4..c1577a4c7b3f 100644
--- a/svl/source/items/stylepool.cxx
+++ b/svl/source/items/stylepool.cxx
@@ -296,7 +296,7 @@ namespace {
mbSkipIgnorable( bSkipIgnorable )
{}
virtual StylePool::SfxItemSet_Pointer_t getNext();
- virtual ::rtl::OUString getName();
+ virtual OUString getName();
};
StylePool::SfxItemSet_Pointer_t Iterator::getNext()
@@ -331,9 +331,9 @@ namespace {
return pReturn;
}
- ::rtl::OUString Iterator::getName()
+ OUString Iterator::getName()
{
- ::rtl::OUString aString;
+ OUString aString;
if( mpNode && mpNode->hasItemSet( false ) )
{
aString = StylePool::nameOf( mpNode->getUsedOrLastAddedItemSet() );
@@ -346,9 +346,9 @@ namespace {
/* This static method creates a unique name from a shared pointer to a SfxItemSet
The name is the memory address of the SfxItemSet itself. */
-::rtl::OUString StylePool::nameOf( SfxItemSet_Pointer_t pSet )
+OUString StylePool::nameOf( SfxItemSet_Pointer_t pSet )
{
- return ::rtl::OUString::valueOf( reinterpret_cast<sal_IntPtr>( pSet.get() ), 16 );
+ return OUString::valueOf( reinterpret_cast<sal_IntPtr>( pSet.get() ), 16 );
}
// class StylePoolImpl organized a tree-structure where every node represents a SfxItemSet.