[Libreoffice-commits] .: filter/inc filter/source oox/inc oox/Library_oox.mk oox/source
Tor Lillqvist
tml at kemper.freedesktop.org
Thu Sep 1 11:39:22 PDT 2011
filter/inc/filter/msfilter/ooxmlexport.hxx | 48 -----------------------------
filter/source/msfilter/makefile.mk | 3 -
filter/source/msfilter/ooxmlexport.cxx | 38 ----------------------
oox/Library_oox.mk | 1
oox/inc/oox/export/ooxmlexport.hxx | 48 +++++++++++++++++++++++++++++
oox/source/export/ooxmlexport.cxx | 35 +++++++++++++++++++++
6 files changed, 85 insertions(+), 88 deletions(-)
New commits:
commit f8d22519a415fbe427efa603ad2a7aad6a39e2a9
Author: Tor Lillqvist <tlillqvist at suse.com>
Date: Thu Sep 1 21:06:38 2011 +0300
Move OoxmlFormulaExportBase to oox
diff --git a/filter/inc/filter/msfilter/ooxmlexport.hxx b/filter/inc/filter/msfilter/ooxmlexport.hxx
deleted file mode 100644
index 2f7d53b..0000000
--- a/filter/inc/filter/msfilter/ooxmlexport.hxx
+++ /dev/null
@@ -1,48 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * Version: MPL 1.1 / GPLv3+ / LGPLv3+
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License or as specified alternatively below. You may obtain a copy of
- * the License at http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * Major Contributor(s):
- * Copyright (C) 2011 Lubos Lunak <l.lunak at suse.cz> (initial developer)
- *
- * All Rights Reserved.
- *
- * For minor contributions see the git repository.
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 3 or later (the "GPLv3+"), or
- * the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
- * in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
- * instead of those above.
- */
-#ifndef _OOXMLEXPORT_HXX
-#define _OOXMLEXPORT_HXX
-
-#include <sax/fshelper.hxx>
-#include <oox/core/filterbase.hxx>
-#include "filter/msfilter/msfilterdllapi.h"
-
-/**
- Interface class, StarMath will implement writeFormulaOoxml() to write out OOXML
- representing the formula.
- */
-class MSFILTER_DLLPUBLIC OoxmlFormulaExportBase
-{
-public:
- OoxmlFormulaExportBase();
- virtual void writeFormulaOoxml( ::sax_fastparser::FSHelperPtr m_pSerializer, oox::core::OoxmlVersion version ) = 0;
-};
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/filter/source/msfilter/makefile.mk b/filter/source/msfilter/makefile.mk
index 7a71919..971787b 100644
--- a/filter/source/msfilter/makefile.mk
+++ b/filter/source/msfilter/makefile.mk
@@ -53,8 +53,7 @@ SLOFILES= \
$(SLO)$/services.obj \
$(SLO)$/svdfppt.obj \
$(SLO)$/svxmsbas2.obj \
- $(SLO)$/mstoolbar.obj \
- $(SLO)$/ooxmlexport.obj
+ $(SLO)$/mstoolbar.obj
SHL1TARGET= msfilter$(DLLPOSTFIX)
diff --git a/filter/source/msfilter/ooxmlexport.cxx b/filter/source/msfilter/ooxmlexport.cxx
deleted file mode 100644
index 61b3afc..0000000
--- a/filter/source/msfilter/ooxmlexport.cxx
+++ /dev/null
@@ -1,38 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * Version: MPL 1.1 / GPLv3+ / LGPLv3+
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License or as specified alternatively below. You may obtain a copy of
- * the License at http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * Major Contributor(s):
- * Copyright (C) 2011 Tor Lillqvist <tlillqvist at suse.com> (initial developer)
- *
- * All Rights Reserved.
- *
- * For minor contributions see the git repository.
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 3 or later (the "GPLv3+"), or
- * the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
- * in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
- * instead of those above.
- */
-
-// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_filter.hxx"
-
-#include <filter/msfilter/ooxmlexport.hxx>
-
-OoxmlFormulaExportBase::OoxmlFormulaExportBase()
-{
-}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/oox/Library_oox.mk b/oox/Library_oox.mk
index 63d9c63..9a0295c 100644
--- a/oox/Library_oox.mk
+++ b/oox/Library_oox.mk
@@ -196,6 +196,7 @@ $(eval $(call gb_Library_add_exception_objects,oox,\
oox/source/export/ColorPropertySet \
oox/source/export/drawingml \
oox/source/export/SchXMLSeriesHelper \
+ oox/source/export/ooxmlexport \
oox/source/export/shapes \
oox/source/export/vmlexport \
oox/source/helper/attributelist \
diff --git a/oox/inc/oox/export/ooxmlexport.hxx b/oox/inc/oox/export/ooxmlexport.hxx
new file mode 100644
index 0000000..288dbdc
--- /dev/null
+++ b/oox/inc/oox/export/ooxmlexport.hxx
@@ -0,0 +1,48 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * Version: MPL 1.1 / GPLv3+ / LGPLv3+
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License or as specified alternatively below. You may obtain a copy of
+ * the License at http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * Major Contributor(s):
+ * Copyright (C) 2011 Lubos Lunak <l.lunak at suse.cz> (initial developer)
+ *
+ * All Rights Reserved.
+ *
+ * For minor contributions see the git repository.
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+ * the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+ * in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+ * instead of those above.
+ */
+#ifndef _OOXMLEXPORT_HXX
+#define _OOXMLEXPORT_HXX
+
+#include <sax/fshelper.hxx>
+#include <oox/core/filterbase.hxx>
+#include <oox/dllapi.h>
+
+/**
+ Interface class, StarMath will implement writeFormulaOoxml() to write out OOXML
+ representing the formula.
+ */
+class OOX_DLLPUBLIC OoxmlFormulaExportBase
+{
+public:
+ OoxmlFormulaExportBase();
+ virtual void writeFormulaOoxml( ::sax_fastparser::FSHelperPtr m_pSerializer, oox::core::OoxmlVersion version ) = 0;
+};
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/oox/source/export/ooxmlexport.cxx b/oox/source/export/ooxmlexport.cxx
new file mode 100644
index 0000000..30d13a9
--- /dev/null
+++ b/oox/source/export/ooxmlexport.cxx
@@ -0,0 +1,35 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * Version: MPL 1.1 / GPLv3+ / LGPLv3+
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License or as specified alternatively below. You may obtain a copy of
+ * the License at http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * Major Contributor(s):
+ * Copyright (C) 2011 Tor Lillqvist <tlillqvist at suse.com> (initial developer)
+ *
+ * All Rights Reserved.
+ *
+ * For minor contributions see the git repository.
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+ * the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+ * in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+ * instead of those above.
+ */
+
+#include <oox/export/ooxmlexport.hxx>
+
+OoxmlFormulaExportBase::OoxmlFormulaExportBase()
+{
+}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
More information about the Libreoffice-commits
mailing list