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

20 files changed, 54 insertions, 66 deletions

diff --git a/xmloff/source/xforms/SchemaContext.cxx b/xmloff/source/xforms/SchemaContext.cxx
index 35a34ce11a76..393b3e6b4b1e 100644
--- a/xmloff/source/xforms/SchemaContext.cxx
+++ b/xmloff/source/xforms/SchemaContext.cxx
@@ -32,7 +32,6 @@
 #include <com/sun/star/xsd/WhiteSpaceTreatment.hpp>
 #include <com/sun/star/xforms/XDataTypeRepository.hpp>
 
-using rtl::OUString;
 using com::sun::star::uno::Reference;
 using com::sun::star::uno::Any;
 using com::sun::star::xml::sax::XAttributeList;
diff --git a/xmloff/source/xforms/SchemaContext.hxx b/xmloff/source/xforms/SchemaContext.hxx
index 916e762b2ba1..449b6ab04abb 100644
--- a/xmloff/source/xforms/SchemaContext.hxx
+++ b/xmloff/source/xforms/SchemaContext.hxx
@@ -46,7 +46,7 @@ public:
 
     SchemaContext( SvXMLImport& rImport,
                    sal_uInt16 nPrfx,
-                   const ::rtl::OUString& rLName,
+                   const OUString& rLName,
                    const com::sun::star::uno::Reference<com::sun::star::xforms::XDataTypeRepository>& rRepository );
     virtual ~SchemaContext();
 
@@ -59,12 +59,12 @@ protected:
 
     virtual void HandleAttribute(
         sal_uInt16 nToken,
-        const rtl::OUString& rValue );
+        const OUString& rValue );
 
     virtual SvXMLImportContext* HandleChild(
         sal_uInt16 nToken,
         sal_uInt16 nPrefix,
-        const rtl::OUString& rLocalName,
+        const OUString& rLocalName,
         const com::sun::star::uno::Reference<com::sun::star::xml::sax::XAttributeList>& xAttrList );
 };
 
diff --git a/xmloff/source/xforms/SchemaRestrictionContext.cxx b/xmloff/source/xforms/SchemaRestrictionContext.cxx
index 071a5afa05d1..facfafbcdc07 100644
--- a/xmloff/source/xforms/SchemaRestrictionContext.cxx
+++ b/xmloff/source/xforms/SchemaRestrictionContext.cxx
@@ -42,7 +42,6 @@
 #include <tools/debug.hxx>
 
 
-using rtl::OUString;
 using com::sun::star::uno::Reference;
 using com::sun::star::uno::Exception;
 using com::sun::star::uno::Any;
diff --git a/xmloff/source/xforms/SchemaRestrictionContext.hxx b/xmloff/source/xforms/SchemaRestrictionContext.hxx
index 22f29946cb4c..47c5c5124058 100644
--- a/xmloff/source/xforms/SchemaRestrictionContext.hxx
+++ b/xmloff/source/xforms/SchemaRestrictionContext.hxx
@@ -42,16 +42,16 @@ class SchemaRestrictionContext : public TokenContext
 {
     com::sun::star::uno::Reference<com::sun::star::xforms::XDataTypeRepository> mxRepository;
     com::sun::star::uno::Reference<com::sun::star::beans::XPropertySet> mxDataType;
-    ::rtl::OUString msTypeName;
-    ::rtl::OUString msBaseName;
+    OUString msTypeName;
+    OUString msBaseName;
 
 public:
 
     SchemaRestrictionContext( SvXMLImport& rImport,
                               sal_uInt16 nPrfx,
-                              const ::rtl::OUString& rLName,
+                              const OUString& rLName,
                               com::sun::star::uno::Reference<com::sun::star::xforms::XDataTypeRepository>& rRepository,
-                              const ::rtl::OUString& sTypeName );
+                              const OUString& sTypeName );
     virtual ~SchemaRestrictionContext();
 
 
@@ -66,12 +66,12 @@ protected:
 
     virtual void HandleAttribute(
         sal_uInt16 nToken,
-        const rtl::OUString& rValue );
+        const OUString& rValue );
 
     virtual SvXMLImportContext* HandleChild(
         sal_uInt16 nToken,
         sal_uInt16 nPrefix,
-        const rtl::OUString& rLocalName,
+        const OUString& rLocalName,
         const com::sun::star::uno::Reference<com::sun::star::xml::sax::XAttributeList>& xAttrList );
 };
 
diff --git a/xmloff/source/xforms/SchemaSimpleTypeContext.cxx b/xmloff/source/xforms/SchemaSimpleTypeContext.cxx
index 5a773ef81052..747dd2288444 100644
--- a/xmloff/source/xforms/SchemaSimpleTypeContext.cxx
+++ b/xmloff/source/xforms/SchemaSimpleTypeContext.cxx
@@ -30,7 +30,6 @@
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/xsd/WhiteSpaceTreatment.hpp>
 
-using rtl::OUString;
 using com::sun::star::uno::Reference;
 using com::sun::star::uno::Any;
 using com::sun::star::xml::sax::XAttributeList;
diff --git a/xmloff/source/xforms/SchemaSimpleTypeContext.hxx b/xmloff/source/xforms/SchemaSimpleTypeContext.hxx
index f27f7ce2774b..4b91e8bf0607 100644
--- a/xmloff/source/xforms/SchemaSimpleTypeContext.hxx
+++ b/xmloff/source/xforms/SchemaSimpleTypeContext.hxx
@@ -41,13 +41,13 @@ class SvXMLImportContext;
 class SchemaSimpleTypeContext : public TokenContext
 {
     com::sun::star::uno::Reference<com::sun::star::xforms::XDataTypeRepository> mxRepository;
-    rtl::OUString msTypeName;
+    OUString msTypeName;
 
 public:
 
     SchemaSimpleTypeContext( SvXMLImport& rImport,
                              sal_uInt16 nPrfx,
-                             const ::rtl::OUString& rLName,
+                             const OUString& rLName,
                              const com::sun::star::uno::Reference<com::sun::star::xforms::XDataTypeRepository>& rRepository );
 
     virtual ~SchemaSimpleTypeContext();
@@ -61,12 +61,12 @@ protected:
 
     virtual void HandleAttribute(
         sal_uInt16 nToken,
-        const rtl::OUString& rValue );
+        const OUString& rValue );
 
     virtual SvXMLImportContext* HandleChild(
         sal_uInt16 nToken,
         sal_uInt16 nPrefix,
-        const rtl::OUString& rLocalName,
+        const OUString& rLocalName,
         const com::sun::star::uno::Reference<com::sun::star::xml::sax::XAttributeList>& xAttrList );
 };
 
diff --git a/xmloff/source/xforms/TokenContext.cxx b/xmloff/source/xforms/TokenContext.cxx
index 24f3fe2fd7f8..3790018ff531 100644
--- a/xmloff/source/xforms/TokenContext.cxx
+++ b/xmloff/source/xforms/TokenContext.cxx
@@ -25,7 +25,6 @@
 
 #include <tools/debug.hxx>
 
-using rtl::OUString;
 using com::sun::star::uno::Reference;
 using com::sun::star::xml::sax::XAttributeList;
 
@@ -124,7 +123,7 @@ static bool lcl_IsWhiteSpace( sal_Unicode c )
         || c == sal_Unicode( 0x0D );
 }
 
-void TokenContext::Characters( const ::rtl::OUString& rCharacters )
+void TokenContext::Characters( const OUString& rCharacters )
 {
     // get iterators for string data
     const sal_Unicode* pBegin = rCharacters.getStr();
diff --git a/xmloff/source/xforms/TokenContext.hxx b/xmloff/source/xforms/TokenContext.hxx
index a7ced8e7936b..0e74939bc8a5 100644
--- a/xmloff/source/xforms/TokenContext.hxx
+++ b/xmloff/source/xforms/TokenContext.hxx
@@ -49,7 +49,7 @@ public:
 
     TokenContext( SvXMLImport& rImport,
                   sal_uInt16 nPrefix,
-                  const ::rtl::OUString& rLocalName,
+                  const OUString& rLocalName,
                   const SvXMLTokenMapEntry* pAttributes = NULL,
                   const SvXMLTokenMapEntry* pChildren = NULL );
 
@@ -72,20 +72,20 @@ public:
      * handling of defaults. */
     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 );
 
     /** Create a warning for all non-namespace character
      * content. Classes that wish to deal with character content have
      * to overload this method anyway, and will thus get rid of the
      * warnings. */
-    virtual void Characters( const ::rtl::OUString& rChars );
+    virtual void Characters( const OUString& rChars );
 
 protected:
     /** will be called for each attribute */
     virtual void HandleAttribute(
         sal_uInt16 nToken,
-        const rtl::OUString& rValue ) = 0;
+        const OUString& rValue ) = 0;
 
     /** will be called for each child element */
     virtual SvXMLImportContext* HandleChild(
@@ -94,7 +94,7 @@ protected:
         // the following attributes are mainly to be used for child
         // context creation
         sal_uInt16 nPrefix,
-        const rtl::OUString& rLocalName,
+        const OUString& rLocalName,
         const com::sun::star::uno::Reference<com::sun::star::xml::sax::XAttributeList>& xAttrList ) = 0;
 };
 
diff --git a/xmloff/source/xforms/XFormsBindContext.cxx b/xmloff/source/xforms/XFormsBindContext.cxx
index 452156c65e85..4358dd76bd18 100644
--- a/xmloff/source/xforms/XFormsBindContext.cxx
+++ b/xmloff/source/xforms/XFormsBindContext.cxx
@@ -34,7 +34,6 @@
 
 #include <tools/debug.hxx>
 
-using rtl::OUString;
 using com::sun::star::beans::XPropertySet;
 using com::sun::star::uno::Reference;
 using com::sun::star::uno::makeAny;
diff --git a/xmloff/source/xforms/XFormsBindContext.hxx b/xmloff/source/xforms/XFormsBindContext.hxx
index d376c60f7db3..1705b2f4cde1 100644
--- a/xmloff/source/xforms/XFormsBindContext.hxx
+++ b/xmloff/source/xforms/XFormsBindContext.hxx
@@ -48,7 +48,7 @@ public:
 
     XFormsBindContext( SvXMLImport& rImport,
                        sal_uInt16 nPrefix,
-                       const rtl::OUString& rLocalName,
+                       const OUString& rLocalName,
                        const com::sun::star::uno::Reference<com::sun::star::xforms::XModel2>& xModel );
     virtual ~XFormsBindContext();
 
@@ -62,12 +62,12 @@ public:
 
 protected:
     virtual void HandleAttribute( sal_uInt16 nToken,
-                                  const rtl::OUString& rValue );
+                                  const OUString& rValue );
 
     virtual SvXMLImportContext* HandleChild(
         sal_uInt16 nToken,
         sal_uInt16 nNamespace,
-        const rtl::OUString& rLocalName,
+        const OUString& rLocalName,
         const com::sun::star::uno::Reference<com::sun::star::xml::sax::XAttributeList>& xAttrList );
 
 };
diff --git a/xmloff/source/xforms/XFormsInstanceContext.cxx b/xmloff/source/xforms/XFormsInstanceContext.cxx
index 1e437fa4902e..fbc218545537 100644
--- a/xmloff/source/xforms/XFormsInstanceContext.cxx
+++ b/xmloff/source/xforms/XFormsInstanceContext.cxx
@@ -38,7 +38,6 @@
 #include <xmloff/nmspmap.hxx>
 
 
-using rtl::OUString;
 using com::sun::star::uno::Reference;
 using com::sun::star::uno::makeAny;
 using com::sun::star::uno::UNO_QUERY;
@@ -121,7 +120,7 @@ void XFormsInstanceContext::EndElement()
 
 void XFormsInstanceContext::HandleAttribute(
     sal_uInt16 nToken,
-    const rtl::OUString& rValue )
+    const OUString& rValue )
 {
     switch( nToken )
     {
diff --git a/xmloff/source/xforms/XFormsInstanceContext.hxx b/xmloff/source/xforms/XFormsInstanceContext.hxx
index 30b50c2176e5..d19fbadd52d4 100644
--- a/xmloff/source/xforms/XFormsInstanceContext.hxx
+++ b/xmloff/source/xforms/XFormsInstanceContext.hxx
@@ -44,14 +44,14 @@ class XFormsInstanceContext : public TokenContext
 {
     com::sun::star::uno::Reference<com::sun::star::xforms::XModel2> mxModel;
     com::sun::star::uno::Reference<com::sun::star::xml::dom::XDocument> mxInstance;
-    rtl::OUString msId;
-    rtl::OUString msURL;
+    OUString msId;
+    OUString msURL;
 
 public:
 
     XFormsInstanceContext( SvXMLImport& rImport,
                            sal_uInt16 nPrfx,
-                           const ::rtl::OUString& rLName,
+                           const OUString& rLName,
                            const com::sun::star::uno::Reference<com::sun::star::xforms::XModel2> & xModel );
     virtual ~XFormsInstanceContext();
 
@@ -65,7 +65,7 @@ public:
 
     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 EndElement();
@@ -74,12 +74,12 @@ protected:
 
     virtual void HandleAttribute(
         sal_uInt16 nToken,
-        const rtl::OUString& rValue );
+        const OUString& rValue );
 
     virtual SvXMLImportContext* HandleChild(
         sal_uInt16 nToken,
         sal_uInt16 nNamespace,
-        const rtl::OUString& rLocalName,
+        const OUString& rLocalName,
         const com::sun::star::uno::Reference<com::sun::star::xml::sax::XAttributeList>& xAttrList );
 };
 
diff --git a/xmloff/source/xforms/XFormsModelContext.cxx b/xmloff/source/xforms/XFormsModelContext.cxx
index 0cccc425188b..947981dbc350 100644
--- a/xmloff/source/xforms/XFormsModelContext.cxx
+++ b/xmloff/source/xforms/XFormsModelContext.cxx
@@ -38,7 +38,6 @@
 #include <com/sun/star/xforms/XModel2.hpp>
 
 
-using rtl::OUString;
 using com::sun::star::xml::sax::XAttributeList;
 using com::sun::star::beans::XPropertySet;
 using com::sun::star::util::XUpdatable;
diff --git a/xmloff/source/xforms/XFormsModelContext.hxx b/xmloff/source/xforms/XFormsModelContext.hxx
index 9339bc59eccd..8e538328dae9 100644
--- a/xmloff/source/xforms/XFormsModelContext.hxx
+++ b/xmloff/source/xforms/XFormsModelContext.hxx
@@ -46,7 +46,7 @@ public:
 
     XFormsModelContext( SvXMLImport& rImport,
                         sal_uInt16 nPrfx,
-                        const ::rtl::OUString& rLName );
+                        const OUString& rLName );
     virtual ~XFormsModelContext();
 
     com::sun::star::uno::Reference<com::sun::star::xforms::XModel2> getModel();
@@ -61,12 +61,12 @@ protected:
 
     virtual void HandleAttribute(
         sal_uInt16 nToken,
-        const rtl::OUString& rValue );
+        const OUString& rValue );
 
     virtual SvXMLImportContext* HandleChild(
         sal_uInt16 nToken,
         sal_uInt16 nPrefix,
-        const rtl::OUString& rLocalName,
+        const OUString& rLocalName,
         const com::sun::star::uno::Reference<com::sun::star::xml::sax::XAttributeList>& xAttrList );
 };
 
diff --git a/xmloff/source/xforms/XFormsSubmissionContext.cxx b/xmloff/source/xforms/XFormsSubmissionContext.cxx
index 23e470cdf619..fb0bdbbf0a3a 100644
--- a/xmloff/source/xforms/XFormsSubmissionContext.cxx
+++ b/xmloff/source/xforms/XFormsSubmissionContext.cxx
@@ -36,7 +36,6 @@
 
 #include <tools/debug.hxx>
 
-using rtl::OUString;
 using com::sun::star::beans::XPropertySet;
 using com::sun::star::container::XNameContainer;
 using com::sun::star::xml::sax::XAttributeList;
diff --git a/xmloff/source/xforms/XFormsSubmissionContext.hxx b/xmloff/source/xforms/XFormsSubmissionContext.hxx
index 0c56d8bec171..bc09a4b6658f 100644
--- a/xmloff/source/xforms/XFormsSubmissionContext.hxx
+++ b/xmloff/source/xforms/XFormsSubmissionContext.hxx
@@ -47,7 +47,7 @@ public:
 
     XFormsSubmissionContext( SvXMLImport& rImport,
                              sal_uInt16 nPrefix,
-                             const rtl::OUString& rLocalName,
+                             const OUString& rLocalName,
                              const com::sun::star::uno::Reference<com::sun::star::xforms::XModel2>& xModel );
     virtual ~XFormsSubmissionContext();
 
@@ -58,12 +58,12 @@ public:
 
 protected:
     virtual void HandleAttribute( sal_uInt16 nToken,
-                                  const rtl::OUString& rValue );
+                                  const OUString& rValue );
 
     virtual SvXMLImportContext* HandleChild(
         sal_uInt16 nToken,
         sal_uInt16 nNamespace,
-        const rtl::OUString& rLocalName,
+        const OUString& rLocalName,
         const com::sun::star::uno::Reference<com::sun::star::xml::sax::XAttributeList>& xAttrList );
 
 };
diff --git a/xmloff/source/xforms/xformsapi.cxx b/xmloff/source/xforms/xformsapi.cxx
index b73af0ab43ca..9f1b32ce5c99 100644
--- a/xmloff/source/xforms/xformsapi.cxx
+++ b/xmloff/source/xforms/xformsapi.cxx
@@ -39,7 +39,6 @@
 #include <xmloff/xmlnmspe.hxx>
 #include <xmloff/xmltkmap.hxx>
 
-using rtl::OUString;
 using com::sun::star::uno::Reference;
 using com::sun::star::uno::Sequence;
 using com::sun::star::uno::UNO_QUERY;
@@ -98,7 +97,7 @@ void xforms_addXFormsModel(
 
 static Reference<XPropertySet> lcl_findXFormsBindingOrSubmission(
     Reference<frame::XModel>& xDocument,
-    const rtl::OUString& rBindingID,
+    const OUString& rBindingID,
     bool bBinding )
 {
     // find binding by iterating over all models, and look for the
@@ -153,14 +152,14 @@ static Reference<XPropertySet> lcl_findXFormsBindingOrSubmission(
 
 Reference<XPropertySet> xforms_findXFormsBinding(
     Reference<frame::XModel>& xDocument,
-    const rtl::OUString& rBindingID )
+    const OUString& rBindingID )
 {
     return lcl_findXFormsBindingOrSubmission( xDocument, rBindingID, true );
 }
 
 Reference<XPropertySet> xforms_findXFormsSubmission(
     Reference<frame::XModel>& xDocument,
-    const rtl::OUString& rBindingID )
+    const OUString& rBindingID )
 {
     return lcl_findXFormsBindingOrSubmission( xDocument, rBindingID, false );
 }
@@ -265,7 +264,7 @@ sal_uInt16 xforms_getTypeClass(
 }
 
 
-rtl::OUString xforms_getTypeName(
+OUString xforms_getTypeName(
     const Reference<XDataTypeRepository>& xRepository,
     const SvXMLNamespaceMap& rNamespaceMap,
     const OUString& rXMLName )
@@ -279,7 +278,7 @@ rtl::OUString xforms_getTypeName(
         : xforms_getBasicTypeName( xRepository, rNamespaceMap, rXMLName );
 }
 
-rtl::OUString xforms_getBasicTypeName(
+OUString xforms_getBasicTypeName(
     const Reference<XDataTypeRepository>& xRepository,
     const SvXMLNamespaceMap& rNamespaceMap,
     const OUString& rXMLName )
diff --git a/xmloff/source/xforms/xformsapi.hxx b/xmloff/source/xforms/xformsapi.hxx
index 75115b90c1e0..577599e18205 100644
--- a/xmloff/source/xforms/xformsapi.hxx
+++ b/xmloff/source/xforms/xformsapi.hxx
@@ -41,19 +41,19 @@ void xforms_addXFormsModel(
     const com::sun::star::uno::Reference<com::sun::star::frame::XModel>& xDocument,
     const com::sun::star::uno::Reference<com::sun::star::xforms::XModel2>& xModel );
 
-com::sun::star::uno::Reference<com::sun::star::beans::XPropertySet> xforms_findXFormsBinding( com::sun::star::uno::Reference<com::sun::star::frame::XModel>&, const rtl::OUString& );
+com::sun::star::uno::Reference<com::sun::star::beans::XPropertySet> xforms_findXFormsBinding( com::sun::star::uno::Reference<com::sun::star::frame::XModel>&, const OUString& );
 
-com::sun::star::uno::Reference<com::sun::star::beans::XPropertySet> xforms_findXFormsSubmission( com::sun::star::uno::Reference<com::sun::star::frame::XModel>&, const rtl::OUString& );
+com::sun::star::uno::Reference<com::sun::star::beans::XPropertySet> xforms_findXFormsSubmission( com::sun::star::uno::Reference<com::sun::star::frame::XModel>&, const OUString& );
 
 void xforms_setValue(
     com::sun::star::uno::Reference<com::sun::star::beans::XPropertySet>& xPropSet,
-    const rtl::OUString& rName,
+    const OUString& rName,
     const com::sun::star::uno::Any rAny );
 
 template<typename T>
 void xforms_setValue(
     com::sun::star::uno::Reference<com::sun::star::beans::XPropertySet>& xPropSet,
-    const rtl::OUString& rName,
+    const OUString& rName,
     T& aValue )
 {
     xforms_setValue( xPropSet, rName, com::sun::star::uno::makeAny( aValue ) );
@@ -62,17 +62,17 @@ void xforms_setValue(
 sal_uInt16 xforms_getTypeClass(
     const com::sun::star::uno::Reference<com::sun::star::xforms::XDataTypeRepository>& xRepository,
     const SvXMLNamespaceMap& rNamespaceMap,
-    const rtl::OUString& rXMLName );
+    const OUString& rXMLName );
 
-rtl::OUString xforms_getTypeName(
+OUString xforms_getTypeName(
     const com::sun::star::uno::Reference<com::sun::star::xforms::XDataTypeRepository>& xRepository,
     const SvXMLNamespaceMap& rNamespaceMap,
-    const rtl::OUString& rXMLName );
+    const OUString& rXMLName );
 
-rtl::OUString xforms_getBasicTypeName(
+OUString xforms_getBasicTypeName(
     const com::sun::star::uno::Reference<com::sun::star::xforms::XDataTypeRepository>& xRepository,
     const SvXMLNamespaceMap& rNamespaceMap,
-    const rtl::OUString& rXMLName );
+    const OUString& rXMLName );
 
 #endif
 
diff --git a/xmloff/source/xforms/xformsexport.cxx b/xmloff/source/xforms/xformsexport.cxx
index cda917f4c515..a19d11acf6f9 100644
--- a/xmloff/source/xforms/xformsexport.cxx
+++ b/xmloff/source/xforms/xformsexport.cxx
@@ -64,8 +64,6 @@ using namespace com::sun::star;
 using namespace com::sun::star::uno;
 using namespace xmloff::token;
 
-using rtl::OUString;
-using rtl::OUStringBuffer;
 using com::sun::star::beans::XPropertySet;
 using com::sun::star::beans::XPropertySetInfo;
 using com::sun::star::container::XIndexAccess;
@@ -792,11 +790,11 @@ void getXFormsSettings( const Reference< XNameAccess >& _rXForms, Sequence< Prop
         // are the names of the XForm models, and which in turn provides named sequences of
         // PropertyValues - which denote the actual property values of the given named model.
 
-        Sequence< ::rtl::OUString > aModelNames( _rXForms->getElementNames() );
+        Sequence< OUString > aModelNames( _rXForms->getElementNames() );
 
         Reference< XNameContainer > xModelSettings = document::NamedPropertyValues::create( comphelper::getProcessComponentContext() );
 
-        for (   const ::rtl::OUString* pModelName = aModelNames.getConstArray();
+        for (   const OUString* pModelName = aModelNames.getConstArray();
                 pModelName != aModelNames.getConstArray() + aModelNames.getLength();
                 ++pModelName
             )
diff --git a/xmloff/source/xforms/xformsimport.cxx b/xmloff/source/xforms/xformsimport.cxx
index b12ae09cfea5..daa9b23c90ef 100644
--- a/xmloff/source/xforms/xformsimport.cxx
+++ b/xmloff/source/xforms/xformsimport.cxx
@@ -54,12 +54,11 @@ using com::sun::star::form::binding::XListEntrySource;
 using com::sun::star::form::binding::XListEntrySink;
 using com::sun::star::form::submission::XSubmission;
 using com::sun::star::form::submission::XSubmissionSupplier;
-using rtl::OUString;
 
 SvXMLImportContext* createXFormsModelContext(
     SvXMLImport& rImport,
     sal_uInt16 nPrefix,
-    const rtl::OUString& rLocalName )
+    const OUString& rLocalName )
 {
     return new XFormsModelContext( rImport, nPrefix, rLocalName );
 }
@@ -153,8 +152,8 @@ void applyXFormsSettings( const Reference< XNameAccess >& _rXForms, const Sequen
 
     try
     {
-        Sequence< ::rtl::OUString > aSettingsForModels( xModelSettings->getElementNames() );
-        for (   const ::rtl::OUString* pModelName = aSettingsForModels.getConstArray();
+        Sequence< OUString > aSettingsForModels( xModelSettings->getElementNames() );
+        for (   const OUString* pModelName = aSettingsForModels.getConstArray();
                 pModelName != aSettingsForModels.getConstArray() + aSettingsForModels.getLength();
                 ++pModelName
             )