com::sun::star->css in xmloff/

Change-Id: Iee6e21e093fb1383f19a0716dbc1c341f446b8c2
Reviewed-on: https://gerrit.libreoffice.org/20192
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Tested-by: Noel Grandin <noelgrandin@gmail.com>

13 files changed, 115 insertions, 115 deletions

diff --git a/xmloff/source/xforms/SchemaContext.hxx b/xmloff/source/xforms/SchemaContext.hxx
index 7baa5c6840d8..20c3eb6e6121 100644
--- a/xmloff/source/xforms/SchemaContext.hxx
+++ b/xmloff/source/xforms/SchemaContext.hxx
@@ -35,13 +35,13 @@ class SvXMLImportContext;
 /** import the data type declarations from an xsd:schema element */
 class SchemaContext : public TokenContext
 {
-    com::sun::star::uno::Reference<com::sun::star::xforms::XDataTypeRepository> mxRepository;
+    css::uno::Reference<css::xforms::XDataTypeRepository> mxRepository;
 
 public:
     SchemaContext( SvXMLImport& rImport,
                    sal_uInt16 nPrfx,
                    const OUString& rLName,
-                   const com::sun::star::uno::Reference<com::sun::star::xforms::XDataTypeRepository>& rRepository );
+                   const css::uno::Reference<css::xforms::XDataTypeRepository>& rRepository );
     virtual ~SchemaContext();
 
     // implement TokenContext methods:
@@ -55,7 +55,7 @@ protected:
         sal_uInt16 nToken,
         sal_uInt16 nPrefix,
         const OUString& rLocalName,
-        const com::sun::star::uno::Reference<com::sun::star::xml::sax::XAttributeList>& xAttrList ) override;
+        const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList ) override;
 };
 
 #endif
diff --git a/xmloff/source/xforms/SchemaRestrictionContext.cxx b/xmloff/source/xforms/SchemaRestrictionContext.cxx
index b7ab05eee0e5..91d480588767 100644
--- a/xmloff/source/xforms/SchemaRestrictionContext.cxx
+++ b/xmloff/source/xforms/SchemaRestrictionContext.cxx
@@ -87,7 +87,7 @@ SchemaRestrictionContext::SchemaRestrictionContext(
     SvXMLImport& rImport,
     sal_uInt16 nPrefix,
     const OUString& rLocalName,
-    Reference<com::sun::star::xforms::XDataTypeRepository>& rRepository,
+    Reference<css::xforms::XDataTypeRepository>& rRepository,
     const OUString& sTypeName ) :
         TokenContext( rImport, nPrefix, rLocalName, aAttributes, aChildren ),
         mxRepository( rRepository ),
@@ -163,11 +163,11 @@ Any xforms_whitespace( const OUString& rValue )
 {
     Any aValue;
     if( IsXMLToken( rValue, XML_PRESERVE ) )
-        aValue <<= com::sun::star::xsd::WhiteSpaceTreatment::Preserve;
+        aValue <<= css::xsd::WhiteSpaceTreatment::Preserve;
     else if( IsXMLToken( rValue, XML_REPLACE ) )
-        aValue <<= com::sun::star::xsd::WhiteSpaceTreatment::Replace;
+        aValue <<= css::xsd::WhiteSpaceTreatment::Replace;
     else if( IsXMLToken( rValue, XML_COLLAPSE ) )
-        aValue <<= com::sun::star::xsd::WhiteSpaceTreatment::Collapse;
+        aValue <<= css::xsd::WhiteSpaceTreatment::Collapse;
     return aValue;
 }
 
@@ -212,7 +212,7 @@ Any xforms_time( const OUString& rValue )
     Duration aDuration;
     if (::sax::Converter::convertDuration( aDuration, rValue ))
     {
-        com::sun::star::util::Time aTime;
+        css::util::Time aTime;
         aTime.Hours = aDuration.Hours;
         aTime.Minutes = aDuration.Minutes;
         aTime.Seconds = aDuration.Seconds;
@@ -303,45 +303,45 @@ SvXMLImportContext* SchemaRestrictionContext::HandleChild(
                                       GetImport().GetNamespaceMap(),
                                       msBaseName ) )
             {
-            case com::sun::star::xsd::DataTypeClass::DECIMAL:
-            case com::sun::star::xsd::DataTypeClass::DOUBLE:
-            case com::sun::star::xsd::DataTypeClass::FLOAT:
+            case css::xsd::DataTypeClass::DECIMAL:
+            case css::xsd::DataTypeClass::DOUBLE:
+            case css::xsd::DataTypeClass::FLOAT:
                 sPropertyName += "Double";
                 pConvert = &xforms_double;
                 break;
-            case com::sun::star::xsd::DataTypeClass::DATETIME:
+            case css::xsd::DataTypeClass::DATETIME:
                 sPropertyName += "DateTime";
                 pConvert = &xforms_dateTime;
                 break;
-            case com::sun::star::xsd::DataTypeClass::DATE:
+            case css::xsd::DataTypeClass::DATE:
                 sPropertyName += "Date";
                 pConvert = &xforms_date;
                 break;
-            case com::sun::star::xsd::DataTypeClass::TIME:
+            case css::xsd::DataTypeClass::TIME:
                 sPropertyName += "Time";
                 pConvert = &xforms_time;
                 break;
-            case com::sun::star::xsd::DataTypeClass::gYear:
-            case com::sun::star::xsd::DataTypeClass::gDay:
-            case com::sun::star::xsd::DataTypeClass::gMonth:
+            case css::xsd::DataTypeClass::gYear:
+            case css::xsd::DataTypeClass::gDay:
+            case css::xsd::DataTypeClass::gMonth:
                 sPropertyName += "Int";
                 pConvert = &xforms_int16;
                 break;
 
-            case com::sun::star::xsd::DataTypeClass::STRING:
-            case com::sun::star::xsd::DataTypeClass::anyURI:
-            case com::sun::star::xsd::DataTypeClass::BOOLEAN:
+            case css::xsd::DataTypeClass::STRING:
+            case css::xsd::DataTypeClass::anyURI:
+            case css::xsd::DataTypeClass::BOOLEAN:
                 // invalid: These shouldn't have min/max-inclusive
                 break;
 
                 /* data types not yet supported:
-                   case com::sun::star::xsd::DataTypeClass::DURATION:
-                   case com::sun::star::xsd::DataTypeClass::gYearMonth:
-                   case com::sun::star::xsd::DataTypeClass::gMonthDay:
-                   case com::sun::star::xsd::DataTypeClass::hexBinary:
-                   case com::sun::star::xsd::DataTypeClass::base64Binary:
-                   case com::sun::star::xsd::DataTypeClass::QName:
-                   case com::sun::star::xsd::DataTypeClass::NOTATION:
+                   case css::xsd::DataTypeClass::DURATION:
+                   case css::xsd::DataTypeClass::gYearMonth:
+                   case css::xsd::DataTypeClass::gMonthDay:
+                   case css::xsd::DataTypeClass::hexBinary:
+                   case css::xsd::DataTypeClass::base64Binary:
+                   case css::xsd::DataTypeClass::QName:
+                   case css::xsd::DataTypeClass::NOTATION:
                 */
             }
         }
diff --git a/xmloff/source/xforms/SchemaRestrictionContext.hxx b/xmloff/source/xforms/SchemaRestrictionContext.hxx
index 6bbb7a4e67aa..0382714fc34e 100644
--- a/xmloff/source/xforms/SchemaRestrictionContext.hxx
+++ b/xmloff/source/xforms/SchemaRestrictionContext.hxx
@@ -35,8 +35,8 @@ class SvXMLImportContext;
 /** import the xsd:restriction element */
 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;
+    css::uno::Reference<css::xforms::XDataTypeRepository> mxRepository;
+    css::uno::Reference<css::beans::XPropertySet> mxDataType;
     OUString msTypeName;
     OUString msBaseName;
 
@@ -44,7 +44,7 @@ public:
     SchemaRestrictionContext( SvXMLImport& rImport,
                               sal_uInt16 nPrfx,
                               const OUString& rLName,
-                              com::sun::star::uno::Reference<com::sun::star::xforms::XDataTypeRepository>& rRepository,
+                              css::uno::Reference<css::xforms::XDataTypeRepository>& rRepository,
                               const OUString& sTypeName );
     virtual ~SchemaRestrictionContext();
 
@@ -62,7 +62,7 @@ protected:
         sal_uInt16 nToken,
         sal_uInt16 nPrefix,
         const OUString& rLocalName,
-        const com::sun::star::uno::Reference<com::sun::star::xml::sax::XAttributeList>& xAttrList ) override;
+        const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList ) override;
 };
 
 #endif
diff --git a/xmloff/source/xforms/SchemaSimpleTypeContext.hxx b/xmloff/source/xforms/SchemaSimpleTypeContext.hxx
index ea89b39ed837..4f13868db99d 100644
--- a/xmloff/source/xforms/SchemaSimpleTypeContext.hxx
+++ b/xmloff/source/xforms/SchemaSimpleTypeContext.hxx
@@ -35,14 +35,14 @@ class SvXMLImportContext;
 /** import the xsd:simpleType element */
 class SchemaSimpleTypeContext : public TokenContext
 {
-    com::sun::star::uno::Reference<com::sun::star::xforms::XDataTypeRepository> mxRepository;
+    css::uno::Reference<css::xforms::XDataTypeRepository> mxRepository;
     OUString msTypeName;
 
 public:
     SchemaSimpleTypeContext( SvXMLImport& rImport,
                              sal_uInt16 nPrfx,
                              const OUString& rLName,
-                             const com::sun::star::uno::Reference<com::sun::star::xforms::XDataTypeRepository>& rRepository );
+                             const css::uno::Reference<css::xforms::XDataTypeRepository>& rRepository );
 
     virtual ~SchemaSimpleTypeContext();
 
@@ -57,7 +57,7 @@ protected:
         sal_uInt16 nToken,
         sal_uInt16 nPrefix,
         const OUString& rLocalName,
-        const com::sun::star::uno::Reference<com::sun::star::xml::sax::XAttributeList>& xAttrList ) override;
+        const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList ) override;
 };
 
 #endif
diff --git a/xmloff/source/xforms/TokenContext.hxx b/xmloff/source/xforms/TokenContext.hxx
index 8a8531063556..eab8ae63aa54 100644
--- a/xmloff/source/xforms/TokenContext.hxx
+++ b/xmloff/source/xforms/TokenContext.hxx
@@ -55,7 +55,7 @@ public:
      * create a warning for all others. Classes that wish to override
      * StartElement need to call the parent method. */
     virtual void StartElement(
-        const com::sun::star::uno::Reference<com::sun::star::xml::sax::XAttributeList>& xAttrList ) override;
+        const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList ) override;
 
     /** call HandleChild for each child element in the token map;
      * create a warning for all others. Classes that wish to override
@@ -64,7 +64,7 @@ public:
     virtual SvXMLImportContext* CreateChildContext(
         sal_uInt16 nPrefix,
         const OUString& rLocalName,
-        const com::sun::star::uno::Reference<com::sun::star::xml::sax::XAttributeList>& xAttrList ) override;
+        const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList ) override;
 
     /** Create a warning for all non-namespace character
      * content. Classes that wish to deal with character content have
@@ -86,7 +86,7 @@ protected:
         // context creation
         sal_uInt16 nPrefix,
         const OUString& rLocalName,
-        const com::sun::star::uno::Reference<com::sun::star::xml::sax::XAttributeList>& xAttrList ) = 0;
+        const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList ) = 0;
 };
 
 #endif
diff --git a/xmloff/source/xforms/XFormsBindContext.hxx b/xmloff/source/xforms/XFormsBindContext.hxx
index 8bda8309ad89..a0e0b7468771 100644
--- a/xmloff/source/xforms/XFormsBindContext.hxx
+++ b/xmloff/source/xforms/XFormsBindContext.hxx
@@ -35,20 +35,20 @@ class SvXMLImportContext;
 /** import the xforms:binding element */
 class XFormsBindContext : public TokenContext
 {
-    const com::sun::star::uno::Reference<com::sun::star::xforms::XModel2> mxModel;
-    com::sun::star::uno::Reference<com::sun::star::beans::XPropertySet> mxBinding;
+    const css::uno::Reference<css::xforms::XModel2> mxModel;
+    css::uno::Reference<css::beans::XPropertySet> mxBinding;
 
 public:
     XFormsBindContext( SvXMLImport& rImport,
                        sal_uInt16 nPrefix,
                        const OUString& rLocalName,
-                       const com::sun::star::uno::Reference<com::sun::star::xforms::XModel2>& xModel );
+                       const css::uno::Reference<css::xforms::XModel2>& xModel );
     virtual ~XFormsBindContext();
 
     // implement SvXMLImportContext & TokenContext methods:
 
     virtual void StartElement(
-        const com::sun::star::uno::Reference<com::sun::star::xml::sax::XAttributeList>& xAttrList ) override;
+        const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList ) override;
 
 protected:
     virtual void HandleAttribute( sal_uInt16 nToken,
@@ -58,7 +58,7 @@ protected:
         sal_uInt16 nToken,
         sal_uInt16 nNamespace,
         const OUString& rLocalName,
-        const com::sun::star::uno::Reference<com::sun::star::xml::sax::XAttributeList>& xAttrList ) override;
+        const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList ) override;
 
 };
 
diff --git a/xmloff/source/xforms/XFormsInstanceContext.hxx b/xmloff/source/xforms/XFormsInstanceContext.hxx
index 6c480bac1f49..44dc04b7130d 100644
--- a/xmloff/source/xforms/XFormsInstanceContext.hxx
+++ b/xmloff/source/xforms/XFormsInstanceContext.hxx
@@ -36,8 +36,8 @@ class SvXMLImportContext;
 /** import the xforms:instance element */
 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;
+    css::uno::Reference<css::xforms::XModel2> mxModel;
+    css::uno::Reference<css::xml::dom::XDocument> mxInstance;
     OUString msId;
     OUString msURL;
 
@@ -45,7 +45,7 @@ public:
     XFormsInstanceContext( SvXMLImport& rImport,
                            sal_uInt16 nPrfx,
                            const OUString& rLName,
-                           const com::sun::star::uno::Reference<com::sun::star::xforms::XModel2> & xModel );
+                           const css::uno::Reference<css::xforms::XModel2> & xModel );
     virtual ~XFormsInstanceContext();
 
     // implement SvXMLImportContext & TokenContext methods:
@@ -56,7 +56,7 @@ public:
     virtual SvXMLImportContext* CreateChildContext(
         sal_uInt16 nPrefix,
         const OUString& rLocalName,
-        const com::sun::star::uno::Reference<com::sun::star::xml::sax::XAttributeList >& xAttrList ) override;
+        const css::uno::Reference<css::xml::sax::XAttributeList >& xAttrList ) override;
 
     virtual void EndElement() override;
 
@@ -69,7 +69,7 @@ protected:
         sal_uInt16 nToken,
         sal_uInt16 nNamespace,
         const OUString& rLocalName,
-        const com::sun::star::uno::Reference<com::sun::star::xml::sax::XAttributeList>& xAttrList ) override;
+        const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList ) override;
 };
 
 #endif
diff --git a/xmloff/source/xforms/XFormsModelContext.hxx b/xmloff/source/xforms/XFormsModelContext.hxx
index fc8e04be6dd0..2ec6bcb0e878 100644
--- a/xmloff/source/xforms/XFormsModelContext.hxx
+++ b/xmloff/source/xforms/XFormsModelContext.hxx
@@ -35,7 +35,7 @@ class SvXMLImportContext;
 /** import the xforms:model element */
 class XFormsModelContext : public TokenContext
 {
-    com::sun::star::uno::Reference<com::sun::star::xforms::XModel2> mxModel;
+    css::uno::Reference<css::xforms::XModel2> mxModel;
 
 public:
     XFormsModelContext( SvXMLImport& rImport,
@@ -43,7 +43,7 @@ public:
                         const OUString& rLName );
     virtual ~XFormsModelContext();
 
-    com::sun::star::uno::Reference<com::sun::star::xforms::XModel2> getModel() { return mxModel;}
+    css::uno::Reference<css::xforms::XModel2> getModel() { return mxModel;}
 
     // implement SvXMLImportContext & TokenContext methods:
 
@@ -58,7 +58,7 @@ protected:
         sal_uInt16 nToken,
         sal_uInt16 nPrefix,
         const OUString& rLocalName,
-        const com::sun::star::uno::Reference<com::sun::star::xml::sax::XAttributeList>& xAttrList ) override;
+        const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList ) override;
 };
 
 #endif
diff --git a/xmloff/source/xforms/XFormsModelExport.hxx b/xmloff/source/xforms/XFormsModelExport.hxx
index c00ec871e84a..42187b74450d 100644
--- a/xmloff/source/xforms/XFormsModelExport.hxx
+++ b/xmloff/source/xforms/XFormsModelExport.hxx
@@ -29,7 +29,7 @@ namespace com { namespace sun { namespace star {
 } } }
 
 void exportXFormsModel( SvXMLExport&,
-                        const com::sun::star::uno::Reference<com::sun::star::beans::XPropertySet>& );
+                        const css::uno::Reference<css::beans::XPropertySet>& );
 
 #endif
 
diff --git a/xmloff/source/xforms/XFormsSubmissionContext.hxx b/xmloff/source/xforms/XFormsSubmissionContext.hxx
index a570ab56e887..a171ec834cf0 100644
--- a/xmloff/source/xforms/XFormsSubmissionContext.hxx
+++ b/xmloff/source/xforms/XFormsSubmissionContext.hxx
@@ -35,13 +35,13 @@ class SvXMLImportContext;
 /** import the xforms:submission element */
 class XFormsSubmissionContext : public TokenContext
 {
-    com::sun::star::uno::Reference<com::sun::star::beans::XPropertySet> mxSubmission;
+    css::uno::Reference<css::beans::XPropertySet> mxSubmission;
 
 public:
     XFormsSubmissionContext( SvXMLImport& rImport,
                              sal_uInt16 nPrefix,
                              const OUString& rLocalName,
-                             const com::sun::star::uno::Reference<com::sun::star::xforms::XModel2>& xModel );
+                             const css::uno::Reference<css::xforms::XModel2>& xModel );
     virtual ~XFormsSubmissionContext();
 
     // implement TokenContext methods:
@@ -54,7 +54,7 @@ protected:
         sal_uInt16 nToken,
         sal_uInt16 nNamespace,
         const OUString& rLocalName,
-        const com::sun::star::uno::Reference<com::sun::star::xml::sax::XAttributeList>& xAttrList ) override;
+        const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList ) override;
 
 };
 
diff --git a/xmloff/source/xforms/xformsapi.cxx b/xmloff/source/xforms/xformsapi.cxx
index 20c9a96a6369..9a1e630c8433 100644
--- a/xmloff/source/xforms/xformsapi.cxx
+++ b/xmloff/source/xforms/xformsapi.cxx
@@ -201,7 +201,7 @@ sal_uInt16 xforms_getTypeClass(
     SvXMLTokenMap aMap( aTypes );
     sal_uInt16 mnToken = aMap.Get( nPrefix, sLocalName );
 
-    sal_uInt16 nTypeClass = com::sun::star::xsd::DataTypeClass::STRING;
+    sal_uInt16 nTypeClass = css::xsd::DataTypeClass::STRING;
     if( mnToken != XML_TOK_UNKNOWN )
     {
         // we found an XSD name: then get the proper API name for it
@@ -209,50 +209,50 @@ sal_uInt16 xforms_getTypeClass(
         switch( mnToken )
         {
         case XML_STRING:
-            nTypeClass = com::sun::star::xsd::DataTypeClass::STRING;
+            nTypeClass = css::xsd::DataTypeClass::STRING;
             break;
         case XML_ANYURI:
-            nTypeClass = com::sun::star::xsd::DataTypeClass::anyURI;
+            nTypeClass = css::xsd::DataTypeClass::anyURI;
             break;
         case XML_DECIMAL:
-            nTypeClass = com::sun::star::xsd::DataTypeClass::DECIMAL;
+            nTypeClass = css::xsd::DataTypeClass::DECIMAL;
             break;
         case XML_DOUBLE:
-            nTypeClass = com::sun::star::xsd::DataTypeClass::DOUBLE;
+            nTypeClass = css::xsd::DataTypeClass::DOUBLE;
             break;
         case XML_FLOAT:
-            nTypeClass = com::sun::star::xsd::DataTypeClass::FLOAT;
+            nTypeClass = css::xsd::DataTypeClass::FLOAT;
             break;
         case XML_BOOLEAN:
-            nTypeClass = com::sun::star::xsd::DataTypeClass::BOOLEAN;
+            nTypeClass = css::xsd::DataTypeClass::BOOLEAN;
             break;
         case XML_DATETIME_XSD:
-            nTypeClass = com::sun::star::xsd::DataTypeClass::DATETIME;
+            nTypeClass = css::xsd::DataTypeClass::DATETIME;
             break;
         case XML_DATE:
-            nTypeClass = com::sun::star::xsd::DataTypeClass::DATE;
+            nTypeClass = css::xsd::DataTypeClass::DATE;
             break;
         case XML_TIME:
-            nTypeClass = com::sun::star::xsd::DataTypeClass::TIME;
+            nTypeClass = css::xsd::DataTypeClass::TIME;
             break;
         case XML_YEAR:
-            nTypeClass = com::sun::star::xsd::DataTypeClass::gYear;
+            nTypeClass = css::xsd::DataTypeClass::gYear;
             break;
         case XML_DAY:
-            nTypeClass = com::sun::star::xsd::DataTypeClass::gDay;
+            nTypeClass = css::xsd::DataTypeClass::gDay;
             break;
         case XML_MONTH:
-            nTypeClass = com::sun::star::xsd::DataTypeClass::gMonth;
+            nTypeClass = css::xsd::DataTypeClass::gMonth;
             break;
 
             /* data types not yet supported:
-            nTypeClass = com::sun::star::xsd::DataTypeClass::DURATION;
-            nTypeClass = com::sun::star::xsd::DataTypeClass::gYearMonth;
-            nTypeClass = com::sun::star::xsd::DataTypeClass::gMonthDay;
-            nTypeClass = com::sun::star::xsd::DataTypeClass::hexBinary;
-            nTypeClass = com::sun::star::xsd::DataTypeClass::base64Binary;
-            nTypeClass = com::sun::star::xsd::DataTypeClass::QName;
-            nTypeClass = com::sun::star::xsd::DataTypeClass::NOTATION;
+            nTypeClass = css::xsd::DataTypeClass::DURATION;
+            nTypeClass = css::xsd::DataTypeClass::gYearMonth;
+            nTypeClass = css::xsd::DataTypeClass::gMonthDay;
+            nTypeClass = css::xsd::DataTypeClass::hexBinary;
+            nTypeClass = css::xsd::DataTypeClass::base64Binary;
+            nTypeClass = css::xsd::DataTypeClass::QName;
+            nTypeClass = css::xsd::DataTypeClass::NOTATION;
             */
         }
     }
diff --git a/xmloff/source/xforms/xformsapi.hxx b/xmloff/source/xforms/xformsapi.hxx
index e4e8aaff04fc..b24caf77e349 100644
--- a/xmloff/source/xforms/xformsapi.hxx
+++ b/xmloff/source/xforms/xformsapi.hxx
@@ -34,42 +34,42 @@ namespace com { namespace sun { namespace star {
 } } }
 class SvXMLNamespaceMap;
 
-com::sun::star::uno::Reference<com::sun::star::xforms::XModel2> xforms_createXFormsModel();
+css::uno::Reference<css::xforms::XModel2> xforms_createXFormsModel();
 
 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 );
+    const css::uno::Reference<css::frame::XModel>& xDocument,
+    const css::uno::Reference<css::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 OUString& );
+css::uno::Reference<css::beans::XPropertySet> xforms_findXFormsBinding( css::uno::Reference<css::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 OUString& );
+css::uno::Reference<css::beans::XPropertySet> xforms_findXFormsSubmission( css::uno::Reference<css::frame::XModel>&, const OUString& );
 
 void xforms_setValue(
-    com::sun::star::uno::Reference<com::sun::star::beans::XPropertySet>& xPropSet,
+    css::uno::Reference<css::beans::XPropertySet>& xPropSet,
     const OUString& rName,
-    const com::sun::star::uno::Any& rAny );
+    const css::uno::Any& rAny );
 
 template<typename T>
 void xforms_setValue(
-    com::sun::star::uno::Reference<com::sun::star::beans::XPropertySet>& xPropSet,
+    css::uno::Reference<css::beans::XPropertySet>& xPropSet,
     const OUString& rName,
     T& aValue )
 {
-    xforms_setValue( xPropSet, rName, com::sun::star::uno::makeAny( aValue ) );
+    xforms_setValue( xPropSet, rName, css::uno::makeAny( aValue ) );
 }
 
 sal_uInt16 xforms_getTypeClass(
-    const com::sun::star::uno::Reference<com::sun::star::xforms::XDataTypeRepository>& xRepository,
+    const css::uno::Reference<css::xforms::XDataTypeRepository>& xRepository,
     const SvXMLNamespaceMap& rNamespaceMap,
     const OUString& rXMLName );
 
 OUString xforms_getTypeName(
-    const com::sun::star::uno::Reference<com::sun::star::xforms::XDataTypeRepository>& xRepository,
+    const css::uno::Reference<css::xforms::XDataTypeRepository>& xRepository,
     const SvXMLNamespaceMap& rNamespaceMap,
     const OUString& rXMLName );
 
 OUString xforms_getBasicTypeName(
-    const com::sun::star::uno::Reference<com::sun::star::xforms::XDataTypeRepository>& xRepository,
+    const css::uno::Reference<css::xforms::XDataTypeRepository>& xRepository,
     const SvXMLNamespaceMap& rNamespaceMap,
     const OUString& rXMLName );
 
diff --git a/xmloff/source/xforms/xformsexport.cxx b/xmloff/source/xforms/xformsexport.cxx
index af419af8364b..d45518e4e57a 100644
--- a/xmloff/source/xforms/xformsexport.cxx
+++ b/xmloff/source/xforms/xformsexport.cxx
@@ -107,7 +107,7 @@ void exportXForms( SvXMLExport& rExport )
 void exportXFormsInstance( SvXMLExport&, const Sequence<PropertyValue>& );
 void exportXFormsBinding( SvXMLExport&, const Reference<XPropertySet>& );
 void exportXFormsSubmission( SvXMLExport&, const Reference<XPropertySet>& );
-void exportXFormsSchemas( SvXMLExport&, const Reference<com::sun::star::xforms::XModel>& );
+void exportXFormsSchemas( SvXMLExport&, const Reference<css::xforms::XModel>& );
 
 
 typedef OUString (*convert_t)( const Any& );
@@ -133,14 +133,14 @@ template<typename T, void (*FUNC)( OUStringBuffer&, T )> OUString xforms_convert
 template<typename T, void (*FUNC)( OUStringBuffer&, const T& )> OUString xforms_convertRef( const Any& );
 
 void xforms_formatDate( OUStringBuffer& aBuffer, const util::Date& aDate );
-void xforms_formatTime( OUStringBuffer& aBuffer, const com::sun::star::util::Time& aTime );
+void xforms_formatTime( OUStringBuffer& aBuffer, const css::util::Time& aTime );
 void xforms_formatDateTime( OUStringBuffer& aBuffer, const util::DateTime& aDateTime );
 
 convert_t xforms_int32    = &xforms_convert<sal_Int32,&::sax::Converter::convertNumber>;
 convert_t xforms_double   = &xforms_convert<double,&::sax::Converter::convertDouble>;
 convert_t xforms_dateTime = &xforms_convertRef<util::DateTime,&xforms_formatDateTime>;
 convert_t xforms_date     = &xforms_convertRef<util::Date,&xforms_formatDate>;
-convert_t xforms_time     = &xforms_convertRef<com::sun::star::util::Time,&xforms_formatTime>;
+convert_t xforms_time     = &xforms_convertRef<css::util::Time,&xforms_formatTime>;
 
 // other functions
 static OUString lcl_getXSDType( SvXMLExport& rExport,
@@ -162,7 +162,7 @@ void exportXFormsModel( SvXMLExport& rExport,
                         const Reference<XPropertySet>& xModelPropSet )
 {
     // no model -> don't do anything!
-    Reference<com::sun::star::xforms::XModel> xModel( xModelPropSet, UNO_QUERY );
+    Reference<css::xforms::XModel> xModel( xModelPropSet, UNO_QUERY );
     if( ! xModel.is() || ! xModelPropSet.is() )
         return;
 
@@ -297,7 +297,7 @@ void exportXFormsBinding( SvXMLExport& rExport,
         {
             // now get type, and determine whether it's a standard type. If
             // so, export the XSD name
-            Reference<com::sun::star::xforms::XModel> xModel(
+            Reference<css::xforms::XModel> xModel(
                 xBinding->getPropertyValue( "Model" ),
                 UNO_QUERY );
             Reference<XDataTypeRepository> xRepository(
@@ -473,49 +473,49 @@ static OUString lcl_getXSDType( SvXMLExport& rExport,
     xType->getPropertyValue( "TypeClass" ) >>= nDataTypeClass;
     switch( nDataTypeClass )
     {
-    case com::sun::star::xsd::DataTypeClass::STRING:
+    case css::xsd::DataTypeClass::STRING:
         eToken = XML_STRING;
         break;
-    case com::sun::star::xsd::DataTypeClass::anyURI:
+    case css::xsd::DataTypeClass::anyURI:
         eToken = XML_ANYURI;
         break;
-    case com::sun::star::xsd::DataTypeClass::DECIMAL:
+    case css::xsd::DataTypeClass::DECIMAL:
         eToken = XML_DECIMAL;
         break;
-    case com::sun::star::xsd::DataTypeClass::DOUBLE:
+    case css::xsd::DataTypeClass::DOUBLE:
         eToken = XML_DOUBLE;
         break;
-    case com::sun::star::xsd::DataTypeClass::FLOAT:
+    case css::xsd::DataTypeClass::FLOAT:
         eToken = XML_FLOAT;
         break;
-    case com::sun::star::xsd::DataTypeClass::BOOLEAN:
+    case css::xsd::DataTypeClass::BOOLEAN:
         eToken = XML_BOOLEAN;
         break;
-    case com::sun::star::xsd::DataTypeClass::DATETIME:
+    case css::xsd::DataTypeClass::DATETIME:
         eToken = XML_DATETIME_XSD;
         break;
-    case com::sun::star::xsd::DataTypeClass::TIME:
+    case css::xsd::DataTypeClass::TIME:
         eToken = XML_TIME;
         break;
-    case com::sun::star::xsd::DataTypeClass::DATE:
+    case css::xsd::DataTypeClass::DATE:
         eToken = XML_DATE;
         break;
-    case com::sun::star::xsd::DataTypeClass::gYear:
+    case css::xsd::DataTypeClass::gYear:
         eToken = XML_YEAR;
         break;
-    case com::sun::star::xsd::DataTypeClass::gDay:
+    case css::xsd::DataTypeClass::gDay:
         eToken = XML_DAY;
         break;
-    case com::sun::star::xsd::DataTypeClass::gMonth:
+    case css::xsd::DataTypeClass::gMonth:
         eToken = XML_MONTH;
         break;
-    case com::sun::star::xsd::DataTypeClass::DURATION:
-    case com::sun::star::xsd::DataTypeClass::gYearMonth:
-    case com::sun::star::xsd::DataTypeClass::gMonthDay:
-    case com::sun::star::xsd::DataTypeClass::hexBinary:
-    case com::sun::star::xsd::DataTypeClass::base64Binary:
-    case com::sun::star::xsd::DataTypeClass::QName:
-    case com::sun::star::xsd::DataTypeClass::NOTATION:
+    case css::xsd::DataTypeClass::DURATION:
+    case css::xsd::DataTypeClass::gYearMonth:
+    case css::xsd::DataTypeClass::gMonthDay:
+    case css::xsd::DataTypeClass::hexBinary:
+    case css::xsd::DataTypeClass::base64Binary:
+    case css::xsd::DataTypeClass::QName:
+    case css::xsd::DataTypeClass::NOTATION:
     default:
         OSL_FAIL( "unknown data type" );
     }
@@ -558,7 +558,7 @@ static void lcl_exportDataType( SvXMLExport& rExport,
 }
 
 void exportXFormsSchemas( SvXMLExport& rExport,
-                          const Reference<com::sun::star::xforms::XModel>& xModel )
+                          const Reference<css::xforms::XModel>& xModel )
 {
     // TODO: for now, we'll fake this...
     {
@@ -672,7 +672,7 @@ void xforms_formatDate( OUStringBuffer& aBuffer, const util::Date& rDate )
             + "-" + OUString::number(static_cast<sal_Int32>( rDate.Day )) );
 }
 
-void xforms_formatTime( OUStringBuffer& aBuffer, const com::sun::star::util::Time& rTime )
+void xforms_formatTime( OUStringBuffer& aBuffer, const css::util::Time& rTime )
 {
     Duration aDuration;
     aDuration.Hours = rTime.Hours;
@@ -695,13 +695,13 @@ OUString xforms_whitespace( const Any& rAny )
     {
         switch( n )
         {
-        case com::sun::star::xsd::WhiteSpaceTreatment::Preserve:
+        case css::xsd::WhiteSpaceTreatment::Preserve:
             sResult = GetXMLToken( XML_PRESERVE );
             break;
-        case com::sun::star::xsd::WhiteSpaceTreatment::Replace:
+        case css::xsd::WhiteSpaceTreatment::Replace:
             sResult = GetXMLToken( XML_REPLACE );
             break;
-        case com::sun::star::xsd::WhiteSpaceTreatment::Collapse:
+        case css::xsd::WhiteSpaceTreatment::Collapse:
             sResult = GetXMLToken( XML_COLLAPSE );
             break;
         }