summaryrefslogtreecommitdiff
path: root/editeng/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 /editeng/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 'editeng/source/items')
-rw-r--r--editeng/source/items/bulitem.cxx4
-rw-r--r--editeng/source/items/flditem.cxx52
-rw-r--r--editeng/source/items/frmitems.cxx8
-rw-r--r--editeng/source/items/numitem.cxx4
-rw-r--r--editeng/source/items/paraitem.cxx14
-rw-r--r--editeng/source/items/textitem.cxx22
-rw-r--r--editeng/source/items/xmlcnitm.cxx32
7 files changed, 68 insertions, 68 deletions
diff --git a/editeng/source/items/bulitem.cxx b/editeng/source/items/bulitem.cxx
index 42ed83f56b15..0841f53307be 100644
--- a/editeng/source/items/bulitem.cxx
+++ b/editeng/source/items/bulitem.cxx
@@ -152,7 +152,7 @@ SvxBulletItem::SvxBulletItem( SvStream& rStrm, sal_uInt16 _nWhich ) :
char cTmpSymbol;
rStrm >> cTmpSymbol;
//convert single byte to unicode
- cSymbol = rtl::OUString(&cTmpSymbol, 1, aFont.GetCharSet()).toChar();
+ cSymbol = OUString(&cTmpSymbol, 1, aFont.GetCharSet()).toChar();
rStrm >> nScale;
@@ -352,7 +352,7 @@ SvStream& SvxBulletItem::Store( SvStream& rStrm, sal_uInt16 /*nItemVersion*/ ) c
rStrm << static_cast<sal_Int32>(nWidth);
rStrm << nStart;
rStrm << nJustify;
- rStrm << rtl::OUStringToOString(rtl::OUString(cSymbol), aFont.GetCharSet()).toChar();
+ rStrm << OUStringToOString(OUString(cSymbol), aFont.GetCharSet()).toChar();
rStrm << nScale;
// UNICODE: rStrm << aPrevText;
diff --git a/editeng/source/items/flditem.cxx b/editeng/source/items/flditem.cxx
index 83dee76661e2..2b3d090b796e 100644
--- a/editeng/source/items/flditem.cxx
+++ b/editeng/source/items/flditem.cxx
@@ -93,7 +93,7 @@ SvxFieldData* SvxFieldData::Create(const uno::Reference<text::XTextContent>& xTe
}
case text::textfield::Type::URL:
{
- rtl::OUString aRep, aTarget, aURL;
+ OUString aRep, aTarget, aURL;
sal_Int16 nFmt = -1;
xPropSet->getPropertyValue(UNO_TC_PROP_URL_REPRESENTATION) >>= aRep;
xPropSet->getPropertyValue(UNO_TC_PROP_URL_TARGET) >>= aTarget;
@@ -120,7 +120,7 @@ SvxFieldData* SvxFieldData::Create(const uno::Reference<text::XTextContent>& xTe
}
case text::textfield::Type::EXTENDED_FILE:
{
- rtl::OUString aPresentation;
+ OUString aPresentation;
sal_Bool bIsFixed = false;
sal_Int16 nFmt = text::FilenameDisplayFormat::FULL;
xPropSet->getPropertyValue(UNO_TC_PROP_IS_FIXED) >>= bIsFixed;
@@ -145,7 +145,7 @@ SvxFieldData* SvxFieldData::Create(const uno::Reference<text::XTextContent>& xTe
sal_Bool bIsFixed = false;
sal_Bool bFullName = false;
sal_Int16 nFmt = -1;
- rtl::OUString aPresentation, aContent, aFirstName, aLastName;
+ OUString aPresentation, aContent, aFirstName, aLastName;
xPropSet->getPropertyValue(UNO_TC_PROP_IS_FIXED) >>= bIsFixed;
xPropSet->getPropertyValue(UNO_TC_PROP_AUTHOR_FULLNAME) >>= bFullName;
xPropSet->getPropertyValue(UNO_TC_PROP_CURRENT_PRESENTATION) >>= aPresentation;
@@ -171,7 +171,7 @@ SvxFieldData* SvxFieldData::Create(const uno::Reference<text::XTextContent>& xTe
// #92009# pass fixed attribute to constructor
SvxAuthorField* pData = new SvxAuthorField(
- aFirstName, aLastName, rtl::OUString(), bIsFixed ? SVXAUTHORTYPE_FIX : SVXAUTHORTYPE_VAR);
+ aFirstName, aLastName, OUString(), bIsFixed ? SVXAUTHORTYPE_FIX : SVXAUTHORTYPE_VAR);
if (!bFullName)
{
@@ -425,7 +425,7 @@ void SvxDateField::Save( SvPersistStream & rStm )
// -----------------------------------------------------------------------
-rtl::OUString SvxDateField::GetFormatted( SvNumberFormatter& rFormatter, LanguageType eLang ) const
+OUString SvxDateField::GetFormatted( SvNumberFormatter& rFormatter, LanguageType eLang ) const
{
Date aDate( Date::EMPTY );
if ( eType == SVXDATETYPE_FIX )
@@ -436,7 +436,7 @@ rtl::OUString SvxDateField::GetFormatted( SvNumberFormatter& rFormatter, Languag
return GetFormatted( aDate, eFormat, rFormatter, eLang );
}
-rtl::OUString SvxDateField::GetFormatted( Date& aDate, SvxDateFormat eFormat, SvNumberFormatter& rFormatter, LanguageType eLang )
+OUString SvxDateField::GetFormatted( Date& aDate, SvxDateFormat eFormat, SvNumberFormatter& rFormatter, LanguageType eLang )
{
if ( eFormat == SVXDATEFORMAT_SYSTEM )
{
@@ -490,7 +490,7 @@ rtl::OUString SvxDateField::GetFormatted( Date& aDate, SvxDateFormat eFormat, Sv
}
double fDiffDate = aDate - *(rFormatter.GetNullDate());
- rtl::OUString aStr;
+ OUString aStr;
Color* pColor = NULL;
rFormatter.GetOutputString( fDiffDate, nFormatKey, aStr, &pColor );
return aStr;
@@ -512,7 +512,7 @@ SvxURLField::SvxURLField()
// -----------------------------------------------------------------------
-SvxURLField::SvxURLField( const rtl::OUString& rURL, const rtl::OUString& rRepres, SvxURLFormat eFmt )
+SvxURLField::SvxURLField( const OUString& rURL, const OUString& rRepres, SvxURLFormat eFmt )
: aURL( rURL ), aRepresentation( rRepres )
{
eFormat = eFmt;
@@ -541,7 +541,7 @@ int SvxURLField::operator==( const SvxFieldData& rOther ) const
// -----------------------------------------------------------------------
-static void write_unicode( SvPersistStream & rStm, const rtl::OUString& rString )
+static void write_unicode( SvPersistStream & rStm, const OUString& rString )
{
sal_uInt16 nL = sal::static_int_cast<sal_uInt16>(rString.getLength());
rStm << nL;
@@ -549,7 +549,7 @@ static void write_unicode( SvPersistStream & rStm, const rtl::OUString& rString
rStm.Write( rString.getStr(), nL*sizeof(sal_Unicode) );
}
-static rtl::OUString read_unicode( SvPersistStream & rStm )
+static OUString read_unicode( SvPersistStream & rStm )
{
rtl_uString *pStr = NULL;
sal_uInt16 nL = 0;
@@ -561,7 +561,7 @@ static rtl::OUString read_unicode( SvPersistStream & rStm )
rStm.Read(pStr->buffer, nL*sizeof(sal_Unicode));
}
//take ownership of buffer and return, otherwise return empty string
- return pStr ? rtl::OUString(pStr, SAL_NO_ACQUIRE) : rtl::OUString();
+ return pStr ? OUString(pStr, SAL_NO_ACQUIRE) : OUString();
}
void SvxURLField::Load( SvPersistStream & rStm )
@@ -805,7 +805,7 @@ void SvxExtTimeField::Save( SvPersistStream & rStm )
//----------------------------------------------------------------------------
-rtl::OUString SvxExtTimeField::GetFormatted( SvNumberFormatter& rFormatter, LanguageType eLang ) const
+OUString SvxExtTimeField::GetFormatted( SvNumberFormatter& rFormatter, LanguageType eLang ) const
{
Time aTime( Time::EMPTY );
if ( eType == SVXTIMETYPE_FIX )
@@ -815,7 +815,7 @@ rtl::OUString SvxExtTimeField::GetFormatted( SvNumberFormatter& rFormatter, Lang
return GetFormatted( aTime, eFormat, rFormatter, eLang );
}
-rtl::OUString SvxExtTimeField::GetFormatted( Time& aTime, SvxTimeFormat eFormat, SvNumberFormatter& rFormatter, LanguageType eLang )
+OUString SvxExtTimeField::GetFormatted( Time& aTime, SvxTimeFormat eFormat, SvNumberFormatter& rFormatter, LanguageType eLang )
{
switch( eFormat )
{
@@ -897,7 +897,7 @@ SvxExtFileField::SvxExtFileField()
//----------------------------------------------------------------------------
-SvxExtFileField::SvxExtFileField( const rtl::OUString& rStr, SvxFileType eT, SvxFileFormat eF )
+SvxExtFileField::SvxExtFileField( const OUString& rStr, SvxFileType eT, SvxFileFormat eF )
{
aFile = rStr;
eType = eT;
@@ -953,16 +953,16 @@ void SvxExtFileField::Save( SvPersistStream & rStm )
//----------------------------------------------------------------------------
-rtl::OUString SvxExtFileField::GetFormatted() const
+OUString SvxExtFileField::GetFormatted() const
{
- rtl::OUString aString;
+ OUString aString;
INetURLObject aURLObj( aFile );
if( INET_PROT_NOT_VALID == aURLObj.GetProtocol() )
{
// invalid? try to interpret string as system file name
- rtl::OUString aURLStr;
+ OUString aURLStr;
::utl::LocalFileHelper::ConvertPhysicalNameToURL( aFile, aURLStr );
@@ -1044,9 +1044,9 @@ SvxAuthorField::SvxAuthorField()
//----------------------------------------------------------------------------
-SvxAuthorField::SvxAuthorField( const rtl::OUString& rFirstName,
- const rtl::OUString& rLastName,
- const rtl::OUString& rShortName,
+SvxAuthorField::SvxAuthorField( const OUString& rFirstName,
+ const OUString& rLastName,
+ const OUString& rShortName,
SvxAuthorType eT, SvxAuthorFormat eF )
{
aName = rLastName;
@@ -1109,15 +1109,15 @@ void SvxAuthorField::Save( SvPersistStream & rStm )
//----------------------------------------------------------------------------
-rtl::OUString SvxAuthorField::GetFormatted() const
+OUString SvxAuthorField::GetFormatted() const
{
- rtl::OUString aString;
+ OUString aString;
switch( eFormat )
{
case SVXAUTHORFORMAT_FULLNAME:
{
- rtl::OUStringBuffer aBuf(aFirstName);
+ OUStringBuffer aBuf(aFirstName);
aBuf.append(sal_Unicode(' '));
aBuf.append(aName);
aString = aBuf.makeStringAndClear();
@@ -1230,10 +1230,10 @@ void SvxDateTimeField::Save( SvPersistStream & /*rStm*/ )
SvxDateTimeField::SvxDateTimeField() {}
-rtl::OUString SvxDateTimeField::GetFormatted(
+OUString SvxDateTimeField::GetFormatted(
Date& rDate, Time& rTime, int eFormat, SvNumberFormatter& rFormatter, LanguageType eLanguage )
{
- rtl::OUString aRet;
+ OUString aRet;
SvxDateFormat eDateFormat = (SvxDateFormat)(eFormat & 0x0f);
@@ -1246,7 +1246,7 @@ rtl::OUString SvxDateTimeField::GetFormatted(
if(eTimeFormat)
{
- rtl::OUStringBuffer aBuf(aRet);
+ OUStringBuffer aBuf(aRet);
if (!aRet.isEmpty())
aBuf.append(sal_Unicode(' '));
diff --git a/editeng/source/items/frmitems.cxx b/editeng/source/items/frmitems.cxx
index 65b5fa0ed34b..8741e69778de 100644
--- a/editeng/source/items/frmitems.cxx
+++ b/editeng/source/items/frmitems.cxx
@@ -1540,7 +1540,7 @@ sal_uInt16 SvxShadowItem::GetValueCount() const
// -----------------------------------------------------------------------
-rtl::OUString SvxShadowItem::GetValueTextByPos( sal_uInt16 nPos ) const
+OUString SvxShadowItem::GetValueTextByPos( sal_uInt16 nPos ) const
{
DBG_ASSERT( nPos < SVX_SHADOW_END, "enum overflow!" );
return EE_RESSTR(RID_SVXITEMS_SHADOW_BEGIN + nPos );
@@ -2928,7 +2928,7 @@ SfxItemPresentation SvxFmtBreakItem::GetPresentation
// -----------------------------------------------------------------------
-rtl::OUString SvxFmtBreakItem::GetValueTextByPos( sal_uInt16 nPos ) const
+OUString SvxFmtBreakItem::GetValueTextByPos( sal_uInt16 nPos ) const
{
DBG_ASSERT( nPos < SVX_BREAK_END, "enum overflow!" );
return EE_RESSTR(RID_SVXITEMS_BREAK_BEGIN + nPos);
@@ -3598,7 +3598,7 @@ bool SvxBrushItem::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const
{
OUString sPrefix(
UNO_NAME_GRAPHOBJ_URLPREFIX);
- OUString sId(rtl::OStringToOUString(
+ OUString sId(OStringToOUString(
pImpl->pGraphicObject->GetUniqueID(),
RTL_TEXTENCODING_ASCII_US));
sLink = sPrefix + sId;
@@ -3689,7 +3689,7 @@ bool SvxBrushItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId )
{
DELETEZ( pStrLink );
String sTmp( sLink );
- rtl::OString sId(rtl::OUStringToOString(sTmp.Copy(
+ OString sId(OUStringToOString(sTmp.Copy(
sizeof(UNO_NAME_GRAPHOBJ_URLPREFIX)-1),
RTL_TEXTENCODING_ASCII_US));
GraphicObject *pOldGrfObj = pImpl->pGraphicObject;
diff --git a/editeng/source/items/numitem.cxx b/editeng/source/items/numitem.cxx
index 719d93950032..7c3ec9c89f09 100644
--- a/editeng/source/items/numitem.cxx
+++ b/editeng/source/items/numitem.cxx
@@ -125,9 +125,9 @@ String SvxNumberType::GetNumStr( sal_uLong nNo, const Locale& rLocale ) const
{
Sequence< PropertyValue > aProperties(2);
PropertyValue* pValues = aProperties.getArray();
- pValues[0].Name = rtl::OUString("NumberingType");
+ pValues[0].Name = OUString("NumberingType");
pValues[0].Value <<= nNumType;
- pValues[1].Name = rtl::OUString("Value");
+ pValues[1].Name = OUString("Value");
pValues[1].Value <<= (sal_Int32)nNo;
try
diff --git a/editeng/source/items/paraitem.cxx b/editeng/source/items/paraitem.cxx
index ec97047de345..8210fbbe72b5 100644
--- a/editeng/source/items/paraitem.cxx
+++ b/editeng/source/items/paraitem.cxx
@@ -295,10 +295,10 @@ sal_uInt16 SvxLineSpacingItem::GetValueCount() const
// -----------------------------------------------------------------------
-rtl::OUString SvxLineSpacingItem::GetValueTextByPos( sal_uInt16 nPos ) const
+OUString SvxLineSpacingItem::GetValueTextByPos( sal_uInt16 nPos ) const
{
//! load strings from resource
- rtl::OUString aText;
+ OUString aText;
switch ( nPos )
{
case SVX_LINESPACE_USER:
@@ -459,7 +459,7 @@ sal_uInt16 SvxAdjustItem::GetValueCount() const
// -----------------------------------------------------------------------
-rtl::OUString SvxAdjustItem::GetValueTextByPos( sal_uInt16 nPos ) const
+OUString SvxAdjustItem::GetValueTextByPos( sal_uInt16 nPos ) const
{
DBG_ASSERT( nPos <= (sal_uInt16)SVX_ADJUST_BLOCKLINE, "enum overflow!" );
return EE_RESSTR(RID_SVXITEMS_ADJUST_BEGIN + nPos);
@@ -1021,7 +1021,7 @@ bool SvxTabStopItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId )
}
if (!(rAnySeq[2] >>= aSeq[n].DecimalChar))
{
- ::rtl::OUString aVal;
+ OUString aVal;
if ( (rAnySeq[2] >>= aVal) && aVal.getLength() == 1 )
aSeq[n].DecimalChar = aVal.toChar();
else
@@ -1029,7 +1029,7 @@ bool SvxTabStopItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId )
}
if (!(rAnySeq[3] >>= aSeq[n].FillChar))
{
- ::rtl::OUString aVal;
+ OUString aVal;
if ( (rAnySeq[3] >>= aVal) && aVal.getLength() == 1 )
aSeq[n].FillChar = aVal.toChar();
else
@@ -1319,7 +1319,7 @@ bool SvxPageModelItem::QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMe
switch ( nMemberId )
{
case MID_AUTO: rVal <<= (sal_Bool) bAuto; break;
- case MID_NAME: rVal <<= ::rtl::OUString( GetValue() ); break;
+ case MID_NAME: rVal <<= OUString( GetValue() ); break;
default: OSL_FAIL("Wrong MemberId!"); return sal_False;
}
@@ -1330,7 +1330,7 @@ bool SvxPageModelItem::PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8
{
nMemberId &= ~CONVERT_TWIPS;
sal_Bool bRet;
- ::rtl::OUString aStr;
+ OUString aStr;
switch ( nMemberId )
{
case MID_AUTO: bRet = ( rVal >>= bAuto ); break;
diff --git a/editeng/source/items/textitem.cxx b/editeng/source/items/textitem.cxx
index 87134db022bc..31d316bd82bf 100644
--- a/editeng/source/items/textitem.cxx
+++ b/editeng/source/items/textitem.cxx
@@ -536,7 +536,7 @@ SfxItemPresentation SvxPostureItem::GetPresentation
// -----------------------------------------------------------------------
-rtl::OUString SvxPostureItem::GetValueTextByPos( sal_uInt16 nPos ) const
+OUString SvxPostureItem::GetValueTextByPos( sal_uInt16 nPos ) const
{
DBG_ASSERT( nPos <= (sal_uInt16)ITALIC_NORMAL, "enum overflow!" );
@@ -551,7 +551,7 @@ rtl::OUString SvxPostureItem::GetValueTextByPos( sal_uInt16 nPos ) const
default: ;//prevent warning
}
- return nId ? EE_RESSTR(nId) : rtl::OUString();
+ return nId ? EE_RESSTR(nId) : OUString();
}
bool SvxPostureItem::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const
@@ -701,7 +701,7 @@ SfxItemPresentation SvxWeightItem::GetPresentation
// -----------------------------------------------------------------------
-rtl::OUString SvxWeightItem::GetValueTextByPos( sal_uInt16 nPos ) const
+OUString SvxWeightItem::GetValueTextByPos( sal_uInt16 nPos ) const
{
DBG_ASSERT( nPos <= (sal_uInt16)WEIGHT_BLACK, "enum overflow!" );
return EE_RESSTR(RID_SVXITEMS_WEIGHT_BEGIN + nPos);
@@ -1360,10 +1360,10 @@ SfxItemPresentation SvxTextLineItem::GetPresentation
// -----------------------------------------------------------------------
-rtl::OUString SvxTextLineItem::GetValueTextByPos( sal_uInt16 /*nPos*/ ) const
+OUString SvxTextLineItem::GetValueTextByPos( sal_uInt16 /*nPos*/ ) const
{
OSL_FAIL("SvxTextLineItem::GetValueTextByPos: Pure virtual method");
- return rtl::OUString();
+ return OUString();
}
bool SvxTextLineItem::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const
@@ -1462,7 +1462,7 @@ SfxPoolItem* SvxUnderlineItem::Create(SvStream& rStrm, sal_uInt16) const
// -----------------------------------------------------------------------
-rtl::OUString SvxUnderlineItem::GetValueTextByPos( sal_uInt16 nPos ) const
+OUString SvxUnderlineItem::GetValueTextByPos( sal_uInt16 nPos ) const
{
DBG_ASSERT( nPos <= (sal_uInt16)UNDERLINE_BOLDWAVE, "enum overflow!" );
return EE_RESSTR(RID_SVXITEMS_UL_BEGIN + nPos);
@@ -1495,7 +1495,7 @@ SfxPoolItem* SvxOverlineItem::Create(SvStream& rStrm, sal_uInt16) const
// -----------------------------------------------------------------------
-rtl::OUString SvxOverlineItem::GetValueTextByPos( sal_uInt16 nPos ) const
+OUString SvxOverlineItem::GetValueTextByPos( sal_uInt16 nPos ) const
{
DBG_ASSERT( nPos <= (sal_uInt16)UNDERLINE_BOLDWAVE, "enum overflow!" );
return EE_RESSTR(RID_SVXITEMS_OL_BEGIN + nPos);
@@ -1586,7 +1586,7 @@ SfxItemPresentation SvxCrossedOutItem::GetPresentation
// -----------------------------------------------------------------------
-rtl::OUString SvxCrossedOutItem::GetValueTextByPos( sal_uInt16 nPos ) const
+OUString SvxCrossedOutItem::GetValueTextByPos( sal_uInt16 nPos ) const
{
DBG_ASSERT( nPos <= (sal_uInt16)STRIKEOUT_X, "enum overflow!" );
return EE_RESSTR(RID_SVXITEMS_STRIKEOUT_BEGIN + nPos);
@@ -2283,7 +2283,7 @@ SfxItemPresentation SvxCaseMapItem::GetPresentation
// -----------------------------------------------------------------------
-rtl::OUString SvxCaseMapItem::GetValueTextByPos( sal_uInt16 nPos ) const
+OUString SvxCaseMapItem::GetValueTextByPos( sal_uInt16 nPos ) const
{
DBG_ASSERT( nPos < (sal_uInt16)SVX_CASEMAP_END, "enum overflow!" );
return EE_RESSTR(RID_SVXITEMS_CASEMAP_BEGIN + nPos);
@@ -2441,7 +2441,7 @@ SfxItemPresentation SvxEscapementItem::GetPresentation
// -----------------------------------------------------------------------
-rtl::OUString SvxEscapementItem::GetValueTextByPos( sal_uInt16 nPos ) const
+OUString SvxEscapementItem::GetValueTextByPos( sal_uInt16 nPos ) const
{
DBG_ASSERT( nPos < (sal_uInt16)SVX_ESCAPEMENT_END, "enum overflow!" );
return EE_RESSTR(RID_SVXITEMS_ESCAPEMENT_BEGIN + nPos);
@@ -3389,7 +3389,7 @@ sal_uInt16 SvxCharReliefItem::GetVersion( sal_uInt16 nFFVer ) const
return SOFFICE_FILEFORMAT_50 > nFFVer ? USHRT_MAX : 0;
}
-rtl::OUString SvxCharReliefItem::GetValueTextByPos( sal_uInt16 nPos ) const
+OUString SvxCharReliefItem::GetValueTextByPos( sal_uInt16 nPos ) const
{
DBG_ASSERT( RID_SVXITEMS_RELIEF_ENGRAVED - RID_SVXITEMS_RELIEF_NONE,
"enum overflow" );
diff --git a/editeng/source/items/xmlcnitm.cxx b/editeng/source/items/xmlcnitm.cxx
index 8f04dc78238e..d63487b33aae 100644
--- a/editeng/source/items/xmlcnitm.cxx
+++ b/editeng/source/items/xmlcnitm.cxx
@@ -116,8 +116,8 @@ bool SvXMLAttrContainerItem::PutValue( const com::sun::star::uno::Any& rVal, sal
if( !xContainer.is() )
return sal_False;
- const Sequence< ::rtl::OUString > aNameSequence( xContainer->getElementNames() );
- const ::rtl::OUString* pNames = aNameSequence.getConstArray();
+ const Sequence< OUString > aNameSequence( xContainer->getElementNames() );
+ const OUString* pNames = aNameSequence.getConstArray();
const sal_Int32 nCount = aNameSequence.getLength();
Any aAny;
AttributeData* pData;
@@ -125,7 +125,7 @@ bool SvXMLAttrContainerItem::PutValue( const com::sun::star::uno::Any& rVal, sal
for( nAttr = 0; nAttr < nCount; nAttr++ )
{
- const ::rtl::OUString aName( *pNames++ );
+ const OUString aName( *pNames++ );
aAny = xContainer->getByName( aName );
if( aAny.getValue() == NULL || aAny.getValueType() != ::getCppuType((AttributeData*)0) )
@@ -135,8 +135,8 @@ bool SvXMLAttrContainerItem::PutValue( const com::sun::star::uno::Any& rVal, sal
sal_Int32 pos = aName.indexOf( sal_Unicode(':') );
if( pos != -1 )
{
- const ::rtl::OUString aPrefix( aName.copy( 0, pos ));
- const ::rtl::OUString aLName( aName.copy( pos+1 ));
+ const OUString aPrefix( aName.copy( 0, pos ));
+ const OUString aLName( aName.copy( pos+1 ));
if( pData->Namespace.isEmpty() )
{
@@ -170,15 +170,15 @@ bool SvXMLAttrContainerItem::PutValue( const com::sun::star::uno::Any& rVal, sal
}
-sal_Bool SvXMLAttrContainerItem::AddAttr( const ::rtl::OUString& rLName,
- const ::rtl::OUString& rValue )
+sal_Bool SvXMLAttrContainerItem::AddAttr( const OUString& rLName,
+ const OUString& rValue )
{
return pImpl->AddAttr( rLName, rValue );
}
-sal_Bool SvXMLAttrContainerItem::AddAttr( const ::rtl::OUString& rPrefix,
- const ::rtl::OUString& rNamespace, const ::rtl::OUString& rLName,
- const ::rtl::OUString& rValue )
+sal_Bool SvXMLAttrContainerItem::AddAttr( const OUString& rPrefix,
+ const OUString& rNamespace, const OUString& rLName,
+ const OUString& rValue )
{
return pImpl->AddAttr( rPrefix, rNamespace, rLName, rValue );
}
@@ -188,22 +188,22 @@ sal_uInt16 SvXMLAttrContainerItem::GetAttrCount() const
return (sal_uInt16)pImpl->GetAttrCount();
}
-::rtl::OUString SvXMLAttrContainerItem::GetAttrNamespace( sal_uInt16 i ) const
+OUString SvXMLAttrContainerItem::GetAttrNamespace( sal_uInt16 i ) const
{
return pImpl->GetAttrNamespace( i );
}
-::rtl::OUString SvXMLAttrContainerItem::GetAttrPrefix( sal_uInt16 i ) const
+OUString SvXMLAttrContainerItem::GetAttrPrefix( sal_uInt16 i ) const
{
return pImpl->GetAttrPrefix( i );
}
-const ::rtl::OUString& SvXMLAttrContainerItem::GetAttrLName( sal_uInt16 i ) const
+const OUString& SvXMLAttrContainerItem::GetAttrLName( sal_uInt16 i ) const
{
return pImpl->GetAttrLName( i );
}
-const ::rtl::OUString& SvXMLAttrContainerItem::GetAttrValue( sal_uInt16 i ) const
+const OUString& SvXMLAttrContainerItem::GetAttrValue( sal_uInt16 i ) const
{
return pImpl->GetAttrValue( i );
}
@@ -219,12 +219,12 @@ sal_uInt16 SvXMLAttrContainerItem::GetNextNamespaceIndex( sal_uInt16 nIdx ) cons
return pImpl->GetNextNamespaceIndex( nIdx );
}
-const ::rtl::OUString& SvXMLAttrContainerItem::GetNamespace( sal_uInt16 i ) const
+const OUString& SvXMLAttrContainerItem::GetNamespace( sal_uInt16 i ) const
{
return pImpl->GetNamespace( i );
}
-const ::rtl::OUString& SvXMLAttrContainerItem::GetPrefix( sal_uInt16 i ) const
+const OUString& SvXMLAttrContainerItem::GetPrefix( sal_uInt16 i ) const
{
return pImpl->GetPrefix( i );
}