summaryrefslogtreecommitdiff
path: root/xmloff/source/meta
diff options
context:
space:
mode:
Diffstat (limited to 'xmloff/source/meta')
-rw-r--r--xmloff/source/meta/MetaExportComponent.cxx6
-rw-r--r--xmloff/source/meta/MetaImportComponent.cxx12
-rw-r--r--xmloff/source/meta/xmlmetae.cxx2
-rw-r--r--xmloff/source/meta/xmlmetai.cxx15
-rw-r--r--xmloff/source/meta/xmlversion.cxx14
5 files changed, 21 insertions, 28 deletions
diff --git a/xmloff/source/meta/MetaExportComponent.cxx b/xmloff/source/meta/MetaExportComponent.cxx
index 7b6481109f20..53ce1d651473 100644
--- a/xmloff/source/meta/MetaExportComponent.cxx
+++ b/xmloff/source/meta/MetaExportComponent.cxx
@@ -43,7 +43,7 @@ using namespace ::com::sun::star;
using namespace ::xmloff::token;
XMLMetaExportComponent::XMLMetaExportComponent(
- const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& xContext,
+ const css::uno::Reference< css::uno::XComponentContext >& xContext,
OUString const & implementationName, SvXMLExportFlags nFlags )
: SvXMLExport( util::MeasureUnit::CM, xContext, implementationName, XML_TEXT, nFlags )
{
@@ -53,7 +53,7 @@ XMLMetaExportComponent::~XMLMetaExportComponent()
{
}
-void SAL_CALL XMLMetaExportComponent::setSourceDocument( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent >& xDoc ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception)
+void SAL_CALL XMLMetaExportComponent::setSourceDocument( const css::uno::Reference< css::lang::XComponent >& xDoc ) throw(css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception)
{
try
{
@@ -113,7 +113,7 @@ sal_uInt32 XMLMetaExportComponent::exportDoc( enum XMLTokenEnum )
SetDocHandler( xDocHandler );
}
- catch( com::sun::star::uno::Exception& )
+ catch( css::uno::Exception& )
{
OSL_FAIL( "Cannot instantiate com.sun.star.comp.Oasis2OOoTransformer!\n");
}
diff --git a/xmloff/source/meta/MetaImportComponent.cxx b/xmloff/source/meta/MetaImportComponent.cxx
index 326b84a1fd9b..ed544443ae99 100644
--- a/xmloff/source/meta/MetaImportComponent.cxx
+++ b/xmloff/source/meta/MetaImportComponent.cxx
@@ -33,13 +33,12 @@ using namespace ::xmloff::token;
class XMLMetaImportComponent : public SvXMLImport
{
private:
- ::com::sun::star::uno::Reference<
- ::com::sun::star::document::XDocumentProperties> mxDocProps;
+ css::uno::Reference< css::document::XDocumentProperties> mxDocProps;
public:
// XMLMetaImportComponent() throw();
XMLMetaImportComponent(
- const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& xContext
+ const css::uno::Reference< css::uno::XComponentContext >& xContext
) throw();
virtual ~XMLMetaImportComponent() throw();
@@ -49,12 +48,11 @@ protected:
virtual SvXMLImportContext* CreateContext(
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;
// XImporter
- virtual void SAL_CALL setTargetDocument( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent >& xDoc )
- throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL setTargetDocument( const css::uno::Reference< css::lang::XComponent >& xDoc )
+ throw(css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
};
// global functions to support the component
diff --git a/xmloff/source/meta/xmlmetae.cxx b/xmloff/source/meta/xmlmetae.cxx
index a9bb477d6ac6..e9e90bde5a34 100644
--- a/xmloff/source/meta/xmlmetae.cxx
+++ b/xmloff/source/meta/xmlmetae.cxx
@@ -346,7 +346,7 @@ void SvXMLMetaExport::Export()
}
}
-// ::com::sun::star::xml::sax::XDocumentHandler:
+// css::xml::sax::XDocumentHandler:
void SAL_CALL
SvXMLMetaExport::startDocument()
throw (uno::RuntimeException, xml::sax::SAXException, std::exception)
diff --git a/xmloff/source/meta/xmlmetai.cxx b/xmloff/source/meta/xmlmetai.cxx
index c6b6f6dc5ad0..5ad8aafca01e 100644
--- a/xmloff/source/meta/xmlmetai.cxx
+++ b/xmloff/source/meta/xmlmetai.cxx
@@ -37,26 +37,21 @@ using namespace ::xmloff::token;
class XMLDocumentBuilderContext : public SvXMLImportContext
{
private:
- ::com::sun::star::uno::Reference<
- ::com::sun::star::xml::dom::XSAXDocumentBuilder2> mxDocBuilder;
+ css::uno::Reference< css::xml::dom::XSAXDocumentBuilder2> mxDocBuilder;
public:
XMLDocumentBuilderContext(SvXMLImport& rImport, sal_uInt16 nPrfx,
const OUString& rLName,
- const ::com::sun::star::uno::Reference<
- ::com::sun::star::xml::sax::XAttributeList>& xAttrList,
- const ::com::sun::star::uno::Reference<
- ::com::sun::star::xml::dom::XSAXDocumentBuilder2>& rDocBuilder);
+ const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList,
+ const css::uno::Reference< css::xml::dom::XSAXDocumentBuilder2>& rDocBuilder);
virtual ~XMLDocumentBuilderContext();
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 StartElement( const ::com::sun::star::uno::Reference<
- ::com::sun::star::xml::sax::XAttributeList >& xAttrList ) override;
+ virtual void StartElement( const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList ) override;
virtual void Characters( const OUString& rChars ) override;
diff --git a/xmloff/source/meta/xmlversion.cxx b/xmloff/source/meta/xmlversion.cxx
index de6fdec8bdfb..1e3eb896505d 100644
--- a/xmloff/source/meta/xmlversion.cxx
+++ b/xmloff/source/meta/xmlversion.cxx
@@ -40,8 +40,8 @@ using namespace ::com::sun::star;
const char XMLN_VERSIONSLIST[] = "VersionList.xml";
XMLVersionListExport::XMLVersionListExport(
- const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rContext,
- const com::sun::star::uno::Sequence < com::sun::star::util::RevisionTag >& rVersions,
+ const css::uno::Reference< css::uno::XComponentContext >& rContext,
+ const css::uno::Sequence < css::util::RevisionTag >& rVersions,
const OUString &rFileName,
Reference< XDocumentHandler > &rHandler )
: SvXMLExport( rContext, "", rFileName, util::MeasureUnit::CM, rHandler ),
@@ -99,8 +99,8 @@ sal_uInt32 XMLVersionListExport::exportDoc( enum ::xmloff::token::XMLTokenEnum )
}
XMLVersionListImport::XMLVersionListImport(
- const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rContext,
- com::sun::star::uno::Sequence < com::sun::star::util::RevisionTag >& rVersions )
+ const css::uno::Reference< css::uno::XComponentContext >& rContext,
+ css::uno::Sequence < css::util::RevisionTag >& rVersions )
: SvXMLImport(rContext, ""),
maVersions( rVersions )
{
@@ -318,7 +318,7 @@ bool XMLVersionContext::ParseISODateTimeString(
}
void SAL_CALL XMLVersionListPersistence::store( const uno::Reference< embed::XStorage >& xRoot, const uno::Sequence< util::RevisionTag >& rVersions )
- throw (::com::sun::star::io::IOException, ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception)
+ throw (css::io::IOException, css::uno::Exception, css::uno::RuntimeException, std::exception)
{
// no storage, no version list!
if ( xRoot.is() )
@@ -364,9 +364,9 @@ void SAL_CALL XMLVersionListPersistence::store( const uno::Reference< embed::XSt
}
uno::Sequence< util::RevisionTag > SAL_CALL XMLVersionListPersistence::load( const uno::Reference< embed::XStorage >& xRoot )
- throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::io::IOException, ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception)
+ throw (css::container::NoSuchElementException, css::io::IOException, css::uno::Exception, css::uno::RuntimeException, std::exception)
{
- com::sun::star::uno::Sequence < com::sun::star::util::RevisionTag > aVersions;
+ css::uno::Sequence < css::util::RevisionTag > aVersions;
const OUString sDocName( XMLN_VERSIONSLIST );
uno::Reference< container::XNameAccess > xRootNames( xRoot, uno::UNO_QUERY );