diff options
| author | Luboš Luňák <l.lunak@suse.cz> | 2013-04-07 12:06:47 +0200 |
|---|---|---|
| committer | Luboš Luňák <l.lunak@suse.cz> | 2013-04-07 14:23:11 +0200 |
| commit | 1946794ae09ba732022fe6a74ea45e304ab70b84 (patch) | |
| tree | e32bd7ba61fa021ecc7f8c85959df8ca837d6e81 /xmloff/source/core | |
| parent | 5b08c6e7a21dda94d5b755eea0b1ed1e9c199bec (diff) | |
mass removal of rtl:: prefixes for O(U)String*
Modules sal, salhelper, cppu, cppuhelper, codemaker (selectively) and odk
have kept them, in order not to break external API (the automatic using declaration
is LO-internal).
Change-Id: I588fc9e0c45b914f824f91c0376980621d730f09
Diffstat (limited to 'xmloff/source/core')
31 files changed, 363 insertions, 392 deletions
diff --git a/xmloff/source/core/DocumentSettingsContext.cxx b/xmloff/source/core/DocumentSettingsContext.cxx index 6379a13c4284..f963983e6041 100644 --- a/xmloff/source/core/DocumentSettingsContext.cxx +++ b/xmloff/source/core/DocumentSettingsContext.cxx @@ -129,7 +129,7 @@ protected: com::sun::star::uno::Any& mrAny; XMLConfigBaseContext* mpBaseContext; public: - XMLConfigBaseContext(SvXMLImport& rImport, sal_uInt16 nPrfx, const rtl::OUString& rLName, + XMLConfigBaseContext(SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, com::sun::star::uno::Any& rAny, XMLConfigBaseContext* pBaseContext); virtual ~XMLConfigBaseContext(); @@ -141,27 +141,27 @@ public: class XMLConfigItemContext : public SvXMLImportContext { - rtl::OUString msType; - rtl::OUString msValue; + OUString msType; + OUString msValue; uno::Sequence<sal_Int8> maDecoded; com::sun::star::uno::Any& mrAny; - const rtl::OUString mrItemName; + const OUString mrItemName; XMLConfigBaseContext* mpBaseContext; public: - XMLConfigItemContext(SvXMLImport& rImport, sal_uInt16 nPrfx, const rtl::OUString& rLName, + XMLConfigItemContext(SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, com::sun::star::uno::Any& rAny, - const rtl::OUString& rItemName, + const OUString& rItemName, XMLConfigBaseContext* pBaseContext); virtual ~XMLConfigItemContext(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); - virtual void Characters( const ::rtl::OUString& rChars ); + virtual void Characters( const OUString& rChars ); virtual void EndElement(); @@ -173,7 +173,7 @@ public: class XMLConfigItemSetContext : public XMLConfigBaseContext { public: - XMLConfigItemSetContext(SvXMLImport& rImport, sal_uInt16 nPrfx, const rtl::OUString& rLName, + XMLConfigItemSetContext(SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, com::sun::star::uno::Any& rAny, @@ -181,7 +181,7 @@ public: virtual ~XMLConfigItemSetContext(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); @@ -193,7 +193,7 @@ public: class XMLConfigItemMapNamedContext : public XMLConfigBaseContext { public: - XMLConfigItemMapNamedContext(SvXMLImport& rImport, sal_uInt16 nPrfx, const rtl::OUString& rLName, + XMLConfigItemMapNamedContext(SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, com::sun::star::uno::Any& rAny, @@ -201,7 +201,7 @@ public: virtual ~XMLConfigItemMapNamedContext(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); @@ -213,20 +213,20 @@ public: class XMLConfigItemMapIndexedContext : public XMLConfigBaseContext { private: - rtl::OUString maConfigItemName; + OUString maConfigItemName; public: XMLConfigItemMapIndexedContext(SvXMLImport& rImport, sal_uInt16 nPrfx, - const rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, com::sun::star::uno::Any& rAny, - const rtl::OUString& rConfigItemName, + const OUString& rConfigItemName, XMLConfigBaseContext* pBaseContext); virtual ~XMLConfigItemMapIndexedContext(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); @@ -236,21 +236,21 @@ public: //============================================================================= SvXMLImportContext *CreateSettingsContext(SvXMLImport& rImport, sal_uInt16 p_nPrefix, - const rtl::OUString& rLocalName, + const OUString& rLocalName, const uno::Reference<xml::sax::XAttributeList>& xAttrList, beans::PropertyValue& rProp, XMLConfigBaseContext* pBaseContext) { SvXMLImportContext *pContext = 0; - rProp.Name = rtl::OUString(); + rProp.Name = OUString(); sal_Int16 nAttrCount = xAttrList.is() ? xAttrList->getLength() : 0; for( sal_Int16 i=0; i < nAttrCount; i++ ) { - rtl::OUString sAttrName = xAttrList->getNameByIndex( i ); - rtl::OUString aLocalName; + OUString sAttrName = xAttrList->getNameByIndex( i ); + OUString aLocalName; sal_uInt16 nPrefix = rImport.GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName ); - rtl::OUString sValue = xAttrList->getValueByIndex( i ); + OUString sValue = xAttrList->getValueByIndex( i ); if (nPrefix == XML_NAMESPACE_CONFIG) { @@ -283,7 +283,7 @@ namespace { struct SettingsGroup { - ::rtl::OUString sGroupName; + OUString sGroupName; uno::Any aSettings; SettingsGroup() @@ -292,7 +292,7 @@ namespace { } - SettingsGroup( const ::rtl::OUString& _rGroupName, const uno::Any& _rSettings ) + SettingsGroup( const OUString& _rGroupName, const uno::Any& _rSettings ) :sGroupName( _rGroupName ) ,aSettings( _rSettings ) { @@ -309,7 +309,7 @@ struct XMLDocumentSettingsContext_Data //============================================================================= -XMLDocumentSettingsContext::XMLDocumentSettingsContext(SvXMLImport& rImport, sal_uInt16 nPrfx, const rtl::OUString& rLName, +XMLDocumentSettingsContext::XMLDocumentSettingsContext(SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, const uno::Reference<xml::sax::XAttributeList>& ) : SvXMLImportContext( rImport, nPrfx, rLName ) , m_pData( new XMLDocumentSettingsContext_Data ) @@ -322,21 +322,21 @@ XMLDocumentSettingsContext::~XMLDocumentSettingsContext() } SvXMLImportContext *XMLDocumentSettingsContext::CreateChildContext( sal_uInt16 p_nPrefix, - const rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) { SvXMLImportContext *pContext = 0; - rtl::OUString sName; + OUString sName; sal_Int16 nAttrCount = xAttrList.is() ? xAttrList->getLength() : 0; for( sal_Int16 i=0; i < nAttrCount; i++ ) { - rtl::OUString sAttrName = xAttrList->getNameByIndex( i ); - rtl::OUString aLocalName; + OUString sAttrName = xAttrList->getNameByIndex( i ); + OUString aLocalName; sal_uInt16 nPrefix = GetImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName ); - rtl::OUString sValue = xAttrList->getValueByIndex( i ); + OUString sValue = xAttrList->getValueByIndex( i ); if (nPrefix == XML_NAMESPACE_CONFIG) { @@ -349,7 +349,7 @@ SvXMLImportContext *XMLDocumentSettingsContext::CreateChildContext( sal_uInt16 p { if (IsXMLToken(rLocalName, XML_CONFIG_ITEM_SET)) { - ::rtl::OUString aLocalConfigName; + OUString aLocalConfigName; sal_uInt16 nConfigPrefix = GetImport().GetNamespaceMap().GetKeyByAttrName( sName, &aLocalConfigName ); @@ -422,11 +422,11 @@ void XMLDocumentSettingsContext::EndElement() while ( ( i >= 0 ) && nFound < 2 ) { - rtl::OUString sProp( aSeqConfigProps[i].Name ); + OUString sProp( aSeqConfigProps[i].Name ); if ( sProp.compareToAscii("PrinterName") == 0 ) { - rtl::OUString sEmpty; + OUString sEmpty; aSeqConfigProps[i].Value = uno::makeAny( sEmpty ); nFound++; } @@ -458,7 +458,7 @@ void XMLDocumentSettingsContext::EndElement() //============================================================================= XMLConfigBaseContext::XMLConfigBaseContext(SvXMLImport& rImport, sal_uInt16 nPrfx, - const rtl::OUString& rLName, com::sun::star::uno::Any& rTempAny, + const OUString& rLName, com::sun::star::uno::Any& rTempAny, XMLConfigBaseContext* pTempBaseContext) : SvXMLImportContext( rImport, nPrfx, rLName ), maProps( rImport.GetComponentContext() ), @@ -475,7 +475,7 @@ XMLConfigBaseContext::~XMLConfigBaseContext() //============================================================================= XMLConfigItemSetContext::XMLConfigItemSetContext(SvXMLImport& rImport, sal_uInt16 nPrfx, - const rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>&, com::sun::star::uno::Any& rAny, @@ -490,7 +490,7 @@ XMLConfigItemSetContext::~XMLConfigItemSetContext() } SvXMLImportContext *XMLConfigItemSetContext::CreateChildContext( sal_uInt16 nPrefix, - const rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) { @@ -506,11 +506,11 @@ void XMLConfigItemSetContext::EndElement() //============================================================================= -XMLConfigItemContext::XMLConfigItemContext(SvXMLImport& rImport, sal_uInt16 nPrfx, const rtl::OUString& rLName, +XMLConfigItemContext::XMLConfigItemContext(SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, com::sun::star::uno::Any& rTempAny, - const rtl::OUString& rTempItemName, + const OUString& rTempItemName, XMLConfigBaseContext* pTempBaseContext) : SvXMLImportContext(rImport, nPrfx, rLName), mrAny(rTempAny), @@ -520,11 +520,11 @@ XMLConfigItemContext::XMLConfigItemContext(SvXMLImport& rImport, sal_uInt16 nPrf sal_Int16 nAttrCount = xAttrList.is() ? xAttrList->getLength() : 0; for( sal_Int16 i=0; i < nAttrCount; i++ ) { - rtl::OUString sAttrName = xAttrList->getNameByIndex( i ); - rtl::OUString aLocalName; + OUString sAttrName = xAttrList->getNameByIndex( i ); + OUString aLocalName; sal_uInt16 nPrefix = GetImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName ); - rtl::OUString sValue = xAttrList->getValueByIndex( i ); + OUString sValue = xAttrList->getValueByIndex( i ); if (nPrefix == XML_NAMESPACE_CONFIG) { @@ -539,7 +539,7 @@ XMLConfigItemContext::~XMLConfigItemContext() } SvXMLImportContext *XMLConfigItemContext::CreateChildContext( sal_uInt16 nPrefix, - const rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& ) { @@ -547,19 +547,19 @@ SvXMLImportContext *XMLConfigItemContext::CreateChildContext( sal_uInt16 nPrefix return pContext; } -void XMLConfigItemContext::Characters( const ::rtl::OUString& rChars ) +void XMLConfigItemContext::Characters( const OUString& rChars ) { if (IsXMLToken(msType, XML_BASE64BINARY)) { - rtl::OUString sTrimmedChars( rChars.trim() ); + OUString sTrimmedChars( rChars.trim() ); if( !sTrimmedChars.isEmpty() ) { - rtl::OUString sChars; + OUString sChars; if( !msValue.isEmpty() ) { sChars = msValue; sChars += sTrimmedChars; - msValue = rtl::OUString(); + msValue = OUString(); } else { @@ -658,7 +658,7 @@ void XMLConfigItemContext::ManipulateConfigItem() { if( mrItemName == "PrinterIndependentLayout" ) { - rtl::OUString sValue; + OUString sValue; mrAny >>= sValue; sal_Int16 nTmp = document::PrinterIndependentLayout::HIGH_RESOLUTION; @@ -683,7 +683,7 @@ void XMLConfigItemContext::ManipulateConfigItem() uno::Reference< uno::XComponentContext > xContext( GetImport().GetComponentContext() ); uno::Reference< util::XStringSubstitution > xStringSubsitution( util::PathSubstitution::create(xContext) ); - rtl::OUString aURL; + OUString aURL; mrAny >>= aURL; aURL = xStringSubsitution->substituteVariables( aURL, sal_False ); mrAny <<= aURL; @@ -697,7 +697,7 @@ void XMLConfigItemContext::ManipulateConfigItem() //============================================================================= -XMLConfigItemMapNamedContext::XMLConfigItemMapNamedContext(SvXMLImport& rImport, sal_uInt16 nPrfx, const rtl::OUString& rLName, +XMLConfigItemMapNamedContext::XMLConfigItemMapNamedContext(SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>&, com::sun::star::uno::Any& rAny, @@ -711,7 +711,7 @@ XMLConfigItemMapNamedContext::~XMLConfigItemMapNamedContext() } SvXMLImportContext *XMLConfigItemMapNamedContext::CreateChildContext( sal_uInt16 nPrefix, - const rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) { @@ -733,11 +733,11 @@ void XMLConfigItemMapNamedContext::EndElement() //============================================================================= XMLConfigItemMapIndexedContext::XMLConfigItemMapIndexedContext(SvXMLImport& rImport, sal_uInt16 nPrfx, - const rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>&, com::sun::star::uno::Any& rAny, - const ::rtl::OUString& rConfigItemName, + const OUString& rConfigItemName, XMLConfigBaseContext* pBaseContext) : XMLConfigBaseContext(rImport, nPrfx, rLName, rAny, pBaseContext), maConfigItemName( rConfigItemName ) @@ -749,7 +749,7 @@ XMLConfigItemMapIndexedContext::~XMLConfigItemMapIndexedContext() } SvXMLImportContext *XMLConfigItemMapIndexedContext::CreateChildContext( sal_uInt16 nPrefix, - const rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) { @@ -789,11 +789,11 @@ void XMLConfigItemMapIndexedContext::EndElement() beans::PropertyValue *pForChar = aProps.getArray(); i18n::ForbiddenCharacters aForbid; lang::Locale aLocale; - const rtl::OUString sLanguage ( "Language" ); - const rtl::OUString sCountry ( "Country" ); - const rtl::OUString sVariant ( "Variant" ); - const rtl::OUString sBeginLine ( "BeginLine" ); - const rtl::OUString sEndLine ( "EndLine" ); + const OUString sLanguage ( "Language" ); + const OUString sCountry ( "Country" ); + const OUString sVariant ( "Variant" ); + const OUString sBeginLine ( "BeginLine" ); + const OUString sEndLine ( "EndLine" ); sal_Bool bHaveLanguage = sal_False, bHaveCountry = sal_False, bHaveVariant = sal_False, bHaveBegin = sal_False, bHaveEnd = sal_False; @@ -857,16 +857,16 @@ void XMLConfigItemMapIndexedContext::EndElement() formula::SymbolDescriptor *pDescriptor = aSymbolList.getArray(); - const rtl::OUString sName ( "Name" ); - const rtl::OUString sExportName ( "ExportName" ); - const rtl::OUString sFontName ( "FontName" ); - const rtl::OUString sSymbolSet ( "SymbolSet" ); - const rtl::OUString sCharacter ( "Character" ); - const rtl::OUString sCharSet ( "CharSet" ); - const rtl::OUString sFamily ( "Family" ); - const rtl::OUString sPitch ( "Pitch" ); - const rtl::OUString sWeight ( "Weight" ); - const rtl::OUString sItalic ( "Italic" ); + const OUString sName ( "Name" ); + const OUString sExportName ( "ExportName" ); + const OUString sFontName ( "FontName" ); + const OUString sSymbolSet ( "SymbolSet" ); + const OUString sCharacter ( "Character" ); + const OUString sCharSet ( "CharSet" ); + const OUString sFamily ( "Family" ); + const OUString sPitch ( "Pitch" ); + const OUString sWeight ( "Weight" ); + const OUString sItalic ( "Italic" ); sal_Int16 nNumFullEntries = 0; for ( sal_Int32 i = 0; i < nCount; i++ ) diff --git a/xmloff/source/core/DomBuilderContext.cxx b/xmloff/source/core/DomBuilderContext.cxx index c35b9763ad0d..8d02dd45972d 100644 --- a/xmloff/source/core/DomBuilderContext.cxx +++ b/xmloff/source/core/DomBuilderContext.cxx @@ -54,7 +54,6 @@ using com::sun::star::xml::dom::XNode; using com::sun::star::xml::dom::XElement; using com::sun::star::xml::sax::XAttributeList; using com::sun::star::xml::dom::NodeType_ELEMENT_NODE; -using rtl::OUString; // helper functions; implemented below diff --git a/xmloff/source/core/DomExport.cxx b/xmloff/source/core/DomExport.cxx index 1266815f8342..7e87c621aba2 100644 --- a/xmloff/source/core/DomExport.cxx +++ b/xmloff/source/core/DomExport.cxx @@ -54,8 +54,6 @@ using std::vector; using namespace com::sun::star::xml::dom; -using rtl::OUString; -using rtl::OUStringBuffer; class DomVisitor diff --git a/xmloff/source/core/PropertySetMerger.cxx b/xmloff/source/core/PropertySetMerger.cxx index edebc2bda0a7..43355a5925b4 100644 --- a/xmloff/source/core/PropertySetMerger.cxx +++ b/xmloff/source/core/PropertySetMerger.cxx @@ -20,7 +20,6 @@ #include <com/sun/star/beans/XPropertyState.hpp> #include "PropertySetMerger.hxx" -using ::rtl::OUString; using namespace ::com::sun::star; using namespace ::com::sun::star::uno; diff --git a/xmloff/source/core/RDFaExportHelper.cxx b/xmloff/source/core/RDFaExportHelper.cxx index 2b278b242ac0..eb7936047b09 100644 --- a/xmloff/source/core/RDFaExportHelper.cxx +++ b/xmloff/source/core/RDFaExportHelper.cxx @@ -57,18 +57,18 @@ using namespace ::com::sun::star; namespace xmloff { -static ::rtl::OUString +static OUString makeCURIE(SvXMLExport * i_pExport, uno::Reference<rdf::XURI> const & i_xURI) { OSL_ENSURE(i_xURI.is(), "makeCURIE: null URI"); if (!i_xURI.is()) throw uno::RuntimeException(); - const ::rtl::OUString Namespace( i_xURI->getNamespace() ); + const OUString Namespace( i_xURI->getNamespace() ); OSL_ENSURE(!Namespace.isEmpty(), "makeCURIE: no namespace"); if (Namespace.isEmpty()) throw uno::RuntimeException(); - ::rtl::OUStringBuffer buf; + OUStringBuffer buf; buf.append( i_pExport->EnsureNamespace(Namespace) ); buf.append( static_cast<sal_Unicode>(':') ); // N.B.: empty LocalName is valid! @@ -80,12 +80,12 @@ makeCURIE(SvXMLExport * i_pExport, // #i112473# SvXMLExport::GetRelativeReference() not right for RDF on SaveAs // because the URIs in the repository are not rewritten on SaveAs, the // URI of the loaded document has to be used, not the URI of the target doc. -static ::rtl::OUString -getRelativeReference(SvXMLExport const& rExport, ::rtl::OUString const& rURI) +static OUString +getRelativeReference(SvXMLExport const& rExport, OUString const& rURI) { uno::Reference< rdf::XURI > const xModelURI( rExport.GetModel(), uno::UNO_QUERY_THROW ); - ::rtl::OUString const baseURI( xModelURI->getStringValue() ); + OUString const baseURI( xModelURI->getStringValue() ); uno::Reference<uno::XComponentContext> xContext( comphelper::getProcessComponentContext() ); uno::Reference<uri::XUriReferenceFactory> const xUriFactory = @@ -98,7 +98,7 @@ getRelativeReference(SvXMLExport const& rExport, ::rtl::OUString const& rURI) uno::Reference< uri::XUriReference > const xRelativeURI( xUriFactory->makeRelative(xBaseURI, xAbsoluteURI, true, true, false), uno::UNO_SET_THROW ); - ::rtl::OUString const relativeURI(xRelativeURI->getUriReference()); + OUString const relativeURI(xRelativeURI->getUriReference()); return relativeURI; } @@ -116,13 +116,13 @@ RDFaExportHelper::RDFaExportHelper(SvXMLExport & i_rExport) m_xRepository.set(xRS->getRDFRepository(), uno::UNO_QUERY_THROW); } -::rtl::OUString +OUString RDFaExportHelper::LookupBlankNode( uno::Reference<rdf::XBlankNode> const & i_xBlankNode) { OSL_ENSURE(i_xBlankNode.is(), "null BlankNode?"); if (!i_xBlankNode.is()) throw uno::RuntimeException(); - ::rtl::OUString & rEntry( + OUString & rEntry( m_BlankNodeMap[ i_xBlankNode->getStringValue() ] ); if (rEntry.isEmpty()) { @@ -160,9 +160,9 @@ RDFaExportHelper::AddRDFa( } static const sal_Unicode s_OpenBracket ('['); static const sal_Unicode s_CloseBracket(']'); - const ::rtl::OUString about( xSubjectURI.is() + const OUString about( xSubjectURI.is() ? getRelativeReference(m_rExport, xSubjectURI->getStringValue()) - : ::rtl::OUStringBuffer().append(s_OpenBracket).append( + : OUStringBuffer().append(s_OpenBracket).append( LookupBlankNode(xSubjectBNode)).append(s_CloseBracket) .makeStringAndClear() ); @@ -172,7 +172,7 @@ RDFaExportHelper::AddRDFa( const uno::Reference<rdf::XURI> xDatatype(xContent->getDatatype()); if (xDatatype.is()) { - const ::rtl::OUString datatype( + const OUString datatype( makeCURIE(&m_rExport, xDatatype) ); m_rExport.AddAttribute(XML_NAMESPACE_XHTML, token::XML_DATATYPE, datatype); @@ -183,7 +183,7 @@ RDFaExportHelper::AddRDFa( xContent->getValue()); } - ::rtl::OUStringBuffer property; + OUStringBuffer property; ::comphelper::intersperse( ::boost::make_transform_iterator( ::comphelper::stl_begin(rStatements), @@ -195,7 +195,7 @@ RDFaExportHelper::AddRDFa( ::boost::bind(&makeCURIE, &m_rExport, ::boost::bind(&rdf::Statement::Predicate, _1))), ::comphelper::OUStringBufferAppender(property), - ::rtl::OUString(" ")); + OUString(" ")); m_rExport.AddAttribute(XML_NAMESPACE_XHTML, token::XML_PROPERTY, property.makeStringAndClear()); diff --git a/xmloff/source/core/RDFaImportHelper.cxx b/xmloff/source/core/RDFaImportHelper.cxx index 5ae9760fa116..e37789435fea 100644 --- a/xmloff/source/core/RDFaImportHelper.cxx +++ b/xmloff/source/core/RDFaImportHelper.cxx @@ -58,7 +58,7 @@ class SAL_DLLPRIVATE RDFaReader const SvXMLImport & GetImport() const { return m_rImport; } //FIXME: this is an ugly hack to workaround buggy SvXMLImport::GetAbsolute - ::rtl::OUString GetAbsoluteReference(::rtl::OUString const & i_rURI) const + OUString GetAbsoluteReference(OUString const & i_rURI) const { if (i_rURI.isEmpty() || i_rURI[0] == '#') { @@ -76,13 +76,13 @@ public: { } // returns URI or blank node! - ::rtl::OUString ReadCURIE(::rtl::OUString const & i_rCURIE) const; + OUString ReadCURIE(OUString const & i_rCURIE) const; - std::vector< ::rtl::OUString > - ReadCURIEs(::rtl::OUString const & i_rCURIEs) const; + std::vector< OUString > + ReadCURIEs(OUString const & i_rCURIEs) const; - ::rtl::OUString - ReadURIOrSafeCURIE( ::rtl::OUString const & i_rURIOrSafeCURIE) const; + OUString + ReadURIOrSafeCURIE( OUString const & i_rURIOrSafeCURIE) const; }; /** helper to insert RDFa statements into the RDF repository */ @@ -91,7 +91,7 @@ class SAL_DLLPRIVATE RDFaInserter const uno::Reference<uno::XComponentContext> m_xContext; uno::Reference< rdf::XDocumentRepository > m_xRepository; - typedef ::std::map< ::rtl::OUString, uno::Reference< rdf::XBlankNode > > + typedef ::std::map< OUString, uno::Reference< rdf::XBlankNode > > BlankNodeMap_t; BlankNodeMap_t m_BlankNodeMap; @@ -104,13 +104,13 @@ public: {} uno::Reference< rdf::XBlankNode > - LookupBlankNode(::rtl::OUString const & i_rNodeId ); + LookupBlankNode(OUString const & i_rNodeId ); uno::Reference< rdf::XURI > - MakeURI( ::rtl::OUString const & i_rURI) const; + MakeURI( OUString const & i_rURI) const; uno::Reference< rdf::XResource> - MakeResource( ::rtl::OUString const & i_rResource); + MakeResource( OUString const & i_rResource); void InsertRDFaEntry(struct RDFaEntry const & i_rEntry); }; @@ -118,16 +118,16 @@ public: /** store parsed RDFa attributes */ struct SAL_DLLPRIVATE ParsedRDFaAttributes { - ::rtl::OUString m_About; - ::std::vector< ::rtl::OUString > m_Properties; - ::rtl::OUString m_Content; - ::rtl::OUString m_Datatype; + OUString m_About; + ::std::vector< OUString > m_Properties; + OUString m_Content; + OUString m_Datatype; ParsedRDFaAttributes( - ::rtl::OUString const & i_rAbout, - ::std::vector< ::rtl::OUString > const & i_rProperties, - ::rtl::OUString const & i_rContent, - ::rtl::OUString const & i_rDatatype) + OUString const & i_rAbout, + ::std::vector< OUString > const & i_rProperties, + OUString const & i_rContent, + OUString const & i_rDatatype) : m_About(i_rAbout) , m_Properties(i_rProperties) , m_Content(i_rContent) @@ -157,7 +157,7 @@ static inline bool isWS(const sal_Unicode i_Char) || (' ' == i_Char); } -static ::rtl::OUString splitAtWS(::rtl::OUString & io_rString) +static OUString splitAtWS(OUString & io_rString) { const sal_Int32 len( io_rString.getLength() ); sal_Int32 idxstt(0); @@ -166,21 +166,21 @@ static ::rtl::OUString splitAtWS(::rtl::OUString & io_rString) sal_Int32 idxend(idxstt); while ((idxend < len) && (!isWS(io_rString[idxend]))) ++idxend; // the CURIE - const ::rtl::OUString ret(io_rString.copy(idxstt, idxend - idxstt)); + const OUString ret(io_rString.copy(idxstt, idxend - idxstt)); io_rString = io_rString.copy(idxend); // rest return ret; } -::rtl::OUString -RDFaReader::ReadCURIE(::rtl::OUString const & i_rCURIE) const +OUString +RDFaReader::ReadCURIE(OUString const & i_rCURIE) const { // the RDFa spec says that a prefix is required (it may be empty: ":foo") const sal_Int32 idx( i_rCURIE.indexOf(':') ); if (idx >= 0) { - ::rtl::OUString Prefix; - ::rtl::OUString LocalName; - ::rtl::OUString Namespace; + OUString Prefix; + OUString LocalName; + OUString Namespace; sal_uInt16 nKey( GetImport().GetNamespaceMap()._GetKeyByAttrName( i_rCURIE, &Prefix, &LocalName, &Namespace) ); if ( Prefix == "_" ) @@ -196,30 +196,30 @@ RDFaReader::ReadCURIE(::rtl::OUString const & i_rCURIE) const (XML_NAMESPACE_XMLNS != nKey)) { // N.B.: empty LocalName is valid! - const ::rtl::OUString URI(Namespace + LocalName); + const OUString URI(Namespace + LocalName); return GetAbsoluteReference(URI); } else { OSL_TRACE( "ReadCURIE: invalid CURIE: invalid prefix" ); - return ::rtl::OUString(); + return OUString(); } } } OSL_TRACE( "ReadCURIE: invalid CURIE: no prefix" ); - return ::rtl::OUString(); + return OUString(); } -::std::vector< ::rtl::OUString > -RDFaReader::ReadCURIEs(::rtl::OUString const & i_rCURIEs) const +::std::vector< OUString > +RDFaReader::ReadCURIEs(OUString const & i_rCURIEs) const { - std::vector< ::rtl::OUString > vec; - ::rtl::OUString CURIEs(i_rCURIEs); + std::vector< OUString > vec; + OUString CURIEs(i_rCURIEs); do { - ::rtl::OUString curie( splitAtWS(CURIEs) ); + OUString curie( splitAtWS(CURIEs) ); if (!curie.isEmpty()) { - const ::rtl::OUString uri(ReadCURIE(curie)); + const OUString uri(ReadCURIE(curie)); if (!uri.isEmpty()) { vec.push_back(uri); @@ -234,8 +234,8 @@ RDFaReader::ReadCURIEs(::rtl::OUString const & i_rCURIEs) const return vec; } -::rtl::OUString -RDFaReader::ReadURIOrSafeCURIE(::rtl::OUString const & i_rURIOrSafeCURIE) const +OUString +RDFaReader::ReadURIOrSafeCURIE(OUString const & i_rURIOrSafeCURIE) const { const sal_Int32 len(i_rURIOrSafeCURIE.getLength()); if (len && (i_rURIOrSafeCURIE[0] == '[')) @@ -247,7 +247,7 @@ RDFaReader::ReadURIOrSafeCURIE(::rtl::OUString const & i_rURIOrSafeCURIE) const else { OSL_TRACE( "ReadURIOrSafeCURIE: invalid SafeCURIE" ); - return ::rtl::OUString(); + return OUString(); } } else @@ -255,7 +255,7 @@ RDFaReader::ReadURIOrSafeCURIE(::rtl::OUString const & i_rURIOrSafeCURIE) const if (i_rURIOrSafeCURIE.matchAsciiL("_:", 2)) // blank node { OSL_TRACE( "ReadURIOrSafeCURIE: invalid URI: scheme is _" ); - return ::rtl::OUString(); + return OUString(); } else { @@ -267,7 +267,7 @@ RDFaReader::ReadURIOrSafeCURIE(::rtl::OUString const & i_rURIOrSafeCURIE) const //////////////////////////////////////////////////////////////////////////// uno::Reference< rdf::XBlankNode > -RDFaInserter::LookupBlankNode(::rtl::OUString const & i_rNodeId ) +RDFaInserter::LookupBlankNode(OUString const & i_rNodeId ) { uno::Reference< rdf::XBlankNode > & rEntry( m_BlankNodeMap[ i_rNodeId ] ); if (!rEntry.is()) @@ -278,7 +278,7 @@ RDFaInserter::LookupBlankNode(::rtl::OUString const & i_rNodeId ) } uno::Reference< rdf::XURI > -RDFaInserter::MakeURI( ::rtl::OUString const & i_rURI) const +RDFaInserter::MakeURI( OUString const & i_rURI) const { if (i_rURI.matchAsciiL("_:", 2)) // blank node { @@ -300,14 +300,14 @@ RDFaInserter::MakeURI( ::rtl::OUString const & i_rURI) const } uno::Reference< rdf::XResource> -RDFaInserter::MakeResource( ::rtl::OUString const & i_rResource) +RDFaInserter::MakeResource( OUString const & i_rResource) { if (i_rResource.matchAsciiL("_:", 2)) // blank node { // we cannot use the blank node label as-is: it must be distinct // from labels in other graphs, so create fresh ones per XML stream // N.B.: content.xml and styles.xml are distinct graphs - ::rtl::OUString name( i_rResource.copy(2) ); + OUString name( i_rResource.copy(2) ); const uno::Reference< rdf::XBlankNode > xBNode( LookupBlankNode(name) ); OSL_ENSURE(xBNode.is(), "no blank node?"); return uno::Reference<rdf::XResource>( xBNode, uno::UNO_QUERY); @@ -405,10 +405,10 @@ RDFaImportHelper::~RDFaImportHelper() ::boost::shared_ptr<ParsedRDFaAttributes> RDFaImportHelper::ParseRDFa( - ::rtl::OUString const & i_rAbout, - ::rtl::OUString const & i_rProperty, - ::rtl::OUString const & i_rContent, - ::rtl::OUString const & i_rDatatype) + OUString const & i_rAbout, + OUString const & i_rProperty, + OUString const & i_rContent, + OUString const & i_rDatatype) { if (i_rProperty.isEmpty()) { @@ -417,18 +417,18 @@ RDFaImportHelper::ParseRDFa( } // must parse CURIEs here: need namespace declaration context RDFaReader reader(GetImport()); - const ::rtl::OUString about( reader.ReadURIOrSafeCURIE(i_rAbout) ); + const OUString about( reader.ReadURIOrSafeCURIE(i_rAbout) ); if (about.isEmpty()) { return ::boost::shared_ptr<ParsedRDFaAttributes>(); } - const ::std::vector< ::rtl::OUString > properties( + const ::std::vector< OUString > properties( reader.ReadCURIEs(i_rProperty) ); if (!properties.size()) { return ::boost::shared_ptr<ParsedRDFaAttributes>(); } - const ::rtl::OUString datatype( !i_rDatatype.isEmpty() + const OUString datatype( !i_rDatatype.isEmpty() ? reader.ReadCURIE(i_rDatatype) - : ::rtl::OUString() ); + : OUString() ); return ::boost::shared_ptr<ParsedRDFaAttributes>( new ParsedRDFaAttributes(about, properties, i_rContent, datatype)); } @@ -454,10 +454,10 @@ RDFaImportHelper::AddRDFa( void RDFaImportHelper::ParseAndAddRDFa( uno::Reference<rdf::XMetadatable> const & i_xObject, - ::rtl::OUString const & i_rAbout, - ::rtl::OUString const & i_rProperty, - ::rtl::OUString const & i_rContent, - ::rtl::OUString const & i_rDatatype) + OUString const & i_rAbout, + OUString const & i_rProperty, + OUString const & i_rContent, + OUString const & i_rDatatype) { ::boost::shared_ptr<ParsedRDFaAttributes> pAttributes( ParseRDFa(i_rAbout, i_rProperty, i_rContent, i_rDatatype) ); diff --git a/xmloff/source/core/SettingsExportHelper.cxx b/xmloff/source/core/SettingsExportHelper.cxx index a1de3f713322..b8d2a571c442 100644 --- a/xmloff/source/core/SettingsExportHelper.cxx +++ b/xmloff/source/core/SettingsExportHelper.cxx @@ -62,7 +62,7 @@ XMLSettingsExportHelper::~XMLSettingsExportHelper() } void XMLSettingsExportHelper::CallTypeFunction(const uno::Any& rAny, - const rtl::OUString& rName) const + const OUString& rName) const { uno::Any aAny( rAny ); ManipulateSetting( aAny, rName ); @@ -122,7 +122,7 @@ void XMLSettingsExportHelper::CallTypeFunction(const uno::Any& rAny, break; case uno::TypeClass_STRING: { - rtl::OUString sString; + OUString sString; aAny >>= sString; exportString(sString, rName); } @@ -180,13 +180,13 @@ void XMLSettingsExportHelper::CallTypeFunction(const uno::Any& rAny, } } -void XMLSettingsExportHelper::exportBool(const sal_Bool bValue, const rtl::OUString& rName) const +void XMLSettingsExportHelper::exportBool(const sal_Bool bValue, const OUString& rName) const { DBG_ASSERT(!rName.isEmpty(), "no name"); m_rContext.AddAttribute( XML_NAME, rName ); m_rContext.AddAttribute( XML_TYPE, XML_BOOLEAN ); m_rContext.StartElement( XML_CONFIG_ITEM, sal_True ); - rtl::OUString sValue; + OUString sValue; if (bValue) sValue = GetXMLToken(XML_TRUE); else @@ -195,7 +195,7 @@ void XMLSettingsExportHelper::exportBool(const sal_Bool bValue, const rtl::OUStr m_rContext.EndElement( sal_False ); } -void XMLSettingsExportHelper::exportByte(const sal_Int8 nValue, const rtl::OUString& rName) const +void XMLSettingsExportHelper::exportByte(const sal_Int8 nValue, const OUString& rName) const { (void) nValue; (void) rName; OSL_ENSURE(false, "XMLSettingsExportHelper::exportByte(): #i114162#:\n" @@ -203,54 +203,54 @@ void XMLSettingsExportHelper::exportByte(const sal_Int8 nValue, const rtl::OUStr "so storing them is disabled!\n" "Use a different type instead (e.g. \"short\")."); } -void XMLSettingsExportHelper::exportShort(const sal_Int16 nValue, const rtl::OUString& rName) const +void XMLSettingsExportHelper::exportShort(const sal_Int16 nValue, const OUString& rName) const { DBG_ASSERT(!rName.isEmpty(), "no name"); m_rContext.AddAttribute( XML_NAME, rName ); m_rContext.AddAttribute( XML_TYPE, XML_SHORT ); m_rContext.StartElement( XML_CONFIG_ITEM, sal_True ); - rtl::OUStringBuffer sBuffer; + OUStringBuffer sBuffer; ::sax::Converter::convertNumber(sBuffer, sal_Int32(nValue)); m_rContext.Characters( sBuffer.makeStringAndClear() ); m_rContext.EndElement( sal_False ); } -void XMLSettingsExportHelper::exportInt(const sal_Int32 nValue, const rtl::OUString& rName) const +void XMLSettingsExportHelper::exportInt(const sal_Int32 nValue, const OUString& rName) const { DBG_ASSERT(!rName.isEmpty(), "no name"); m_rContext.AddAttribute( XML_NAME, rName ); m_rContext.AddAttribute( XML_TYPE, XML_INT ); m_rContext.StartElement( XML_CONFIG_ITEM, sal_True ); - rtl::OUStringBuffer sBuffer; + OUStringBuffer sBuffer; ::sax::Converter::convertNumber(sBuffer, nValue); m_rContext.Characters( sBuffer.makeStringAndClear() ); m_rContext.EndElement( sal_False ); } -void XMLSettingsExportHelper::exportLong(const sal_Int64 nValue, const rtl::OUString& rName) const +void XMLSettingsExportHelper::exportLong(const sal_Int64 nValue, const OUString& rName) const { DBG_ASSERT(!rName.isEmpty(), "no name"); m_rContext.AddAttribute( XML_NAME, rName ); m_rContext.AddAttribute( XML_TYPE, XML_LONG ); m_rContext.StartElement( XML_CONFIG_ITEM, sal_True ); - rtl::OUString sValue(rtl::OUString::valueOf(nValue)); + OUString sValue(OUString::valueOf(nValue)); m_rContext.Characters( sValue ); m_rContext.EndElement( sal_False ); } -void XMLSettingsExportHelper::exportDouble(const double fValue, const rtl::OUString& rName) const +void XMLSettingsExportHelper::exportDouble(const double fValue, const OUString& rName) const { DBG_ASSERT(!rName.isEmpty(), "no name"); m_rContext.AddAttribute( XML_NAME, rName ); m_rContext.AddAttribute( XML_TYPE, XML_DOUBLE ); m_rContext.StartElement( XML_CONFIG_ITEM, sal_True ); - rtl::OUStringBuffer sBuffer; + OUStringBuffer sBuffer; ::sax::Converter::convertDouble(sBuffer, fValue); m_rContext.Characters( sBuffer.makeStringAndClear() ); m_rContext.EndElement( sal_False ); } -void XMLSettingsExportHelper::exportString(const rtl::OUString& sValue, const rtl::OUString& rName) const +void XMLSettingsExportHelper::exportString(const OUString& sValue, const OUString& rName) const { DBG_ASSERT(!rName.isEmpty(), "no name"); m_rContext.AddAttribute( XML_NAME, rName ); @@ -261,12 +261,12 @@ void XMLSettingsExportHelper::exportString(const rtl::OUString& sValue, const rt m_rContext.EndElement( sal_False ); } -void XMLSettingsExportHelper::exportDateTime(const util::DateTime& aValue, const rtl::OUString& rName) const +void XMLSettingsExportHelper::exportDateTime(const util::DateTime& aValue, const OUString& rName) const { DBG_ASSERT(!rName.isEmpty(), "no name"); m_rContext.AddAttribute( XML_NAME, rName ); m_rContext.AddAttribute( XML_TYPE, XML_DATETIME ); - rtl::OUStringBuffer sBuffer; + OUStringBuffer sBuffer; ::sax::Converter::convertDateTime(sBuffer, aValue); m_rContext.StartElement( XML_CONFIG_ITEM, sal_True ); m_rContext.Characters( sBuffer.makeStringAndClear() ); @@ -275,7 +275,7 @@ void XMLSettingsExportHelper::exportDateTime(const util::DateTime& aValue, const void XMLSettingsExportHelper::exportSequencePropertyValue( const uno::Sequence<beans::PropertyValue>& aProps, - const rtl::OUString& rName) const + const OUString& rName) const { DBG_ASSERT(!rName.isEmpty(), "no name"); sal_Int32 nLength(aProps.getLength()); @@ -290,20 +290,20 @@ void XMLSettingsExportHelper::exportSequencePropertyValue( } void XMLSettingsExportHelper::exportSymbolDescriptors( const uno::Sequence < formula::SymbolDescriptor > &rProps, - const rtl::OUString rName) const + const OUString rName) const { uno::Reference< container::XIndexContainer > xBox = document::IndexedPropertyValues::create(m_rContext.GetComponentContext()); - const rtl::OUString sName ( "Name" ); - const rtl::OUString sExportName ( "ExportName" ); - const rtl::OUString sSymbolSet ( "SymbolSet" ); - const rtl::OUString sCharacter ( "Character" ); - const rtl::OUString sFontName ( "FontName" ); - const rtl::OUString sCharSet ( "CharSet" ); - const rtl::OUString sFamily ( "Family" ); - const rtl::OUString sPitch ( "Pitch" ); - const rtl::OUString sWeight ( "Weight" ); - const rtl::OUString sItalic ( "Italic" ); + const OUString sName ( "Name" ); + const OUString sExportName ( "ExportName" ); + const OUString sSymbolSet ( "SymbolSet" ); + const OUString sCharacter ( "Character" ); + const OUString sFontName ( "FontName" ); + const OUString sCharSet ( "CharSet" ); + const OUString sFamily ( "Family" ); + const OUString sPitch ( "Pitch" ); + const OUString sWeight ( "Weight" ); + const OUString sItalic ( "Italic" ); sal_Int32 nCount = rProps.getLength(); const formula::SymbolDescriptor *pDescriptor = rProps.getConstArray(); @@ -342,7 +342,7 @@ void XMLSettingsExportHelper::exportSymbolDescriptors( } void XMLSettingsExportHelper::exportbase64Binary( const uno::Sequence<sal_Int8>& aProps, - const rtl::OUString& rName) const + const OUString& rName) const { DBG_ASSERT(!rName.isEmpty(), "no name"); sal_Int32 nLength(aProps.getLength()); @@ -351,7 +351,7 @@ void XMLSettingsExportHelper::exportbase64Binary( m_rContext.StartElement( XML_CONFIG_ITEM, sal_True ); if(nLength) { - rtl::OUStringBuffer sBuffer; + OUStringBuffer sBuffer; ::sax::Converter::encodeBase64(sBuffer, aProps); m_rContext.Characters( sBuffer.makeStringAndClear() ); } @@ -359,7 +359,7 @@ void XMLSettingsExportHelper::exportbase64Binary( } void XMLSettingsExportHelper::exportMapEntry(const uno::Any& rAny, - const rtl::OUString& rName, + const OUString& rName, const sal_Bool bNameAccess) const { DBG_ASSERT((bNameAccess && !rName.isEmpty()) || !bNameAccess, "no name"); @@ -379,7 +379,7 @@ void XMLSettingsExportHelper::exportMapEntry(const uno::Any& rAny, void XMLSettingsExportHelper::exportNameAccess( const uno::Reference<container::XNameAccess>& aNamed, - const rtl::OUString& rName) const + const OUString& rName) const { DBG_ASSERT(!rName.isEmpty(), "no name"); DBG_ASSERT(aNamed->getElementType().equals(getCppuType( (uno::Sequence<beans::PropertyValue> *)0 ) ), @@ -388,7 +388,7 @@ void XMLSettingsExportHelper::exportNameAccess( { m_rContext.AddAttribute( XML_NAME, rName ); m_rContext.StartElement( XML_CONFIG_ITEM_MAP_NAMED, sal_True ); - uno::Sequence< rtl::OUString > aNames(aNamed->getElementNames()); + uno::Sequence< OUString > aNames(aNamed->getElementNames()); for (sal_Int32 i = 0; i < aNames.getLength(); i++) exportMapEntry(aNamed->getByName(aNames[i]), aNames[i], sal_True); m_rContext.EndElement( sal_True ); @@ -397,12 +397,12 @@ void XMLSettingsExportHelper::exportNameAccess( void XMLSettingsExportHelper::exportIndexAccess( const uno::Reference<container::XIndexAccess> aIndexed, - const rtl::OUString rName) const + const OUString rName) const { DBG_ASSERT(!rName.isEmpty(), "no name"); DBG_ASSERT(aIndexed->getElementType().equals(getCppuType( (uno::Sequence<beans::PropertyValue> *)0 ) ), "wrong IndexAccess" ); - rtl::OUString sEmpty; + OUString sEmpty; if(aIndexed->hasElements()) { m_rContext.AddAttribute( XML_NAME, rName ); @@ -418,7 +418,7 @@ void XMLSettingsExportHelper::exportIndexAccess( void XMLSettingsExportHelper::exportForbiddenCharacters( const uno::Any &rAny, - const rtl::OUString rName) const + const OUString rName) const { uno::Reference<i18n::XForbiddenCharacters> xForbChars; uno::Reference<linguistic2::XSupportedLocales> xLocales; @@ -437,11 +437,11 @@ void XMLSettingsExportHelper::exportForbiddenCharacters( const sal_Int32 nCount = aLocales.getLength(); - const rtl::OUString sLanguage ( "Language" ); - const rtl::OUString sCountry ( "Country" ); - const rtl::OUString sVariant ( "Variant" ); - const rtl::OUString sBeginLine ( "BeginLine" ); - const rtl::OUString sEndLine ( "EndLine" ); + const OUString sLanguage ( "Language" ); + const OUString sCountry ( "Country" ); + const OUString sVariant ( "Variant" ); + const OUString sBeginLine ( "BeginLine" ); + const OUString sEndLine ( "EndLine" ); sal_Int32 nPos = 0; for( sal_Int32 nIndex = 0; nIndex < nCount; nIndex++, pLocales++ ) @@ -474,7 +474,7 @@ void XMLSettingsExportHelper::exportForbiddenCharacters( void XMLSettingsExportHelper::exportAllSettings( const uno::Sequence<beans::PropertyValue>& aProps, - const rtl::OUString& rName) const + const OUString& rName) const { DBG_ASSERT(!rName.isEmpty(), "no name"); exportSequencePropertyValue(aProps, rName); @@ -485,7 +485,7 @@ void XMLSettingsExportHelper::exportAllSettings( * from their XML settings representation. This is your chance to do * so! */ -void XMLSettingsExportHelper::ManipulateSetting( uno::Any& rAny, const rtl::OUString& rName ) const +void XMLSettingsExportHelper::ManipulateSetting( uno::Any& rAny, const OUString& rName ) const { if( rName == msPrinterIndependentLayout ) { @@ -493,11 +493,11 @@ void XMLSettingsExportHelper::ManipulateSetting( uno::Any& rAny, const rtl::OUSt if( rAny >>= nTmp ) { if( nTmp == document::PrinterIndependentLayout::LOW_RESOLUTION ) - rAny <<= rtl::OUString("low-resolution"); + rAny <<= OUString("low-resolution"); else if( nTmp == document::PrinterIndependentLayout::DISABLED ) - rAny <<= rtl::OUString("disabled"); + rAny <<= OUString("disabled"); else if( nTmp == document::PrinterIndependentLayout::HIGH_RESOLUTION ) - rAny <<= rtl::OUString("high-resolution"); + rAny <<= OUString("high-resolution"); } } else if( (rName == msColorTableURL) || (rName == msLineEndTableURL) || (rName == msHatchTableURL) || @@ -518,7 +518,7 @@ void XMLSettingsExportHelper::ManipulateSetting( uno::Any& rAny, const rtl::OUSt if( mxStringSubsitution.is() ) { - ::rtl::OUString aURL; + OUString aURL; rAny >>= aURL; aURL = mxStringSubsitution->reSubstituteVariables( aURL ); rAny <<= aURL; diff --git a/xmloff/source/core/SvXMLAttr.cxx b/xmloff/source/core/SvXMLAttr.cxx index 2a42dff11760..4ce1a12d99fd 100644 --- a/xmloff/source/core/SvXMLAttr.cxx +++ b/xmloff/source/core/SvXMLAttr.cxx @@ -31,8 +31,8 @@ #include <limits.h> //USHRT_MAX #include "SvXMLAttr.hxx" -SvXMLAttr::SvXMLAttr( const rtl::OUString& rLName, - const rtl::OUString& rValue ) : +SvXMLAttr::SvXMLAttr( const OUString& rLName, + const OUString& rValue ) : aPrefixPos(USHRT_MAX), aLName(rLName), aValue(rValue) @@ -40,8 +40,8 @@ SvXMLAttr::SvXMLAttr( const rtl::OUString& rLName, } SvXMLAttr::SvXMLAttr( const sal_uInt16 nPos, - const rtl::OUString& rLName, - const rtl::OUString& rValue ) : + const OUString& rLName, + const OUString& rValue ) : aPrefixPos(nPos), aLName(rLName), aValue(rValue) @@ -60,12 +60,12 @@ sal_uInt16 SvXMLAttr::getPrefixPos() const return aPrefixPos; } -const rtl::OUString& SvXMLAttr::getLName() const +const OUString& SvXMLAttr::getLName() const { return aLName; } -const rtl::OUString& SvXMLAttr::getValue() const { +const OUString& SvXMLAttr::getValue() const { return aValue; } diff --git a/xmloff/source/core/SvXMLAttr.hxx b/xmloff/source/core/SvXMLAttr.hxx index 6ac9cd954ceb..82f8e95151ef 100644 --- a/xmloff/source/core/SvXMLAttr.hxx +++ b/xmloff/source/core/SvXMLAttr.hxx @@ -31,26 +31,26 @@ #ifndef _XMLOFF_SVXMLATTR_HXX #define _XMLOFF_SVXMLATTR_HXX -#include <rtl/ustring.hxx> //rtl::OUString +#include <rtl/ustring.hxx> //OUString class SvXMLAttr { private: sal_uInt16 aPrefixPos; - rtl::OUString aLName; - rtl::OUString aValue; + OUString aLName; + OUString aValue; public: // Assuming OUString is well behaved, the default copy constructor and // assignment operator are fine. - SvXMLAttr( const rtl::OUString& rLName, - const rtl::OUString& rValue ); + SvXMLAttr( const OUString& rLName, + const OUString& rValue ); SvXMLAttr( const sal_uInt16 nPos, - const rtl::OUString& rLName, - const rtl::OUString& rValue ); + const OUString& rLName, + const OUString& rValue ); bool operator== (const SvXMLAttr &rCmp) const; sal_uInt16 getPrefixPos() const; - const rtl::OUString& getLName() const; - const rtl::OUString& getValue() const; + const OUString& getLName() const; + const OUString& getValue() const; }; #endif /* _XMLOFF_SVXMLATTR_HXX */ diff --git a/xmloff/source/core/SvXMLAttrCollection.cxx b/xmloff/source/core/SvXMLAttrCollection.cxx index 748ed5dff3a2..2c3bbf2da966 100644 --- a/xmloff/source/core/SvXMLAttrCollection.cxx +++ b/xmloff/source/core/SvXMLAttrCollection.cxx @@ -37,26 +37,26 @@ bool SvXMLAttrCollection::operator ==( const SvXMLAttrCollection& rCmp ) const (rCmp.aAttrs == aAttrs); } -sal_Bool SvXMLAttrCollection::AddAttr( const rtl::OUString& rLName, - const rtl::OUString& rValue ) +sal_Bool SvXMLAttrCollection::AddAttr( const OUString& rLName, + const OUString& rValue ) { aAttrs.push_back( SvXMLAttr(rLName, rValue) ); return sal_True; } -sal_Bool SvXMLAttrCollection::AddAttr( const rtl::OUString& rPrefix, - const rtl::OUString& rNamespace, - const rtl::OUString& rLName, - const rtl::OUString& rValue ) +sal_Bool SvXMLAttrCollection::AddAttr( const OUString& rPrefix, + const OUString& rNamespace, + const OUString& rLName, + const OUString& rValue ) { sal_uInt16 nPos = aNamespaceMap.Add( rPrefix, rNamespace ); aAttrs.push_back( SvXMLAttr(nPos, rLName, rValue) ); return sal_True; } -sal_Bool SvXMLAttrCollection::AddAttr( const rtl::OUString& rPrefix, - const rtl::OUString& rLName, - const rtl::OUString& rValue ) +sal_Bool SvXMLAttrCollection::AddAttr( const OUString& rPrefix, + const OUString& rLName, + const OUString& rValue ) { sal_uInt16 nPos = aNamespaceMap.GetIndexByPrefix( rPrefix ); if( USHRT_MAX == nPos ) @@ -66,8 +66,8 @@ sal_Bool SvXMLAttrCollection::AddAttr( const rtl::OUString& rPrefix, } sal_Bool SvXMLAttrCollection::SetAt( size_t i, - const rtl::OUString& rLName, - const rtl::OUString& rValue ) + const OUString& rLName, + const OUString& rValue ) { if( i >= GetAttrCount() ) return sal_False; @@ -76,10 +76,10 @@ sal_Bool SvXMLAttrCollection::SetAt( size_t i, } sal_Bool SvXMLAttrCollection::SetAt( size_t i, - const rtl::OUString& rPrefix, - const rtl::OUString& rNamespace, - const rtl::OUString& rLName, - const rtl::OUString& rValue ) + const OUString& rPrefix, + const OUString& rNamespace, + const OUString& rLName, + const OUString& rValue ) { if( i >= GetAttrCount() ) return sal_False; @@ -93,9 +93,9 @@ sal_Bool SvXMLAttrCollection::SetAt( size_t i, } sal_Bool SvXMLAttrCollection::SetAt( size_t i, - const rtl::OUString& rPrefix, - const rtl::OUString& rLName, - const rtl::OUString& rValue ) + const OUString& rPrefix, + const OUString& rLName, + const OUString& rValue ) { if( i >= GetAttrCount() ) return sal_False; @@ -125,21 +125,21 @@ size_t SvXMLAttrCollection::GetAttrCount() const return aAttrs.size(); } -const rtl::OUString& SvXMLAttrCollection::GetAttrLName(size_t i) const +const OUString& SvXMLAttrCollection::GetAttrLName(size_t i) const { OSL_ENSURE( i < aAttrs.size(), "SvXMLAttrContainerData::GetLName: illegal index" ); return aAttrs[i].getLName(); } -const rtl::OUString& SvXMLAttrCollection::GetAttrValue(size_t i) const +const OUString& SvXMLAttrCollection::GetAttrValue(size_t i) const { OSL_ENSURE( i < aAttrs.size(), "SvXMLAttrContainerData::GetValue: illegal index" ); return aAttrs[i].getValue(); } -const rtl::OUString SvXMLAttrCollection::GetAttrNamespace( size_t i ) const +const OUString SvXMLAttrCollection::GetAttrNamespace( size_t i ) const { - rtl::OUString sRet; + OUString sRet; sal_uInt16 nPos = GetPrefixPos( i ); //Does this point to a valid namespace entry? if( USHRT_MAX != nPos ) @@ -147,9 +147,9 @@ const rtl::OUString SvXMLAttrCollection::GetAttrNamespace( size_t i ) const return sRet; } -const rtl::OUString SvXMLAttrCollection::GetAttrPrefix( size_t i ) const +const OUString SvXMLAttrCollection::GetAttrPrefix( size_t i ) const { - rtl::OUString sRet; + OUString sRet; sal_uInt16 nPos = GetPrefixPos( i ); //Does this point to a valid namespace entry? if( USHRT_MAX != nPos ) @@ -157,12 +157,12 @@ const rtl::OUString SvXMLAttrCollection::GetAttrPrefix( size_t i ) const return sRet; } -const rtl::OUString& SvXMLAttrCollection::GetNamespace( sal_uInt16 i ) const +const OUString& SvXMLAttrCollection::GetNamespace( sal_uInt16 i ) const { return aNamespaceMap.GetNameByIndex( i ); } -const rtl::OUString& SvXMLAttrCollection::GetPrefix( sal_uInt16 i ) const +const OUString& SvXMLAttrCollection::GetPrefix( sal_uInt16 i ) const { return aNamespaceMap.GetPrefixByIndex( i ); } diff --git a/xmloff/source/core/SvXMLAttrCollection.hxx b/xmloff/source/core/SvXMLAttrCollection.hxx index 96fb88a5ace2..852ca4eba9e2 100644 --- a/xmloff/source/core/SvXMLAttrCollection.hxx +++ b/xmloff/source/core/SvXMLAttrCollection.hxx @@ -34,7 +34,7 @@ #include "SvXMLAttr.hxx" #include <xmloff/nmspmap.hxx> //SvXMLNamespaceMap -#include <rtl/ustring.hxx> //rtl::OUString +#include <rtl/ustring.hxx> //OUString #include <sal/types.h> //sal_uInt16 and sal_Bool #include <vector> @@ -45,38 +45,38 @@ public: std::vector<SvXMLAttr> aAttrs; bool operator==(const SvXMLAttrCollection &rCmp) const; - sal_Bool AddAttr( const rtl::OUString& rLName, - const rtl::OUString& rValue ); - sal_Bool AddAttr( const rtl::OUString& rPrefix, - const rtl::OUString& rNamespace, - const rtl::OUString& rLName, - const rtl::OUString& rValue ); - sal_Bool AddAttr( const rtl::OUString& rPrefix, - const rtl::OUString& rLName, - const rtl::OUString& rValue ); + sal_Bool AddAttr( const OUString& rLName, + const OUString& rValue ); + sal_Bool AddAttr( const OUString& rPrefix, + const OUString& rNamespace, + const OUString& rLName, + const OUString& rValue ); + sal_Bool AddAttr( const OUString& rPrefix, + const OUString& rLName, + const OUString& rValue ); sal_Bool SetAt( size_t i, - const rtl::OUString& rLName, - const rtl::OUString& rValue ); + const OUString& rLName, + const OUString& rValue ); sal_Bool SetAt( size_t i, - const rtl::OUString& rPrefix, - const rtl::OUString& rNamespace, - const rtl::OUString& rLName, - const rtl::OUString& rValue ); + const OUString& rPrefix, + const OUString& rNamespace, + const OUString& rLName, + const OUString& rValue ); sal_Bool SetAt( size_t i, - const rtl::OUString& rPrefix, - const rtl::OUString& rLName, - const rtl::OUString& rValue ); + const OUString& rPrefix, + const OUString& rLName, + const OUString& rValue ); void Remove( size_t i ); size_t GetAttrCount() const; - const rtl::OUString& GetAttrLName(size_t i) const; - const rtl::OUString& GetAttrValue(size_t i) const; - const rtl::OUString GetAttrNamespace( size_t i ) const; - const rtl::OUString GetAttrPrefix( size_t i ) const; - const rtl::OUString& GetNamespace( sal_uInt16 i ) const; - const rtl::OUString& GetPrefix( sal_uInt16 i ) const; + const OUString& GetAttrLName(size_t i) const; + const OUString& GetAttrValue(size_t i) const; + const OUString GetAttrNamespace( size_t i ) const; + const OUString GetAttrPrefix( size_t i ) const; + const OUString& GetNamespace( sal_uInt16 i ) const; + const OUString& GetPrefix( sal_uInt16 i ) const; sal_uInt16 GetFirstNamespaceIndex() const; sal_uInt16 GetNextNamespaceIndex( sal_uInt16 nIdx ) const; diff --git a/xmloff/source/core/XMLBase64Export.cxx b/xmloff/source/core/XMLBase64Export.cxx index b402f985e6c9..45e20ce0087d 100644 --- a/xmloff/source/core/XMLBase64Export.cxx +++ b/xmloff/source/core/XMLBase64Export.cxx @@ -30,8 +30,6 @@ using namespace ::com::sun::star::uno; using namespace ::com::sun::star::io; -using ::rtl::OUString; -using ::rtl::OUStringBuffer; #define INPUT_BUFFER_SIZE 54 #define OUTPUT_BUFFER_SIZE 72 diff --git a/xmloff/source/core/XMLBase64ImportContext.cxx b/xmloff/source/core/XMLBase64ImportContext.cxx index cfca4e01b290..22a6f464b6b9 100644 --- a/xmloff/source/core/XMLBase64ImportContext.cxx +++ b/xmloff/source/core/XMLBase64ImportContext.cxx @@ -25,8 +25,6 @@ #include <xmloff/xmlimp.hxx> #include <xmloff/XMLBase64ImportContext.hxx> -using ::rtl::OUString; -using ::rtl::OUStringBuffer; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::xml::sax; @@ -56,7 +54,7 @@ void XMLBase64ImportContext::EndElement() xOut->closeOutput(); } -void XMLBase64ImportContext::Characters( const ::rtl::OUString& rChars ) +void XMLBase64ImportContext::Characters( const OUString& rChars ) { OUString sTrimmedChars( rChars. trim() ); if( !sTrimmedChars.isEmpty() ) diff --git a/xmloff/source/core/XMLBasicExportFilter.cxx b/xmloff/source/core/XMLBasicExportFilter.cxx index cb226621f586..abc408cc4e55 100644 --- a/xmloff/source/core/XMLBasicExportFilter.cxx +++ b/xmloff/source/core/XMLBasicExportFilter.cxx @@ -58,7 +58,7 @@ void XMLBasicExportFilter::endDocument() // ----------------------------------------------------------------------------- -void XMLBasicExportFilter::startElement( const ::rtl::OUString& aName, +void XMLBasicExportFilter::startElement( const OUString& aName, const Reference< xml::sax::XAttributeList >& xAttribs ) throw (xml::sax::SAXException, RuntimeException) { @@ -68,7 +68,7 @@ void XMLBasicExportFilter::startElement( const ::rtl::OUString& aName, // ----------------------------------------------------------------------------- -void XMLBasicExportFilter::endElement( const ::rtl::OUString& aName ) +void XMLBasicExportFilter::endElement( const OUString& aName ) throw (xml::sax::SAXException, RuntimeException) { if ( m_xHandler.is() ) @@ -77,7 +77,7 @@ void XMLBasicExportFilter::endElement( const ::rtl::OUString& aName ) // ----------------------------------------------------------------------------- -void XMLBasicExportFilter::characters( const ::rtl::OUString& aChars ) +void XMLBasicExportFilter::characters( const OUString& aChars ) throw (xml::sax::SAXException, RuntimeException) { if ( m_xHandler.is() ) @@ -86,7 +86,7 @@ void XMLBasicExportFilter::characters( const ::rtl::OUString& aChars ) // ----------------------------------------------------------------------------- -void XMLBasicExportFilter::ignorableWhitespace( const ::rtl::OUString& aWhitespaces ) +void XMLBasicExportFilter::ignorableWhitespace( const OUString& aWhitespaces ) throw (xml::sax::SAXException, RuntimeException) { if ( m_xHandler.is() ) @@ -95,8 +95,8 @@ void XMLBasicExportFilter::ignorableWhitespace( const ::rtl::OUString& aWhitespa // ----------------------------------------------------------------------------- -void XMLBasicExportFilter::processingInstruction( const ::rtl::OUString& aTarget, - const ::rtl::OUString& aData ) +void XMLBasicExportFilter::processingInstruction( const OUString& aTarget, + const OUString& aData ) throw (xml::sax::SAXException, RuntimeException) { if ( m_xHandler.is() ) diff --git a/xmloff/source/core/XMLEmbeddedObjectExportFilter.cxx b/xmloff/source/core/XMLEmbeddedObjectExportFilter.cxx index f49a9f29ad48..fa8cdffc28dc 100644 --- a/xmloff/source/core/XMLEmbeddedObjectExportFilter.cxx +++ b/xmloff/source/core/XMLEmbeddedObjectExportFilter.cxx @@ -19,7 +19,6 @@ #include "xmloff/XMLEmbeddedObjectExportFilter.hxx" -using ::rtl::OUString; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::xml::sax; diff --git a/xmloff/source/core/XMLEmbeddedObjectImportContext.cxx b/xmloff/source/core/XMLEmbeddedObjectImportContext.cxx index fa5a264ebf78..b00df847f95f 100644 --- a/xmloff/source/core/XMLEmbeddedObjectImportContext.cxx +++ b/xmloff/source/core/XMLEmbeddedObjectImportContext.cxx @@ -32,8 +32,6 @@ #include "xmloff/XMLFilterServiceNames.h" #include "XMLEmbeddedObjectImportContext.hxx" -using ::rtl::OUString; -using ::rtl::OUStringBuffer; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::util; @@ -76,21 +74,21 @@ public: TYPEINFO(); XMLEmbeddedObjectImportContext_Impl( SvXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XDocumentHandler >& rHandler ); virtual ~XMLEmbeddedObjectImportContext_Impl(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ); virtual void StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ); virtual void EndElement(); - virtual void Characters( const ::rtl::OUString& rChars ); + virtual void Characters( const OUString& rChars ); }; TYPEINIT1( XMLEmbeddedObjectImportContext_Impl, SvXMLImportContext ); @@ -219,7 +217,7 @@ XMLEmbeddedObjectImportContext::XMLEmbeddedObjectImportContext( }; for (int k=0; aTmp[k]; k++) { - ::rtl::OUString sTmpString = ::rtl::OUString::createFromAscii(aTmp[k]); + OUString sTmpString = OUString::createFromAscii(aTmp[k]); if( sMime.matchAsciiL( aTmp[k], sTmpString.getLength() ) ) { sClass = sMime.copy( sTmpString.getLength() ); @@ -325,7 +323,7 @@ void XMLEmbeddedObjectImportContext::EndElement() } } -void XMLEmbeddedObjectImportContext::Characters( const ::rtl::OUString& rChars ) +void XMLEmbeddedObjectImportContext::Characters( const OUString& rChars ) { if( xHandler.is() ) xHandler->characters( rChars ); diff --git a/xmloff/source/core/attrlist.cxx b/xmloff/source/core/attrlist.cxx index 6ae6031cfaee..c625ae5792a9 100644 --- a/xmloff/source/core/attrlist.cxx +++ b/xmloff/source/core/attrlist.cxx @@ -26,7 +26,6 @@ #include <xmloff/attrlist.hxx> -using ::rtl::OUString; using namespace ::osl; using namespace ::com::sun::star; @@ -197,7 +196,7 @@ void SvXMLAttributeList::AppendAttributeList( const uno::Reference< ::com::sun:: } void SvXMLAttributeList::SetValueByIndex( sal_Int16 i, - const ::rtl::OUString& rValue ) + const OUString& rValue ) { if( static_cast< SvXMLAttributeList_Impl::size_type >( i ) < m_pImpl->vecAttribute.size() ) diff --git a/xmloff/source/core/facreg.cxx b/xmloff/source/core/facreg.cxx index 689b314885d3..1b7e60196768 100644 --- a/xmloff/source/core/facreg.cxx +++ b/xmloff/source/core/facreg.cxx @@ -33,7 +33,6 @@ using namespace com::sun::star; -using ::rtl::OUString; #define SERVICE( className ) \ extern OUString SAL_CALL className##_getImplementationName() throw(); \ diff --git a/xmloff/source/core/i18nmap.cxx b/xmloff/source/core/i18nmap.cxx index c61a986f4b8b..7f4d69eb5bab 100644 --- a/xmloff/source/core/i18nmap.cxx +++ b/xmloff/source/core/i18nmap.cxx @@ -21,8 +21,8 @@ #include <tools/debug.hxx> #include "xmloff/i18nmap.hxx" -bool SvI18NMap::Add( sal_uInt16 nKind, const rtl::OUString& rName, - const rtl::OUString& rNewName ) +bool SvI18NMap::Add( sal_uInt16 nKind, const OUString& rName, + const OUString& rNewName ) { SvI18NMapEntry_Key aKey(nKind, rName); bool bIsNewInsertion = m_aMap.insert(SvI18NMap_Impl::value_type(aKey, rNewName)).second; @@ -30,7 +30,7 @@ bool SvI18NMap::Add( sal_uInt16 nKind, const rtl::OUString& rName, return bIsNewInsertion; } -const rtl::OUString& SvI18NMap::Get( sal_uInt16 nKind, const rtl::OUString& rName ) const +const OUString& SvI18NMap::Get( sal_uInt16 nKind, const OUString& rName ) const { SvI18NMapEntry_Key aKey(nKind, rName); SvI18NMap_Impl::const_iterator aI = m_aMap.find(aKey); diff --git a/xmloff/source/core/nmspmap.cxx b/xmloff/source/core/nmspmap.cxx index ebf268c26dd7..03e5e13edd08 100644 --- a/xmloff/source/core/nmspmap.cxx +++ b/xmloff/source/core/nmspmap.cxx @@ -29,8 +29,6 @@ #include "xmloff/xmlnmspe.hxx" -using ::rtl::OUString; -using ::rtl::OUStringBuffer; using namespace ::xmloff::token; /* The basic idea of this class is that we have two two ways to search our @@ -179,7 +177,7 @@ OUString SvXMLNamespaceMap::GetAttrNameByKey( sal_uInt16 nKey ) const if (aIter != aNameMap.end()) { sAttrName.append( sXMLNS ); - const ::rtl::OUString & prefix( (*aIter).second->sPrefix ); + const OUString & prefix( (*aIter).second->sPrefix ); if (!prefix.isEmpty()) // not default namespace { sAttrName.append( sal_Unicode(':') ); @@ -444,7 +442,7 @@ sal_uInt16 SvXMLNamespaceMap::GetKeyByAttrName( const OUString& rAttrName, return _GetKeyByAttrName ( rAttrName, pPrefix, pLocalName, pNamespace ); } -sal_Bool SvXMLNamespaceMap::NormalizeURI( ::rtl::OUString& rName ) +sal_Bool SvXMLNamespaceMap::NormalizeURI( OUString& rName ) { // try OASIS + W3 URI normalization sal_Bool bSuccess = NormalizeOasisURN( rName ); @@ -453,7 +451,7 @@ sal_Bool SvXMLNamespaceMap::NormalizeURI( ::rtl::OUString& rName ) return bSuccess; } -sal_Bool SvXMLNamespaceMap::NormalizeW3URI( ::rtl::OUString& rName ) +sal_Bool SvXMLNamespaceMap::NormalizeW3URI( OUString& rName ) { // check if URI matches: // http://www.w3.org/[0-9]*/[:letter:]* @@ -477,7 +475,7 @@ sal_Bool SvXMLNamespaceMap::NormalizeW3URI( ::rtl::OUString& rName ) return bSuccess; } -sal_Bool SvXMLNamespaceMap::NormalizeOasisURN( ::rtl::OUString& rName ) +sal_Bool SvXMLNamespaceMap::NormalizeOasisURN( OUString& rName ) { // #i38644# // we exported the wrong namespace for smil, so we correct this here on load diff --git a/xmloff/source/core/unoatrcn.cxx b/xmloff/source/core/unoatrcn.cxx index 8cbebdd55778..cc51124ead99 100644 --- a/xmloff/source/core/unoatrcn.cxx +++ b/xmloff/source/core/unoatrcn.cxx @@ -27,8 +27,6 @@ #include "xmloff/unoatrcn.hxx" -using ::rtl::OUString; -using ::rtl::OUStringBuffer; using namespace ::com::sun::star; diff --git a/xmloff/source/core/unointerfacetouniqueidentifiermapper.cxx b/xmloff/source/core/unointerfacetouniqueidentifiermapper.cxx index 4b1d1336b8c0..87e54d711e21 100644 --- a/xmloff/source/core/unointerfacetouniqueidentifiermapper.cxx +++ b/xmloff/source/core/unointerfacetouniqueidentifiermapper.cxx @@ -23,7 +23,6 @@ using namespace ::com::sun::star; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::XInterface; -using ::rtl::OUString; namespace comphelper { diff --git a/xmloff/source/core/xmlcnimp.cxx b/xmloff/source/core/xmlcnimp.cxx index 2cb1deb0a8be..ca467fba0a29 100644 --- a/xmloff/source/core/xmlcnimp.cxx +++ b/xmloff/source/core/xmlcnimp.cxx @@ -41,47 +41,47 @@ int SvXMLAttrContainerData::operator ==( const SvXMLAttrContainerData& rCmp ) co return ( *(rCmp.pimpl) == *(pimpl) ); } -sal_Bool SvXMLAttrContainerData::AddAttr( const rtl::OUString& rLName, - const rtl::OUString& rValue ) +sal_Bool SvXMLAttrContainerData::AddAttr( const OUString& rLName, + const OUString& rValue ) { return pimpl->AddAttr(rLName, rValue); } -sal_Bool SvXMLAttrContainerData::AddAttr( const rtl::OUString& rPrefix, - const rtl::OUString& rNamespace, - const rtl::OUString& rLName, - const rtl::OUString& rValue ) +sal_Bool SvXMLAttrContainerData::AddAttr( const OUString& rPrefix, + const OUString& rNamespace, + const OUString& rLName, + const OUString& rValue ) { return pimpl->AddAttr(rPrefix, rNamespace, rLName, rValue); } -sal_Bool SvXMLAttrContainerData::AddAttr( const rtl::OUString& rPrefix, - const rtl::OUString& rLName, - const rtl::OUString& rValue ) +sal_Bool SvXMLAttrContainerData::AddAttr( const OUString& rPrefix, + const OUString& rLName, + const OUString& rValue ) { return pimpl->AddAttr(rPrefix, rLName, rValue); } sal_Bool SvXMLAttrContainerData::SetAt( size_t i, - const rtl::OUString& rLName, - const rtl::OUString& rValue ) + const OUString& rLName, + const OUString& rValue ) { return pimpl->SetAt(i, rLName, rValue); } sal_Bool SvXMLAttrContainerData::SetAt( size_t i, - const rtl::OUString& rPrefix, - const rtl::OUString& rNamespace, - const rtl::OUString& rLName, - const rtl::OUString& rValue ) + const OUString& rPrefix, + const OUString& rNamespace, + const OUString& rLName, + const OUString& rValue ) { return pimpl->SetAt(i, rPrefix, rNamespace, rLName, rValue); } sal_Bool SvXMLAttrContainerData::SetAt( size_t i, - const rtl::OUString& rPrefix, - const rtl::OUString& rLName, - const rtl::OUString& rValue ) + const OUString& rPrefix, + const OUString& rLName, + const OUString& rValue ) { return pimpl->SetAt(i, rPrefix, rLName, rValue); } @@ -96,32 +96,32 @@ size_t SvXMLAttrContainerData::GetAttrCount() const return pimpl->GetAttrCount(); } -const rtl::OUString& SvXMLAttrContainerData::GetAttrLName(size_t i) const +const OUString& SvXMLAttrContainerData::GetAttrLName(size_t i) const { return pimpl->GetAttrLName(i); } -const rtl::OUString& SvXMLAttrContainerData::GetAttrValue(size_t i) const +const OUString& SvXMLAttrContainerData::GetAttrValue(size_t i) const { return pimpl->GetAttrValue(i); } -const rtl::OUString SvXMLAttrContainerData::GetAttrNamespace( size_t i ) const +const OUString SvXMLAttrContainerData::GetAttrNamespace( size_t i ) const { return pimpl->GetAttrNamespace(i); } -const rtl::OUString SvXMLAttrContainerData::GetAttrPrefix( size_t i ) const +const OUString SvXMLAttrContainerData::GetAttrPrefix( size_t i ) const { return pimpl->GetAttrPrefix(i); } -const rtl::OUString& SvXMLAttrContainerData::GetNamespace( sal_uInt16 i ) const +const OUString& SvXMLAttrContainerData::GetNamespace( sal_uInt16 i ) const { return pimpl->GetNamespace(i); } -const rtl::OUString& SvXMLAttrContainerData::GetPrefix( sal_uInt16 i ) const +const OUString& SvXMLAttrContainerData::GetPrefix( sal_uInt16 i ) const { return pimpl->GetPrefix(i); } diff --git a/xmloff/source/core/xmlerror.cxx b/xmloff/source/core/xmlerror.cxx index 76463aa2fa84..c9fd6bd25e23 100644 --- a/xmloff/source/core/xmlerror.cxx +++ b/xmloff/source/core/xmlerror.cxx @@ -31,8 +31,6 @@ -using ::rtl::OUString; -using ::rtl::OUStringBuffer; using ::com::sun::star::uno::Any; using ::com::sun::star::uno::Sequence; using ::com::sun::star::uno::Reference; @@ -181,7 +179,7 @@ void XMLErrors::AddRecord( } // convert to byte string and signal the error - rtl::OString aError(rtl::OUStringToOString(sMessage.makeStringAndClear(), + OString aError(OUStringToOString(sMessage.makeStringAndClear(), RTL_TEXTENCODING_ASCII_US)); OSL_FAIL( aError.getStr() ); #endif diff --git a/xmloff/source/core/xmlexp.cxx b/xmloff/source/core/xmlexp.cxx index c82a6809ff3d..82ba7252f4d7 100644 --- a/xmloff/source/core/xmlexp.cxx +++ b/xmloff/source/core/xmlexp.cxx @@ -88,7 +88,6 @@ #include <comphelper/xmltools.hxx> -using ::rtl::OUString; using namespace ::osl; using namespace ::com::sun::star; @@ -155,7 +154,7 @@ public: } virtual void AddAttribute( enum ::xmloff::token::XMLTokenEnum i_eName, - const ::rtl::OUString& i_rValue ); + const OUString& i_rValue ); virtual void AddAttribute( enum ::xmloff::token::XMLTokenEnum i_eName, enum ::xmloff::token::XMLTokenEnum i_eValue ); @@ -163,16 +162,16 @@ public: const sal_Bool i_bIgnoreWhitespace ); virtual void EndElement( const sal_Bool i_bIgnoreWhitespace ); - virtual void Characters( const ::rtl::OUString& i_rCharacters ); + virtual void Characters( const OUString& i_rCharacters ); virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > GetComponentContext() const; private: SvXMLExport& m_rExport; - ::std::stack< ::rtl::OUString > m_aElements; + ::std::stack< OUString > m_aElements; }; -void SettingsExportFacade::AddAttribute( enum ::xmloff::token::XMLTokenEnum i_eName, const ::rtl::OUString& i_rValue ) +void SettingsExportFacade::AddAttribute( enum ::xmloff::token::XMLTokenEnum i_eName, const OUString& i_rValue ) { m_rExport.AddAttribute( XML_NAMESPACE_CONFIG, i_eName, i_rValue ); } @@ -184,19 +183,19 @@ void SettingsExportFacade::AddAttribute( enum ::xmloff::token::XMLTokenEnum i_eN void SettingsExportFacade::StartElement( enum ::xmloff::token::XMLTokenEnum i_eName, const sal_Bool i_bIgnoreWhitespace ) { - const ::rtl::OUString sElementName( m_rExport.GetNamespaceMap().GetQNameByKey( XML_NAMESPACE_CONFIG, GetXMLToken( i_eName ) ) ); + const OUString sElementName( m_rExport.GetNamespaceMap().GetQNameByKey( XML_NAMESPACE_CONFIG, GetXMLToken( i_eName ) ) ); m_rExport.StartElement( sElementName, i_bIgnoreWhitespace ); m_aElements.push( sElementName ); } void SettingsExportFacade::EndElement( const sal_Bool i_bIgnoreWhitespace ) { - const ::rtl::OUString sElementName( m_aElements.top() ); + const OUString sElementName( m_aElements.top() ); m_rExport.EndElement( sElementName, i_bIgnoreWhitespace ); m_aElements.pop(); } -void SettingsExportFacade::Characters( const ::rtl::OUString& i_rCharacters ) +void SettingsExportFacade::Characters( const OUString& i_rCharacters ) { m_rExport.GetDocHandler()->characters( i_rCharacters ); } @@ -251,8 +250,8 @@ public: ::comphelper::UnoInterfaceToUniqueIdentifierMapper maInterfaceToIdentifierMapper; uno::Reference< uri::XUriReferenceFactory > mxUriReferenceFactory; - rtl::OUString msPackageURI; - rtl::OUString msPackageURIScheme; + OUString msPackageURI; + OUString msPackageURIScheme; // Written OpenDocument file format doesn't fit to the created text document (#i69627#) sal_Bool mbOutlineStyleAsNormalListStyle; sal_Bool mbSaveBackwardCompatibleODF; @@ -262,10 +261,10 @@ public: SvtSaveOptions maSaveOptions; /// relative path of stream in package, e.g. "someobject/content.xml" - ::rtl::OUString mStreamPath; + OUString mStreamPath; /// name of stream in package, e.g., "content.xml" - ::rtl::OUString mStreamName; + OUString mStreamName; /// stack of backed up namespace maps /// long: depth at which namespace map has been backed up into the stack @@ -278,7 +277,7 @@ public: sal_Bool mbExportTextNumberElement; sal_Bool mbNullDateInitialized; - void SetSchemeOf( const ::rtl::OUString& rOrigFileName ) + void SetSchemeOf( const OUString& rOrigFileName ) { sal_Int32 nSep = rOrigFileName.indexOf(':'); if( nSep != -1 ) @@ -775,7 +774,7 @@ void SAL_CALL SvXMLExport::initialize( const uno::Sequence< uno::Any >& aArgumen mpImpl->mStreamName = sName; // Note: may be empty (XSLT) // Written OpenDocument file format doesn't fit to the created text document (#i69627#) - const ::rtl::OUString sOutlineStyleAsNormalListStyle( + const OUString sOutlineStyleAsNormalListStyle( "OutlineStyleAsNormalListStyle" ); if( xPropertySetInfo->hasPropertyByName( sOutlineStyleAsNormalListStyle ) ) { @@ -787,7 +786,7 @@ void SAL_CALL SvXMLExport::initialize( const uno::Sequence< uno::Any >& aArgumen if( xPropertySetInfo->hasPropertyByName( sTargetStorage ) ) mxExportInfo->getPropertyValue( sTargetStorage ) >>= mpImpl->mxTargetStorage; - const ::rtl::OUString sExportTextNumberElement( + const OUString sExportTextNumberElement( "ExportTextNumberElement" ); if( xPropertySetInfo->hasPropertyByName( sExportTextNumberElement ) ) { @@ -841,12 +840,12 @@ sal_Bool SAL_CALL SvXMLExport::filter( const uno::Sequence< beans::PropertyValue if (GetModel().is()) { // print a trace message with the URL - rtl::OString aUrl(rtl::OUStringToOString(GetModel()->getURL(), + OString aUrl(OUStringToOString(GetModel()->getURL(), RTL_TEXTENCODING_ASCII_US)); RTL_LOGFILE_CONTEXT_TRACE1( aLogContext, "%s", aUrl.getStr() ); // we also want a trace message with the document class - rtl::OString aClass(rtl::OUStringToOString(GetXMLToken(meClass), + OString aClass(OUStringToOString(GetXMLToken(meClass), RTL_TEXTENCODING_ASCII_US)); RTL_LOGFILE_CONTEXT_TRACE1( aLogContext, "class=\"%s\"", aClass.getStr() ); @@ -875,13 +874,13 @@ void SAL_CALL SvXMLExport::cancel() throw(uno::RuntimeException) SetError(XMLERROR_CANCEL|XMLERROR_FLAG_SEVERE, aEmptySeq); } -::rtl::OUString SAL_CALL SvXMLExport::getName( ) +OUString SAL_CALL SvXMLExport::getName( ) throw (::com::sun::star::uno::RuntimeException) { return msFilterName; } -void SAL_CALL SvXMLExport::setName( const ::rtl::OUString& ) +void SAL_CALL SvXMLExport::setName( const OUString& ) throw (::com::sun::star::uno::RuntimeException) { // do nothing, because it is not possible to set the FilterName @@ -913,11 +912,11 @@ uno::Sequence< OUString > SAL_CALL SvXMLExport::getSupportedServiceNames( ) /////////////////////////////////////////////////////////////////////// -::rtl::OUString -SvXMLExport::EnsureNamespace(::rtl::OUString const & i_rNamespace, - ::rtl::OUString const & i_rPreferredPrefix) +OUString +SvXMLExport::EnsureNamespace(OUString const & i_rNamespace, + OUString const & i_rPreferredPrefix) { - ::rtl::OUString sPrefix; + OUString sPrefix; sal_uInt16 nKey( _GetNamespaceMap().GetKeyByName( i_rNamespace ) ); if( XML_NAMESPACE_UNKNOWN == nKey ) { @@ -926,7 +925,7 @@ SvXMLExport::EnsureNamespace(::rtl::OUString const & i_rNamespace, sPrefix = i_rPreferredPrefix; nKey = _GetNamespaceMap().GetKeyByPrefix( sPrefix ); sal_Int32 n( 0 ); - ::rtl::OUStringBuffer buf; + OUStringBuffer buf; while( nKey != USHRT_MAX ) { buf.append( i_rPreferredPrefix ); @@ -1006,15 +1005,15 @@ void SvXMLExport::AddAttribute( sal_uInt16 nPrefixKey, GetXMLToken(eValue) ); } -void SvXMLExport::AddAttribute( const ::rtl::OUString& rQName, - const ::rtl::OUString& rValue ) +void SvXMLExport::AddAttribute( const OUString& rQName, + const OUString& rValue ) { mpAttrList->AddAttribute( rQName, rValue ); } -void SvXMLExport::AddAttribute( const ::rtl::OUString& rQName, +void SvXMLExport::AddAttribute( const OUString& rQName, enum ::xmloff::token::XMLTokenEnum eValue ) { mpAttrList->AddAttribute( @@ -1222,7 +1221,7 @@ void SvXMLExport::addChaffWhenEncryptedStorage() if (xEncr.is() && xEncr->hasEncryptionData() && mxExtHandler.is()) { - mxExtHandler->comment(rtl::OStringToOUString(comphelper::xml::makeXMLChaff(), RTL_TEXTENCODING_ASCII_US)); + mxExtHandler->comment(OStringToOUString(comphelper::xml::makeXMLChaff(), RTL_TEXTENCODING_ASCII_US)); } } @@ -1266,7 +1265,7 @@ sal_uInt32 SvXMLExport::exportDoc( enum ::xmloff::token::XMLTokenEnum eClass ) ::comphelper::PropertyMapEntry aInfoMap[] = { { "Class", sizeof("Class")-1, 0, - &::getCppuType((::rtl::OUString*)0), + &::getCppuType((OUString*)0), PropertyAttribute::MAYBEVOID, 0}, { NULL, 0, 0, NULL, 0, 0 } }; @@ -1481,8 +1480,8 @@ void SvXMLExport::_ExportScripts() // export Basic macros (only for FlatXML) if ( mnExportFlags & EXPORT_EMBEDDED ) { - ::rtl::OUString aValue( GetNamespaceMap().GetPrefixByKey( XML_NAMESPACE_OOO ) ); - aValue += ::rtl::OUString( ":Basic" ); + OUString aValue( GetNamespaceMap().GetPrefixByKey( XML_NAMESPACE_OOO ) ); + aValue += OUString( ":Basic" ); AddAttribute( XML_NAMESPACE_SCRIPT, XML_LANGUAGE, aValue ); SvXMLElementExport aElem( *this, XML_NAMESPACE_OFFICE, XML_SCRIPT, sal_True, sal_True ); @@ -1492,7 +1491,7 @@ void SvXMLExport::_ExportScripts() { Reference< beans::XPropertySet > xPSet( mxModel, UNO_QUERY ); if ( xPSet.is() ) - xPSet->getPropertyValue( ::rtl::OUString( "BasicLibraries" ) ); + xPSet->getPropertyValue( OUString( "BasicLibraries" ) ); } Reference < XDocumentHandler > xHdl( new XMLBasicExportFilter( mxHandler ) ); @@ -2201,7 +2200,7 @@ void SvXMLExport::StartElement(const OUString& rName, ++mpImpl->mDepth; // increment nesting depth counter } -void SvXMLExport::Characters(const ::rtl::OUString& rChars) +void SvXMLExport::Characters(const OUString& rChars) { if ((mnErrorFlags & ERROR_DO_NOTHING) != ERROR_DO_NOTHING) { @@ -2361,14 +2360,14 @@ SvtSaveOptions::ODFDefaultVersion SvXMLExport::getDefaultVersion() const return SvtSaveOptions::ODFVER_012; } -::rtl::OUString SvXMLExport::GetStreamName() const +OUString SvXMLExport::GetStreamName() const { return mpImpl->mStreamName; } void SvXMLExport::AddAttributeIdLegacy( - sal_uInt16 const nLegacyPrefix, ::rtl::OUString const& rValue) + sal_uInt16 const nLegacyPrefix, OUString const& rValue) { switch (getDefaultVersion()) { case SvtSaveOptions::ODFVER_011: // fall thru @@ -2399,7 +2398,7 @@ SvXMLExport::AddAttributeXmlId(uno::Reference<uno::XInterface> const & i_xIfc) const beans::StringPair mdref( xMeta->getMetadataReference() ); if ( !mdref.Second.isEmpty() ) { - const ::rtl::OUString streamName( GetStreamName() ); + const OUString streamName( GetStreamName() ); if ( !streamName.isEmpty() ) { if ( streamName.equals(mdref.First) ) diff --git a/xmloff/source/core/xmlictxt.cxx b/xmloff/source/core/xmlictxt.cxx index fd1e3b8e8867..f748d04fbbca 100644 --- a/xmloff/source/core/xmlictxt.cxx +++ b/xmloff/source/core/xmlictxt.cxx @@ -28,8 +28,6 @@ #include <xmloff/xmlictxt.hxx> #include <tools/debug.hxx> -using ::rtl::OUString; -using ::rtl::OUStringBuffer; using namespace ::com::sun::star; diff --git a/xmloff/source/core/xmlimp.cxx b/xmloff/source/core/xmlimp.cxx index 07c1f4c8298b..b9de04c615c7 100644 --- a/xmloff/source/core/xmlimp.cxx +++ b/xmloff/source/core/xmlimp.cxx @@ -62,8 +62,6 @@ using ::com::sun::star::beans::XPropertySetInfo; -using ::rtl::OUString; -using ::rtl::OUStringBuffer; using namespace ::osl; using namespace ::com::sun::star; @@ -269,9 +267,9 @@ public: INetURLObject aDocBase; /// name of stream in package, e.g., "content.xml" - ::rtl::OUString mStreamName; + OUString mStreamName; - ::rtl::OUString aODFVersion; + OUString aODFVersion; // Boolean, indicating that position attributes // of shapes are given in horizontal left-to-right layout. This is the case @@ -689,7 +687,7 @@ void SAL_CALL SvXMLImport::startElement( const OUString& rName, #ifdef TIMELOG // If we do profiling, we want a trace message for the first element // in order to identify the stream. - rtl::OString aString(rtl::OUStringToOString(rName, RTL_TEXTENCODING_ASCII_US)); + OString aString(OUStringToOString(rName, RTL_TEXTENCODING_ASCII_US)); RTL_LOGFILE_TRACE_AUTHOR1( "xmloff", "unknown", "SvXMLImport::StartElement( \"%s\", ... )", aString.getStr() ); @@ -1160,7 +1158,7 @@ const Reference< container::XNameContainer > & SvXMLImport::GetDashHelper() return mxDashHelper; } -sal_Bool SvXMLImport::IsPackageURL( const ::rtl::OUString& rURL ) const +sal_Bool SvXMLImport::IsPackageURL( const OUString& rURL ) const { // if, and only if, only parts are imported, then we're in a package @@ -1206,16 +1204,16 @@ sal_Bool SvXMLImport::IsPackageURL( const ::rtl::OUString& rURL ) const return sal_True; } -::rtl::OUString SvXMLImport::ResolveGraphicObjectURL( const ::rtl::OUString& rURL, +OUString SvXMLImport::ResolveGraphicObjectURL( const OUString& rURL, sal_Bool bLoadOnDemand ) { - ::rtl::OUString sRet; + OUString sRet; if( IsPackageURL( rURL ) ) { if( !bLoadOnDemand && mxGraphicResolver.is() ) { - ::rtl::OUString aTmp( msPackageProtocol ); + OUString aTmp( msPackageProtocol ); aTmp += rURL; sRet = mxGraphicResolver->resolveGraphicObjectURL( aTmp ); } @@ -1244,7 +1242,7 @@ Reference< XOutputStream > SvXMLImport::GetStreamForGraphicObjectURLFromBase64() return xOStm; } -::rtl::OUString SvXMLImport::ResolveGraphicObjectURLFromBase64( +OUString SvXMLImport::ResolveGraphicObjectURLFromBase64( const Reference < XOutputStream >& rOut ) { OUString sURL; @@ -1255,11 +1253,11 @@ Reference< XOutputStream > SvXMLImport::GetStreamForGraphicObjectURLFromBase64() return sURL; } -::rtl::OUString SvXMLImport::ResolveEmbeddedObjectURL( - const ::rtl::OUString& rURL, - const ::rtl::OUString& rClassId ) +OUString SvXMLImport::ResolveEmbeddedObjectURL( + const OUString& rURL, + const OUString& rClassId ) { - ::rtl::OUString sRet; + OUString sRet; if( IsPackageURL( rURL ) ) { @@ -1304,9 +1302,9 @@ Reference < XOutputStream > return xOLEStream; } -::rtl::OUString SvXMLImport::ResolveEmbeddedObjectURLFromBase64() +OUString SvXMLImport::ResolveEmbeddedObjectURLFromBase64() { - ::rtl::OUString sRet; + OUString sRet; if( mxEmbeddedResolver.is() ) { @@ -1373,7 +1371,7 @@ void SvXMLImport::SetConfigurationSettings(const com::sun::star::uno::Sequence<c { } -void SvXMLImport::SetDocumentSpecificSettings(const ::rtl::OUString& _rSettingsGroupName, const uno::Sequence<beans::PropertyValue>& _rSettings) +void SvXMLImport::SetDocumentSpecificSettings(const OUString& _rSettingsGroupName, const uno::Sequence<beans::PropertyValue>& _rSettings) { (void)_rSettingsGroupName; (void)_rSettings; @@ -1489,7 +1487,7 @@ void SvXMLImport::SetAutoStyles( SvXMLStylesContext *pAutoStyles ) if (pAutoStyles && mxNumberStyles.is() && (mnImportFlags & IMPORT_CONTENT) ) { uno::Reference<xml::sax::XAttributeList> xAttrList; - uno::Sequence< ::rtl::OUString > aNames = mxNumberStyles->getElementNames(); + uno::Sequence< OUString > aNames = mxNumberStyles->getElementNames(); sal_uInt32 nCount(aNames.getLength()); if (nCount) { @@ -1566,7 +1564,7 @@ OUString SvXMLImport::GetAbsoluteReference(const OUString& rValue) const return rValue; } -sal_Bool SvXMLImport::IsODFVersionConsistent( const ::rtl::OUString& aODFVersion ) +sal_Bool SvXMLImport::IsODFVersionConsistent( const OUString& aODFVersion ) { // the check returns sal_False only if the storage version could be retrieved sal_Bool bResult = sal_True; @@ -1582,7 +1580,7 @@ sal_Bool SvXMLImport::IsODFVersionConsistent( const ::rtl::OUString& aODFVersion uno::Reference< beans::XPropertySet > xStorProps( xStor, uno::UNO_QUERY_THROW ); // the check should be done only for OASIS format - ::rtl::OUString aMediaType; + OUString aMediaType; xStorProps->getPropertyValue( "MediaType" ) >>= aMediaType; if ( ::comphelper::OStorageHelper::GetXStorageFormat( xStor ) >= SOFFICE_FILEFORMAT_8 ) { @@ -1597,7 +1595,7 @@ sal_Bool SvXMLImport::IsODFVersionConsistent( const ::rtl::OUString& aODFVersion // check only if not in Repair mode if ( !bRepairPackage ) { - ::rtl::OUString aStorVersion; + OUString aStorVersion; xStorProps->getPropertyValue( "Version" ) >>= aStorVersion; @@ -1773,17 +1771,17 @@ SvXMLImport::GetComponentContext() const return mpImpl->mxComponentContext; } -::rtl::OUString SvXMLImport::GetBaseURL() const +OUString SvXMLImport::GetBaseURL() const { return mpImpl->aBaseURL.GetMainURL( INetURLObject::NO_DECODE ); } -::rtl::OUString SvXMLImport::GetDocumentBase() const +OUString SvXMLImport::GetDocumentBase() const { return mpImpl->aDocBase.GetMainURL( INetURLObject::NO_DECODE ); } -::rtl::OUString SvXMLImport::GetStreamName() const +OUString SvXMLImport::GetStreamName() const { return mpImpl->mStreamName; } @@ -1847,14 +1845,14 @@ bool SvXMLImport::isGraphicLoadOnDemandSupported() const return mbIsGraphicLoadOnDemandSupported; } -::rtl::OUString SvXMLImport::GetODFVersion() const +OUString SvXMLImport::GetODFVersion() const { return mpImpl->aODFVersion; } // xml:id for RDF metadata void SvXMLImport::SetXmlId(uno::Reference<uno::XInterface> const & i_xIfc, - ::rtl::OUString const & i_rXmlId) + OUString const & i_rXmlId) { if (!i_rXmlId.isEmpty()) { try { @@ -1888,10 +1886,10 @@ SvXMLImport::GetRDFaImportHelper() void SvXMLImport::AddRDFa(uno::Reference<rdf::XMetadatable> i_xObject, - ::rtl::OUString const & i_rAbout, - ::rtl::OUString const & i_rProperty, - ::rtl::OUString const & i_rContent, - ::rtl::OUString const & i_rDatatype) + OUString const & i_rAbout, + OUString const & i_rProperty, + OUString const & i_rContent, + OUString const & i_rDatatype) { // N.B.: we only get called if i_xObject had xhtml:about attribute // (an empty attribute value is valid) diff --git a/xmloff/source/core/xmlmultiimagehelper.cxx b/xmloff/source/core/xmlmultiimagehelper.cxx index e060de15c2d3..b1ad7bb1ae19 100644 --- a/xmloff/source/core/xmlmultiimagehelper.cxx +++ b/xmloff/source/core/xmlmultiimagehelper.cxx @@ -28,7 +28,7 @@ using namespace ::com::sun::star; namespace { - sal_uInt32 getQualityIndex(const rtl::OUString& rString) + sal_uInt32 getQualityIndex(const OUString& rString) { sal_uInt32 nRetval(0); @@ -100,7 +100,7 @@ void multiImageImportHelper::solveMultipleImages() for(a = 0; a < maImplContextVector.size(); a++) { - const rtl::OUString aStreamURL(getGraphicURLFromImportContext(**maImplContextVector[a])); + const OUString aStreamURL(getGraphicURLFromImportContext(**maImplContextVector[a])); const sal_uInt32 nNewQuality(getQualityIndex(aStreamURL)); if(nNewQuality > nBestQuality) diff --git a/xmloff/source/core/xmltkmap.cxx b/xmloff/source/core/xmltkmap.cxx index d88c287ab4ba..1087017ca1ae 100644 --- a/xmloff/source/core/xmltkmap.cxx +++ b/xmloff/source/core/xmltkmap.cxx @@ -24,7 +24,6 @@ using namespace ::xmloff::token; -using ::rtl::OUString; class SvXMLTokenMapEntry_Impl { diff --git a/xmloff/source/core/xmltoken.cxx b/xmloff/source/core/xmltoken.cxx index b195b94c41ad..da73b1606aef 100644 --- a/xmloff/source/core/xmltoken.cxx +++ b/xmloff/source/core/xmltoken.cxx @@ -22,7 +22,6 @@ #include <tools/debug.hxx> #include <rtl/ustring.hxx> -using ::rtl::OUString; namespace xmloff { namespace token { @@ -33,7 +32,7 @@ namespace xmloff { namespace token { { sal_Int32 nLength; const sal_Char* pChar; - ::rtl::OUString* pOUString; + OUString* pOUString; #if OSL_DEBUG_LEVEL > 0 XMLTokenEnum eToken; #endif diff --git a/xmloff/source/core/xmluconv.cxx b/xmloff/source/core/xmluconv.cxx index 604c0cd6d90b..056a5c8306e4 100644 --- a/xmloff/source/core/xmluconv.cxx +++ b/xmloff/source/core/xmluconv.cxx @@ -53,8 +53,6 @@ using namespace com::sun::star::style; using namespace ::com::sun::star::i18n; using namespace ::xmloff::token; -using ::rtl::OUString; -using ::rtl::OUStringBuffer; const sal_Int8 XML_MAXDIGITSCOUNT_TIME = 11; const sal_Int8 XML_MAXDIGITSCOUNT_DATETIME = 6; @@ -274,7 +272,7 @@ void SvXMLUnitConverter::convertDouble(OUStringBuffer& rBuffer, /** convert string to double number (using ::rtl::math) */ sal_Bool SvXMLUnitConverter::convertDouble(double& rValue, - const ::rtl::OUString& rString, sal_Bool bLookForUnits) const + const OUString& rString, sal_Bool bLookForUnits) const { if(bLookForUnits) { @@ -297,13 +295,13 @@ sal_Bool SvXMLUnitConverter::setNullDate(const com::sun::star::uno::Reference <c if (xNumberFormatsSupplier.is()) { const com::sun::star::uno::Reference <com::sun::star::beans::XPropertySet> xPropertySet = xNumberFormatsSupplier->getNumberFormatSettings(); - return xPropertySet.is() && (xPropertySet->getPropertyValue(rtl::OUString(XML_NULLDATE)) >>= m_pImpl->m_aNullDate); + return xPropertySet.is() && (xPropertySet->getPropertyValue(OUString(XML_NULLDATE)) >>= m_pImpl->m_aNullDate); } return sal_False; } /** convert double to ISO Date Time String */ -void SvXMLUnitConverter::convertDateTime(::rtl::OUStringBuffer& rBuffer, +void SvXMLUnitConverter::convertDateTime(OUStringBuffer& rBuffer, const double& fDateTime, bool const bAddTimeIf0AM) { convertDateTime(rBuffer, fDateTime, m_pImpl->m_aNullDate, bAddTimeIf0AM); @@ -311,7 +309,7 @@ void SvXMLUnitConverter::convertDateTime(::rtl::OUStringBuffer& rBuffer, /** convert ISO Date Time String to double */ bool SvXMLUnitConverter::convertDateTime(double& fDateTime, - const ::rtl::OUString& rString) + const OUString& rString) { return convertDateTime(fDateTime, rString, m_pImpl->m_aNullDate); } |