[Libreoffice-commits] core.git: xmloff/inc xmloff/source
Stephan Bergmann
sbergman at redhat.com
Wed Apr 9 03:04:33 PDT 2014
xmloff/inc/facreg.hxx | 351 +++++++++++++++++++
xmloff/source/chart/SchXMLExport.cxx | 13
xmloff/source/chart/SchXMLImport.cxx | 1
xmloff/source/core/attrlist.cxx | 1
xmloff/source/core/facreg.cxx | 112 ------
xmloff/source/core/xmltkmap.cxx | 6
xmloff/source/draw/animationimport.cxx | 2
xmloff/source/draw/sdxmlexp.cxx | 1
xmloff/source/draw/sdxmlimp.cxx | 4
xmloff/source/draw/xexptran.cxx | 104 -----
xmloff/source/draw/ximpcustomshape.cxx | 16
xmloff/source/forms/elementimport.cxx | 12
xmloff/source/forms/property_meta_data.cxx | 1
xmloff/source/meta/MetaExportComponent.cxx | 1
xmloff/source/meta/xmlversion.cxx | 21 -
xmloff/source/style/xmlnumfi.cxx | 2
xmloff/source/style/xmlstyle.cxx | 5
xmloff/source/text/XMLAutoTextEventExport.cxx | 1
xmloff/source/transform/EventOASISTContext.cxx | 48 --
xmloff/source/transform/OOo2Oasis.cxx | 1
xmloff/source/transform/Oasis2OOo.cxx | 1
xmloff/source/transform/PersMixedContentTContext.cxx | 1
xmloff/source/transform/XMLFilterRegistration.cxx | 39 --
xmloff/source/transform/XMLFilterRegistration.hxx | 64 +++
24 files changed, 433 insertions(+), 375 deletions(-)
New commits:
commit 9c51f5b80640034097457de9603f4ffa021e42ff
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Wed Apr 9 12:04:12 2014 +0200
Clean up function declarations and some unused functions
Change-Id: I2ca50a15209503020047975ac848df98b74089af
diff --git a/xmloff/inc/facreg.hxx b/xmloff/inc/facreg.hxx
new file mode 100644
index 0000000..f0f415f
--- /dev/null
+++ b/xmloff/inc/facreg.hxx
@@ -0,0 +1,351 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed
+ * with this work for additional information regarding copyright
+ * ownership. The ASF licenses this file to you under the Apache
+ * License, Version 2.0 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+
+#ifndef INCLUDED_XMLOFF_INC_FACREG_HXX
+#define INCLUDED_XMLOFF_INC_FACREG_HXX
+
+#include <sal/config.h>
+
+#include <com/sun/star/uno/Exception.hpp>
+#include <com/sun/star/uno/Reference.hxx>
+#include <com/sun/star/uno/Sequence.hxx>
+#include <rtl/ustring.hxx>
+#include <sal/types.h>
+
+namespace com { namespace sun { namespace star {
+ namespace lang { class XMultiServiceFactory; }
+ namespace uno { class XInterface; }
+} } }
+
+// impress oasis import
+OUString SAL_CALL XMLImpressImportOasis_getImplementationName() throw();
+css::uno::Sequence<OUString> SAL_CALL XMLImpressImportOasis_getSupportedServiceNames() throw();
+css::uno::Reference<css::uno::XInterface> SAL_CALL XMLImpressImportOasis_createInstance(
+ css::uno::Reference<css::lang::XMultiServiceFactory> const & rSMgr)
+ throw (css::uno::Exception);
+OUString SAL_CALL XMLImpressStylesImportOasis_getImplementationName() throw();
+css::uno::Sequence<OUString> SAL_CALL XMLImpressStylesImportOasis_getSupportedServiceNames() throw();
+css::uno::Reference<css::uno::XInterface> SAL_CALL XMLImpressStylesImportOasis_createInstance(
+ css::uno::Reference<css::lang::XMultiServiceFactory> const & rSMgr)
+ throw (css::uno::Exception);
+OUString SAL_CALL XMLImpressContentImportOasis_getImplementationName() throw();
+css::uno::Sequence<OUString> SAL_CALL XMLImpressContentImportOasis_getSupportedServiceNames() throw();
+css::uno::Reference<css::uno::XInterface> SAL_CALL XMLImpressContentImportOasis_createInstance(
+ css::uno::Reference<css::lang::XMultiServiceFactory> const & rSMgr)
+ throw (css::uno::Exception);
+OUString SAL_CALL XMLImpressMetaImportOasis_getImplementationName() throw();
+css::uno::Sequence<OUString> SAL_CALL XMLImpressMetaImportOasis_getSupportedServiceNames() throw();
+css::uno::Reference<css::uno::XInterface> SAL_CALL XMLImpressMetaImportOasis_createInstance(
+ css::uno::Reference<css::lang::XMultiServiceFactory> const & rSMgr)
+ throw (css::uno::Exception);
+OUString SAL_CALL XMLImpressSettingsImportOasis_getImplementationName() throw();
+css::uno::Sequence<OUString> SAL_CALL XMLImpressSettingsImportOasis_getSupportedServiceNames() throw();
+css::uno::Reference<css::uno::XInterface> SAL_CALL XMLImpressSettingsImportOasis_createInstance(
+ css::uno::Reference<css::lang::XMultiServiceFactory> const & rSMgr)
+ throw (css::uno::Exception);
+
+// impress oasis export
+OUString SAL_CALL XMLImpressExportOasis_getImplementationName() throw();
+css::uno::Sequence<OUString> SAL_CALL XMLImpressExportOasis_getSupportedServiceNames() throw();
+css::uno::Reference<css::uno::XInterface> SAL_CALL XMLImpressExportOasis_createInstance(
+ css::uno::Reference<css::lang::XMultiServiceFactory> const & rSMgr)
+ throw (css::uno::Exception);
+OUString SAL_CALL XMLImpressStylesExportOasis_getImplementationName() throw();
+css::uno::Sequence<OUString> SAL_CALL XMLImpressStylesExportOasis_getSupportedServiceNames() throw();
+css::uno::Reference<css::uno::XInterface> SAL_CALL XMLImpressStylesExportOasis_createInstance(
+ css::uno::Reference<css::lang::XMultiServiceFactory> const & rSMgr)
+ throw (css::uno::Exception);
+OUString SAL_CALL XMLImpressContentExportOasis_getImplementationName() throw();
+css::uno::Sequence<OUString> SAL_CALL XMLImpressContentExportOasis_getSupportedServiceNames() throw();
+css::uno::Reference<css::uno::XInterface> SAL_CALL XMLImpressContentExportOasis_createInstance(
+ css::uno::Reference<css::lang::XMultiServiceFactory> const & rSMgr)
+ throw (css::uno::Exception);
+OUString SAL_CALL XMLImpressMetaExportOasis_getImplementationName() throw();
+css::uno::Sequence<OUString> SAL_CALL XMLImpressMetaExportOasis_getSupportedServiceNames() throw();
+css::uno::Reference<css::uno::XInterface> SAL_CALL XMLImpressMetaExportOasis_createInstance(
+ css::uno::Reference<css::lang::XMultiServiceFactory> const & rSMgr)
+ throw (css::uno::Exception);
+OUString SAL_CALL XMLImpressSettingsExportOasis_getImplementationName() throw();
+css::uno::Sequence<OUString> SAL_CALL XMLImpressSettingsExportOasis_getSupportedServiceNames() throw();
+css::uno::Reference<css::uno::XInterface> SAL_CALL XMLImpressSettingsExportOasis_createInstance(
+ css::uno::Reference<css::lang::XMultiServiceFactory> const & rSMgr)
+ throw (css::uno::Exception);
+
+// impress OOo import
+
+// impress OOo export
+OUString SAL_CALL XMLImpressExportOOO_getImplementationName() throw();
+css::uno::Sequence<OUString> SAL_CALL XMLImpressExportOOO_getSupportedServiceNames() throw();
+css::uno::Reference<css::uno::XInterface> SAL_CALL XMLImpressExportOOO_createInstance(
+ css::uno::Reference<css::lang::XMultiServiceFactory> const & rSMgr)
+ throw (css::uno::Exception);
+OUString SAL_CALL XMLImpressStylesExportOOO_getImplementationName() throw();
+css::uno::Sequence<OUString> SAL_CALL XMLImpressStylesExportOOO_getSupportedServiceNames() throw();
+css::uno::Reference<css::uno::XInterface> SAL_CALL XMLImpressStylesExportOOO_createInstance(
+ css::uno::Reference<css::lang::XMultiServiceFactory> const & rSMgr)
+ throw (css::uno::Exception);
+OUString SAL_CALL XMLImpressContentExportOOO_getImplementationName() throw();
+css::uno::Sequence<OUString> SAL_CALL XMLImpressContentExportOOO_getSupportedServiceNames() throw();
+css::uno::Reference<css::uno::XInterface> SAL_CALL XMLImpressContentExportOOO_createInstance(
+ css::uno::Reference<css::lang::XMultiServiceFactory> const & rSMgr)
+ throw (css::uno::Exception);
+OUString SAL_CALL XMLImpressMetaExportOOO_getImplementationName() throw();
+css::uno::Sequence<OUString> SAL_CALL XMLImpressMetaExportOOO_getSupportedServiceNames() throw();
+css::uno::Reference<css::uno::XInterface> SAL_CALL XMLImpressMetaExportOOO_createInstance(
+ css::uno::Reference<css::lang::XMultiServiceFactory> const & rSMgr)
+ throw (css::uno::Exception);
+OUString SAL_CALL XMLImpressSettingsExportOOO_getImplementationName() throw();
+css::uno::Sequence<OUString> SAL_CALL XMLImpressSettingsExportOOO_getSupportedServiceNames() throw();
+css::uno::Reference<css::uno::XInterface> SAL_CALL XMLImpressSettingsExportOOO_createInstance(
+ css::uno::Reference<css::lang::XMultiServiceFactory> const & rSMgr)
+ throw (css::uno::Exception);
+
+// draw oasis import
+OUString SAL_CALL XMLDrawImportOasis_getImplementationName() throw();
+css::uno::Sequence<OUString> SAL_CALL XMLDrawImportOasis_getSupportedServiceNames() throw();
+css::uno::Reference<css::uno::XInterface> SAL_CALL XMLDrawImportOasis_createInstance(
+ css::uno::Reference<css::lang::XMultiServiceFactory> const & rSMgr)
+ throw (css::uno::Exception);
+OUString SAL_CALL XMLDrawStylesImportOasis_getImplementationName() throw();
+css::uno::Sequence<OUString> SAL_CALL XMLDrawStylesImportOasis_getSupportedServiceNames() throw();
+css::uno::Reference<css::uno::XInterface> SAL_CALL XMLDrawStylesImportOasis_createInstance(
+ css::uno::Reference<css::lang::XMultiServiceFactory> const & rSMgr)
+ throw (css::uno::Exception);
+OUString SAL_CALL XMLDrawContentImportOasis_getImplementationName() throw();
+css::uno::Sequence<OUString> SAL_CALL XMLDrawContentImportOasis_getSupportedServiceNames() throw();
+css::uno::Reference<css::uno::XInterface> SAL_CALL XMLDrawContentImportOasis_createInstance(
+ css::uno::Reference<css::lang::XMultiServiceFactory> const & rSMgr)
+ throw (css::uno::Exception);
+OUString SAL_CALL XMLDrawMetaImportOasis_getImplementationName() throw();
+css::uno::Sequence<OUString> SAL_CALL XMLDrawMetaImportOasis_getSupportedServiceNames() throw();
+css::uno::Reference<css::uno::XInterface> SAL_CALL XMLDrawMetaImportOasis_createInstance(
+ css::uno::Reference<css::lang::XMultiServiceFactory> const & rSMgr)
+ throw (css::uno::Exception);
+OUString SAL_CALL XMLDrawSettingsImportOasis_getImplementationName() throw();
+css::uno::Sequence<OUString> SAL_CALL XMLDrawSettingsImportOasis_getSupportedServiceNames() throw();
+css::uno::Reference<css::uno::XInterface> SAL_CALL XMLDrawSettingsImportOasis_createInstance(
+ css::uno::Reference<css::lang::XMultiServiceFactory> const & rSMgr)
+ throw (css::uno::Exception);
+
+// draw oasis export
+OUString SAL_CALL XMLDrawExportOasis_getImplementationName() throw();
+css::uno::Sequence<OUString> SAL_CALL XMLDrawExportOasis_getSupportedServiceNames() throw();
+css::uno::Reference<css::uno::XInterface> SAL_CALL XMLDrawExportOasis_createInstance(
+ css::uno::Reference<css::lang::XMultiServiceFactory> const & rSMgr)
+ throw (css::uno::Exception);
+OUString SAL_CALL XMLDrawStylesExportOasis_getImplementationName() throw();
+css::uno::Sequence<OUString> SAL_CALL XMLDrawStylesExportOasis_getSupportedServiceNames() throw();
+css::uno::Reference<css::uno::XInterface> SAL_CALL XMLDrawStylesExportOasis_createInstance(
+ css::uno::Reference<css::lang::XMultiServiceFactory> const & rSMgr)
+ throw (css::uno::Exception);
+OUString SAL_CALL XMLDrawContentExportOasis_getImplementationName() throw();
+css::uno::Sequence<OUString> SAL_CALL XMLDrawContentExportOasis_getSupportedServiceNames() throw();
+css::uno::Reference<css::uno::XInterface> SAL_CALL XMLDrawContentExportOasis_createInstance(
+ css::uno::Reference<css::lang::XMultiServiceFactory> const & rSMgr)
+ throw (css::uno::Exception);
+OUString SAL_CALL XMLDrawMetaExportOasis_getImplementationName() throw();
+css::uno::Sequence<OUString> SAL_CALL XMLDrawMetaExportOasis_getSupportedServiceNames() throw();
+css::uno::Reference<css::uno::XInterface> SAL_CALL XMLDrawMetaExportOasis_createInstance(
+ css::uno::Reference<css::lang::XMultiServiceFactory> const & rSMgr)
+ throw (css::uno::Exception);
+OUString SAL_CALL XMLDrawSettingsExportOasis_getImplementationName() throw();
+css::uno::Sequence<OUString> SAL_CALL XMLDrawSettingsExportOasis_getSupportedServiceNames() throw();
+css::uno::Reference<css::uno::XInterface> SAL_CALL XMLDrawSettingsExportOasis_createInstance(
+ css::uno::Reference<css::lang::XMultiServiceFactory> const & rSMgr)
+ throw (css::uno::Exception);
+
+// draw OOo import
+
+// draw OOo export
+OUString SAL_CALL XMLDrawExportOOO_getImplementationName() throw();
+css::uno::Sequence<OUString> SAL_CALL XMLDrawExportOOO_getSupportedServiceNames() throw();
+css::uno::Reference<css::uno::XInterface> SAL_CALL XMLDrawExportOOO_createInstance(
+ css::uno::Reference<css::lang::XMultiServiceFactory> const & rSMgr)
+ throw (css::uno::Exception);
+OUString SAL_CALL XMLDrawStylesExportOOO_getImplementationName() throw();
+css::uno::Sequence<OUString> SAL_CALL XMLDrawStylesExportOOO_getSupportedServiceNames() throw();
+css::uno::Reference<css::uno::XInterface> SAL_CALL XMLDrawStylesExportOOO_createInstance(
+ css::uno::Reference<css::lang::XMultiServiceFactory> const & rSMgr)
+ throw (css::uno::Exception);
+OUString SAL_CALL XMLDrawContentExportOOO_getImplementationName() throw();
+css::uno::Sequence<OUString> SAL_CALL XMLDrawContentExportOOO_getSupportedServiceNames() throw();
+css::uno::Reference<css::uno::XInterface> SAL_CALL XMLDrawContentExportOOO_createInstance(
+ css::uno::Reference<css::lang::XMultiServiceFactory> const & rSMgr)
+ throw (css::uno::Exception);
+OUString SAL_CALL XMLDrawMetaExportOOO_getImplementationName() throw();
+css::uno::Sequence<OUString> SAL_CALL XMLDrawMetaExportOOO_getSupportedServiceNames() throw();
+css::uno::Reference<css::uno::XInterface> SAL_CALL XMLDrawMetaExportOOO_createInstance(
+ css::uno::Reference<css::lang::XMultiServiceFactory> const & rSMgr)
+ throw (css::uno::Exception);
+OUString SAL_CALL XMLDrawSettingsExportOOO_getImplementationName() throw();
+css::uno::Sequence<OUString> SAL_CALL XMLDrawSettingsExportOOO_getSupportedServiceNames() throw();
+css::uno::Reference<css::uno::XInterface> SAL_CALL XMLDrawSettingsExportOOO_createInstance(
+ css::uno::Reference<css::lang::XMultiServiceFactory> const & rSMgr)
+ throw (css::uno::Exception);
+
+// impress animation import
+OUString SAL_CALL AnimationsImport_getImplementationName() throw();
+css::uno::Sequence<OUString> SAL_CALL AnimationsImport_getSupportedServiceNames() throw();
+css::uno::Reference<css::uno::XInterface> SAL_CALL AnimationsImport_createInstance(
+ css::uno::Reference<css::lang::XMultiServiceFactory> const & rSMgr)
+ throw (css::uno::Exception);
+
+// drawing layer export
+OUString SAL_CALL XMLDrawingLayerExport_getImplementationName() throw();
+css::uno::Sequence<OUString> SAL_CALL XMLDrawingLayerExport_getSupportedServiceNames() throw();
+css::uno::Reference<css::uno::XInterface> SAL_CALL XMLDrawingLayerExport_createInstance(
+ css::uno::Reference<css::lang::XMultiServiceFactory> const & rSMgr)
+ throw (css::uno::Exception);
+
+// impress xml clipboard export
+OUString SAL_CALL XMLImpressClipboardExport_getImplementationName() throw();
+css::uno::Sequence<OUString> SAL_CALL XMLImpressClipboardExport_getSupportedServiceNames() throw();
+css::uno::Reference<css::uno::XInterface> SAL_CALL XMLImpressClipboardExport_createInstance(
+ css::uno::Reference<css::lang::XMultiServiceFactory> const & rSMgr)
+ throw (css::uno::Exception);
+
+// chart oasis import
+OUString SAL_CALL SchXMLImport_getImplementationName() throw();
+css::uno::Sequence<OUString> SAL_CALL SchXMLImport_getSupportedServiceNames() throw();
+css::uno::Reference<css::uno::XInterface> SAL_CALL SchXMLImport_createInstance(
+ css::uno::Reference<css::lang::XMultiServiceFactory> const & rSMgr)
+ throw (css::uno::Exception);
+OUString SAL_CALL SchXMLImport_Meta_getImplementationName() throw();
+css::uno::Sequence<OUString> SAL_CALL SchXMLImport_Meta_getSupportedServiceNames() throw();
+css::uno::Reference<css::uno::XInterface> SAL_CALL SchXMLImport_Meta_createInstance(
+ css::uno::Reference<css::lang::XMultiServiceFactory> const & rSMgr)
+ throw (css::uno::Exception);
+OUString SAL_CALL SchXMLImport_Styles_getImplementationName() throw();
+css::uno::Sequence<OUString> SAL_CALL SchXMLImport_Styles_getSupportedServiceNames() throw();
+css::uno::Reference<css::uno::XInterface> SAL_CALL SchXMLImport_Styles_createInstance(
+ css::uno::Reference<css::lang::XMultiServiceFactory> const & rSMgr)
+ throw (css::uno::Exception);
+OUString SAL_CALL SchXMLImport_Content_getImplementationName() throw();
+css::uno::Sequence<OUString> SAL_CALL SchXMLImport_Content_getSupportedServiceNames() throw();
+css::uno::Reference<css::uno::XInterface> SAL_CALL SchXMLImport_Content_createInstance(
+ css::uno::Reference<css::lang::XMultiServiceFactory> const & rSMgr)
+ throw (css::uno::Exception);
+
+// chart oasis export
+OUString SAL_CALL SchXMLExport_Oasis_getImplementationName() throw();
+css::uno::Sequence<OUString> SAL_CALL SchXMLExport_Oasis_getSupportedServiceNames() throw();
+css::uno::Reference<css::uno::XInterface> SAL_CALL SchXMLExport_Oasis_createInstance(
+ css::uno::Reference<css::lang::XMultiServiceFactory> const & rSMgr)
+ throw (css::uno::Exception);
+OUString SAL_CALL SchXMLExport_Oasis_Meta_getImplementationName() throw();
+css::uno::Sequence<OUString> SAL_CALL SchXMLExport_Oasis_Meta_getSupportedServiceNames() throw();
+css::uno::Reference<css::uno::XInterface> SAL_CALL SchXMLExport_Oasis_Meta_createInstance(
+ css::uno::Reference<css::lang::XMultiServiceFactory> const & rSMgr)
+ throw (css::uno::Exception);
+OUString SAL_CALL SchXMLExport_Oasis_Styles_getImplementationName() throw();
+css::uno::Sequence<OUString> SAL_CALL SchXMLExport_Oasis_Styles_getSupportedServiceNames() throw();
+css::uno::Reference<css::uno::XInterface> SAL_CALL SchXMLExport_Oasis_Styles_createInstance(
+ css::uno::Reference<css::lang::XMultiServiceFactory> const & rSMgr)
+ throw (css::uno::Exception);
+OUString SAL_CALL SchXMLExport_Oasis_Content_getImplementationName() throw();
+css::uno::Sequence<OUString> SAL_CALL SchXMLExport_Oasis_Content_getSupportedServiceNames() throw();
+css::uno::Reference<css::uno::XInterface> SAL_CALL SchXMLExport_Oasis_Content_createInstance(
+ css::uno::Reference<css::lang::XMultiServiceFactory> const & rSMgr)
+ throw (css::uno::Exception);
+
+// chart OOo import
+
+// chart OOo export
+OUString SAL_CALL SchXMLExport_getImplementationName() throw();
+css::uno::Sequence<OUString> SAL_CALL SchXMLExport_getSupportedServiceNames() throw();
+css::uno::Reference<css::uno::XInterface> SAL_CALL SchXMLExport_createInstance(
+ css::uno::Reference<css::lang::XMultiServiceFactory> const & rSMgr)
+ throw (css::uno::Exception);
+OUString SAL_CALL SchXMLExport_Styles_getImplementationName() throw();
+css::uno::Sequence<OUString> SAL_CALL SchXMLExport_Styles_getSupportedServiceNames() throw();
+css::uno::Reference<css::uno::XInterface> SAL_CALL SchXMLExport_Styles_createInstance(
+ css::uno::Reference<css::lang::XMultiServiceFactory> const & rSMgr)
+ throw (css::uno::Exception);
+OUString SAL_CALL SchXMLExport_Content_getImplementationName() throw();
+css::uno::Sequence<OUString> SAL_CALL SchXMLExport_Content_getSupportedServiceNames() throw();
+css::uno::Reference<css::uno::XInterface> SAL_CALL SchXMLExport_Content_createInstance(
+ css::uno::Reference<css::lang::XMultiServiceFactory> const & rSMgr)
+ throw (css::uno::Exception);
+
+// meta export
+OUString SAL_CALL XMLMetaExportComponent_getImplementationName() throw();
+css::uno::Sequence<OUString> SAL_CALL XMLMetaExportComponent_getSupportedServiceNames() throw();
+css::uno::Reference<css::uno::XInterface> SAL_CALL XMLMetaExportComponent_createInstance(
+ css::uno::Reference<css::lang::XMultiServiceFactory> const & rSMgr)
+ throw (css::uno::Exception);
+
+// meta import
+OUString SAL_CALL XMLMetaImportComponent_getImplementationName() throw();
+css::uno::Sequence<OUString> SAL_CALL XMLMetaImportComponent_getSupportedServiceNames() throw();
+css::uno::Reference<css::uno::XInterface> SAL_CALL XMLMetaImportComponent_createInstance(
+ css::uno::Reference<css::lang::XMultiServiceFactory> const & rSMgr)
+ throw (css::uno::Exception);
+
+// meta export OOo
+OUString SAL_CALL XMLMetaExportOOO_getImplementationName() throw();
+css::uno::Sequence<OUString> SAL_CALL XMLMetaExportOOO_getSupportedServiceNames() throw();
+css::uno::Reference<css::uno::XInterface> SAL_CALL XMLMetaExportOOO_createInstance(
+ css::uno::Reference<css::lang::XMultiServiceFactory> const & rSMgr)
+ throw (css::uno::Exception);
+
+// writer autotext event export
+OUString SAL_CALL XMLAutoTextEventExport_getImplementationName() throw();
+css::uno::Sequence<OUString> SAL_CALL XMLAutoTextEventExport_getSupportedServiceNames() throw();
+css::uno::Reference<css::uno::XInterface> SAL_CALL XMLAutoTextEventExport_createInstance(
+ css::uno::Reference<css::lang::XMultiServiceFactory> const & rSMgr)
+ throw (css::uno::Exception);
+
+// writer autotext event import
+OUString SAL_CALL XMLAutoTextEventImport_getImplementationName() throw();
+css::uno::Sequence<OUString> SAL_CALL XMLAutoTextEventImport_getSupportedServiceNames() throw();
+css::uno::Reference<css::uno::XInterface> SAL_CALL XMLAutoTextEventImport_createInstance(
+ css::uno::Reference<css::lang::XMultiServiceFactory> const & rSMgr)
+ throw (css::uno::Exception);
+
+// writer autotext event export OOo
+OUString SAL_CALL XMLAutoTextEventExportOOO_getImplementationName() throw();
+css::uno::Sequence<OUString> SAL_CALL XMLAutoTextEventExportOOO_getSupportedServiceNames() throw();
+css::uno::Reference<css::uno::XInterface> SAL_CALL XMLAutoTextEventExportOOO_createInstance(
+ css::uno::Reference<css::lang::XMultiServiceFactory> const & rSMgr)
+ throw (css::uno::Exception);
+
+// writer autotext event import OOo
+OUString SAL_CALL XMLAutoTextEventImportOOO_getImplementationName() throw();
+css::uno::Sequence<OUString> SAL_CALL XMLAutoTextEventImportOOO_getSupportedServiceNames() throw();
+css::uno::Reference<css::uno::XInterface> SAL_CALL XMLAutoTextEventImportOOO_createInstance(
+ css::uno::Reference<css::lang::XMultiServiceFactory> const & rSMgr)
+ throw (css::uno::Exception);
+
+// Oasis2OOo transformer
+OUString SAL_CALL Oasis2OOoTransformer_getImplementationName() throw();
+css::uno::Sequence<OUString> SAL_CALL Oasis2OOoTransformer_getSupportedServiceNames() throw();
+css::uno::Reference<css::uno::XInterface> SAL_CALL Oasis2OOoTransformer_createInstance(
+ css::uno::Reference<css::lang::XMultiServiceFactory> const & rSMgr)
+ throw (css::uno::Exception);
+
+// OOo2Oasis transformer
+OUString SAL_CALL OOo2OasisTransformer_getImplementationName() throw();
+css::uno::Sequence<OUString> SAL_CALL OOo2OasisTransformer_getSupportedServiceNames() throw();
+css::uno::Reference<css::uno::XInterface> SAL_CALL OOo2OasisTransformer_createInstance(
+ css::uno::Reference<css::lang::XMultiServiceFactory> const & rSMgr)
+ throw (css::uno::Exception);
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/chart/SchXMLExport.cxx b/xmloff/source/chart/SchXMLExport.cxx
index bd17360..3dfdeaf 100644
--- a/xmloff/source/chart/SchXMLExport.cxx
+++ b/xmloff/source/chart/SchXMLExport.cxx
@@ -17,6 +17,9 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
+#include <sal/config.h>
+
+#include <boost/noncopyable.hpp>
#include <sax/tools/converter.hxx>
#include <xmloff/xmlprmap.hxx>
@@ -26,6 +29,7 @@
#include "ColorPropertySet.hxx"
#include "SchXMLTools.hxx"
#include "SchXMLEnumConverter.hxx"
+#include "facreg.hxx"
#include <tools/debug.hxx>
#include <comphelper/processfactory.hxx>
@@ -114,7 +118,7 @@ using ::std::vector;
// class SchXMLExportHelper_Impl
-class SchXMLExportHelper_Impl
+class SchXMLExportHelper_Impl: private boost::noncopyable
{
public:
// first: data sequence for label, second: data sequence for values.
@@ -243,15 +247,8 @@ public:
/// add svg size as attribute for current element
void addSize( const ::com::sun::star::awt::Size & rSize, bool bIsOOoNamespace = false );
void addSize( com::sun::star::uno::Reference< com::sun::star::drawing::XShape > xShape, bool bIsOOoNamespace = false );
- /// fills the member msString with the appropriate String (i.e. "A3")
- void getCellAddress( sal_Int32 nCol, sal_Int32 nRow );
/// exports a string as a paragraph element
void exportText( const OUString& rText, bool bConvertTabsLFs = false );
- void exportErrorBarRanges();
-
-private:
- SchXMLExportHelper_Impl(SchXMLExportHelper_Impl &); // not defined
- SchXMLExportHelper_Impl operator =(SchXMLExportHelper_Impl &); // not defined
public:
SvXMLExport& mrExport;
diff --git a/xmloff/source/chart/SchXMLImport.cxx b/xmloff/source/chart/SchXMLImport.cxx
index 042dcba..b8b13f3 100644
--- a/xmloff/source/chart/SchXMLImport.cxx
+++ b/xmloff/source/chart/SchXMLImport.cxx
@@ -22,6 +22,7 @@
#include "contexts.hxx"
#include "XMLChartPropertySetMapper.hxx"
#include "SchXMLTools.hxx"
+#include "facreg.hxx"
#include <tools/debug.hxx>
#include <rtl/ustrbuf.hxx>
diff --git a/xmloff/source/core/attrlist.cxx b/xmloff/source/core/attrlist.cxx
index 11b43d0..ace876a 100644
--- a/xmloff/source/core/attrlist.cxx
+++ b/xmloff/source/core/attrlist.cxx
@@ -33,7 +33,6 @@ using namespace ::xmloff::token;
struct SvXMLTagAttribute_Impl
{
- SvXMLTagAttribute_Impl(){}
SvXMLTagAttribute_Impl( const OUString &rName,
const OUString &rValue )
: sName(rName),
diff --git a/xmloff/source/core/facreg.cxx b/xmloff/source/core/facreg.cxx
index ca9bb8b..60f2bee 100644
--- a/xmloff/source/core/facreg.cxx
+++ b/xmloff/source/core/facreg.cxx
@@ -30,117 +30,9 @@
#include <cppuhelper/factory.hxx>
#include <xmloff/xmlreg.hxx>
-using namespace com::sun::star;
-
-
-#define SERVICE( className ) \
-extern OUString SAL_CALL className##_getImplementationName() throw(); \
-extern uno::Sequence< OUString > SAL_CALL className##_getSupportedServiceNames() throw();\
-extern uno::Reference< uno::XInterface > SAL_CALL className##_createInstance( \
- const uno::Reference< lang::XMultiServiceFactory > & rSMgr ) \
- throw( uno::Exception )
-
-// impress oasis import
-SERVICE( XMLImpressImportOasis );
-SERVICE( XMLImpressStylesImportOasis );
-SERVICE( XMLImpressContentImportOasis );
-SERVICE( XMLImpressMetaImportOasis );
-SERVICE( XMLImpressSettingsImportOasis );
-
-// impress oasis export
-SERVICE( XMLImpressExportOasis );
-SERVICE( XMLImpressStylesExportOasis );
-SERVICE( XMLImpressContentExportOasis );
-SERVICE( XMLImpressMetaExportOasis );
-SERVICE( XMLImpressSettingsExportOasis );
-
-// impress OOo import
-
-// impress OOo export
-SERVICE( XMLImpressExportOOO );
-SERVICE( XMLImpressStylesExportOOO );
-SERVICE( XMLImpressContentExportOOO );
-SERVICE( XMLImpressMetaExportOOO );
-SERVICE( XMLImpressSettingsExportOOO );
-
-// draw oasis import
-SERVICE( XMLDrawImportOasis );
-SERVICE( XMLDrawStylesImportOasis );
-SERVICE( XMLDrawContentImportOasis );
-SERVICE( XMLDrawMetaImportOasis );
-SERVICE( XMLDrawSettingsImportOasis );
-
-// draw oasis export
-SERVICE( XMLDrawExportOasis );
-SERVICE( XMLDrawStylesExportOasis );
-SERVICE( XMLDrawContentExportOasis );
-SERVICE( XMLDrawMetaExportOasis );
-SERVICE( XMLDrawSettingsExportOasis );
-
-// draw OOo import
-
-// draw OOo export
-SERVICE( XMLDrawExportOOO );
-SERVICE( XMLDrawStylesExportOOO );
-SERVICE( XMLDrawContentExportOOO );
-SERVICE( XMLDrawMetaExportOOO );
-SERVICE( XMLDrawSettingsExportOOO );
-
-// impress animation import
-SERVICE( AnimationsImport );
-
-// drawing layer export
-SERVICE( XMLDrawingLayerExport );
-
-// impress xml clipboard export
-SERVICE( XMLImpressClipboardExport );
-
-// chart oasis import
-SERVICE( SchXMLImport );
-SERVICE( SchXMLImport_Meta );
-SERVICE( SchXMLImport_Styles );
-SERVICE( SchXMLImport_Content );
-
-// chart oasis export
-SERVICE( SchXMLExport_Oasis );
-SERVICE( SchXMLExport_Oasis_Meta );
-SERVICE( SchXMLExport_Oasis_Styles );
-SERVICE( SchXMLExport_Oasis_Content );
-
-// chart OOo import
-
-// chart OOo export
-SERVICE( SchXMLExport );
-SERVICE( SchXMLExport_Styles );
-SERVICE( SchXMLExport_Content );
-
-// meta export
-SERVICE( XMLMetaExportComponent );
-
-// meta import
-SERVICE( XMLMetaImportComponent );
-
-// meta export OOo
-SERVICE( XMLMetaExportOOO );
-
-// writer autotext event export
-SERVICE( XMLAutoTextEventExport );
-
-// writer autotext event import
-SERVICE( XMLAutoTextEventImport );
-
-// writer autotext event export OOo
-SERVICE( XMLAutoTextEventExportOOO );
-
-// writer autotext event import OOo
-SERVICE( XMLAutoTextEventImportOOO );
-
-// Oasis2OOo transformer
-SERVICE( Oasis2OOoTransformer );
-
-// OOo2Oasis transformer
-SERVICE( OOo2OasisTransformer );
+#include <facreg.hxx>
+using namespace com::sun::star;
#ifdef __cplusplus
extern "C"
diff --git a/xmloff/source/core/xmltkmap.cxx b/xmloff/source/core/xmltkmap.cxx
index 73055a8..fe527c7 100644
--- a/xmloff/source/core/xmltkmap.cxx
+++ b/xmloff/source/core/xmltkmap.cxx
@@ -47,12 +47,6 @@ public:
nToken( rEntry.nToken )
{}
- bool operator==( const SvXMLTokenMapEntry_Impl& r ) const
- {
- return nPrefixKey == r.nPrefixKey &&
- sLocalName == r.sLocalName;
- }
-
bool operator<( const SvXMLTokenMapEntry_Impl& r ) const
{
return nPrefixKey < r.nPrefixKey ||
diff --git a/xmloff/source/draw/animationimport.cxx b/xmloff/source/draw/animationimport.cxx
index 92d0ac3..4ea112d 100644
--- a/xmloff/source/draw/animationimport.cxx
+++ b/xmloff/source/draw/animationimport.cxx
@@ -62,6 +62,7 @@
#include <osl/mutex.hxx>
#include <xmloff/nmspmap.hxx>
#include "anim.hxx"
+#include "facreg.hxx"
#include "animations.hxx"
#include "animationimport.hxx"
@@ -124,7 +125,6 @@ public:
Sequence< double > convertKeyTimes( const OUString& rValue );
Sequence< TimeFilterPair > convertTimeFilter( const OUString& rValue );
- bool convertAnimationValue( XMLTokenEnum eAttributeName, Any& rValue );
const OUString mastrHSL;
};
diff --git a/xmloff/source/draw/sdxmlexp.cxx b/xmloff/source/draw/sdxmlexp.cxx
index 80f3580..46b714f 100644
--- a/xmloff/source/draw/sdxmlexp.cxx
+++ b/xmloff/source/draw/sdxmlexp.cxx
@@ -60,6 +60,7 @@
#include "sdpropls.hxx"
#include <xmloff/xmlexppr.hxx>
#include <com/sun/star/beans/XPropertyState.hpp>
+#include "facreg.hxx"
#include "xexptran.hxx"
#include <cppuhelper/implbase1.hxx>
diff --git a/xmloff/source/draw/sdxmlimp.cxx b/xmloff/source/draw/sdxmlimp.cxx
index c184ea0..dbd8347 100644
--- a/xmloff/source/draw/sdxmlimp.cxx
+++ b/xmloff/source/draw/sdxmlimp.cxx
@@ -21,6 +21,7 @@
#include <comphelper/processfactory.hxx>
#include <xmloff/xmlscripti.hxx>
+#include "facreg.hxx"
#include "sdxmlimp_impl.hxx"
#include "ximpbody.hxx"
@@ -52,8 +53,6 @@ using namespace ::xmloff::token;
class SdXMLBodyContext_Impl : public SvXMLImportContext
{
- const SdXMLImport& GetSdImport() const
- { return (const SdXMLImport&)GetImport(); }
SdXMLImport& GetSdImport() { return (SdXMLImport&)GetImport(); }
public:
@@ -92,7 +91,6 @@ SvXMLImportContext *SdXMLBodyContext_Impl::CreateChildContext(
class SdXMLDocContext_Impl : public virtual SvXMLImportContext
{
protected:
- const SdXMLImport& GetSdImport() const { return (const SdXMLImport&)GetImport(); }
SdXMLImport& GetSdImport() { return (SdXMLImport&)GetImport(); }
public:
diff --git a/xmloff/source/draw/xexptran.cxx b/xmloff/source/draw/xexptran.cxx
index 0d7b5a0..6882cf6 100644
--- a/xmloff/source/draw/xexptran.cxx
+++ b/xmloff/source/draw/xexptran.cxx
@@ -36,26 +36,6 @@
using namespace ::com::sun::star;
-// Defines
-
-#define BORDER_INTEGERS_ARE_EQUAL (4)
-
-// Predeclarations
-
-void Imp_SkipDouble(const OUString& rStr, sal_Int32& rPos, const sal_Int32 nLen);
-void Imp_CalcVectorValues(::basegfx::B2DVector& aVec1, ::basegfx::B2DVector& aVec2, bool& bSameLength, bool& bSameDirection)
-{
- const sal_Int32 nLen1(FRound(aVec1.getLength()));
- const sal_Int32 nLen2(FRound(aVec2.getLength()));
- aVec1.normalize();
- aVec2.normalize();
- aVec1 += aVec2;
- const sal_Int32 nLen3(FRound(aVec1.getLength() * ((nLen1 + nLen2) / 2.0)));
-
- bSameLength = (abs(nLen1 - nLen2) <= BORDER_INTEGERS_ARE_EQUAL);
- bSameDirection = (nLen3 <= BORDER_INTEGERS_ARE_EQUAL);
-}
-
// parsing help functions for simple chars
void Imp_SkipSpaces(const OUString& rStr, sal_Int32& rPos, const sal_Int32 nLen)
{
@@ -87,18 +67,6 @@ void Imp_SkipSpacesAndClosingBraces(const OUString& rStr, sal_Int32& rPos, const
// parsing help functions for integer numbers
-bool Imp_IsOnNumberChar(const OUString& rStr, const sal_Int32 nPos, bool bSignAllowed = true)
-{
- sal_Unicode aChar(rStr[nPos]);
-
- if(('0' <= aChar && '9' >= aChar)
- || (bSignAllowed && '+' == aChar)
- || (bSignAllowed && '-' == aChar)
- )
- return true;
- return false;
-}
-
bool Imp_IsOnUnitChar(const OUString& rStr, const sal_Int32 nPos)
{
sal_Unicode aChar(rStr[nPos]);
@@ -111,78 +79,6 @@ bool Imp_IsOnUnitChar(const OUString& rStr, const sal_Int32 nPos)
return false;
}
-void Imp_SkipNumber(const OUString& rStr, sal_Int32& rPos, const sal_Int32 nLen)
-{
- bool bSignAllowed(true);
-
- while(rPos < nLen && Imp_IsOnNumberChar(rStr, rPos, bSignAllowed))
- {
- bSignAllowed = false;
- rPos++;
- }
-}
-
-void Imp_SkipNumberAndSpacesAndCommas(const OUString& rStr, sal_Int32& rPos,
- const sal_Int32 nLen)
-{
- Imp_SkipNumber(rStr, rPos, nLen);
- Imp_SkipSpacesAndCommas(rStr, rPos, nLen);
-}
-
-void Imp_PutNumberChar(OUString& rStr, sal_Int32 nValue)
-{
- OUStringBuffer sStringBuffer;
- ::sax::Converter::convertNumber(sStringBuffer, nValue);
- rStr += OUString(sStringBuffer.makeStringAndClear());
-}
-
-void Imp_PutNumberCharWithSpace(OUString& rStr, sal_Int32 nValue)
-{
- const sal_Int32 aLen(rStr.getLength());
- if(aLen)
- if(Imp_IsOnNumberChar(rStr, aLen - 1, false) && nValue >= 0)
- rStr += OUString(' ');
- Imp_PutNumberChar(rStr, nValue);
-}
-
-// parsing help functions for double numbers
-
-void Imp_SkipDouble(const OUString& rStr, sal_Int32& rPos, const sal_Int32)
-{
- sal_Unicode aChar(rStr[rPos]);
-
- if('+' == aChar || '-' == aChar)
- {
- ++rPos;
- aChar = rPos >= rStr.getLength() ? 0 : rStr[rPos];
- }
-
- while(('0' <= aChar && '9' >= aChar)
- || '.' == aChar)
- {
- ++rPos;
- aChar = rPos >= rStr.getLength() ? 0 : rStr[rPos];
- }
-
- if('e' == aChar || 'E' == aChar)
- {
- ++rPos;
- aChar = rPos >= rStr.getLength() ? 0 : rStr[rPos];
-
- if('+' == aChar || '-' == aChar)
- {
- ++rPos;
- aChar = rPos >= rStr.getLength() ? 0 : rStr[rPos];
- }
-
- while('0' <= aChar && '9' >= aChar)
- {
- ++rPos;
- aChar = rPos >= rStr.getLength() ? 0 : rStr[rPos];
- }
- }
-}
-
double Imp_GetDoubleChar(const OUString& rStr, sal_Int32& rPos, const sal_Int32 nLen,
const SvXMLUnitConverter& rConv, double fRetval, bool bLookForUnits = false)
{
diff --git a/xmloff/source/draw/ximpcustomshape.cxx b/xmloff/source/draw/ximpcustomshape.cxx
index 31c9e31..38c41f8 100644
--- a/xmloff/source/draw/ximpcustomshape.cxx
+++ b/xmloff/source/draw/ximpcustomshape.cxx
@@ -113,22 +113,6 @@ void GetDouble( std::vector< com::sun::star::beans::PropertyValue >& rDest,
}
}
-void GetDistance( std::vector< com::sun::star::beans::PropertyValue >& rDest,
- const OUString& rValue, const EnhancedCustomShapeTokenEnum eDestProp )
-{
- double fAttrDouble;
- sal_Int16 const eSrcUnit( ::sax::Converter::GetUnitFromString(
- rValue, util::MeasureUnit::MM_100TH) );
- if (::sax::Converter::convertDouble(fAttrDouble, rValue, eSrcUnit,
- util::MeasureUnit::MM_100TH))
- {
- beans::PropertyValue aProp;
- aProp.Name = EASGet( eDestProp );
- aProp.Value <<= fAttrDouble;
- rDest.push_back( aProp );
- }
-}
-
void GetString( std::vector< com::sun::star::beans::PropertyValue >& rDest,
const OUString& rValue, const EnhancedCustomShapeTokenEnum eDestProp )
{
diff --git a/xmloff/source/forms/elementimport.cxx b/xmloff/source/forms/elementimport.cxx
index dfc3195..e3ef0a0 100644
--- a/xmloff/source/forms/elementimport.cxx
+++ b/xmloff/source/forms/elementimport.cxx
@@ -82,18 +82,6 @@ namespace xmloff
}
};
- struct PropertyValueCompare : public ::std::binary_function< PropertyValue, OUString, bool>
- {
- bool operator() (const PropertyValue& lhs, const OUString& rhs) const
- {
- return lhs.Name == rhs;
- }
- bool operator() (const OUString& lhs, const PropertyValue& rhs) const
- {
- return lhs == rhs.Name;
- }
- };
-
template <class ELEMENT>
void pushBackSequenceElement(Sequence< ELEMENT >& _rContainer, const ELEMENT& _rElement)
{
diff --git a/xmloff/source/forms/property_meta_data.cxx b/xmloff/source/forms/property_meta_data.cxx
index 23a275c..984f070 100644
--- a/xmloff/source/forms/property_meta_data.cxx
+++ b/xmloff/source/forms/property_meta_data.cxx
@@ -18,6 +18,7 @@
*/
#include "property_description.hxx"
+#include "property_meta_data.hxx"
#include "forms/form_handler_factory.hxx"
#include "strings.hxx"
#include <xmloff/xmltoken.hxx>
diff --git a/xmloff/source/meta/MetaExportComponent.cxx b/xmloff/source/meta/MetaExportComponent.cxx
index 7a94fdb..915fa55 100644
--- a/xmloff/source/meta/MetaExportComponent.cxx
+++ b/xmloff/source/meta/MetaExportComponent.cxx
@@ -18,6 +18,7 @@
*/
#include "MetaExportComponent.hxx"
+#include "facreg.hxx"
#include <com/sun/star/frame/XModel.hpp>
#include <com/sun/star/xml/sax/XDocumentHandler.hpp>
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
diff --git a/xmloff/source/meta/xmlversion.cxx b/xmloff/source/meta/xmlversion.cxx
index edd693a..53f5801 100644
--- a/xmloff/source/meta/xmlversion.cxx
+++ b/xmloff/source/meta/xmlversion.cxx
@@ -427,27 +427,6 @@ uno::Sequence< util::RevisionTag > SAL_CALL XMLVersionListPersistence::load( con
return aVersions;
}
-uno::Sequence< OUString > SAL_CALL XMLVersionImExportOOO_getSupportedServiceNames()
- throw()
-{
- const OUString aServiceName(
- "com.sun.star.document.DocumentRevisionListPersistence" );
- const uno::Sequence< OUString > aSeq( &aServiceName, 1 );
- return aSeq;
-}
-
-OUString SAL_CALL XMLVersionImExportOOO_getImplementationName() throw()
-{
- return OUString( "XMLVersionImExportOOo" );
-}
-
-uno::Reference< uno::XInterface > SAL_CALL XMLVersionImExportOOO_createInstance(
- const uno::Reference< lang::XMultiServiceFactory > &)
- throw( uno::Exception )
-{
- return (cppu::OWeakObject*)new XMLVersionListPersistence;
-}
-
extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL
XMLVersionListPersistence_get_implementation(
css::uno::XComponentContext *,
diff --git a/xmloff/source/style/xmlnumfi.cxx b/xmloff/source/style/xmlnumfi.cxx
index 393f1db..e34e5ea 100644
--- a/xmloff/source/style/xmlnumfi.cxx
+++ b/xmloff/source/style/xmlnumfi.cxx
@@ -69,8 +69,6 @@ struct SvXMLEmbeddedElement
SvXMLEmbeddedElement( sal_Int32 nFP, const OUString& rT ) :
nFormatPos(nFP), aText(rT) {}
- // comparison operators for PTRARR sorting - sorted by position
- bool operator ==( const SvXMLEmbeddedElement& r ) const { return nFormatPos == r.nFormatPos; }
bool operator < ( const SvXMLEmbeddedElement& r ) const { return nFormatPos < r.nFormatPos; }
};
diff --git a/xmloff/source/style/xmlstyle.cxx b/xmloff/source/style/xmlstyle.cxx
index c08e744..84f5425 100644
--- a/xmloff/source/style/xmlstyle.cxx
+++ b/xmloff/source/style/xmlstyle.cxx
@@ -267,11 +267,6 @@ public:
size_t GetStyleCount() const { return aStyles.size(); }
- const SvXMLStyleContext *GetStyle( size_t i ) const
- {
- return i < aStyles.size() ? aStyles[ i ] : 0;
- }
-
SvXMLStyleContext *GetStyle( size_t i )
{
return i < aStyles.size() ? aStyles[ i ] : 0;
diff --git a/xmloff/source/text/XMLAutoTextEventExport.cxx b/xmloff/source/text/XMLAutoTextEventExport.cxx
index 957ce88..02b18fc 100644
--- a/xmloff/source/text/XMLAutoTextEventExport.cxx
+++ b/xmloff/source/text/XMLAutoTextEventExport.cxx
@@ -18,6 +18,7 @@
*/
#include "XMLAutoTextEventExport.hxx"
+#include "facreg.hxx"
#include <com/sun/star/frame/XModel.hpp>
#include <com/sun/star/xml/sax/XDocumentHandler.hpp>
#include <com/sun/star/util/MeasureUnit.hpp>
diff --git a/xmloff/source/transform/EventOASISTContext.cxx b/xmloff/source/transform/EventOASISTContext.cxx
index 9c2007f..d83e02e 100644
--- a/xmloff/source/transform/EventOASISTContext.cxx
+++ b/xmloff/source/transform/EventOASISTContext.cxx
@@ -127,54 +127,6 @@ OUString XMLEventOASISTransformerContext::GetEventName(
return (*aIter).second;
}
-bool ParseURLAsString(
- const OUString& rAttrValue,
- OUString* pName, OUString* pLocation )
-{
- OUString SCHEME( "vnd.sun.star.script:" );
-
- sal_Int32 params = rAttrValue.indexOf( '?' );
- if ( rAttrValue.indexOf( SCHEME ) != 0 || params < 0 )
- {
- return false;
- }
-
- sal_Int32 start = SCHEME.getLength();
- *pName = rAttrValue.copy( start, params - start );
-
- OUString aToken;
- OUString aLanguage;
- params++;
- do
- {
- aToken = rAttrValue.getToken( 0, '&', params );
- sal_Int32 dummy = 0;
-
- if ( aToken.match( GetXMLToken( XML_LANGUAGE ) ) )
- {
- aLanguage = aToken.getToken( 1, '=', dummy );
- }
- else if ( aToken.match( GetXMLToken( XML_LOCATION ) ) )
- {
- OUString tmp = aToken.getToken( 1, '=', dummy );
- if ( tmp.equalsIgnoreAsciiCase( GetXMLToken( XML_DOCUMENT ) ) )
- {
- *pLocation = GetXMLToken( XML_DOCUMENT );
- }
- else
- {
- *pLocation = GetXMLToken( XML_APPLICATION );
- }
- }
- } while ( params >= 0 );
-
- if ( aLanguage.equalsIgnoreAsciiCase("basic") )
- {
- return true;
- }
- return false;
-}
-
bool ParseURL(
const OUString& rAttrValue,
OUString* pName, OUString* pLocation )
diff --git a/xmloff/source/transform/OOo2Oasis.cxx b/xmloff/source/transform/OOo2Oasis.cxx
index d3c3fbb..dc97349 100644
--- a/xmloff/source/transform/OOo2Oasis.cxx
+++ b/xmloff/source/transform/OOo2Oasis.cxx
@@ -38,6 +38,7 @@
#include "PropertyActionsOOo.hxx"
#include "TransformerActions.hxx"
#include "OOo2Oasis.hxx"
+#include "XMLFilterRegistration.hxx"
#include <cppuhelper/supportsservice.hxx>
using namespace ::xmloff::token;
diff --git a/xmloff/source/transform/Oasis2OOo.cxx b/xmloff/source/transform/Oasis2OOo.cxx
index fe85a00..c340b19 100644
--- a/xmloff/source/transform/Oasis2OOo.cxx
+++ b/xmloff/source/transform/Oasis2OOo.cxx
@@ -40,6 +40,7 @@
#include "AttrTransformerAction.hxx"
#include "TransformerActions.hxx"
#include "FamilyType.hxx"
+#include "facreg.hxx"
#include <comphelper/servicehelper.hxx>
#include "Oasis2OOo.hxx"
#include <cppuhelper/supportsservice.hxx>
diff --git a/xmloff/source/transform/PersMixedContentTContext.cxx b/xmloff/source/transform/PersMixedContentTContext.cxx
index 18cb129..1601616 100644
--- a/xmloff/source/transform/PersMixedContentTContext.cxx
+++ b/xmloff/source/transform/PersMixedContentTContext.cxx
@@ -44,7 +44,6 @@ public:
virtual sal_Bool IsPersistent() const SAL_OVERRIDE;
virtual void Export() SAL_OVERRIDE;
- const OUString& GetText() const { return m_aCharacters; }
};
TYPEINIT1( XMLPersTextTContext_Impl, XMLTransformerContext );
diff --git a/xmloff/source/transform/XMLFilterRegistration.cxx b/xmloff/source/transform/XMLFilterRegistration.cxx
index 0625459..5d3c7a8 100644
--- a/xmloff/source/transform/XMLFilterRegistration.cxx
+++ b/xmloff/source/transform/XMLFilterRegistration.cxx
@@ -21,48 +21,13 @@
#include <com/sun/star/registry/XRegistryKey.hpp>
#include <cppuhelper/factory.hxx>
-using namespace ::com::sun::star;
+#include <XMLFilterRegistration.hxx>
-#define DECLARE_SERVICE( classname ) \
- extern OUString SAL_CALL classname##_getImplementationName() throw(); \
- extern uno::Sequence< OUString > SAL_CALL classname##_getSupportedServiceNames() throw(); \
- extern uno::Reference< uno::XInterface > SAL_CALL classname##_createInstance( \
- const uno::Reference< lang::XMultiServiceFactory > & rSMgr ) throw( uno::Exception );
+using namespace ::com::sun::star;
#define ENUMERATE_SERVICE( classname ) \
{ classname##_getImplementationName, classname##_getSupportedServiceNames, classname##_createInstance }
-DECLARE_SERVICE( OOo2OasisTransformer )
-DECLARE_SERVICE( Oasis2OOoTransformer )
-
-DECLARE_SERVICE( XMLAutoTextEventImportOOO )
-DECLARE_SERVICE( XMLMetaImportOOO )
-DECLARE_SERVICE( XMLMathSettingsImportOOO )
-DECLARE_SERVICE( XMLMathMetaImportOOO )
-DECLARE_SERVICE( XMLCalcSettingsImportOOO )
-DECLARE_SERVICE( XMLCalcMetaImportOOO )
-DECLARE_SERVICE( XMLCalcContentImportOOO )
-DECLARE_SERVICE( XMLCalcStylesImportOOO )
-DECLARE_SERVICE( XMLCalcImportOOO )
-DECLARE_SERVICE( XMLWriterSettingsImportOOO )
-DECLARE_SERVICE( XMLWriterMetaImportOOO )
-DECLARE_SERVICE( XMLWriterContentImportOOO )
-DECLARE_SERVICE( XMLWriterStylesImportOOO )
-DECLARE_SERVICE( XMLWriterImportOOO )
-DECLARE_SERVICE( XMLChartContentImportOOO )
-DECLARE_SERVICE( XMLChartStylesImportOOO )
-DECLARE_SERVICE( XMLChartImportOOO )
-DECLARE_SERVICE( XMLDrawSettingsImportOOO )
-DECLARE_SERVICE( XMLDrawMetaImportOOO )
-DECLARE_SERVICE( XMLDrawContentImportOOO )
-DECLARE_SERVICE( XMLDrawStylesImportOOO )
-DECLARE_SERVICE( XMLDrawImportOOO )
-DECLARE_SERVICE( XMLImpressSettingsImportOOO )
-DECLARE_SERVICE( XMLImpressMetaImportOOO )
-DECLARE_SERVICE( XMLImpressContentImportOOO )
-DECLARE_SERVICE( XMLImpressStylesImportOOO )
-DECLARE_SERVICE( XMLImpressImportOOO )
-
namespace
{
typedef OUString (SAL_CALL * GetImplementationName)();
diff --git a/xmloff/source/transform/XMLFilterRegistration.hxx b/xmloff/source/transform/XMLFilterRegistration.hxx
new file mode 100644
index 0000000..cb583ec
--- /dev/null
+++ b/xmloff/source/transform/XMLFilterRegistration.hxx
@@ -0,0 +1,64 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed
+ * with this work for additional information regarding copyright
+ * ownership. The ASF licenses this file to you under the Apache
+ * License, Version 2.0 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+
+#ifndef INCLUDED_XMLOFF_SOURCE_TRANSFORM_XMLFILTERREGISTRATION_HXX
+#define INCLUDED_XMLOFF_SOURCE_TRANSFORM_XMLFILTERREGISTRATION_HXX
+
+#include <sal/config.h>
+
+#define DECLARE_SERVICE( classname ) \
+ OUString SAL_CALL classname##_getImplementationName() throw(); \
+ css::uno::Sequence< OUString > SAL_CALL classname##_getSupportedServiceNames() throw(); \
+ css::uno::Reference< css::uno::XInterface > SAL_CALL classname##_createInstance( \
+ const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr ) throw( css::uno::Exception );
+
+DECLARE_SERVICE( OOo2OasisTransformer )
+DECLARE_SERVICE( Oasis2OOoTransformer )
+
+DECLARE_SERVICE( XMLAutoTextEventImportOOO )
+DECLARE_SERVICE( XMLMetaImportOOO )
+DECLARE_SERVICE( XMLMathSettingsImportOOO )
+DECLARE_SERVICE( XMLMathMetaImportOOO )
+DECLARE_SERVICE( XMLCalcSettingsImportOOO )
+DECLARE_SERVICE( XMLCalcMetaImportOOO )
+DECLARE_SERVICE( XMLCalcContentImportOOO )
+DECLARE_SERVICE( XMLCalcStylesImportOOO )
+DECLARE_SERVICE( XMLCalcImportOOO )
+DECLARE_SERVICE( XMLWriterSettingsImportOOO )
+DECLARE_SERVICE( XMLWriterMetaImportOOO )
+DECLARE_SERVICE( XMLWriterContentImportOOO )
+DECLARE_SERVICE( XMLWriterStylesImportOOO )
+DECLARE_SERVICE( XMLWriterImportOOO )
+DECLARE_SERVICE( XMLChartContentImportOOO )
+DECLARE_SERVICE( XMLChartStylesImportOOO )
+DECLARE_SERVICE( XMLChartImportOOO )
+DECLARE_SERVICE( XMLDrawSettingsImportOOO )
+DECLARE_SERVICE( XMLDrawMetaImportOOO )
+DECLARE_SERVICE( XMLDrawContentImportOOO )
+DECLARE_SERVICE( XMLDrawStylesImportOOO )
+DECLARE_SERVICE( XMLDrawImportOOO )
+DECLARE_SERVICE( XMLImpressSettingsImportOOO )
+DECLARE_SERVICE( XMLImpressMetaImportOOO )
+DECLARE_SERVICE( XMLImpressContentImportOOO )
+DECLARE_SERVICE( XMLImpressStylesImportOOO )
+DECLARE_SERVICE( XMLImpressImportOOO )
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
More information about the Libreoffice-commits
mailing list