Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/2486
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/86/2486/1
RTL_CONSTASCII_USTRINGPARAM and ::rtl:: removals
Change-Id: I3ef372b07f2bacc2b9bbbb034e3d61b9cc8a3677
---
M sw/source/core/access/acccell.cxx
M sw/source/core/access/acccontext.cxx
M sw/source/core/access/acccontext.hxx
M sw/source/core/access/accdoc.cxx
M sw/source/core/access/accembedded.cxx
M sw/source/core/access/accfootnote.cxx
M sw/source/core/access/accgraphic.cxx
M sw/source/core/access/accheaderfooter.cxx
M sw/source/core/access/accpage.cxx
M sw/source/core/access/accpara.cxx
M sw/source/core/access/accpreview.cxx
M sw/source/core/access/accselectionhelper.cxx
M sw/source/core/access/acctable.cxx
M sw/source/core/access/acctextframe.cxx
M sw/source/core/bastyp/SwSmartTagMgr.cxx
M sw/source/core/crsr/bookmrk.cxx
M sw/source/core/crsr/findtxt.cxx
M sw/source/core/doc/doc.cxx
M sw/source/core/doc/doclay.cxx
M sw/source/core/doc/docnew.cxx
M sw/source/core/doc/docxforms.cxx
M sw/source/core/doc/number.cxx
M sw/source/core/docnode/finalthreadmanager.cxx
M sw/source/core/docnode/retrieveinputstream.cxx
M sw/source/core/docnode/swthreadjoiner.cxx
M sw/source/core/edit/edlingu.cxx
M sw/source/core/frmedt/fefly1.cxx
M sw/source/core/graphic/ndgrf.cxx
M sw/source/core/layout/dumpfilter.cxx
M sw/source/core/ole/ndole.cxx
M sw/source/core/swg/SwXMLBlockImport.cxx
M sw/source/core/swg/SwXMLSectionList.cxx
M sw/source/core/swg/SwXMLTextBlocks.cxx
M sw/source/core/swg/SwXMLTextBlocks1.cxx
34 files changed, 285 insertions(+), 288 deletions(-)
diff --git a/sw/source/core/access/acccell.cxx b/sw/source/core/access/acccell.cxx
index 8c5fe32..bd30904 100644
--- a/sw/source/core/access/acccell.cxx
+++ b/sw/source/core/access/acccell.cxx
@@ -214,11 +214,11 @@
OUString SAL_CALL SwAccessibleCell::getImplementationName()
throw( uno::RuntimeException )
{
- return OUString(RTL_CONSTASCII_USTRINGPARAM(sImplementationName));
+ return OUString(sImplementationName);
}
sal_Bool SAL_CALL SwAccessibleCell::supportsService(
- const ::rtl::OUString& sTestServiceName)
+ const OUString& sTestServiceName)
throw (uno::RuntimeException)
{
return sTestServiceName.equalsAsciiL( sServiceName,
@@ -232,8 +232,8 @@
{
uno::Sequence< OUString > aRet(2);
OUString* pArray = aRet.getArray();
- pArray[0] = OUString( RTL_CONSTASCII_USTRINGPARAM(sServiceName) );
- pArray[1] = OUString( RTL_CONSTASCII_USTRINGPARAM(sAccessibleServiceName) );
+ pArray[0] = OUString(sServiceName );
+ pArray[1] = OUString(sAccessibleServiceName );
return aRet;
}
diff --git a/sw/source/core/access/acccontext.cxx b/sw/source/core/access/acccontext.cxx
index 38cba3f..86f9da8 100644
--- a/sw/source/core/access/acccontext.cxx
+++ b/sw/source/core/access/acccontext.cxx
@@ -563,7 +563,7 @@
{
uno::Reference < XAccessibleContext > xThis( this );
lang::IndexOutOfBoundsException aExcept(
- OUString( RTL_CONSTASCII_USTRINGPARAM("index out of bounds") ),
+ OUString( "index out of bounds" ),
xThis );
throw aExcept;
}
@@ -968,7 +968,7 @@
}
sal_Bool SAL_CALL
- SwAccessibleContext::supportsService (const ::rtl::OUString& )
+ SwAccessibleContext::supportsService (const OUString& )
throw (uno::RuntimeException)
{
OSL_ENSURE( !this, "supports service needs to be overloaded" );
@@ -1411,12 +1411,12 @@
if( pArg1 )
{
- sStr.SearchAndReplace( rtl::OUString("$(ARG1)"),
+ sStr.SearchAndReplace( OUString("$(ARG1)"),
String( *pArg1 ) );
}
if( pArg2 )
{
- sStr.SearchAndReplace( rtl::OUString("$(ARG2)"),
+ sStr.SearchAndReplace( OUString("$(ARG2)"),
String( *pArg2 ) );
}
diff --git a/sw/source/core/access/acccontext.hxx b/sw/source/core/access/acccontext.hxx
index e634149..5cce5bd 100644
--- a/sw/source/core/access/acccontext.hxx
+++ b/sw/source/core/access/acccontext.hxx
@@ -64,7 +64,7 @@
private:
- ::rtl::OUString sName; // immutable outside constructor
+ OUString sName; // immutable outside constructor
// The parent if it has been retrieved. This is always an
// SwAccessibleContext. (protected by Mutex)
@@ -92,7 +92,7 @@
void InitStates();
protected:
- void SetName( const ::rtl::OUString& rName ) { sName = rName; }
+ void SetName( const OUString& rName ) { sName = rName; }
inline sal_Int16 GetRole() const
{
return nRole;
@@ -232,12 +232,12 @@
throw (::com::sun::star::uno::RuntimeException);
/// Return this object's description.
- virtual ::rtl::OUString SAL_CALL
+ virtual OUString SAL_CALL
getAccessibleDescription (void)
throw (::com::sun::star::uno::RuntimeException);
/// Return the object's current name.
- virtual ::rtl::OUString SAL_CALL
+ virtual OUString SAL_CALL
getAccessibleName (void)
throw (::com::sun::star::uno::RuntimeException);
@@ -308,20 +308,20 @@
/** Returns an identifier for the implementation of this object.
*/
- virtual ::rtl::OUString SAL_CALL
+ virtual OUString SAL_CALL
getImplementationName (void)
throw (::com::sun::star::uno::RuntimeException);
/** Return whether the specified service is supported by this class.
*/
virtual sal_Bool SAL_CALL
- supportsService (const ::rtl::OUString& sServiceName)
+ supportsService (const OUString& sServiceName)
throw (::com::sun::star::uno::RuntimeException);
/** Returns a list of all supported services. In this case that is just
the AccessibleContext service.
*/
- virtual ::com::sun::star::uno::Sequence< ::rtl::OUString> SAL_CALL
+ virtual ::com::sun::star::uno::Sequence< OUString> SAL_CALL
getSupportedServiceNames (void)
throw (::com::sun::star::uno::RuntimeException);
@@ -367,7 +367,7 @@
// #i88070# - get all additional accessible children
void GetAdditionalAccessibleChildren( std::vector< Window* >* pChildren );
- const ::rtl::OUString& GetName() const { return sName; }
+ const OUString& GetName() const { return sName; }
virtual sal_Bool HasCursor(); // required by map to remember that object
@@ -381,9 +381,9 @@
return Select( 0, pObj, bAdd );
}
- static ::rtl::OUString GetResource( sal_uInt16 nResId,
- const ::rtl::OUString *pArg1 = 0,
- const ::rtl::OUString *pArg2 = 0 );
+ static OUString GetResource( sal_uInt16 nResId,
+ const OUString *pArg1 = 0,
+ const OUString *pArg2 = 0 );
};
@@ -395,7 +395,7 @@
#define THROW_RUNTIME_EXCEPTION( ifc, msg ) \
::com::sun::star::uno::Reference < ifc > xThis( this ); \
::com::sun::star::uno::RuntimeException aExcept( \
- ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(msg) ), xThis ); \
+ OUString( msg ), xThis ); \
throw aExcept;
#define CHECK_FOR_DEFUNC_THIS( ifc, ths ) \
@@ -403,7 +403,7 @@
{ \
::com::sun::star::uno::Reference < ifc > xThis( ths ); \
::com::sun::star::lang::DisposedException aExcept( \
- ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(sDefunc) ), \
+ OUString( sDefunc ), \
xThis ); \
throw aExcept; \
}
diff --git a/sw/source/core/access/accdoc.cxx b/sw/source/core/access/accdoc.cxx
index 538e5e3..f2ab001 100644
--- a/sw/source/core/access/accdoc.cxx
+++ b/sw/source/core/access/accdoc.cxx
@@ -378,11 +378,11 @@
OUString SAL_CALL SwAccessibleDocument::getImplementationName()
throw( uno::RuntimeException )
{
- return OUString(RTL_CONSTASCII_USTRINGPARAM(sImplementationName));
+ return OUString(sImplementationName);
}
sal_Bool SAL_CALL SwAccessibleDocument::supportsService(
- const ::rtl::OUString& sTestServiceName)
+ const OUString& sTestServiceName)
throw (uno::RuntimeException)
{
return sTestServiceName.equalsAsciiL( sServiceName,
@@ -396,8 +396,8 @@
{
uno::Sequence< OUString > aRet(2);
OUString* pArray = aRet.getArray();
- pArray[0] = OUString( RTL_CONSTASCII_USTRINGPARAM(sServiceName) );
- pArray[1] = OUString( RTL_CONSTASCII_USTRINGPARAM(sAccessibleServiceName) );
+ pArray[0] = OUString( sServiceName );
+ pArray[1] = OUString( sAccessibleServiceName );
return aRet;
}
diff --git a/sw/source/core/access/accembedded.cxx b/sw/source/core/access/accembedded.cxx
index b6cb3d8..3f480b9 100644
--- a/sw/source/core/access/accembedded.cxx
+++ b/sw/source/core/access/accembedded.cxx
@@ -46,11 +46,11 @@
OUString SAL_CALL SwAccessibleEmbeddedObject::getImplementationName()
throw( uno::RuntimeException )
{
- return OUString(RTL_CONSTASCII_USTRINGPARAM(sImplementationName));
+ return OUString(sImplementationName);
}
sal_Bool SAL_CALL SwAccessibleEmbeddedObject::supportsService(
- const ::rtl::OUString& sTestServiceName)
+ const OUString& sTestServiceName)
throw (uno::RuntimeException)
{
return sTestServiceName.equalsAsciiL( sServiceName,
@@ -64,8 +64,8 @@
{
uno::Sequence< OUString > aRet(2);
OUString* pArray = aRet.getArray();
- pArray[0] = OUString( RTL_CONSTASCII_USTRINGPARAM(sServiceName) );
- pArray[1] = OUString( RTL_CONSTASCII_USTRINGPARAM(sAccessibleServiceName) );
+ pArray[0] = OUString( sServiceName );
+ pArray[1] = OUString( sAccessibleServiceName );
return aRet;
}
diff --git a/sw/source/core/access/accfootnote.cxx b/sw/source/core/access/accfootnote.cxx
index 517880d..e289450 100644
--- a/sw/source/core/access/accfootnote.cxx
+++ b/sw/source/core/access/accfootnote.cxx
@@ -90,13 +90,13 @@
throw( RuntimeException )
{
if( AccessibleRole::END_NOTE == GetRole() )
- return OUString(RTL_CONSTASCII_USTRINGPARAM(sImplementationNameEndnote));
+ return OUString(sImplementationNameEndnote);
else
- return OUString(RTL_CONSTASCII_USTRINGPARAM(sImplementationNameFootnote));
+ return OUString(sImplementationNameFootnote);
}
sal_Bool SAL_CALL SwAccessibleFootnote::supportsService(
- const ::rtl::OUString& sTestServiceName)
+ const OUString& sTestServiceName)
throw (uno::RuntimeException)
{
if( sTestServiceName.equalsAsciiL( sAccessibleServiceName,
@@ -115,10 +115,10 @@
Sequence< OUString > aRet(2);
OUString* pArray = aRet.getArray();
if( AccessibleRole::END_NOTE == GetRole() )
- pArray[0] = OUString( RTL_CONSTASCII_USTRINGPARAM(sServiceNameEndnote) );
+ pArray[0] = OUString( sServiceNameEndnote );
else
- pArray[0] = OUString( RTL_CONSTASCII_USTRINGPARAM(sServiceNameFootnote) );
- pArray[1] = OUString( RTL_CONSTASCII_USTRINGPARAM(sAccessibleServiceName) );
+ pArray[0] = OUString( sServiceNameFootnote );
+ pArray[1] = OUString( sAccessibleServiceName );
return aRet;
}
diff --git a/sw/source/core/access/accgraphic.cxx b/sw/source/core/access/accgraphic.cxx
index 750a19a..58beaff 100644
--- a/sw/source/core/access/accgraphic.cxx
+++ b/sw/source/core/access/accgraphic.cxx
@@ -47,11 +47,11 @@
OUString SAL_CALL SwAccessibleGraphic::getImplementationName()
throw( RuntimeException )
{
- return OUString(RTL_CONSTASCII_USTRINGPARAM(sImplementationName));
+ return OUString(sImplementationName);
}
sal_Bool SAL_CALL SwAccessibleGraphic::supportsService(
- const ::rtl::OUString& sTestServiceName)
+ const OUString& sTestServiceName)
throw (uno::RuntimeException)
{
return sTestServiceName.equalsAsciiL( sServiceName,
@@ -65,8 +65,8 @@
{
Sequence< OUString > aRet(2);
OUString* pArray = aRet.getArray();
- pArray[0] = OUString( RTL_CONSTASCII_USTRINGPARAM(sServiceName) );
- pArray[1] = OUString( RTL_CONSTASCII_USTRINGPARAM(sAccessibleServiceName) );
+ pArray[0] = OUString( sServiceName );
+ pArray[1] = OUString( sAccessibleServiceName );
return aRet;
}
diff --git a/sw/source/core/access/accheaderfooter.cxx b/sw/source/core/access/accheaderfooter.cxx
index 4535359..079d7b4 100644
--- a/sw/source/core/access/accheaderfooter.cxx
+++ b/sw/source/core/access/accheaderfooter.cxx
@@ -84,13 +84,13 @@
throw( RuntimeException )
{
if( AccessibleRole::HEADER == GetRole() )
- return OUString(RTL_CONSTASCII_USTRINGPARAM(sImplementationNameHeader));
+ return OUString(sImplementationNameHeader);
else
- return OUString(RTL_CONSTASCII_USTRINGPARAM(sImplementationNameFooter));
+ return OUString(sImplementationNameFooter);
}
sal_Bool SAL_CALL SwAccessibleHeaderFooter::supportsService(
- const ::rtl::OUString& sTestServiceName)
+ const OUString& sTestServiceName)
throw (uno::RuntimeException)
{
if( sTestServiceName.equalsAsciiL( sAccessibleServiceName,
@@ -109,10 +109,10 @@
Sequence< OUString > aRet(2);
OUString* pArray = aRet.getArray();
if( AccessibleRole::HEADER == GetRole() )
- pArray[0] = OUString( RTL_CONSTASCII_USTRINGPARAM(sServiceNameHeader) );
+ pArray[0] = OUString( sServiceNameHeader );
else
- pArray[0] = OUString( RTL_CONSTASCII_USTRINGPARAM(sServiceNameFooter) );
- pArray[1] = OUString( RTL_CONSTASCII_USTRINGPARAM(sAccessibleServiceName) );
+ pArray[0] = OUString( sServiceNameFooter );
+ pArray[1] = OUString( sAccessibleServiceName );
return aRet;
}
diff --git a/sw/source/core/access/accpage.cxx b/sw/source/core/access/accpage.cxx
index a5aefdd..a89fd01 100644
--- a/sw/source/core/access/accpage.cxx
+++ b/sw/source/core/access/accpage.cxx
@@ -141,7 +141,7 @@
OUString SwAccessiblePage::getImplementationName( )
throw( RuntimeException )
{
- return OUString(RTL_CONSTASCII_USTRINGPARAM(sImplementationName));
+ return OUString(sImplementationName);
}
sal_Bool SwAccessiblePage::supportsService( const OUString& rServiceName)
@@ -157,8 +157,8 @@
{
Sequence< OUString > aRet(2);
OUString* pArray = aRet.getArray();
- pArray[0] = OUString( RTL_CONSTASCII_USTRINGPARAM(sServiceName) );
- pArray[1] = OUString( RTL_CONSTASCII_USTRINGPARAM(sAccessibleServiceName) );
+ pArray[0] = OUString( sServiceName );
+ pArray[1] = OUString( sAccessibleServiceName );
return aRet;
}
diff --git a/sw/source/core/access/accpara.cxx b/sw/source/core/access/accpara.cxx
index d3d58cf..1a1d639 100644
--- a/sw/source/core/access/accpara.cxx
+++ b/sw/source/core/access/accpara.cxx
@@ -108,14 +108,14 @@
return pNode;
}
-::rtl::OUString SwAccessibleParagraph::GetString()
+OUString SwAccessibleParagraph::GetString()
{
return GetPortionData().GetAccessibleString();
}
-::rtl::OUString SwAccessibleParagraph::GetDescription()
+OUString SwAccessibleParagraph::GetDescription()
{
- return ::rtl::OUString(); // provide empty description for paragraphs
+ return OUString(); // provide empty description for paragraphs
}
sal_Int32 SwAccessibleParagraph::GetCaretPos()
@@ -355,11 +355,11 @@
void SwAccessibleParagraph::_InvalidateContent( sal_Bool bVisibleDataFired )
{
- ::rtl::OUString sOldText( GetString() );
+ OUString sOldText( GetString() );
ClearPortionData();
- const ::rtl::OUString& rText = GetString();
+ const OUString& rText = GetString();
if( rText != sOldText )
{
@@ -391,8 +391,8 @@
if( bNewIsHeading != bOldIsHeading || rText != sOldText )
{
- ::rtl::OUString sNewDesc( GetDescription() );
- ::rtl::OUString sOldDesc;
+ OUString sNewDesc( GetDescription() );
+ OUString sOldDesc;
{
osl::MutexGuard aGuard( aMutex );
sOldDesc = sDesc;
@@ -484,7 +484,7 @@
SolarMutexGuard aGuard;
bIsHeading = IsHeading();
- SetName( ::rtl::OUString() ); // set an empty accessibility name for paragraphs
+ SetName( OUString() ); // set an empty accessibility name for paragraphs
// If this object has the focus, then it is remembered by the map itself.
nOldCaretPos = GetCaretPos();
@@ -618,7 +618,7 @@
sal_Bool SwAccessibleParagraph::GetCharBoundary(
i18n::Boundary& rBound,
- const ::rtl::OUString&,
+ const OUString&,
sal_Int32 nPos )
{
rBound.startPos = nPos;
@@ -628,7 +628,7 @@
sal_Bool SwAccessibleParagraph::GetWordBoundary(
i18n::Boundary& rBound,
- const ::rtl::OUString& rText,
+ const OUString& rText,
sal_Int32 nPos )
{
sal_Bool bRet = sal_False;
@@ -653,7 +653,7 @@
// It's a word if the first character is an alpha-numeric character.
bRet = GetAppCharClass().isLetterNumeric(
- rtl::OUString(rText[rBound.startPos]) );
+ OUString(rText[rBound.startPos]) );
}
else
{
@@ -667,7 +667,7 @@
sal_Bool SwAccessibleParagraph::GetSentenceBoundary(
i18n::Boundary& rBound,
- const ::rtl::OUString&,
+ const OUString&,
sal_Int32 nPos )
{
GetPortionData().GetSentenceBoundary( rBound, nPos );
@@ -676,7 +676,7 @@
sal_Bool SwAccessibleParagraph::GetLineBoundary(
i18n::Boundary& rBound,
- const ::rtl::OUString& rText,
+ const OUString& rText,
sal_Int32 nPos )
{
if( rText.getLength() == nPos )
@@ -688,7 +688,7 @@
sal_Bool SwAccessibleParagraph::GetParagraphBoundary(
i18n::Boundary& rBound,
- const ::rtl::OUString& rText,
+ const OUString& rText,
sal_Int32 )
{
rBound.startPos = 0;
@@ -698,7 +698,7 @@
sal_Bool SwAccessibleParagraph::GetAttributeBoundary(
i18n::Boundary& rBound,
- const ::rtl::OUString&,
+ const OUString&,
sal_Int32 nPos )
{
GetPortionData().GetAttributeBoundary( rBound, nPos );
@@ -707,7 +707,7 @@
sal_Bool SwAccessibleParagraph::GetGlyphBoundary(
i18n::Boundary& rBound,
- const ::rtl::OUString& rText,
+ const OUString& rText,
sal_Int32 nPos )
{
sal_Bool bRet = sal_False;
@@ -747,7 +747,7 @@
sal_Bool SwAccessibleParagraph::GetTextBoundary(
i18n::Boundary& rBound,
- const ::rtl::OUString& rText,
+ const OUString& rText,
sal_Int32 nPos,
sal_Int16 nTextType )
throw (
@@ -800,7 +800,7 @@
return bRet;
}
-::rtl::OUString SAL_CALL SwAccessibleParagraph::getAccessibleDescription (void)
+OUString SAL_CALL SwAccessibleParagraph::getAccessibleDescription (void)
throw (uno::RuntimeException)
{
SolarMutexGuard aGuard;
@@ -973,14 +973,14 @@
return SwAccessibleContext::getBackground();
}
-::rtl::OUString SAL_CALL SwAccessibleParagraph::getImplementationName()
+OUString SAL_CALL SwAccessibleParagraph::getImplementationName()
throw( uno::RuntimeException )
{
- return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(sImplementationName));
+ return OUString(sImplementationName);
}
sal_Bool SAL_CALL SwAccessibleParagraph::supportsService(
- const ::rtl::OUString& sTestServiceName)
+ const OUString& sTestServiceName)
throw (uno::RuntimeException)
{
return sTestServiceName.equalsAsciiL( sServiceName,
@@ -989,13 +989,13 @@
sizeof(sAccessibleServiceName)-1 );
}
-uno::Sequence< ::rtl::OUString > SAL_CALL SwAccessibleParagraph::getSupportedServiceNames()
+uno::Sequence< OUString > SAL_CALL SwAccessibleParagraph::getSupportedServiceNames()
throw( uno::RuntimeException )
{
- uno::Sequence< ::rtl::OUString > aRet(2);
- ::rtl::OUString* pArray = aRet.getArray();
- pArray[0] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(sServiceName) );
- pArray[1] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(sAccessibleServiceName) );
+ uno::Sequence< OUString > aRet(2);
+ OUString* pArray = aRet.getArray();
+ pArray[0] = OUString( sServiceName );
+ pArray[1] = OUString( sAccessibleServiceName );
return aRet;
}
@@ -1155,7 +1155,7 @@
CHECK_FOR_DEFUNC_THIS( XAccessibleText, *this );
- ::rtl::OUString sText( GetString() );
+ OUString sText( GetString() );
// return character (if valid)
if( IsValidChar(nIndex, sText.getLength() ) )
@@ -1170,14 +1170,14 @@
// <_getDefaultAttributesImpl(..)> and <_getRunAttributesImpl(..)>
uno::Sequence<PropertyValue> SwAccessibleParagraph::getCharacterAttributes(
sal_Int32 nIndex,
- const uno::Sequence< ::rtl::OUString >& aRequestedAttributes )
+ const uno::Sequence< OUString >& aRequestedAttributes )
throw (lang::IndexOutOfBoundsException, uno::RuntimeException)
{
SolarMutexGuard aGuard;
CHECK_FOR_DEFUNC_THIS( XAccessibleText, *this );
- const ::rtl::OUString& rText = GetString();
+ const OUString& rText = GetString();
if( ! IsValidChar( nIndex, rText.getLength() ) )
throw lang::IndexOutOfBoundsException();
@@ -1216,7 +1216,7 @@
// #i63870#
void SwAccessibleParagraph::_getDefaultAttributesImpl(
- const uno::Sequence< ::rtl::OUString >& aRequestedAttributes,
+ const uno::Sequence< OUString >& aRequestedAttributes,
tAccParaPropValMap& rDefAttrSeq,
const bool bOnlyCharAttrs )
{
@@ -1294,14 +1294,14 @@
// add property value entry for the paragraph style
if ( !bOnlyCharAttrs && pTxtNode->GetTxtColl() )
{
- const ::rtl::OUString sParaStyleName =
- ::rtl::OUString::createFromAscii(
+ const OUString sParaStyleName =
+ OUString::createFromAscii(
GetPropName( UNO_NAME_PARA_STYLE_NAME ).pName );
if ( aDefAttrSeq.find( sParaStyleName ) == aDefAttrSeq.end() )
{
PropertyValue rPropVal;
rPropVal.Name = sParaStyleName;
- uno::Any aVal( uno::makeAny( ::rtl::OUString( pTxtNode->GetTxtColl()->GetName() )
) );
+ uno::Any aVal( uno::makeAny( OUString( pTxtNode->GetTxtColl()->GetName() ) ) );
rPropVal.Value = aVal;
rPropVal.Handle = -1;
rPropVal.State = beans::PropertyState_DEFAULT_VALUE;
@@ -1314,8 +1314,8 @@
// resolve value text::WritingMode2::PAGE of property value entry WritingMode
if ( !bOnlyCharAttrs && GetFrm() )
{
- const ::rtl::OUString sWritingMode =
- ::rtl::OUString::createFromAscii(
+ const OUString sWritingMode =
+ OUString::createFromAscii(
GetPropName( UNO_NAME_WRITING_MODE ).pName );
tAccParaPropValMap::iterator aIter = aDefAttrSeq.find( sWritingMode );
if ( aIter != aDefAttrSeq.end() )
@@ -1367,7 +1367,7 @@
}
else
{
- const ::rtl::OUString* pReqAttrs = aRequestedAttributes.getConstArray();
+ const OUString* pReqAttrs = aRequestedAttributes.getConstArray();
const sal_Int32 nLength = aRequestedAttributes.getLength();
for( sal_Int32 i = 0; i < nLength; ++i )
{
@@ -1381,7 +1381,7 @@
}
uno::Sequence< PropertyValue > SwAccessibleParagraph::getDefaultAttributes(
- const uno::Sequence< ::rtl::OUString >& aRequestedAttributes )
+ const uno::Sequence< OUString >& aRequestedAttributes )
throw ( uno::RuntimeException )
{
SolarMutexGuard aGuard;
@@ -1391,7 +1391,7 @@
_getDefaultAttributesImpl( aRequestedAttributes, aDefAttrSeq );
// #i92233#
- static rtl::OUString sMMToPixelRatio(RTL_CONSTASCII_USTRINGPARAM("MMToPixelRatio"));
+ static OUString sMMToPixelRatio("MMToPixelRatio");
bool bProvideMMToPixelRatio( false );
{
if ( aRequestedAttributes.getLength() == 0 )
@@ -1400,7 +1400,7 @@
}
else
{
- const rtl::OUString* aRequestedAttrIter =
+ const OUString* aRequestedAttrIter =
::std::find( ::comphelper::stl_begin( aRequestedAttributes ),
::comphelper::stl_end( aRequestedAttributes ),
sMMToPixelRatio );
@@ -1442,7 +1442,7 @@
void SwAccessibleParagraph::_getRunAttributesImpl(
const sal_Int32 nIndex,
- const uno::Sequence< ::rtl::OUString >& aRequestedAttributes,
+ const uno::Sequence< OUString >& aRequestedAttributes,
tAccParaPropValMap& rRunAttrSeq )
{
// create PaM for character at position <nIndex>
@@ -1495,7 +1495,7 @@
tAccParaPropValMap aRunAttrSeq;
{
tAccParaPropValMap aDefAttrSeq;
- uno::Sequence< ::rtl::OUString > aDummy;
+ uno::Sequence< OUString > aDummy;
_getDefaultAttributesImpl( aDummy, aDefAttrSeq, true ); // #i82637#
const SfxItemPropertyMap& rPropMap =
@@ -1537,7 +1537,7 @@
}
else
{
- const ::rtl::OUString* pReqAttrs = aRequestedAttributes.getConstArray();
+ const OUString* pReqAttrs = aRequestedAttributes.getConstArray();
const sal_Int32 nLength = aRequestedAttributes.getLength();
for( sal_Int32 i = 0; i < nLength; ++i )
{
@@ -1555,7 +1555,7 @@
uno::Sequence< PropertyValue > SwAccessibleParagraph::getRunAttributes(
sal_Int32 nIndex,
- const uno::Sequence< ::rtl::OUString >& aRequestedAttributes )
+ const uno::Sequence< OUString >& aRequestedAttributes )
throw ( lang::IndexOutOfBoundsException,
uno::RuntimeException )
{
@@ -1563,7 +1563,7 @@
CHECK_FOR_DEFUNC_THIS( XAccessibleText, *this );
{
- const ::rtl::OUString& rText = GetString();
+ const OUString& rText = GetString();
if ( !IsValidChar( nIndex, rText.getLength() ) )
{
throw lang::IndexOutOfBoundsException();
@@ -1738,7 +1738,7 @@
: -1L;
}
-::rtl::OUString SwAccessibleParagraph::getSelectedText()
+OUString SwAccessibleParagraph::getSelectedText()
throw (uno::RuntimeException)
{
SolarMutexGuard aGuard;
@@ -1749,7 +1749,7 @@
sal_Bool bSelected = GetSelection( nStart, nEnd );
return bSelected
? GetString().copy( nStart, nEnd - nStart )
- : ::rtl::OUString();
+ : OUString();
}
sal_Int32 SwAccessibleParagraph::getSelectionStart()
@@ -1812,7 +1812,7 @@
return bRet;
}
-::rtl::OUString SwAccessibleParagraph::getText()
+OUString SwAccessibleParagraph::getText()
throw (uno::RuntimeException)
{
SolarMutexGuard aGuard;
@@ -1822,7 +1822,7 @@
return GetString();
}
-::rtl::OUString SwAccessibleParagraph::getTextRange(
+OUString SwAccessibleParagraph::getTextRange(
sal_Int32 nStartIndex, sal_Int32 nEndIndex )
throw (lang::IndexOutOfBoundsException, uno::RuntimeException)
{
@@ -1830,7 +1830,7 @@
CHECK_FOR_DEFUNC_THIS( XAccessibleText, *this );
- ::rtl::OUString sText( GetString() );
+ OUString sText( GetString() );
if ( IsValidRange( nStartIndex, nEndIndex, sText.getLength() ) )
{
@@ -1851,7 +1851,7 @@
aResult.SegmentStart = -1;
aResult.SegmentEnd = -1;
- const ::rtl::OUString rText = GetString();
+ const OUString rText = GetString();
// implement the silly specification that first position after
// text must return an empty string, rather than throwing an
// IndexOutOfBoundsException, except for LINE, where the last
@@ -1883,7 +1883,7 @@
CHECK_FOR_DEFUNC_THIS( XAccessibleText, *this );
- const ::rtl::OUString rText = GetString();
+ const OUString rText = GetString();
/*accessibility::*/TextSegment aResult;
aResult.SegmentStart = -1;
@@ -1930,7 +1930,7 @@
/*accessibility::*/TextSegment aResult;
aResult.SegmentStart = -1;
aResult.SegmentEnd = -1;
- const ::rtl::OUString rText = GetString();
+ const OUString rText = GetString();
// implement the silly specification that first position after
// text must return an empty string, rather than throwing an
@@ -2011,10 +2011,10 @@
sal_Bool SwAccessibleParagraph::deleteText( sal_Int32 nStartIndex, sal_Int32 nEndIndex )
throw (lang::IndexOutOfBoundsException, uno::RuntimeException)
{
- return replaceText( nStartIndex, nEndIndex, ::rtl::OUString() );
+ return replaceText( nStartIndex, nEndIndex, OUString() );
}
-sal_Bool SwAccessibleParagraph::insertText( const ::rtl::OUString& sText, sal_Int32 nIndex )
+sal_Bool SwAccessibleParagraph::insertText( const OUString& sText, sal_Int32 nIndex )
throw (lang::IndexOutOfBoundsException, uno::RuntimeException)
{
return replaceText( nIndex, nIndex, sText );
@@ -2022,14 +2022,14 @@
sal_Bool SwAccessibleParagraph::replaceText(
sal_Int32 nStartIndex, sal_Int32 nEndIndex,
- const ::rtl::OUString& sReplacement )
+ const OUString& sReplacement )
throw (lang::IndexOutOfBoundsException, uno::RuntimeException)
{
SolarMutexGuard aGuard;
CHECK_FOR_DEFUNC( XAccessibleEditableText );
- const ::rtl::OUString& rText = GetString();
+ const OUString& rText = GetString();
if( IsValidRange( nStartIndex, nEndIndex, rText.getLength() ) )
{
@@ -2090,7 +2090,7 @@
SolarMutexGuard aGuard;
CHECK_FOR_DEFUNC( XAccessibleEditableText );
- const ::rtl::OUString& rText = GetString();
+ const OUString& rText = GetString();
if( ! IsValidRange( nStartIndex, nEndIndex, rText.getLength() ) )
throw lang::IndexOutOfBoundsException();
@@ -2114,8 +2114,8 @@
sort( &pIndices[0], &pIndices[nLength], IndexCompare(pPairs) );
// create sorted sequences accoring to index array
- uno::Sequence< ::rtl::OUString > aNames( nLength );
- ::rtl::OUString* pNames = aNames.getArray();
+ uno::Sequence< OUString > aNames( nLength );
+ OUString* pNames = aNames.getArray();
uno::Sequence< uno::Any > aValues( nLength );
uno::Any* pValues = aValues.getArray();
for( i = 0; i < nLength; i++ )
@@ -2141,7 +2141,7 @@
return bRet;
}
-sal_Bool SwAccessibleParagraph::setText( const ::rtl::OUString& sText )
+sal_Bool SwAccessibleParagraph::setText( const OUString& sText )
throw (uno::RuntimeException)
{
return replaceText(0, GetString().getLength(), sText);
@@ -2504,7 +2504,7 @@
GetPortionData().GetBoundaryOfLine( nLineNo, aLineBound );
/*accessibility::*/TextSegment aTextAtLine;
- const ::rtl::OUString rText = GetString();
+ const OUString rText = GetString();
aTextAtLine.SegmentText = rText.copy( aLineBound.startPos,
aLineBound.endPos - aLineBound.startPos );
aTextAtLine.SegmentStart = aLineBound.startPos;
diff --git a/sw/source/core/access/accpreview.cxx b/sw/source/core/access/accpreview.cxx
index 19a4bf4..7767232 100644
--- a/sw/source/core/access/accpreview.cxx
+++ b/sw/source/core/access/accpreview.cxx
@@ -48,7 +48,7 @@
OUString SwAccessiblePreview::getImplementationName( )
throw( RuntimeException )
{
- return OUString( RTL_CONSTASCII_USTRINGPARAM( sImplementationName ) );
+ return OUString( sImplementationName );
}
sal_Bool SwAccessiblePreview::supportsService( const OUString& rServiceName )
@@ -61,8 +61,8 @@
throw( RuntimeException )
{
Sequence<OUString> aSeq( 2 );
- aSeq[0] = OUString( RTL_CONSTASCII_USTRINGPARAM( sServiceName ) );
- aSeq[1] = OUString( RTL_CONSTASCII_USTRINGPARAM( sAccessibleServiceName ) );
+ aSeq[0] = OUString( sServiceName );
+ aSeq[1] = OUString( sAccessibleServiceName );
return aSeq;
}
diff --git a/sw/source/core/access/accselectionhelper.cxx
b/sw/source/core/access/accselectionhelper.cxx
index 509ffd4..13397a6 100644
--- a/sw/source/core/access/accselectionhelper.cxx
+++ b/sw/source/core/access/accselectionhelper.cxx
@@ -70,7 +70,7 @@
Reference < XAccessibleContext > xThis( &rContext );
Reference < XAccessibleSelection >xSelThis( xThis, UNO_QUERY );
lang::IndexOutOfBoundsException aExcept(
- ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("index out of bounds") ),
+ OUString( "index out of bounds" ),
xSelThis ); \
throw aExcept;
}
diff --git a/sw/source/core/access/acctable.cxx b/sw/source/core/access/acctable.cxx
index d50c806..05569cc 100644
--- a/sw/source/core/access/acctable.cxx
+++ b/sw/source/core/access/acctable.cxx
@@ -451,8 +451,7 @@
{
uno::Reference < XAccessibleTable > xThis( pThis );
lang::IndexOutOfBoundsException aExcept(
- OUString( RTL_CONSTASCII_USTRINGPARAM(
- "row or column index out of range") ),
+ OUString( "row or column index out of range" ),
xThis );
throw aExcept;
}
@@ -1276,7 +1275,7 @@
OUString SAL_CALL SwAccessibleTable::getImplementationName()
throw( uno::RuntimeException )
{
- return OUString(RTL_CONSTASCII_USTRINGPARAM(sImplementationName));
+ return OUString(sImplementationName);
}
sal_Bool SAL_CALL SwAccessibleTable::supportsService(
@@ -1294,8 +1293,8 @@
{
uno::Sequence< OUString > aRet(2);
OUString* pArray = aRet.getArray();
- pArray[0] = OUString( RTL_CONSTASCII_USTRINGPARAM(sServiceName) );
- pArray[1] = OUString( RTL_CONSTASCII_USTRINGPARAM(sAccessibleServiceName) );
+ pArray[0] = OUString( sServiceName );
+ pArray[1] = OUString( sAccessibleServiceName );
return aRet;
}
@@ -1699,11 +1698,11 @@
//===== XServiceInfo ====================================================
-::rtl::OUString SAL_CALL SwAccessibleTableColHeaders::getImplementationName (void)
+OUString SAL_CALL SwAccessibleTableColHeaders::getImplementationName (void)
throw (uno::RuntimeException)
{
static const sal_Char sImplName[] =
"com.sun.star.comp.Writer.SwAccessibleTableColumnHeadersView";
- return OUString(RTL_CONSTASCII_USTRINGPARAM(sImplName));
+ return OUString(sImplName);
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/access/acctextframe.cxx b/sw/source/core/access/acctextframe.cxx
index 65b9f1a..e6a96b2 100644
--- a/sw/source/core/access/acctextframe.cxx
+++ b/sw/source/core/access/acctextframe.cxx
@@ -171,7 +171,7 @@
OUString SAL_CALL SwAccessibleTextFrame::getImplementationName()
throw( uno::RuntimeException )
{
- return OUString(RTL_CONSTASCII_USTRINGPARAM(sImplementationName));
+ return OUString(sImplementationName);
}
sal_Bool SAL_CALL SwAccessibleTextFrame::supportsService(
@@ -189,8 +189,8 @@
{
uno::Sequence< OUString > aRet(2);
OUString* pArray = aRet.getArray();
- pArray[0] = OUString( RTL_CONSTASCII_USTRINGPARAM(sServiceName) );
- pArray[1] = OUString( RTL_CONSTASCII_USTRINGPARAM(sAccessibleServiceName) );
+ pArray[0] = OUString( sServiceName );
+ pArray[1] = OUString( sAccessibleServiceName );
return aRet;
}
diff --git a/sw/source/core/bastyp/SwSmartTagMgr.cxx b/sw/source/core/bastyp/SwSmartTagMgr.cxx
index fa4f96c..de84e5b 100644
--- a/sw/source/core/bastyp/SwSmartTagMgr.cxx
+++ b/sw/source/core/bastyp/SwSmartTagMgr.cxx
@@ -34,12 +34,12 @@
if ( !mpTheSwSmartTagMgr )
{
mpTheSwSmartTagMgr = new SwSmartTagMgr( SwDocShell::Factory().GetModuleName() );
- mpTheSwSmartTagMgr->Init(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Writer")));
+ mpTheSwSmartTagMgr->Init(OUString("Writer"));
}
return *mpTheSwSmartTagMgr;
}
-SwSmartTagMgr::SwSmartTagMgr( const rtl::OUString& rModuleName ) :
+SwSmartTagMgr::SwSmartTagMgr( const OUString& rModuleName ) :
SmartTagMgr( rModuleName )
{
}
diff --git a/sw/source/core/crsr/bookmrk.cxx b/sw/source/core/crsr/bookmrk.cxx
index 0cb1562..705f81c 100644
--- a/sw/source/core/crsr/bookmrk.cxx
+++ b/sw/source/core/crsr/bookmrk.cxx
@@ -80,12 +80,12 @@
io_pDoc->GetIDocumentUndoRedo().StartUndo(UNDO_UI_REPLACE, NULL);
if( ( ch_start != aStartMark ) && ( aEndMark != CH_TXT_ATR_FORMELEMENT ) )
{
- io_pDoc->InsertString(aStartPaM, rtl::OUString(aStartMark));
+ io_pDoc->InsertString(aStartPaM, OUString(aStartMark));
rStart.nContent--;
}
if ( aEndMark && ( ch_end != aEndMark ) )
{
- io_pDoc->InsertString(aEndPaM, rtl::OUString(aEndMark));
+ io_pDoc->InsertString(aEndPaM, OUString(aEndMark));
rEnd.nContent++;
}
io_pDoc->GetIDocumentUndoRedo().EndUndo(UNDO_UI_REPLACE, NULL);
@@ -128,7 +128,7 @@
namespace sw { namespace mark
{
MarkBase::MarkBase(const SwPaM& aPaM,
- const ::rtl::OUString& rName)
+ const OUString& rName)
: SwModify(0)
, m_pPos1(new SwPosition(*(aPaM.GetPoint())))
, m_aName(rName)
@@ -159,9 +159,9 @@
::boost::scoped_ptr<SwPosition>(new SwPosition(rNewPos)).swap(m_pPos2);
}
- rtl::OUString MarkBase::ToString( ) const
+ OUString MarkBase::ToString( ) const
{
- rtl::OUStringBuffer buf;
+ OUStringBuffer buf;
buf.appendAscii(RTL_CONSTASCII_STRINGPARAM("Mark: ( Name, [ Node1, Index1 ] ): ( "));
buf.append( m_aName ).appendAscii(RTL_CONSTASCII_STRINGPARAM(", [ "));
buf.append( sal_Int32( GetMarkPos().nNode.GetIndex( ) ) )
@@ -175,17 +175,17 @@
MarkBase::~MarkBase()
{ }
- ::rtl::OUString MarkBase::GenerateNewName(const ::rtl::OUString& rPrefix)
+ OUString MarkBase::GenerateNewName(const OUString& rPrefix)
{
static rtlRandomPool aPool = rtl_random_createPool();
- static ::rtl::OUString sUniquePostfix;
+ static OUString sUniquePostfix;
static sal_Int32 nCount = SAL_MAX_INT32;
- ::rtl::OUStringBuffer aResult(rPrefix);
+ OUStringBuffer aResult(rPrefix);
if(nCount == SAL_MAX_INT32)
{
sal_Int32 nRandom;
rtl_random_getBytes(aPool, &nRandom, sizeof(nRandom));
- sUniquePostfix =
::rtl::OUStringBuffer(13).append('_').append(static_cast<sal_Int32>(abs(nRandom))).makeStringAndClear();
+ sUniquePostfix =
OUStringBuffer(13).append('_').append(static_cast<sal_Int32>(abs(nRandom))).makeStringAndClear();
nCount = 0;
}
// putting the counter in front of the random parts will speed up string comparisons
@@ -204,15 +204,15 @@
// TODO: everything else uses MarkBase::GenerateNewName ?
NavigatorReminder::NavigatorReminder(const SwPaM& rPaM)
- : MarkBase(rPaM, rtl::OUString("__NavigatorReminder__"))
+ : MarkBase(rPaM, OUString("__NavigatorReminder__"))
{ }
UnoMark::UnoMark(const SwPaM& aPaM)
- : MarkBase(aPaM, MarkBase::GenerateNewName(rtl::OUString("__UnoMark__")))
+ : MarkBase(aPaM, MarkBase::GenerateNewName(OUString("__UnoMark__")))
{ }
DdeBookmark::DdeBookmark(const SwPaM& aPaM)
- : MarkBase(aPaM, MarkBase::GenerateNewName(rtl::OUString("__DdeLink__")))
+ : MarkBase(aPaM, MarkBase::GenerateNewName(OUString("__DdeLink__")))
, m_aRefObj(NULL)
{ }
@@ -242,8 +242,8 @@
Bookmark::Bookmark(const SwPaM& aPaM,
const KeyCode& rCode,
- const ::rtl::OUString& rName,
- const ::rtl::OUString& rShortName)
+ const OUString& rName,
+ const OUString& rShortName)
: DdeBookmark(aPaM)
, ::sfx2::Metadatable()
, m_aCode(rCode)
@@ -298,15 +298,15 @@
}
Fieldmark::Fieldmark(const SwPaM& rPaM)
- : MarkBase(rPaM, MarkBase::GenerateNewName(rtl::OUString("__Fieldmark__")))
+ : MarkBase(rPaM, MarkBase::GenerateNewName(OUString("__Fieldmark__")))
{
if(!IsExpanded())
SetOtherMarkPos(GetMarkPos());
}
- rtl::OUString Fieldmark::ToString( ) const
+ OUString Fieldmark::ToString( ) const
{
- rtl::OUStringBuffer buf;
+ OUStringBuffer buf;
buf.appendAscii(RTL_CONSTASCII_STRINGPARAM(
"Fieldmark: ( Name, Type, [ Nd1, Id1 ], [ Nd2, Id2 ] ): ( "));
buf.append( m_aName ).appendAscii(RTL_CONSTASCII_STRINGPARAM(", "));
@@ -361,7 +361,7 @@
{
if ( IsChecked() != checked )
{
-
(*GetParameters())[::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(ODF_FORMCHECKBOX_RESULT))] =
makeAny(checked);
+ (*GetParameters())[OUString(ODF_FORMCHECKBOX_RESULT)] = makeAny(checked);
// mark document as modified
SwDoc *const pDoc( GetMarkPos().GetDoc() );
if ( pDoc )
@@ -372,15 +372,15 @@
bool CheckboxFieldmark::IsChecked() const
{
bool bResult = false;
- parameter_map_t::const_iterator pResult =
GetParameters()->find(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(ODF_FORMCHECKBOX_RESULT)));
+ parameter_map_t::const_iterator pResult =
GetParameters()->find(OUString(ODF_FORMCHECKBOX_RESULT));
if(pResult != GetParameters()->end())
pResult->second >>= bResult;
return bResult;
}
- rtl::OUString CheckboxFieldmark::toString( ) const
+ OUString CheckboxFieldmark::toString( ) const
{
- rtl::OUStringBuffer buf;
+ OUStringBuffer buf;
buf.appendAscii(RTL_CONSTASCII_STRINGPARAM(
"CheckboxFieldmark: ( Name, Type, [ Nd1, Id1 ], [ Nd2, Id2 ] ): ( "));
buf.append( m_aName ).appendAscii(RTL_CONSTASCII_STRINGPARAM(", "));
diff --git a/sw/source/core/crsr/findtxt.cxx b/sw/source/core/crsr/findtxt.cxx
index e813998..e251ee6 100644
--- a/sw/source/core/crsr/findtxt.cxx
+++ b/sw/source/core/crsr/findtxt.cxx
@@ -420,7 +420,7 @@
bool bRemoveSoftHyphens = true;
if ( bRegSearch )
{
- const rtl::OUString a00AD(RTL_CONSTASCII_USTRINGPARAM("\\x00AD"));
+ const OUString a00AD("\\x00AD");
if ( -1 != rSearchOpt.searchString.indexOf( a00AD ) )
bRemoveSoftHyphens = false;
}
@@ -664,7 +664,7 @@
aStr = comphelper::string::remove(aStr, CH_TXTATR_BREAKWORD);
aStr = comphelper::string::remove(aStr, CH_TXTATR_INWORD);
xub_StrLen nStart = 0;
- rtl::OUString sX( 'x' );
+ OUString sX( 'x' );
if( pPam->Start()->nContent > 0 )
{
aStr.Insert( sX, 0 );
diff --git a/sw/source/core/doc/doc.cxx b/sw/source/core/doc/doc.cxx
index 682300d..371426d 100644
--- a/sw/source/core/doc/doc.cxx
+++ b/sw/source/core/doc/doc.cxx
@@ -1548,14 +1548,14 @@
rPagePairs.clear();
rValidPagesSet.clear();
- rtl::OUString aPageRange;
+ OUString aPageRange;
// PageContent :
// 0 -> print all pages (default if aPageRange is empty)
// 1 -> print range according to PageRange
// 2 -> print selection
const sal_Int32 nContent = rOptions.getIntValue( "PrintContent", 0 );
if (nContent == 1)
- aPageRange = rOptions.getStringValue( "PageRange", rtl::OUString() );
+ aPageRange = rOptions.getStringValue( "PageRange", OUString() );
if (aPageRange.isEmpty()) // empty string -> print all
{
// set page range to print to 'all pages'
@@ -1729,24 +1729,24 @@
com::sun::star::uno::Sequence < com::sun::star::beans::NamedValue > aStat( mpDocStat->nPage ?
8 : 7);
sal_Int32 n=0;
- aStat[n].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TableCount"));
+ aStat[n].Name = OUString("TableCount");
aStat[n++].Value <<= (sal_Int32)mpDocStat->nTbl;
- aStat[n].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ImageCount"));
+ aStat[n].Name = OUString("ImageCount");
aStat[n++].Value <<= (sal_Int32)mpDocStat->nGrf;
- aStat[n].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ObjectCount"));
+ aStat[n].Name = OUString("ObjectCount");
aStat[n++].Value <<= (sal_Int32)mpDocStat->nOLE;
if ( mpDocStat->nPage )
{
- aStat[n].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("PageCount"));
+ aStat[n].Name = OUString("PageCount");
aStat[n++].Value <<= (sal_Int32)mpDocStat->nPage;
}
- aStat[n].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ParagraphCount"));
+ aStat[n].Name = OUString("ParagraphCount");
aStat[n++].Value <<= (sal_Int32)mpDocStat->nPara;
- aStat[n].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("WordCount"));
+ aStat[n].Name = OUString("WordCount");
aStat[n++].Value <<= (sal_Int32)mpDocStat->nWord;
- aStat[n].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CharacterCount"));
+ aStat[n].Name = OUString("CharacterCount");
aStat[n++].Value <<= (sal_Int32)mpDocStat->nChar;
- aStat[n].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("NonWhitespaceCharacterCount"));
+ aStat[n].Name = OUString("NonWhitespaceCharacterCount");
aStat[n++].Value <<= (sal_Int32)mpDocStat->nCharExcludingSpaces;
// For e.g. autotext documents there is no pSwgInfo (#i79945)
@@ -1854,7 +1854,7 @@
// Return the names of all set references in the Doc
//JP 24.06.96: If the array pointer is 0, then just return whether a RefMark is set in the Doc
// OS 25.06.96: From now on we always return the reference count
-sal_uInt16 SwDoc::GetRefMarks( std::vector<rtl::OUString>* pNames ) const
+sal_uInt16 SwDoc::GetRefMarks( std::vector<OUString>* pNames ) const
{
const SfxPoolItem* pItem;
const SwTxtRefMark* pTxtRef;
diff --git a/sw/source/core/doc/doclay.cxx b/sw/source/core/doc/doclay.cxx
index 2d09882..8efef51 100644
--- a/sw/source/core/doc/doclay.cxx
+++ b/sw/source/core/doc/doclay.cxx
@@ -531,7 +531,7 @@
uno::Reference< awt::XControlModel > xModel = ((SdrUnoObj*)pObj)->GetUnoControlModel();
uno::Any aVal;
uno::Reference< beans::XPropertySet > xSet(xModel, uno::UNO_QUERY);
- OUString sName(RTL_CONSTASCII_USTRINGPARAM("Name"));
+ OUString sName("Name");
if( xSet.is() )
aVal = xSet->getPropertyValue( sName );
if( bInsInPage )
@@ -1865,8 +1865,8 @@
{
sal_Bool bIsOnlineSpell = pSh->GetViewOptions()->IsOnlineSpell();
sal_Bool bIsAutoGrammar = sal_False;
- SvtLinguConfig().GetProperty( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
- UPN_IS_GRAMMAR_AUTO )) ) >>= bIsAutoGrammar;
+ SvtLinguConfig().GetProperty( OUString(
+ UPN_IS_GRAMMAR_AUTO ) ) >>= bIsAutoGrammar;
if (bIsOnlineSpell && bIsAutoGrammar)
StartGrammarChecking( *this );
diff --git a/sw/source/core/doc/docnew.cxx b/sw/source/core/doc/docnew.cxx
index 2ed4de3..1ccc474 100644
--- a/sw/source/core/doc/docnew.cxx
+++ b/sw/source/core/doc/docnew.cxx
@@ -124,7 +124,7 @@
{
try
{
- rtl::OUString
aServiceName(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.linguistic2.ProofreadingIterator"));
+ OUString aServiceName("com.sun.star.linguistic2.ProofreadingIterator");
m_xGCIterator = uno::Reference< linguistic2::XProofreadingIterator >
( xMgr->createInstance( aServiceName ), uno::UNO_QUERY_THROW );
}
@@ -382,7 +382,7 @@
_InitFieldTypes();
// Create a default OutlineNumRule (for Filters)
- mpOutlineRule = new SwNumRule( rtl::OUString::createFromAscii( SwNumRule::GetOutlineRuleName()
),
+ mpOutlineRule = new SwNumRule( OUString::createFromAscii( SwNumRule::GetOutlineRuleName() ),
// #i89178#
numfunc::GetDefaultPositionAndSpaceMode(),
OUTLINE_RULE );
@@ -810,7 +810,7 @@
InitTOXTypes();
// create a dummy pagedesc for the layout
- sal_uInt16 nDummyPgDsc = MakePageDesc(rtl::OUString("?DUMMY?"));
+ sal_uInt16 nDummyPgDsc = MakePageDesc(OUString("?DUMMY?"));
SwPageDesc* pDummyPgDsc = maPageDescs[ nDummyPgDsc ];
SwNodeIndex aSttIdx( *GetNodes().GetEndOfContent().StartOfSectionNode(), 1 );
@@ -851,7 +851,7 @@
maListStyleLists.clear();
// creation of new outline numbering rule
- mpOutlineRule = new SwNumRule( rtl::OUString::createFromAscii( SwNumRule::GetOutlineRuleName()
),
+ mpOutlineRule = new SwNumRule( OUString::createFromAscii( SwNumRule::GetOutlineRuleName() ),
// #i89178#
numfunc::GetDefaultPositionAndSpaceMode(),
OUTLINE_RULE );
diff --git a/sw/source/core/doc/docxforms.cxx b/sw/source/core/doc/docxforms.cxx
index 9730e62..e027adc 100644
--- a/sw/source/core/doc/docxforms.cxx
+++ b/sw/source/core/doc/docxforms.cxx
@@ -40,7 +40,7 @@
using xforms::XModel;
using frame::XModule;
using xforms::XFormsUIHelper1;
-using rtl::OUString;
+using ::rtl::OUString;
Reference<XNameContainer> SwDoc::getXForms() const
@@ -78,12 +78,12 @@
xModule = xModule.query( pShell->GetModel() );
OSL_ENSURE( xModule.is(), "SwDoc::initXForms: no XModule at the document!" );
if ( xModule.is() )
- xModule->setIdentifier( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(
"com.sun.star.xforms.XMLFormDocument" ) ) );
+ xModule->setIdentifier( OUString( "com.sun.star.xforms.XMLFormDocument" ) );
// create default model
if( bCreateDefaultModel && mxXForms.is() )
{
- OUString sName(RTL_CONSTASCII_USTRINGPARAM("Model 1"));
+ OUString sName("Model 1");
Reference<XModel> xModel(
lcl_createInstance( "com.sun.star.xforms.Model" ),
UNO_QUERY );
@@ -92,7 +92,7 @@
{
xModel->setID( sName );
Reference<XFormsUIHelper1>( xModel, UNO_QUERY )->newInstance(
- OUString(RTL_CONSTASCII_USTRINGPARAM("Instance 1")),
+ OUString("Instance 1"),
OUString(), sal_True );
xModel->initialize();
mxXForms->insertByName( sName, makeAny( xModel ) );
diff --git a/sw/source/core/doc/number.cxx b/sw/source/core/doc/number.cxx
index 026a30c..dd8b966 100644
--- a/sw/source/core/doc/number.cxx
+++ b/sw/source/core/doc/number.cxx
@@ -738,7 +738,7 @@
{
bool bOldHadPrefix = true;
bool bFirstIteration = true;
- ::rtl::OUString sOldPrefix;
+ OUString sOldPrefix;
const SwNodeNum* pWorkingNodeNum( &rNodeNum );
do
@@ -801,7 +801,7 @@
{
aRefNumStr.Insert(sOldPrefix, 0);
}
- sOldPrefix = ::rtl::OUString();
+ sOldPrefix = OUString();
bOldHadPrefix = ( aExtremities.nPrefixChars > 0);
@@ -1133,7 +1133,7 @@
@author OD
*/
- uno::Sequence<rtl::OUString> GetPropNames() const;
+ uno::Sequence<OUString> GetPropNames() const;
/** loads default bullet configuration properties and applies
values to internal data
@@ -1152,7 +1152,7 @@
@author OD
*/
- virtual void Notify( const uno::Sequence<rtl::OUString>& aPropertyNames );
+ virtual void Notify( const uno::Sequence<OUString>& aPropertyNames );
virtual void Commit();
// default bullet list configuration data
@@ -1178,9 +1178,9 @@
}
SwDefBulletConfig::SwDefBulletConfig()
- : ConfigItem(
rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Office.Writer/Numbering/DefaultBulletList")) ),
+ : ConfigItem( OUString("Office.Writer/Numbering/DefaultBulletList") ),
// default bullet font is now OpenSymbol
- msFontname( rtl::OUString("OpenSymbol") ),
+ msFontname( OUString("OpenSymbol") ),
mbUserDefinedFontname( false ),
meFontWeight( WEIGHT_DONTKNOW ),
meFontItalic( ITALIC_NONE ),
@@ -1201,7 +1201,7 @@
void SwDefBulletConfig::SetToDefault()
{
- msFontname = rtl::OUString("OpenSymbol");
+ msFontname = OUString("OpenSymbol");
mbUserDefinedFontname = false;
meFontWeight = WEIGHT_DONTKNOW;
meFontItalic = ITALIC_NONE;
@@ -1218,30 +1218,30 @@
mnLevelChars[9] = 0x2022;
}
- uno::Sequence<rtl::OUString> SwDefBulletConfig::GetPropNames() const
+ uno::Sequence<OUString> SwDefBulletConfig::GetPropNames() const
{
- uno::Sequence<rtl::OUString> aPropNames(13);
- rtl::OUString* pNames = aPropNames.getArray();
- pNames[0] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("BulletFont/FontFamilyname"));
- pNames[1] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("BulletFont/FontWeight"));
- pNames[2] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("BulletFont/FontItalic"));
- pNames[3] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("BulletCharLvl1"));
- pNames[4] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("BulletCharLvl2"));
- pNames[5] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("BulletCharLvl3"));
- pNames[6] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("BulletCharLvl4"));
- pNames[7] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("BulletCharLvl5"));
- pNames[8] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("BulletCharLvl6"));
- pNames[9] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("BulletCharLvl7"));
- pNames[10] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("BulletCharLvl8"));
- pNames[11] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("BulletCharLvl9"));
- pNames[12] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("BulletCharLvl10"));
+ uno::Sequence<OUString> aPropNames(13);
+ OUString* pNames = aPropNames.getArray();
+ pNames[0] = OUString("BulletFont/FontFamilyname");
+ pNames[1] = OUString("BulletFont/FontWeight");
+ pNames[2] = OUString("BulletFont/FontItalic");
+ pNames[3] = OUString("BulletCharLvl1");
+ pNames[4] = OUString("BulletCharLvl2");
+ pNames[5] = OUString("BulletCharLvl3");
+ pNames[6] = OUString("BulletCharLvl4");
+ pNames[7] = OUString("BulletCharLvl5");
+ pNames[8] = OUString("BulletCharLvl6");
+ pNames[9] = OUString("BulletCharLvl7");
+ pNames[10] = OUString("BulletCharLvl8");
+ pNames[11] = OUString("BulletCharLvl9");
+ pNames[12] = OUString("BulletCharLvl10");
return aPropNames;
}
void SwDefBulletConfig::LoadConfig()
{
- uno::Sequence<rtl::OUString> aPropNames = GetPropNames();
+ uno::Sequence<OUString> aPropNames = GetPropNames();
uno::Sequence<uno::Any> aValues =
GetProperties( aPropNames );
const uno::Any* pValues = aValues.getConstArray();
@@ -1257,7 +1257,7 @@
{
case 0:
{
- rtl::OUString aStr;
+ OUString aStr;
pValues[nProp] >>= aStr;
msFontname = aStr;
mbUserDefinedFontname = true;
@@ -1306,7 +1306,7 @@
mpFont->SetItalic( meFontItalic );
}
- void SwDefBulletConfig::Notify( const uno::Sequence<rtl::OUString>& )
+ void SwDefBulletConfig::Notify( const uno::Sequence<OUString>& )
{
SetToDefault();
LoadConfig();
@@ -1368,7 +1368,7 @@
@author OD
*/
- com::sun::star::uno::Sequence<rtl::OUString> GetPropNames() const;
+ com::sun::star::uno::Sequence<OUString> GetPropNames() const;
/** loads configuration properties and applies values to internal data
@@ -1380,7 +1380,7 @@
@author OD
*/
- virtual void Notify( const com::sun::star::uno::Sequence<rtl::OUString>&
aPropertyNames );
+ virtual void Notify( const com::sun::star::uno::Sequence<OUString>& aPropertyNames );
virtual void Commit();
// configuration data
@@ -1398,7 +1398,7 @@
}
SwNumberingUIBehaviorConfig::SwNumberingUIBehaviorConfig()
- : ConfigItem(
rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Office.Writer/Numbering/UserInterfaceBehavior")) ),
+ : ConfigItem( OUString("Office.Writer/Numbering/UserInterfaceBehavior") ),
mbChangeIndentOnTabAtFirstPosOfFirstListItem( sal_True )
{
SetToDefault();
@@ -1413,11 +1413,11 @@
mbChangeIndentOnTabAtFirstPosOfFirstListItem = sal_True;
}
- com::sun::star::uno::Sequence<rtl::OUString> SwNumberingUIBehaviorConfig::GetPropNames() const
+ com::sun::star::uno::Sequence<OUString> SwNumberingUIBehaviorConfig::GetPropNames() const
{
- com::sun::star::uno::Sequence<rtl::OUString> aPropNames(1);
- rtl::OUString* pNames = aPropNames.getArray();
- pNames[0] =
rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ChangeIndentOnTabAtFirstPosOfFirstListItem"));
+ com::sun::star::uno::Sequence<OUString> aPropNames(1);
+ OUString* pNames = aPropNames.getArray();
+ pNames[0] = OUString("ChangeIndentOnTabAtFirstPosOfFirstListItem");
return aPropNames;
}
@@ -1426,7 +1426,7 @@
void SwNumberingUIBehaviorConfig::LoadConfig()
{
- com::sun::star::uno::Sequence<rtl::OUString> aPropNames = GetPropNames();
+ com::sun::star::uno::Sequence<OUString> aPropNames = GetPropNames();
com::sun::star::uno::Sequence<com::sun::star::uno::Any> aValues =
GetProperties( aPropNames );
const com::sun::star::uno::Any* pValues = aValues.getConstArray();
@@ -1455,7 +1455,7 @@
}
}
- void SwNumberingUIBehaviorConfig::Notify( const com::sun::star::uno::Sequence<rtl::OUString>&
aPropertyNames )
+ void SwNumberingUIBehaviorConfig::Notify( const com::sun::star::uno::Sequence<OUString>&
aPropertyNames )
{
(void) aPropertyNames;
SetToDefault();
diff --git a/sw/source/core/docnode/finalthreadmanager.cxx
b/sw/source/core/docnode/finalthreadmanager.cxx
index 6caa65e..d375492 100644
--- a/sw/source/core/docnode/finalthreadmanager.cxx
+++ b/sw/source/core/docnode/finalthreadmanager.cxx
@@ -283,14 +283,14 @@
}
// com.sun.star.uno.XServiceInfo:
-::rtl::OUString SAL_CALL FinalThreadManager::getImplementationName() throw
(css::uno::RuntimeException)
+OUString SAL_CALL FinalThreadManager::getImplementationName() throw (css::uno::RuntimeException)
{
return comp_FinalThreadManager::_getImplementationName();
}
-::sal_Bool SAL_CALL FinalThreadManager::supportsService(::rtl::OUString const & serviceName) throw
(css::uno::RuntimeException)
+::sal_Bool SAL_CALL FinalThreadManager::supportsService(OUString const & serviceName) throw
(css::uno::RuntimeException)
{
- css::uno::Sequence< ::rtl::OUString > serviceNames =
comp_FinalThreadManager::_getSupportedServiceNames();
+ css::uno::Sequence< OUString > serviceNames =
comp_FinalThreadManager::_getSupportedServiceNames();
for (::sal_Int32 i = 0; i < serviceNames.getLength(); ++i) {
if (serviceNames[i] == serviceName)
return sal_True;
@@ -298,7 +298,7 @@
return sal_False;
}
-css::uno::Sequence< ::rtl::OUString > SAL_CALL FinalThreadManager::getSupportedServiceNames()
throw (css::uno::RuntimeException)
+css::uno::Sequence< OUString > SAL_CALL FinalThreadManager::getSupportedServiceNames() throw
(css::uno::RuntimeException)
{
return comp_FinalThreadManager::_getSupportedServiceNames();
}
@@ -451,17 +451,15 @@
// component helper namespace
namespace comp_FinalThreadManager {
- ::rtl::OUString SAL_CALL _getImplementationName()
+ OUString SAL_CALL _getImplementationName()
{
- return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
- "com.sun.star.util.comp.FinalThreadManager"));
+ return OUString("com.sun.star.util.comp.FinalThreadManager");
}
- css::uno::Sequence< ::rtl::OUString > SAL_CALL _getSupportedServiceNames()
+ css::uno::Sequence< OUString > SAL_CALL _getSupportedServiceNames()
{
- css::uno::Sequence< ::rtl::OUString > s(1);
- s[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
- "com.sun.star.util.JobManager"));
+ css::uno::Sequence< OUString > s(1);
+ s[0] = OUString("com.sun.star.util.JobManager");
return s;
}
diff --git a/sw/source/core/docnode/retrieveinputstream.cxx
b/sw/source/core/docnode/retrieveinputstream.cxx
index 6a1122c..9c4996d 100644
--- a/sw/source/core/docnode/retrieveinputstream.cxx
+++ b/sw/source/core/docnode/retrieveinputstream.cxx
@@ -51,8 +51,8 @@
void SwAsyncRetrieveInputStreamThread::threadFunction()
{
com::sun::star::uno::Sequence < com::sun::star::beans::PropertyValue > xProps( 1 );
- xProps[0].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("URL"));
- xProps[0].Value <<= ::rtl::OUString( mrLinkedURL );
+ xProps[0].Name = OUString("URL");
+ xProps[0].Value <<= OUString( mrLinkedURL );
comphelper::MediaDescriptor aMedium( xProps );
aMedium.addInputStream();
diff --git a/sw/source/core/docnode/swthreadjoiner.cxx b/sw/source/core/docnode/swthreadjoiner.cxx
index ba765c7..0f5c74e 100644
--- a/sw/source/core/docnode/swthreadjoiner.cxx
+++ b/sw/source/core/docnode/swthreadjoiner.cxx
@@ -45,7 +45,7 @@
mpThreadJoiner =
uno::Reference< util::XJobManager >(
::comphelper::getProcessServiceFactory()->createInstance(
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.util.JobManager")) ),
+ OUString("com.sun.star.util.JobManager") ),
uno::UNO_QUERY );
}
diff --git a/sw/source/core/edit/edlingu.cxx b/sw/source/core/edit/edlingu.cxx
index a8af36d..6bd017e 100644
--- a/sw/source/core/edit/edlingu.cxx
+++ b/sw/source/core/edit/edlingu.cxx
@@ -408,14 +408,14 @@
//!! Please check SwSpellIter also when modifying this
//!!
- uno::Any aConvRet( makeAny( rtl::OUString() ) );
+ uno::Any aConvRet( makeAny( OUString() ) );
SwEditShell *pMySh = GetSh();
if( !pMySh )
return aConvRet;
OSL_ENSURE( GetEnd(), "SwConvIter::Continue() ohne Start?");
- rtl::OUString aConvText;
+ OUString aConvText;
bool bGoOn = true;
do {
SwPaM *pCrsr = pMySh->GetCrsr();
@@ -471,7 +471,7 @@
{
uno::Reference< beans::XPropertySet > xProp( ::GetLinguPropertySet() );
return xProp.is() ? *(sal_Bool*)xProp->getPropertyValue(
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(UPN_IS_HYPH_AUTO))
).getValue()
+ OUString(UPN_IS_HYPH_AUTO) ).getValue()
: sal_False;
}
@@ -652,7 +652,7 @@
DelSoftHyph( *pCrsr );
pSttPos->nContent += nHyphPos;
SwPaM aRg( *pSttPos );
- pDoc->InsertString( aRg, rtl::OUString(CHAR_SOFTHYPHEN) );
+ pDoc->InsertString( aRg, OUString(CHAR_SOFTHYPHEN) );
// Durch das Einfuegen des SoftHyphs ist ein Zeichen hinzugekommen
//JP 18.07.95: warum, ist doch ein SwIndex, dieser wird doch mitverschoben !!
// pSttPos->nContent++;
@@ -807,7 +807,7 @@
// KEIN StartAction, da damit auch die Paints abgeschaltet
// werden !!!!!
++mnStartAction;
- rtl::OUString aRet;
+ OUString aRet;
uno::Reference< uno::XInterface > xRet;
if (pConvArgs)
{
@@ -1023,7 +1023,7 @@
// implementation here by providing an additional parameter.
Sequence< PropertyValue > aPropVals(1);
PropertyValue &rVal = aPropVals.getArray()[0];
- rVal.Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
UPN_MAX_NUMBER_OF_SUGGESTIONS ));
+ rVal.Name = OUString( UPN_MAX_NUMBER_OF_SUGGESTIONS );
rVal.Value <<= (sal_Int16) 7;
xSpellAlt = xSpell->spell( aWord, eActLang, aPropVals );
@@ -1090,7 +1090,7 @@
linguistic2::ProofreadingResult /*out*/ &rResult, // the complete result
sal_Int32 /*out*/ &rErrorPosInText, // offset of error position in string
that was grammar checked...
sal_Int32 /*out*/ &rErrorIndexInResult, // index of error in
rResult.aGrammarErrors
- uno::Sequence< rtl::OUString > /*out*/ &rSuggestions, // suggestions to be used for the
error found
+ uno::Sequence< OUString > /*out*/ &rSuggestions, // suggestions to be used for the error
found
const Point *pPt, SwRect &rSelectRect )
{
bool bRes = false;
@@ -1123,7 +1123,7 @@
// Expand the string:
const ModelToViewHelper aConversionMap(*pNode);
- rtl::OUString aExpandText = aConversionMap.getViewText();
+ OUString aExpandText = aConversionMap.getViewText();
// get XFlatParagraph to use...
uno::Reference< text::XFlatParagraph > xFlatPara = new SwXFlatParagraph( *pNode,
aExpandText, aConversionMap );
@@ -1592,7 +1592,7 @@
if( bGrammarErrorFound )
{
const ModelToViewHelper aConversionMap(*(SwTxtNode*)pCrsr->GetNode());
- rtl::OUString aExpandText = aConversionMap.getViewText();
+ OUString aExpandText = aConversionMap.getViewText();
xub_StrLen nSentenceEnd = (xub_StrLen)aConversionMap.ConvertToViewPosition(
aGrammarResult.nBehindEndOfSentencePosition );
// remove trailing space
if( aExpandText[nSentenceEnd - 1] == ' ' )
diff --git a/sw/source/core/frmedt/fefly1.cxx b/sw/source/core/frmedt/fefly1.cxx
index a6e003c..9ab6875 100644
--- a/sw/source/core/frmedt/fefly1.cxx
+++ b/sw/source/core/frmedt/fefly1.cxx
@@ -1728,7 +1728,7 @@
if( xModel.is() )
{
uno::Any aVal;
- OUString sName(RTL_CONSTASCII_USTRINGPARAM("ButtonType"));
+ OUString sName("ButtonType");
uno::Reference< beans::XPropertySet > xSet(xModel, uno::UNO_QUERY);
uno::Reference< beans::XPropertySetInfo > xInfo = xSet->getPropertySetInfo();
@@ -2131,7 +2131,7 @@
{
try
{
- aBaseline = xSet->getPropertyValue( rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM("BaseLine") ) );
+ aBaseline = xSet->getPropertyValue( OUString( "BaseLine" ) );
}
catch ( uno::Exception& )
{
diff --git a/sw/source/core/graphic/ndgrf.cxx b/sw/source/core/graphic/ndgrf.cxx
index 640aee0..a555430 100644
--- a/sw/source/core/graphic/ndgrf.cxx
+++ b/sw/source/core/graphic/ndgrf.cxx
@@ -853,7 +853,7 @@
aUserData=aNewStrmName;
}
- String aProt( RTL_CONSTASCII_USTRINGPARAM( "vnd.sun.star.Package:" ) );
+ String aProt( "vnd.sun.star.Package:" );
if( 0 == aUserData.CompareTo( aProt, aProt.Len() ) )
{
// 6.0 (XML) Package
@@ -1191,7 +1191,7 @@
{
String sGrfNm;
refLink->GetLinkManager()->GetDisplayNames( refLink, 0, &sGrfNm, 0, 0 );
- String sProtocol( RTL_CONSTASCII_USTRINGPARAM( "vnd.sun.star.pkg:" ) );
+ String sProtocol( "vnd.sun.star.pkg:" );
if ( sGrfNm.CompareTo( sProtocol, sProtocol.Len() ) != 0 )
{
bRet = true;
diff --git a/sw/source/core/layout/dumpfilter.cxx b/sw/source/core/layout/dumpfilter.cxx
index 75c2f0e..97d97b6 100644
--- a/sw/source/core/layout/dumpfilter.cxx
+++ b/sw/source/core/layout/dumpfilter.cxx
@@ -42,15 +42,15 @@
using namespace ::com::sun::star;
-::rtl::OUString SAL_CALL LayoutDumpFilter_getImplementationName() throw( uno::RuntimeException )
+OUString SAL_CALL LayoutDumpFilter_getImplementationName() throw( uno::RuntimeException )
{
- return rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.Writer.LayoutDump" ) );
+ return OUString( "com.sun.star.comp.Writer.LayoutDump" );
}
-uno::Sequence< rtl::OUString > SAL_CALL LayoutDumpFilter_getSupportedServiceNames() throw(
uno::RuntimeException )
+uno::Sequence< OUString > SAL_CALL LayoutDumpFilter_getSupportedServiceNames() throw(
uno::RuntimeException )
{
- uno::Sequence< rtl::OUString > aSeq( 1 );
- aSeq[0] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.document.ExportFilter" )
);
+ uno::Sequence< OUString > aSeq( 1 );
+ aSeq[0] = OUString( "com.sun.star.document.ExportFilter" );
return aSeq;
}
@@ -179,17 +179,17 @@
}
// XServiceInfo
- ::rtl::OUString LayoutDumpFilter::getImplementationName( )
+ OUString LayoutDumpFilter::getImplementationName( )
throw (uno::RuntimeException)
{
return LayoutDumpFilter_getImplementationName();
}
- sal_Bool LayoutDumpFilter::supportsService( const ::rtl::OUString& rServiceName )
+ sal_Bool LayoutDumpFilter::supportsService( const OUString& rServiceName )
throw (uno::RuntimeException)
{
- uno::Sequence< rtl::OUString > seqServiceNames = getSupportedServiceNames();
- const rtl::OUString* pArray = seqServiceNames.getConstArray();
+ uno::Sequence< OUString > seqServiceNames = getSupportedServiceNames();
+ const OUString* pArray = seqServiceNames.getConstArray();
for ( sal_Int32 nCounter=0; nCounter < seqServiceNames.getLength(); nCounter++ )
{
if ( pArray[nCounter] == rServiceName )
@@ -200,7 +200,7 @@
return sal_False ;
}
- uno::Sequence< ::rtl::OUString > LayoutDumpFilter::getSupportedServiceNames()
+ uno::Sequence< OUString > LayoutDumpFilter::getSupportedServiceNames()
throw (uno::RuntimeException)
{
return LayoutDumpFilter_getSupportedServiceNames();
diff --git a/sw/source/core/ole/ndole.cxx b/sw/source/core/ole/ndole.cxx
index f9dbc73..062c3c5 100644
--- a/sw/source/core/ole/ndole.cxx
+++ b/sw/source/core/ole/ndole.cxx
@@ -54,7 +54,7 @@
#include <vcl/graphicfilter.hxx>
#include <comcore.hrc>
-using rtl::OUString;
+using ::rtl::OUString;
using namespace utl;
using namespace com::sun::star::uno;
using namespace com::sun::star;
@@ -66,13 +66,13 @@
typedef std::deque<SwOLEObj *> OleObjects_t;
OleObjects_t m_OleObjects;
sal_Int32 m_nLRU_InitSize;
- uno::Sequence< rtl::OUString > GetPropertyNames();
+ uno::Sequence< OUString > GetPropertyNames();
public:
SwOLELRUCache();
virtual void Notify( const uno::Sequence<
- rtl::OUString>& aPropertyNames );
+ OUString>& aPropertyNames );
virtual void Commit();
void Load();
@@ -299,7 +299,7 @@
xChild->setParent( p->GetModel() );
OSL_ENSURE( aOLEObj.aName.Len(), "No object name!" );
- ::rtl::OUString aObjName;
+ OUString aObjName;
if ( !p->GetEmbeddedObjectContainer().InsertEmbeddedObject( aOLEObj.xOLERef.GetObject(),
aObjName ) )
{
if ( xChild.is() )
@@ -428,7 +428,7 @@
// Wir hauen das Ding auf SvPersist-Ebene rein
// TODO/LATER: check if using the same naming scheme for all apps works here
- ::rtl::OUString aNewName/*( Sw3Io::UniqueName( p->GetStorage(), "Obj" ) )*/;
+ OUString aNewName/*( Sw3Io::UniqueName( p->GetStorage(), "Obj" ) )*/;
SfxObjectShell* pSrc = GetDoc()->GetPersist();
pPersistShell->GetEmbeddedObjectContainer().CopyAndGetEmbeddedObject(
@@ -532,8 +532,8 @@
// TODO/LATER: there should be possible to get current mediadescriptor
settings from the object
uno::Sequence< beans::PropertyValue > aArgs( 1 );
- aArgs[0].Name = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "URL" ) );
- aArgs[0].Value <<= ::rtl::OUString( aNewLinkURL );
+ aArgs[0].Name = OUString( "URL" );
+ aArgs[0].Value <<= OUString( aNewLinkURL );
xPersObj->reload( aArgs, uno::Sequence< beans::PropertyValue >() );
maLinkURL = aNewLinkURL;
@@ -729,7 +729,7 @@
p->DoInitNew( NULL );
}
- ::rtl::OUString aObjName;
+ OUString aObjName;
uno::Reference < container::XChild > xChild( xOLERef.GetObject(), uno::UNO_QUERY );
if ( xChild.is() && xChild->getParent() != p->GetModel() )
// it is possible that the parent was set already
@@ -781,7 +781,7 @@
aArea.SetSize( Size( 5000, 5000 ) );
// TODO/LATER: set replacement graphic for dead object
// It looks as if it should work even without the object, because the replace will be
generated automatically
- ::rtl::OUString aTmpName;
+ OUString aTmpName;
xObj = p->GetEmbeddedObjectContainer().CreateEmbeddedObject( SvGlobalName(
SO3_DUMMY_CLASSID ).GetByteSequence(), aTmpName );
}
// else
@@ -899,15 +899,15 @@
Load();
}
-uno::Sequence< rtl::OUString > SwOLELRUCache::GetPropertyNames()
+uno::Sequence< OUString > SwOLELRUCache::GetPropertyNames()
{
Sequence< OUString > aNames( 1 );
OUString* pNames = aNames.getArray();
- pNames[0] = OUString(RTL_CONSTASCII_USTRINGPARAM("Writer/OLE_Objects"));
+ pNames[0] = OUString("Writer/OLE_Objects");
return aNames;
}
-void SwOLELRUCache::Notify( const uno::Sequence< rtl::OUString>& )
+void SwOLELRUCache::Notify( const uno::Sequence< OUString>& )
{
Load();
}
diff --git a/sw/source/core/swg/SwXMLBlockImport.cxx b/sw/source/core/swg/SwXMLBlockImport.cxx
index fc0e493..f8258c5 100644
--- a/sw/source/core/swg/SwXMLBlockImport.cxx
+++ b/sw/source/core/swg/SwXMLBlockImport.cxx
@@ -37,7 +37,7 @@
: SvXMLImport( xContext, 0 ),
rBlockList (rBlocks)
{
- GetNamespaceMap().Add( OUString ( RTL_CONSTASCII_USTRINGPARAM ( sXML_np__block_list ) ),
+ GetNamespaceMap().Add( OUString ( sXML_np__block_list ),
GetXMLToken ( XML_N_BLOCK_LIST ),
XML_NAMESPACE_BLOCKLIST );
}
@@ -72,10 +72,10 @@
bTextOnly ( bNewTextOnly ),
m_rText ( rNewText )
{
- GetNamespaceMap().Add( OUString( RTL_CONSTASCII_USTRINGPARAM ( sXML_np__office ) ),
+ GetNamespaceMap().Add( OUString( sXML_np__office ),
GetXMLToken(XML_N_OFFICE_OOO),
XML_NAMESPACE_OFFICE );
- GetNamespaceMap().Add( OUString( RTL_CONSTASCII_USTRINGPARAM ( sXML_np__text ) ),
+ GetNamespaceMap().Add( OUString( sXML_np__text ),
GetXMLToken(XML_N_TEXT_OOO),
XML_NAMESPACE_TEXT );
}
diff --git a/sw/source/core/swg/SwXMLSectionList.cxx b/sw/source/core/swg/SwXMLSectionList.cxx
index a93b486..0406e20 100644
--- a/sw/source/core/swg/SwXMLSectionList.cxx
+++ b/sw/source/core/swg/SwXMLSectionList.cxx
@@ -37,10 +37,10 @@
: SvXMLImport( xContext ),
rSectionList ( rNewSectionList )
{
- GetNamespaceMap().Add( OUString( RTL_CONSTASCII_USTRINGPARAM ( sXML_np__office ) ),
+ GetNamespaceMap().Add( OUString( sXML_np__office ),
GetXMLToken(XML_N_OFFICE_OOO),
XML_NAMESPACE_OFFICE );
- GetNamespaceMap().Add( OUString( RTL_CONSTASCII_USTRINGPARAM ( sXML_np__text ) ),
+ GetNamespaceMap().Add( OUString( sXML_np__text ),
GetXMLToken(XML_N_TEXT_OOO),
XML_NAMESPACE_TEXT );
}
diff --git a/sw/source/core/swg/SwXMLTextBlocks.cxx b/sw/source/core/swg/SwXMLTextBlocks.cxx
index 48cae6a..98f9eb1 100644
--- a/sw/source/core/swg/SwXMLTextBlocks.cxx
+++ b/sw/source/core/swg/SwXMLTextBlocks.cxx
@@ -203,7 +203,7 @@
OSL_ENSURE( xBlkRoot.is(), "No storage set" );
if(!xBlkRoot.is())
return 0;
- rtl::OUString aOldName (aNames[nIdx]->aPackageName);
+ OUString aOldName (aNames[nIdx]->aPackageName);
aShort = rNewShort;
aPackageName = GeneratePackageName( aShort );
@@ -211,9 +211,9 @@
{
if (IsOnlyTextBlock ( nIdx ) )
{
- rtl::OUString sExt(".xml");
- rtl::OUString aOldStreamName( aOldName ); aOldStreamName += sExt;
- rtl::OUString aNewStreamName( aPackageName ); aNewStreamName += sExt;
+ OUString sExt(".xml");
+ OUString aOldStreamName( aOldName ); aOldStreamName += sExt;
+ OUString aNewStreamName( aPackageName ); aNewStreamName += sExt;
xRoot = xBlkRoot->openStorageElement( aOldName, embed::ElementModes::READWRITE );
try
@@ -311,8 +311,8 @@
xRoot = xBlkRoot->openStorageElement( rPackageName, embed::ElementModes::READWRITE );
uno::Reference< beans::XPropertySet > xRootProps( xRoot, uno::UNO_QUERY_THROW );
- ::rtl::OUString aPropName( RTL_CONSTASCII_USTRINGPARAM("MediaType") );
- ::rtl::OUString aMime( SotExchange::GetFormatMimeType( SOT_FORMATSTR_ID_STARWRITER_8 ) );
+ OUString aPropName( "MediaType" );
+ OUString aMime( SotExchange::GetFormatMimeType( SOT_FORMATSTR_ID_STARWRITER_8 ) );
xRootProps->setPropertyValue( aPropName, uno::makeAny( aMime ) );
}
catch (const uno::Exception&)
@@ -536,11 +536,11 @@
sal_Bool SwXMLTextBlocks::IsFileUCBStorage( const String & rFileName)
{
- rtl::OUString aName( rFileName );
+ OUString aName( rFileName );
INetURLObject aObj( aName );
if ( aObj.GetProtocol() == INET_PROT_NOT_VALID )
{
- rtl::OUString aURL;
+ OUString aURL;
::utl::LocalFileHelper::ConvertPhysicalNameToURL( aName, aURL );
aObj.SetURL( aURL );
aName = aObj.GetMainURL( INetURLObject::NO_DECODE );
@@ -559,12 +559,12 @@
return SWBLK_XML;
}
-rtl::OUString SwXMLTextBlocks::GeneratePackageName ( const String& rShort )
+OUString SwXMLTextBlocks::GeneratePackageName ( const String& rShort )
{
String aRet = rShort;
xub_StrLen nPos = 0;
sal_Unicode pDelims[] = { '!', '/', ':', '.', '\\', 0 };
- rtl::OString sByte(rtl::OUStringToOString(aRet, RTL_TEXTENCODING_UTF7));
+ rtl::OString sByte(OUStringToOString(aRet, RTL_TEXTENCODING_UTF7));
aRet = rtl::OStringToOUString(sByte, RTL_TEXTENCODING_ASCII_US);
while( STRING_NOTFOUND != ( nPos = aRet.SearchChar( pDelims, nPos )))
{
diff --git a/sw/source/core/swg/SwXMLTextBlocks1.cxx b/sw/source/core/swg/SwXMLTextBlocks1.cxx
index 5d88455e..3040cc0 100644
--- a/sw/source/core/swg/SwXMLTextBlocks1.cxx
+++ b/sw/source/core/swg/SwXMLTextBlocks1.cxx
@@ -70,7 +70,7 @@
ReadXML->SetBlockMode( sal_False );
// Ole objects fails to display when inserted into document
// because the ObjectReplacement folder ( and contents are missing )
- rtl::OUString sObjReplacements( RTL_CONSTASCII_USTRINGPARAM( "ObjectReplacements" ) );
+ OUString sObjReplacements( "ObjectReplacements" );
if ( xRoot->hasByName( sObjReplacements ) )
{
uno::Reference< document::XStorageBasedDocument > xDocStor(
pDoc->GetDocShell()->GetModel(), uno::UNO_QUERY_THROW );
@@ -92,7 +92,7 @@
}
else
{
- String aStreamName = aFolderName + rtl::OUString(".xml");
+ String aStreamName = aFolderName + OUString(".xml");
try
{
xRoot = xBlkRoot->openStorageElement( aFolderName, embed::ElementModes::READ );
@@ -179,7 +179,7 @@
long nTmp = SOT_FORMATSTR_ID_STARWRITER_60;
bool bOasis = ( SotStorage::GetVersion( xRoot ) > nTmp );
- OUString sStreamName(RTL_CONSTASCII_USTRINGPARAM("atevent.xml"));
+ OUString sStreamName("atevent.xml");
uno::Reference < io::XStream > xDocStream = xRoot->openStreamElement(
sStreamName, embed::ElementModes::READ );
OSL_ENSURE(xDocStream.is(), "Can't create stream");
@@ -214,8 +214,8 @@
// get filter
OUString sFilterComponent = bOasis
- ?
OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.Writer.XMLOasisAutotextEventsImporter"))
- :
OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.Writer.XMLAutotextEventsImporter"));
+ ? OUString("com.sun.star.comp.Writer.XMLOasisAutotextEventsImporter")
+ : OUString("com.sun.star.comp.Writer.XMLAutotextEventsImporter");
uno::Reference< xml::sax::XDocumentHandler > xFilter(
xServiceFactory->createInstanceWithArguments(
sFilterComponent, aFilterArguments),
@@ -285,7 +285,7 @@
sal_uLong n = 0;
sal_Bool bTextOnly = sal_True;
String aFolderName = GeneratePackageName ( rShort );
- String aStreamName = aFolderName + rtl::OUString(".xml");
+ String aStreamName = aFolderName + OUString(".xml");
rText.Erase();
try
@@ -295,7 +295,7 @@
if ( !xAccess->hasByName( aStreamName ) || !xRoot->isStreamElement( aStreamName ) )
{
bTextOnly = sal_False;
- aStreamName = rtl::OUString("content.xml");
+ aStreamName = OUString("content.xml");
}
uno::Reference < io::XStream > xContents = xRoot->openStreamElement( aStreamName,
embed::ElementModes::READ );
@@ -355,7 +355,7 @@
}
*/
String aFolderName( rPackageName );
- String aStreamName = aFolderName + rtl::OUString(".xml");
+ String aStreamName = aFolderName + OUString(".xml");
uno::Reference< uno::XComponentContext > xContext =
comphelper::getProcessComponentContext();
@@ -370,10 +370,10 @@
embed::ElementModes::WRITE | embed::ElementModes::TRUNCATE );
uno::Reference < beans::XPropertySet > xSet( xDocStream, uno::UNO_QUERY );
- OUString aMime ( RTL_CONSTASCII_USTRINGPARAM ( "text/xml") );
+ OUString aMime ( "text/xml" );
Any aAny;
aAny <<= aMime;
- xSet->setPropertyValue( rtl::OUString("MediaType"), aAny );
+ xSet->setPropertyValue( OUString("MediaType"), aAny );
uno::Reference < io::XOutputStream > xOut = xDocStream->getOutputStream();
uno::Reference<io::XActiveDataSource> xSrc(xWriter, uno::UNO_QUERY);
xSrc->setOutputStream(xOut);
@@ -422,7 +422,7 @@
{
try
{
- const OUString sDocName( RTL_CONSTASCII_USTRINGPARAM( XMLN_BLOCKLIST ) );
+ const OUString sDocName( XMLN_BLOCKLIST );
uno::Reference < container::XNameAccess > xAccess( xBlkRoot, uno::UNO_QUERY );
if ( xAccess.is() && xAccess->hasByName( sDocName ) && xBlkRoot->isStreamElement( sDocName ) )
{
@@ -473,7 +473,7 @@
comphelper::getProcessComponentContext();
uno::Reference < xml::sax::XWriter > xWriter = xml::sax::Writer::create(xContext);
- OUString sDocName( RTL_CONSTASCII_USTRINGPARAM( XMLN_BLOCKLIST ) );
+ OUString sDocName( XMLN_BLOCKLIST );
/*
if ( xBlkRoot->IsContained( sDocName) )
@@ -492,14 +492,14 @@
OUString aMime ( RTL_CONSTASCII_USTRINGPARAM ( "text/xml") );
Any aAny;
aAny <<= aMime;
- xSet->setPropertyValue( rtl::OUString("MediaType"), aAny );
+ xSet->setPropertyValue( OUString("MediaType"), aAny );
uno::Reference < io::XOutputStream > xOut = xDocStream->getOutputStream();
uno::Reference<io::XActiveDataSource> xSrc(xWriter, uno::UNO_QUERY);
xSrc->setOutputStream(xOut);
uno::Reference<xml::sax::XDocumentHandler> xHandler(xWriter, uno::UNO_QUERY);
- SwXMLBlockListExport aExp( xContext, *this,
OUString(RTL_CONSTASCII_USTRINGPARAM(XMLN_BLOCKLIST)), xHandler);
+ SwXMLBlockListExport aExp( xContext, *this, OUString(XMLN_BLOCKLIST), xHandler);
aExp.exportDoc( XML_BLOCK_LIST );
@@ -557,7 +557,7 @@
try
{
xRoot = xBlkRoot->openStorageElement( aPackageName, embed::ElementModes::WRITE );
- OUString sStreamName( RTL_CONSTASCII_USTRINGPARAM("atevent.xml") );
+ OUString sStreamName("atevent.xml" );
long nTmp = SOT_FORMATSTR_ID_STARWRITER_60;
bool bOasis = ( SotStorage::GetVersion( xRoot ) > nTmp );
@@ -565,10 +565,10 @@
embed::ElementModes::WRITE | embed::ElementModes::TRUNCATE );
uno::Reference < beans::XPropertySet > xSet( xDocStream, uno::UNO_QUERY );
- OUString aMime ( RTL_CONSTASCII_USTRINGPARAM ( "text/xml") );
+ OUString aMime( "text/xml" );
Any aAny;
aAny <<= aMime;
- xSet->setPropertyValue( rtl::OUString("MediaType"), aAny );
+ xSet->setPropertyValue( OUString("MediaType"), aAny );
uno::Reference < io::XOutputStream > xOutputStream = xDocStream->getOutputStream();
// get XML writer
@@ -592,8 +592,8 @@
// get filter component
OUString sFilterComponent = bOasis
- ?
OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.Writer.XMLOasisAutotextEventsExporter"))
- :
OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.Writer.XMLAutotextEventsExporter"));
+ ? OUString("com.sun.star.comp.Writer.XMLOasisAutotextEventsExporter")
+ : OUString("com.sun.star.comp.Writer.XMLAutotextEventsExporter");
uno::Reference< document::XExporter > xExporter(
xServiceFactory->createInstanceWithArguments(
sFilterComponent, aParams), UNO_QUERY);
--
To view, visit https://gerrit.libreoffice.org/2486
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I3ef372b07f2bacc2b9bbbb034e3d61b9cc8a3677
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Krisztian Pinter <pin.terminator@gmail.com>
Context
- [PATCH] RTL_CONSTASCII_USTRINGPARAM and ::rtl:: removals · Krisztian Pinter (via Code Review)
Privacy Policy |
Impressum (Legal Info) |
Copyright information: Unless otherwise specified, all text and images
on this website are licensed under the
Creative Commons Attribution-Share Alike 3.0 License.
This does not include the source code of LibreOffice, which is
licensed under the Mozilla Public License (
MPLv2).
"LibreOffice" and "The Document Foundation" are
registered trademarks of their corresponding registered owners or are
in actual use as trademarks in one or more countries. Their respective
logos and icons are also subject to international copyright laws. Use
thereof is explained in our
trademark policy.