summaryrefslogtreecommitdiff
path: root/xmlscript
diff options
context:
space:
mode:
authorLuboš Luňák <l.lunak@suse.cz>2013-04-07 12:06:47 +0200
committerLuboš Luňák <l.lunak@suse.cz>2013-04-07 14:23:11 +0200
commit1946794ae09ba732022fe6a74ea45e304ab70b84 (patch)
treee32bd7ba61fa021ecc7f8c85959df8ca837d6e81 /xmlscript
parent5b08c6e7a21dda94d5b755eea0b1ed1e9c199bec (diff)
mass removal of rtl:: prefixes for O(U)String*
Modules sal, salhelper, cppu, cppuhelper, codemaker (selectively) and odk have kept them, in order not to break external API (the automatic using declaration is LO-internal). Change-Id: I588fc9e0c45b914f824f91c0376980621d730f09
Diffstat (limited to 'xmlscript')
-rw-r--r--xmlscript/source/xml_helper/xml_element.cxx1
-rw-r--r--xmlscript/source/xmldlg_imexp/xmldlg_expmodels.cxx1
-rw-r--r--xmlscript/source/xmldlg_imexp/xmldlg_export.cxx2
-rw-r--r--xmlscript/source/xmldlg_imexp/xmldlg_impmodels.cxx1
-rw-r--r--xmlscript/source/xmldlg_imexp/xmldlg_import.cxx9
-rw-r--r--xmlscript/source/xmlflat_imexp/xmlbas_export.hxx10
-rw-r--r--xmlscript/source/xmlflat_imexp/xmlbas_import.hxx70
-rw-r--r--xmlscript/source/xmllib_imexp/xmllib_export.cxx1
-rw-r--r--xmlscript/source/xmlmod_imexp/imp_share.hxx2
9 files changed, 45 insertions, 52 deletions
diff --git a/xmlscript/source/xml_helper/xml_element.cxx b/xmlscript/source/xml_helper/xml_element.cxx
index 9511030b0159..afb9a6d54422 100644
--- a/xmlscript/source/xml_helper/xml_element.cxx
+++ b/xmlscript/source/xml_helper/xml_element.cxx
@@ -23,7 +23,6 @@
using namespace com::sun::star;
using namespace com::sun::star::uno;
-using ::rtl::OUString;
namespace xmlscript
{
diff --git a/xmlscript/source/xmldlg_imexp/xmldlg_expmodels.cxx b/xmlscript/source/xmldlg_imexp/xmldlg_expmodels.cxx
index 30b662836d1e..9f8d8814a538 100644
--- a/xmlscript/source/xmldlg_imexp/xmldlg_expmodels.cxx
+++ b/xmlscript/source/xmldlg_imexp/xmldlg_expmodels.cxx
@@ -32,7 +32,6 @@
using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
-using ::rtl::OUString;
namespace xmlscript
{
diff --git a/xmlscript/source/xmldlg_imexp/xmldlg_export.cxx b/xmlscript/source/xmldlg_imexp/xmldlg_export.cxx
index 7b855d893337..e9a27608165f 100644
--- a/xmlscript/source/xmldlg_imexp/xmldlg_export.cxx
+++ b/xmlscript/source/xmldlg_imexp/xmldlg_export.cxx
@@ -62,8 +62,6 @@
using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
-using ::rtl::OUString;
-using ::rtl::OUStringBuffer;
namespace xmlscript
{
diff --git a/xmlscript/source/xmldlg_imexp/xmldlg_impmodels.cxx b/xmlscript/source/xmldlg_imexp/xmldlg_impmodels.cxx
index eccf7eaf1b5a..d756612f2c02 100644
--- a/xmlscript/source/xmldlg_imexp/xmldlg_impmodels.cxx
+++ b/xmlscript/source/xmldlg_imexp/xmldlg_impmodels.cxx
@@ -34,7 +34,6 @@
#include <comphelper/processfactory.hxx>
using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
-using ::rtl::OUString;
namespace xmlscript
{
diff --git a/xmlscript/source/xmldlg_imexp/xmldlg_import.cxx b/xmlscript/source/xmldlg_imexp/xmldlg_import.cxx
index 98fe378ab9a9..6a520ffa1626 100644
--- a/xmlscript/source/xmldlg_imexp/xmldlg_import.cxx
+++ b/xmlscript/source/xmldlg_imexp/xmldlg_import.cxx
@@ -57,7 +57,6 @@
using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::frame;
-using ::rtl::OUString;
namespace xmlscript
{
@@ -876,7 +875,7 @@ bool ImportContext::importImageURLProperty(
OUString const & rPropName, OUString const & rAttrName,
Reference< xml::input::XAttributes > const & xAttributes )
{
- rtl::OUString sURL = xAttributes->getValueByUidName( _pImport->XMLNS_DIALOGS_UID, rAttrName );
+ OUString sURL = xAttributes->getValueByUidName( _pImport->XMLNS_DIALOGS_UID, rAttrName );
if ( !sURL.isEmpty() )
{
Reference< document::XStorageBasedDocument > xDocStorage( _pImport->getDocOwner(), UNO_QUERY );
@@ -919,7 +918,7 @@ bool ImportContext::importImageURLProperty(
}
//__________________________________________________________________________________________________
bool ImportContext::importDataAwareProperty(
- ::rtl::OUString const & rPropName,
+ OUString const & rPropName,
Reference<xml::input::XAttributes> const & xAttributes )
{
OUString sLinkedCell;
@@ -1681,7 +1680,7 @@ ElementBase::~ElementBase()
}
#if OSL_DEBUG_LEVEL > 1
- ::rtl::OString aStr( ::rtl::OUStringToOString(
+ OString aStr( OUStringToOString(
_aLocalName, RTL_TEXTENCODING_ASCII_US ) );
OSL_TRACE( "ElementBase::~ElementBase(): %s", aStr.getStr() );
#endif
@@ -1795,7 +1794,7 @@ Reference< xml::sax::XDocumentHandler > SAL_CALL importDialogModel(
SAL_THROW( (Exception) )
{
// single set of styles and stylenames apply to all containees
- :: boost::shared_ptr< ::std::vector< ::rtl::OUString > > pStyleNames( new ::std::vector< ::rtl::OUString > );
+ :: boost::shared_ptr< ::std::vector< OUString > > pStyleNames( new ::std::vector< OUString > );
:: boost::shared_ptr< ::std::vector< css::uno::Reference< css::xml::input::XElement > > > pStyles( new ::std::vector< css::uno::Reference< css::xml::input::XElement > > );
return ::xmlscript::createDocumentHandler(
static_cast< xml::input::XRoot * >(
diff --git a/xmlscript/source/xmlflat_imexp/xmlbas_export.hxx b/xmlscript/source/xmlflat_imexp/xmlbas_export.hxx
index c20b53e23609..1b37365b7719 100644
--- a/xmlscript/source/xmlflat_imexp/xmlbas_export.hxx
+++ b/xmlscript/source/xmlflat_imexp/xmlbas_export.hxx
@@ -59,7 +59,7 @@ namespace xmlscript
virtual ~XMLBasicExporterBase();
// XServiceInfo
- virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName )
+ virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
throw (::com::sun::star::uno::RuntimeException);
// XInitialization
@@ -90,9 +90,9 @@ namespace xmlscript
virtual ~XMLBasicExporter();
// XServiceInfo
- virtual ::rtl::OUString SAL_CALL getImplementationName( )
+ virtual OUString SAL_CALL getImplementationName( )
throw (::com::sun::star::uno::RuntimeException);
- virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( )
+ virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( )
throw (::com::sun::star::uno::RuntimeException);
};
@@ -109,9 +109,9 @@ namespace xmlscript
virtual ~XMLOasisBasicExporter();
// XServiceInfo
- virtual ::rtl::OUString SAL_CALL getImplementationName( )
+ virtual OUString SAL_CALL getImplementationName( )
throw (::com::sun::star::uno::RuntimeException);
- virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( )
+ virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( )
throw (::com::sun::star::uno::RuntimeException);
};
diff --git a/xmlscript/source/xmlflat_imexp/xmlbas_import.hxx b/xmlscript/source/xmlflat_imexp/xmlbas_import.hxx
index 5f16ea61204e..060a72d453ff 100644
--- a/xmlscript/source/xmlflat_imexp/xmlbas_import.hxx
+++ b/xmlscript/source/xmlflat_imexp/xmlbas_import.hxx
@@ -51,15 +51,15 @@ namespace xmlscript
protected:
BasicImport* m_pImport;
BasicElementBase* m_pParent;
- ::rtl::OUString m_aLocalName;
+ OUString m_aLocalName;
::com::sun::star::uno::Reference< ::com::sun::star::xml::input::XAttributes > m_xAttributes;
- bool getBoolAttr( sal_Bool* pRet, const ::rtl::OUString& rAttrName,
+ bool getBoolAttr( sal_Bool* pRet, const OUString& rAttrName,
const ::com::sun::star::uno::Reference< ::com::sun::star::xml::input::XAttributes >& xAttributes,
sal_Int32 nUid );
public:
- BasicElementBase( const ::rtl::OUString& rLocalName,
+ BasicElementBase( const OUString& rLocalName,
const ::com::sun::star::uno::Reference< ::com::sun::star::xml::input::XAttributes >& xAttributes,
BasicElementBase* pParent, BasicImport* pImport );
virtual ~BasicElementBase();
@@ -67,23 +67,23 @@ namespace xmlscript
// XElement
virtual ::com::sun::star::uno::Reference< ::com::sun::star::xml::input::XElement > SAL_CALL getParent()
throw (::com::sun::star::uno::RuntimeException);
- virtual ::rtl::OUString SAL_CALL getLocalName()
+ virtual OUString SAL_CALL getLocalName()
throw (::com::sun::star::uno::RuntimeException);
virtual sal_Int32 SAL_CALL getUid()
throw (::com::sun::star::uno::RuntimeException);
virtual ::com::sun::star::uno::Reference< ::com::sun::star::xml::input::XAttributes > SAL_CALL getAttributes()
throw (::com::sun::star::uno::RuntimeException);
virtual ::com::sun::star::uno::Reference< ::com::sun::star::xml::input::XElement > SAL_CALL startChildElement(
- sal_Int32 nUid, const ::rtl::OUString& rLocalName,
+ sal_Int32 nUid, const OUString& rLocalName,
const ::com::sun::star::uno::Reference< ::com::sun::star::xml::input::XAttributes >& xAttributes )
throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL characters( const ::rtl::OUString& rChars )
+ virtual void SAL_CALL characters( const OUString& rChars )
throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException);
virtual void SAL_CALL ignorableWhitespace(
- const ::rtl::OUString& rWhitespaces )
+ const OUString& rWhitespaces )
throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException);
virtual void SAL_CALL processingInstruction(
- const ::rtl::OUString& rTarget, const ::rtl::OUString& rData )
+ const OUString& rTarget, const OUString& rData )
throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException);
virtual void SAL_CALL endElement()
throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException);
@@ -100,14 +100,14 @@ namespace xmlscript
::com::sun::star::uno::Reference< ::com::sun::star::script::XLibraryContainer2 > m_xLibContainer;
public:
- BasicLibrariesElement( const ::rtl::OUString& rLocalName,
+ BasicLibrariesElement( const OUString& rLocalName,
const ::com::sun::star::uno::Reference< ::com::sun::star::xml::input::XAttributes >& xAttributes,
BasicElementBase* pParent, BasicImport* pImport,
const ::com::sun::star::uno::Reference< ::com::sun::star::script::XLibraryContainer2 >& rxLibContainer );
// XElement
virtual ::com::sun::star::uno::Reference< ::com::sun::star::xml::input::XElement > SAL_CALL startChildElement(
- sal_Int32 nUid, const ::rtl::OUString& rLocalName,
+ sal_Int32 nUid, const OUString& rLocalName,
const ::com::sun::star::uno::Reference< ::com::sun::star::xml::input::XAttributes >& xAttributes )
throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException);
virtual void SAL_CALL endElement()
@@ -124,19 +124,19 @@ namespace xmlscript
private:
::com::sun::star::uno::Reference< ::com::sun::star::script::XLibraryContainer2 > m_xLibContainer;
::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer > m_xLib;
- ::rtl::OUString m_aLibName;
+ OUString m_aLibName;
bool m_bReadOnly;
public:
- BasicEmbeddedLibraryElement( const ::rtl::OUString& rLocalName,
+ BasicEmbeddedLibraryElement( const OUString& rLocalName,
const ::com::sun::star::uno::Reference< ::com::sun::star::xml::input::XAttributes >& xAttributes,
BasicElementBase* pParent, BasicImport* pImport,
const ::com::sun::star::uno::Reference< ::com::sun::star::script::XLibraryContainer2 >& rxLibContainer,
- const ::rtl::OUString& rLibName, bool bReadOnly );
+ const OUString& rLibName, bool bReadOnly );
// XElement
virtual ::com::sun::star::uno::Reference< ::com::sun::star::xml::input::XElement > SAL_CALL startChildElement(
- sal_Int32 nUid, const ::rtl::OUString& rLocalName,
+ sal_Int32 nUid, const OUString& rLocalName,
const ::com::sun::star::uno::Reference< ::com::sun::star::xml::input::XAttributes >& xAttributes )
throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException);
virtual void SAL_CALL endElement()
@@ -152,18 +152,18 @@ namespace xmlscript
{
private:
::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer > m_xLib;
- ::rtl::OUString m_aName;
+ OUString m_aName;
public:
- BasicModuleElement( const ::rtl::OUString& rLocalName,
+ BasicModuleElement( const OUString& rLocalName,
const ::com::sun::star::uno::Reference< ::com::sun::star::xml::input::XAttributes >& xAttributes,
BasicElementBase* pParent, BasicImport* pImport,
const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >& rxLib,
- const ::rtl::OUString& rName );
+ const OUString& rName );
// XElement
virtual ::com::sun::star::uno::Reference< ::com::sun::star::xml::input::XElement > SAL_CALL startChildElement(
- sal_Int32 nUid, const ::rtl::OUString& rLocalName,
+ sal_Int32 nUid, const OUString& rLocalName,
const ::com::sun::star::uno::Reference< ::com::sun::star::xml::input::XAttributes >& xAttributes )
throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException);
virtual void SAL_CALL endElement()
@@ -179,18 +179,18 @@ namespace xmlscript
{
private:
::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer > m_xLib;
- ::rtl::OUString m_aName;
- ::rtl::OUStringBuffer m_aBuffer;
+ OUString m_aName;
+ OUStringBuffer m_aBuffer;
public:
- BasicSourceCodeElement( const ::rtl::OUString& rLocalName,
+ BasicSourceCodeElement( const OUString& rLocalName,
const ::com::sun::star::uno::Reference< ::com::sun::star::xml::input::XAttributes >& xAttributes,
BasicElementBase* pParent, BasicImport* pImport,
const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >& rxLib,
- const ::rtl::OUString& rName );
+ const OUString& rName );
// XElement
- virtual void SAL_CALL characters( const ::rtl::OUString& rChars )
+ virtual void SAL_CALL characters( const OUString& rChars )
throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException);
virtual void SAL_CALL endElement()
throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException);
@@ -228,13 +228,13 @@ namespace xmlscript
virtual void SAL_CALL endDocument()
throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException);
virtual void SAL_CALL processingInstruction(
- const ::rtl::OUString& rTarget, const ::rtl::OUString& rData )
+ const OUString& rTarget, const OUString& rData )
throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException);
virtual void SAL_CALL setDocumentLocator(
const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XLocator >& xLocator )
throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException);
virtual ::com::sun::star::uno::Reference< ::com::sun::star::xml::input::XElement > SAL_CALL startRootElement(
- sal_Int32 nUid, const ::rtl::OUString& rLocalName,
+ sal_Int32 nUid, const OUString& rLocalName,
const ::com::sun::star::uno::Reference< ::com::sun::star::xml::input::XAttributes >& xAttributes )
throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException);
};
@@ -263,7 +263,7 @@ namespace xmlscript
virtual ~XMLBasicImporterBase();
// XServiceInfo
- virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName )
+ virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
throw (::com::sun::star::uno::RuntimeException);
// XImporter
@@ -275,16 +275,16 @@ namespace xmlscript
throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException);
virtual void SAL_CALL endDocument()
throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL startElement( const ::rtl::OUString& aName,
+ virtual void SAL_CALL startElement( const OUString& aName,
const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttribs )
throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL endElement( const ::rtl::OUString& aName )
+ virtual void SAL_CALL endElement( const OUString& aName )
throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL characters( const ::rtl::OUString& aChars )
+ virtual void SAL_CALL characters( const OUString& aChars )
throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL ignorableWhitespace( const ::rtl::OUString& aWhitespaces )
+ virtual void SAL_CALL ignorableWhitespace( const OUString& aWhitespaces )
throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL processingInstruction( const ::rtl::OUString& aTarget, const ::rtl::OUString& aData )
+ virtual void SAL_CALL processingInstruction( const OUString& aTarget, const OUString& aData )
throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException);
virtual void SAL_CALL setDocumentLocator( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XLocator >& xLocator )
throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException);
@@ -303,9 +303,9 @@ namespace xmlscript
virtual ~XMLBasicImporter();
// XServiceInfo
- virtual ::rtl::OUString SAL_CALL getImplementationName( )
+ virtual OUString SAL_CALL getImplementationName( )
throw (::com::sun::star::uno::RuntimeException);
- virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( )
+ virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( )
throw (::com::sun::star::uno::RuntimeException);
};
@@ -322,9 +322,9 @@ namespace xmlscript
virtual ~XMLOasisBasicImporter();
// XServiceInfo
- virtual ::rtl::OUString SAL_CALL getImplementationName( )
+ virtual OUString SAL_CALL getImplementationName( )
throw (::com::sun::star::uno::RuntimeException);
- virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( )
+ virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( )
throw (::com::sun::star::uno::RuntimeException);
};
diff --git a/xmlscript/source/xmllib_imexp/xmllib_export.cxx b/xmlscript/source/xmllib_imexp/xmllib_export.cxx
index 3d1e3dad2d36..5df774515f83 100644
--- a/xmlscript/source/xmllib_imexp/xmllib_export.cxx
+++ b/xmlscript/source/xmllib_imexp/xmllib_export.cxx
@@ -24,7 +24,6 @@
using namespace com::sun::star::uno;
using namespace com::sun::star;
-using ::rtl::OUString;
namespace xmlscript
{
diff --git a/xmlscript/source/xmlmod_imexp/imp_share.hxx b/xmlscript/source/xmlmod_imexp/imp_share.hxx
index abf5f0ac3abf..cbdb625db17f 100644
--- a/xmlscript/source/xmlmod_imexp/imp_share.hxx
+++ b/xmlscript/source/xmlmod_imexp/imp_share.hxx
@@ -91,7 +91,7 @@ protected:
OUString _aLocalName;
Reference< xml::input::XAttributes > _xAttributes;
- ::rtl::OUStringBuffer _StrBuffer;
+ OUStringBuffer _StrBuffer;
public:
ModuleElement(