merge DEV300_m77

6 files changed, 135 insertions, 12 deletions

diff --git a/xmloff/inc/SchXMLExport.hxx b/xmloff/inc/SchXMLExport.hxx
index 2f943f100170..d6227754a5f2 100644
--- a/xmloff/inc/SchXMLExport.hxx
+++ b/xmloff/inc/SchXMLExport.hxx
@@ -38,7 +38,6 @@ namespace com { namespace sun { namespace star {
     namespace chart {
         class XDiagram;
         class XChartDocument;
-        class XChartDataArray;
         struct ChartSeriesAddress;
     }
     namespace drawing {
diff --git a/xmloff/inc/xmloff/SchXMLExportHelper.hxx b/xmloff/inc/xmloff/SchXMLExportHelper.hxx
index 5876ce989c30..64f579a7c252 100644
--- a/xmloff/inc/xmloff/SchXMLExportHelper.hxx
+++ b/xmloff/inc/xmloff/SchXMLExportHelper.hxx
@@ -44,7 +44,6 @@ namespace com { namespace sun { namespace star {
     namespace chart {
         class XDiagram;
         class XChartDocument;
-        class XChartDataArray;
         struct ChartSeriesAddress;
     }
     namespace chart2 {
@@ -114,6 +113,7 @@ private:
     ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes > mxAdditionalShapes;
 
     tDataSequenceCont m_aDataSequencesToExport;
+    rtl::OUString maCategoriesRange;
 
     /** first parseDocument: collect autostyles and store names in this queue
         second parseDocument: export content and use names from this queue
@@ -179,8 +179,6 @@ private:
     SAL_DLLPRIVATE void addSize( com::sun::star::uno::Reference< com::sun::star::drawing::XShape > xShape );
     /// fills the member msString with the appropriate String (i.e. "A3")
     SAL_DLLPRIVATE void getCellAddress( sal_Int32 nCol, sal_Int32 nRow );
-    /// interchanges rows and columns of the sequence given
-    SAL_DLLPRIVATE void swapDataArray( com::sun::star::uno::Sequence< com::sun::star::uno::Sequence< double > >& rSequence );
     /// exports a string as a paragraph element
     SAL_DLLPRIVATE void exportText( const ::rtl::OUString& rText, bool bConvertTabsLFs = false );
     SAL_DLLPRIVATE void exportErrorBarRanges();
diff --git a/xmloff/inc/xmloff/SchXMLImportHelper.hxx b/xmloff/inc/xmloff/SchXMLImportHelper.hxx
index f3cb28a754e2..03fa8c8e16c0 100644
--- a/xmloff/inc/xmloff/SchXMLImportHelper.hxx
+++ b/xmloff/inc/xmloff/SchXMLImportHelper.hxx
@@ -136,10 +136,6 @@ public:
 
     static sal_uInt16 GetChartFamilyID() { return XML_STYLE_FAMILY_SCH_CHART_ID; }
 
-    sal_Int32   GetNumberOfSeries();
-    sal_Int32   GetLengthOfSeries();
-    void        ResizeChartData( sal_Int32 nSeries, sal_Int32 nDataPoints = -1 );
-
     /** @param bPushLastChartType If </FALSE>, in case a new chart type has to
                be added (because it does not exist yet), it is appended at the
                end of the chart-type container.  When </TRUE>, a new chart type
diff --git a/xmloff/inc/xmloff/SettingsExportHelper.hxx b/xmloff/inc/xmloff/SettingsExportHelper.hxx
index 406a1a2a1d1b..63c7d9f5df54 100644
--- a/xmloff/inc/xmloff/SettingsExportHelper.hxx
+++ b/xmloff/inc/xmloff/SettingsExportHelper.hxx
@@ -28,6 +28,8 @@
 #ifndef _XMLOFF_SETTINGSEXPORTHELPER_HXX
 #define _XMLOFF_SETTINGSEXPORTHELPER_HXX
 
+#include "xmloff/dllapi.h"
+
 #include <com/sun/star/awt/Rectangle.hpp>
 #include <com/sun/star/formula/SymbolDescriptor.hpp>
 #include <com/sun/star/util/XStringSubstitution.hpp>
@@ -40,9 +42,15 @@ namespace com
         namespace util { struct DateTime; }
     } }
 }
-class XMLSettingsExportHelper
+
+namespace xmloff
+{
+    class XMLSettingsExportContext;
+}
+
+class XMLOFF_DLLPUBLIC XMLSettingsExportHelper
 {
-    SvXMLExport&    rExport;
+    ::xmloff::XMLSettingsExportContext& m_rContext;
 
     ::com::sun::star::uno::Reference< ::com::sun::star::util::XStringSubstitution > mxStringSubsitution;
 
@@ -91,10 +99,10 @@ class XMLSettingsExportHelper
                     const rtl::OUString rName) const;
 
 public:
-    XMLSettingsExportHelper(SvXMLExport& rExport);
+    XMLSettingsExportHelper( ::xmloff::XMLSettingsExportContext& i_rContext );
     ~XMLSettingsExportHelper();
 
-    void exportSettings(
+    void exportAllSettings(
         const com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue>& aProps,
         const rtl::OUString& rName) const;
 };
diff --git a/xmloff/inc/xmloff/XMLSettingsExportContext.hxx b/xmloff/inc/xmloff/XMLSettingsExportContext.hxx
new file mode 100644
index 000000000000..d3e0b6a8c5ee
--- /dev/null
+++ b/xmloff/inc/xmloff/XMLSettingsExportContext.hxx
@@ -0,0 +1,66 @@
+/*************************************************************************
+* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+*
+* Copyright 2009 by Sun Microsystems, Inc.
+*
+* OpenOffice.org - a multi-platform office productivity suite
+*
+* This file is part of OpenOffice.org.
+*
+* OpenOffice.org is free software: you can redistribute it and/or modify
+* it under the terms of the GNU Lesser General Public License version 3
+* only, as published by the Free Software Foundation.
+*
+* OpenOffice.org is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU Lesser General Public License version 3 for more details
+* (a copy is included in the LICENSE file that accompanied this code).
+*
+* You should have received a copy of the GNU Lesser General Public License
+* version 3 along with OpenOffice.org.  If not, see
+* <http://www.openoffice.org/license.html>
+* for a copy of the LGPLv3 License.
+************************************************************************/
+
+#ifndef XML_SETTINGS_EXPORT_CONTEXT_HXX
+#define XML_SETTINGS_EXPORT_CONTEXT_HXX
+
+/** === begin UNO includes === **/
+#include <com/sun/star/lang/XMultiServiceFactory.hpp>
+/** === end UNO includes === **/
+
+#include "xmloff/xmltoken.hxx"
+
+//........................................................................
+namespace xmloff
+{
+//........................................................................
+
+    //====================================================================
+    //= XMLExporter
+    //====================================================================
+    class SAL_NO_VTABLE XMLSettingsExportContext
+    {
+    public:
+        virtual void    AddAttribute( enum ::xmloff::token::XMLTokenEnum i_eName,
+                                      const ::rtl::OUString& i_rValue ) = 0;
+        virtual void    AddAttribute( enum ::xmloff::token::XMLTokenEnum i_eName,
+                                      enum ::xmloff::token::XMLTokenEnum i_eValue ) = 0;
+
+        virtual void    StartElement( enum ::xmloff::token::XMLTokenEnum i_eName,
+                                      const sal_Bool i_bIgnoreWhitespace ) = 0;
+        virtual void    EndElement(   const sal_Bool i_bIgnoreWhitespace ) = 0;
+
+        virtual void    Characters( const ::rtl::OUString& i_rCharacters ) = 0;
+
+        virtual ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >
+                        GetServiceFactory() const = 0;
+
+    };
+
+//........................................................................
+} // namespace xmloff
+//........................................................................
+
+#endif // XML_SETTINGS_EXPORT_CONTEXT_HXX
diff --git a/xmloff/inc/xmloff/odffields.hxx b/xmloff/inc/xmloff/odffields.hxx
new file mode 100644
index 000000000000..2be06b578acd
--- /dev/null
+++ b/xmloff/inc/xmloff/odffields.hxx
@@ -0,0 +1,56 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2008 by Sun Microsystems, Inc.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * $RCSfile: $
+ * $Revision: $
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+/*
+ * Copyright 2008 by Novell, Inc.
+ */
+
+#ifndef _ODFFIELDS_HXX
+#define _ODFFIELDS_HXX
+
+
+#define ODF_FORMTEXT "vnd.oasis.opendocument.field.FORMTEXT"
+
+#define ODF_FORMCHECKBOX "vnd.oasis.opendocument.field.FORMCHECKBOX"
+#define ODF_FORMCHECKBOX_HELPTEXT "Checkbox_HelpText"
+#define ODF_FORMCHECKBOX_NAME "Checkbox_Name"
+#define ODF_FORMCHECKBOX_RESULT "Checkbox_Checked"
+
+#define ODF_FORMDROPDOWN "vnd.oasis.opendocument.field.FORMDROPDOWN"
+#define ODF_FORMDROPDOWN_LISTENTRY "Dropdown_ListEntry"
+#define ODF_FORMDROPDOWN_RESULT "Dropdown_Selected"
+
+#define ODF_TOC "vnd.oasis.opendocument.field.TOC"
+
+#define ODF_HYPERLINK "vnd.oasis.opendocument.field.HYPERLINK"
+
+#define ODF_PAGEREF "vnd.oasis.opendocument.field.PAGEREF"
+
+#endif /*  _ODFFIELDS_HXX */