summaryrefslogtreecommitdiff
path: root/xmlscript/inc
diff options
context:
space:
mode:
authorOlivier Hallot <olivier.hallot@alta.org.br>2012-09-01 12:44:39 -0300
committerOlivier Hallot <olivier.hallot@alta.org.br>2012-09-05 22:13:17 +0000
commitc75af8578d921040e1baf8414edd7239969bcd45 (patch)
tree2c9310a3da94d1859fd80f03a7217bbfec938b67 /xmlscript/inc
parent72fa23ba0e13e6cf8a7ffb0476863d4399af0da1 (diff)
kill RTL_CONSTASCII_USTRINGPARAM in xmlscript
Plus rtl::OUString cleanup Only on rebased files Change-Id: Icddaa20742cc45f08e5a48790447fcf8865f4bd6 Reviewed-on: https://gerrit.libreoffice.org/527 Reviewed-by: Olivier Hallot <olivier.hallot@alta.org.br> Tested-by: Olivier Hallot <olivier.hallot@alta.org.br>
Diffstat (limited to 'xmlscript/inc')
-rw-r--r--xmlscript/inc/xmlscript/xml_helper.hxx22
-rw-r--r--xmlscript/inc/xmlscript/xmllib_imexp.hxx6
-rw-r--r--xmlscript/inc/xmlscript/xmlmod_imexp.hxx8
3 files changed, 18 insertions, 18 deletions
diff --git a/xmlscript/inc/xmlscript/xml_helper.hxx b/xmlscript/inc/xmlscript/xml_helper.hxx
index 1c7ee37e8ddd..5d3c747452ae 100644
--- a/xmlscript/inc/xmlscript/xml_helper.hxx
+++ b/xmlscript/inc/xmlscript/xml_helper.hxx
@@ -42,7 +42,7 @@ class XMLSCRIPT_DLLPUBLIC XMLElement
: public ::cppu::WeakImplHelper1< ::com::sun::star::xml::sax::XAttributeList >
{
public:
- inline XMLElement( ::rtl::OUString const & name )
+ inline XMLElement( OUString const & name )
SAL_THROW(())
: _name( name )
{}
@@ -67,7 +67,7 @@ public:
@param rAttrName qname of attribute
@param rValue value string of element
*/
- void SAL_CALL addAttribute( ::rtl::OUString const & rAttrName, ::rtl::OUString const & rValue )
+ void SAL_CALL addAttribute( OUString const & rAttrName, OUString const & rValue )
SAL_THROW(());
/** Gets the tag name (qname) of element.
@@ -75,7 +75,7 @@ public:
@return
qname of element
*/
- inline ::rtl::OUString SAL_CALL getName() SAL_THROW(())
+ inline OUString SAL_CALL getName() SAL_THROW(())
{ return _name; }
/** Dumps out element (and all sub elements).
@@ -94,22 +94,22 @@ public:
// XAttributeList
virtual sal_Int16 SAL_CALL getLength()
throw (::com::sun::star::uno::RuntimeException);
- virtual ::rtl::OUString SAL_CALL getNameByIndex( sal_Int16 nPos )
+ virtual OUString SAL_CALL getNameByIndex( sal_Int16 nPos )
throw (::com::sun::star::uno::RuntimeException);
- virtual ::rtl::OUString SAL_CALL getTypeByIndex( sal_Int16 nPos )
+ virtual OUString SAL_CALL getTypeByIndex( sal_Int16 nPos )
throw (::com::sun::star::uno::RuntimeException);
- virtual ::rtl::OUString SAL_CALL getTypeByName( ::rtl::OUString const & rName )
+ virtual OUString SAL_CALL getTypeByName( OUString const & rName )
throw (::com::sun::star::uno::RuntimeException);
- virtual ::rtl::OUString SAL_CALL getValueByIndex( sal_Int16 nPos )
+ virtual OUString SAL_CALL getValueByIndex( sal_Int16 nPos )
throw (::com::sun::star::uno::RuntimeException);
- virtual ::rtl::OUString SAL_CALL getValueByName( ::rtl::OUString const & rName )
+ virtual OUString SAL_CALL getValueByName( OUString const & rName )
throw (::com::sun::star::uno::RuntimeException);
protected:
- ::rtl::OUString _name;
+ OUString _name;
- ::std::vector< ::rtl::OUString > _attrNames;
- ::std::vector< ::rtl::OUString > _attrValues;
+ ::std::vector< OUString > _attrNames;
+ ::std::vector< OUString > _attrValues;
::std::vector< ::com::sun::star::uno::Reference<
::com::sun::star::xml::sax::XAttributeList > > _subElems;
diff --git a/xmlscript/inc/xmlscript/xmllib_imexp.hxx b/xmlscript/inc/xmlscript/xmllib_imexp.hxx
index 5a5d30569d0b..6470e6cba7d1 100644
--- a/xmlscript/inc/xmlscript/xmllib_imexp.hxx
+++ b/xmlscript/inc/xmlscript/xmllib_imexp.hxx
@@ -35,12 +35,12 @@ namespace xmlscript
// functionality from xmlscript
struct XMLSCRIPT_DLLPUBLIC LibDescriptor
{
- ::rtl::OUString aName;
- ::rtl::OUString aStorageURL;
+ OUString aName;
+ OUString aStorageURL;
sal_Bool bLink;
sal_Bool bReadOnly;
sal_Bool bPasswordProtected;
- ::com::sun::star::uno::Sequence< ::rtl::OUString > aElementNames;
+ ::com::sun::star::uno::Sequence< OUString > aElementNames;
sal_Bool bPreload;
};
diff --git a/xmlscript/inc/xmlscript/xmlmod_imexp.hxx b/xmlscript/inc/xmlscript/xmlmod_imexp.hxx
index 58fdd910189a..ed3368acb4f6 100644
--- a/xmlscript/inc/xmlscript/xmlmod_imexp.hxx
+++ b/xmlscript/inc/xmlscript/xmlmod_imexp.hxx
@@ -34,10 +34,10 @@ namespace xmlscript
// functionality from xmlscript
struct XMLSCRIPT_DLLPUBLIC ModuleDescriptor
{
- ::rtl::OUString aName;
- ::rtl::OUString aLanguage;
- ::rtl::OUString aCode;
- ::rtl::OUString aModuleType; // VBA
+ OUString aName;
+ OUString aLanguage;
+ OUString aCode;
+ OUString aModuleType; // VBA
};
XMLSCRIPT_DLLPUBLIC void