dba34b: merged DEV300m96

21 files changed, 20 insertions, 337 deletions

diff --git a/xmloff/source/forms/controlpropertymap.cxx b/xmloff/source/forms/controlpropertymap.cxx
index 8e81c2a7e19c..aed0b8c4e190 100644
--- a/xmloff/source/forms/controlpropertymap.cxx
+++ b/xmloff/source/forms/controlpropertymap.cxx
@@ -27,7 +27,7 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_xmloff.hxx"
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/xmltoken.hxx>
 #include <xmloff/maptype.hxx>
 #include <xmloff/xmltypes.hxx>
diff --git a/xmloff/source/forms/elementexport.cxx b/xmloff/source/forms/elementexport.cxx
index 149965631b27..1126583f9a45 100644
--- a/xmloff/source/forms/elementexport.cxx
+++ b/xmloff/source/forms/elementexport.cxx
@@ -30,12 +30,12 @@
 
 #include "elementexport.hxx"
 #include "strings.hxx"
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include "eventexport.hxx"
 #include "formenums.hxx"
 #include "formcellbinding.hxx"
 #include "formcellbinding.hxx"
-#include "xformsexport.hxx"
+#include "xmloff/xformsexport.hxx"
 #include "property_meta_data.hxx"
 
 /** === begin UNO includes === **/
diff --git a/xmloff/source/forms/elementimport.cxx b/xmloff/source/forms/elementimport.cxx
index eb6dd0965e76..c010b666e552 100644
--- a/xmloff/source/forms/elementimport.cxx
+++ b/xmloff/source/forms/elementimport.cxx
@@ -35,7 +35,7 @@
 #include "strings.hxx"
 #include "callbacks.hxx"
 #include "attriblistmerge.hxx"
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include "eventimport.hxx"
 #include "xmloff/txtstyli.hxx"
 #include "formenums.hxx"
diff --git a/xmloff/source/forms/form_handler_factory.hxx b/xmloff/source/forms/form_handler_factory.hxx
deleted file mode 100755
index 62bf94f74aa8..000000000000
--- a/xmloff/source/forms/form_handler_factory.hxx
+++ /dev/null
@@ -1,50 +0,0 @@
-/*************************************************************************
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * 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 XMLOFF_FORM_HANDLER_FACTORY_HXX
-#define XMLOFF_FORM_HANDLER_FACTORY_HXX
-
-#include "property_handler.hxx"
-
-//......................................................................................................................
-namespace xmloff
-{
-//......................................................................................................................
-
-    //==================================================================================================================
-    //= FormHandlerFactory
-    //==================================================================================================================
-    class FormHandlerFactory
-    {
-    public:
-        static PPropertyHandler getFormPropertyHandler( const PropertyId i_propertyId );
-    };
-
-//......................................................................................................................
-} // namespace xmloff
-//......................................................................................................................
-
-#endif // XMLOFF_FORM_HANDLER_FACTORY_HXX
diff --git a/xmloff/source/forms/formattributes.cxx b/xmloff/source/forms/formattributes.cxx
index 0e2ef69ab9f8..e27f03f01de9 100644
--- a/xmloff/source/forms/formattributes.cxx
+++ b/xmloff/source/forms/formattributes.cxx
@@ -28,7 +28,7 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_xmloff.hxx"
 #include "formattributes.hxx"
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/xmluconv.hxx>
 #include <rtl/ustrbuf.hxx>
 #include <rtl/logfile.hxx>
diff --git a/xmloff/source/forms/formevents.cxx b/xmloff/source/forms/formevents.cxx
index fcccef5065a8..5e46fbaab8d8 100644
--- a/xmloff/source/forms/formevents.cxx
+++ b/xmloff/source/forms/formevents.cxx
@@ -28,7 +28,7 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_xmloff.hxx"
 #include "formevents.hxx"
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/xmlevent.hxx>
 
 //.........................................................................
diff --git a/xmloff/source/forms/formlayerexport.cxx b/xmloff/source/forms/formlayerexport.cxx
index 8042db7bb6ac..517c499595ca 100644
--- a/xmloff/source/forms/formlayerexport.cxx
+++ b/xmloff/source/forms/formlayerexport.cxx
@@ -32,7 +32,7 @@
 #include <xmloff/formlayerexport.hxx>
 #include "strings.hxx"
 #include "elementexport.hxx"
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/xmlexp.hxx>
 #include "layerexport.hxx"
 #include "propertyexport.hxx"
diff --git a/xmloff/source/forms/formsimp.cxx b/xmloff/source/forms/formsimp.cxx
index 00a745660710..bc0baaba551e 100644
--- a/xmloff/source/forms/formsimp.cxx
+++ b/xmloff/source/forms/formsimp.cxx
@@ -29,7 +29,7 @@
 #include "precompiled_xmloff.hxx"
 #include <com/sun/star/xml/sax/XAttributeList.hpp>
 #include <xmloff/xmlimp.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/nmspmap.hxx>
 
 #ifndef _XMLOFF_ANIMIMP_HXX
diff --git a/xmloff/source/forms/handler/form_handler_factory.cxx b/xmloff/source/forms/handler/form_handler_factory.cxx
index ccf829d4201f..72a9edf38f42 100755..100644
--- a/xmloff/source/forms/handler/form_handler_factory.cxx
+++ b/xmloff/source/forms/handler/form_handler_factory.cxx
@@ -26,7 +26,7 @@
 
 #include "precompiled_xmloff.hxx"
 
-#include "form_handler_factory.hxx"
+#include "forms/form_handler_factory.hxx"
 #include "vcl_date_handler.hxx"
 #include "vcl_time_handler.hxx"
 
diff --git a/xmloff/source/forms/handler/makefile.mk b/xmloff/source/forms/handler/makefile.mk
deleted file mode 100755
index 574537ffd474..000000000000
--- a/xmloff/source/forms/handler/makefile.mk
+++ /dev/null
@@ -1,55 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# 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.
-#
-#*************************************************************************
-
-PRJ=../../..
-
-PRJNAME=xmloff
-TARGET=form_handlers
-
-INCEXT=..
-
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-.INCLUDE: $(PRJ)/util/makefile.pmk
-
-# --- Files --------------------------------------------------------
-
-SLOFILES =	\
-    $(SLO)/form_handler_factory.obj \
-    $(SLO)/property_handler_base.obj \
-    $(SLO)/vcl_date_handler.obj \
-    $(SLO)/vcl_time_handler.obj
-
-# --- Tagets -------------------------------------------------------
-
-.INCLUDE :  target.mk
-
-test:
-    echo $(INCLUDE)
\ No newline at end of file
diff --git a/xmloff/source/forms/handler/property_handler_base.hxx b/xmloff/source/forms/handler/property_handler_base.hxx
index 10adceaa52aa..01f2a9e843f6 100755..100644
--- a/xmloff/source/forms/handler/property_handler_base.hxx
+++ b/xmloff/source/forms/handler/property_handler_base.hxx
@@ -27,7 +27,7 @@
 #ifndef XMLOFF_PROPERTY_HANDLER_BASE_HXX
 #define XMLOFF_PROPERTY_HANDLER_BASE_HXX
 
-#include "property_handler.hxx"
+#include "forms/property_handler.hxx"
 
 #include <osl/interlck.h>
 
diff --git a/xmloff/source/forms/layerexport.cxx b/xmloff/source/forms/layerexport.cxx
index 9d024a3e2c2e..d4f0e86534ab 100644
--- a/xmloff/source/forms/layerexport.cxx
+++ b/xmloff/source/forms/layerexport.cxx
@@ -33,7 +33,7 @@
 #include "strings.hxx"
 #include <xmloff/xmlexp.hxx>
 #include <xmloff/nmspmap.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/xmluconv.hxx>
 #include <xmloff/xmlprmap.hxx>
 #include <xmloff/prhdlfac.hxx>
@@ -54,7 +54,7 @@
 #include <xmloff/XMLEventExport.hxx>
 #include "formevents.hxx"
 #include <xmloff/xmlnumfe.hxx>
-#include "xformsexport.hxx"
+#include "xmloff/xformsexport.hxx"
 
 /** === begin UNO includes === **/
 #include <com/sun/star/text/XText.hpp>
diff --git a/xmloff/source/forms/layerimport.cxx b/xmloff/source/forms/layerimport.cxx
index 58ee9dbcab13..4a4bc4e7f942 100644
--- a/xmloff/source/forms/layerimport.cxx
+++ b/xmloff/source/forms/layerimport.cxx
@@ -58,9 +58,9 @@
 #include "controlpropertymap.hxx"
 #include "formevents.hxx"
 #include "formcellbinding.hxx"
-#include "xformsimport.hxx"
+#include "xmloff/xformsimport.hxx"
 #include <xmloff/xmltoken.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <rtl/logfile.hxx>
 #include <algorithm>
 
diff --git a/xmloff/source/forms/makefile.mk b/xmloff/source/forms/makefile.mk
deleted file mode 100644
index fa2a6ea7d235..000000000000
--- a/xmloff/source/forms/makefile.mk
+++ /dev/null
@@ -1,72 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# 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.
-#
-#*************************************************************************
-
-PRJ=..$/..
-
-PRJNAME=xmloff
-TARGET=forms
-
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-.INCLUDE: $(PRJ)$/util$/makefile.pmk
-
-# --- Files --------------------------------------------------------
-
-SLOFILES =	\
-        $(SLO)$/officeforms.obj \
-        $(SLO)$/formevents.obj \
-        $(SLO)$/eventimport.obj \
-        $(SLO)$/eventexport.obj \
-        $(SLO)$/controlpropertyhdl.obj \
-        $(SLO)$/controlpropertymap.obj \
-        $(SLO)$/valueproperties.obj \
-        $(SLO)$/attriblistmerge.obj \
-        $(SLO)$/controlelement.obj \
-        $(SLO)$/formlayerexport.obj \
-        $(SLO)$/layerexport.obj \
-        $(SLO)$/elementexport.obj \
-        $(SLO)$/propertyexport.obj \
-        $(SLO)$/elementimport.obj \
-        $(SLO)$/layerimport.obj \
-        $(SLO)$/propertyimport.obj \
-        $(SLO)$/formlayerimport.obj \
-        $(SLO)$/formattributes.obj \
-        $(SLO)$/formenums.obj \
-        $(SLO)$/formsimp.obj \
-        $(SLO)$/strings.obj \
-        $(SLO)$/logging.obj \
-        $(SLO)$/formcellbinding.obj \
-        $(SLO)$/gridcolumnproptranslator.obj \
-        \
-        $(SLO)/property_meta_data.obj
-
-# --- Tagets -------------------------------------------------------
-
-.INCLUDE :  target.mk
diff --git a/xmloff/source/forms/officeforms.cxx b/xmloff/source/forms/officeforms.cxx
index d434d7a9addf..0de7b04b70d3 100644
--- a/xmloff/source/forms/officeforms.cxx
+++ b/xmloff/source/forms/officeforms.cxx
@@ -30,7 +30,7 @@
 #include "officeforms.hxx"
 #include <xmloff/xmluconv.hxx>
 #include <xmloff/xmltoken.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/xmlexp.hxx>
 #include <xmloff/xmlimp.hxx>
 #include <xmloff/nmspmap.hxx>
diff --git a/xmloff/source/forms/property_description.hxx b/xmloff/source/forms/property_description.hxx
index 8e9aa9cb616e..4edab2e649f7 100755..100644
--- a/xmloff/source/forms/property_description.hxx
+++ b/xmloff/source/forms/property_description.hxx
@@ -27,7 +27,7 @@
 #ifndef XMLOFF_PROPERTY_DESCRIPTION_HXX
 #define XMLOFF_PROPERTY_DESCRIPTION_HXX
 
-#include "property_handler.hxx"
+#include "forms/property_handler.hxx"
 #include "property_group.hxx"
 
 #include "xmloff/xmltoken.hxx"
diff --git a/xmloff/source/forms/property_handler.hxx b/xmloff/source/forms/property_handler.hxx
deleted file mode 100755
index 247b4f17f798..000000000000
--- a/xmloff/source/forms/property_handler.hxx
+++ /dev/null
@@ -1,84 +0,0 @@
-/*************************************************************************
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * 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 XMLOFF_PROPERTY_HANDLER_HXX
-#define XMLOFF_PROPERTY_HANDLER_HXX
-
-#include "property_ids.hxx"
-
-#include <com/sun/star/uno/Any.hxx>
-
-#include <rtl/ref.hxx>
-
-#include <map>
-#include <vector>
-
-//......................................................................................................................
-namespace xmloff
-{
-//......................................................................................................................
-
-    typedef ::std::map< PropertyId, ::com::sun::star::uno::Any >    PropertyValues;
-
-    //==================================================================================================================
-    //= IPropertyHandler
-    //==================================================================================================================
-    class IPropertyHandler : public ::rtl::IReference
-    {
-    public:
-        /** retrieves the XML attribute value for the given property values
-        */
-        virtual ::rtl::OUString
-            getAttributeValue( const PropertyValues& i_propertyValues ) const = 0;
-
-        /** is a convenience method for XML attributes whose value comprises of only one UNO API property
-        */
-        virtual ::rtl::OUString
-            getAttributeValue( const ::com::sun::star::uno::Any& i_propertyValue ) const = 0;
-
-        /** retrieves the values of the properties controlled by an XML attributed, described by a given attribute value
-        */
-        virtual bool
-            getPropertyValues( const ::rtl::OUString i_attributeValue, PropertyValues& o_propertyValues ) const = 0;
-
-        virtual ~IPropertyHandler() { }
-    };
-
-    //==================================================================================================================
-    //= PPropertyHandler
-    //==================================================================================================================
-    typedef ::rtl::Reference< IPropertyHandler >    PPropertyHandler;
-
-    //==================================================================================================================
-    //= PropertyHandlerFactory
-    //==================================================================================================================
-    typedef PPropertyHandler (*PropertyHandlerFactory)( const PropertyId i_propertyId );
-
-//......................................................................................................................
-} // namespace xmloff
-//......................................................................................................................
-
-#endif // XMLOFF_PROPERTY_HANDLER_HXX
diff --git a/xmloff/source/forms/property_ids.hxx b/xmloff/source/forms/property_ids.hxx
deleted file mode 100755
index 31004f2d9ff2..000000000000
--- a/xmloff/source/forms/property_ids.hxx
+++ /dev/null
@@ -1,56 +0,0 @@
-/*************************************************************************
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * 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 XMLOFF_PROPERTY_IDS_HXX
-#define XMLOFF_PROPERTY_IDS_HXX
-
-//......................................................................................................................
-namespace xmloff
-{
-//......................................................................................................................
-
-    //==================================================================================================================
-    //= PropertyId
-    //==================================================================================================================
-    enum PropertyId
-    {
-        PID_DATE_MIN,
-        PID_DATE_MAX,
-        PID_DEFAULT_DATE,
-        PID_DATE,
-        PID_TIME_MIN,
-        PID_TIME_MAX,
-        PID_DEFAULT_TIME,
-        PID_TIME,
-
-        PID_INVALID
-    };
-
-//......................................................................................................................
-} // namespace xmloff
-//......................................................................................................................
-
-#endif // XMLOFF_PROPERTY_IDS_HXX
diff --git a/xmloff/source/forms/property_meta_data.cxx b/xmloff/source/forms/property_meta_data.cxx
index 7f058d14b9b7..5930d123578c 100755..100644
--- a/xmloff/source/forms/property_meta_data.cxx
+++ b/xmloff/source/forms/property_meta_data.cxx
@@ -27,10 +27,10 @@
 #include "precompiled_xmloff.hxx"
 
 #include "property_description.hxx"
-#include "form_handler_factory.hxx"
+#include "forms/form_handler_factory.hxx"
 #include "strings.hxx"
 #include "xmloff/xmltoken.hxx"
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 
 #include <tools/diagnose_ex.h>
 #include <tools/debug.hxx>
diff --git a/xmloff/source/forms/propertyexport.cxx b/xmloff/source/forms/propertyexport.cxx
index 7d84e5a60a1f..bab88b47a82f 100644
--- a/xmloff/source/forms/propertyexport.cxx
+++ b/xmloff/source/forms/propertyexport.cxx
@@ -32,7 +32,7 @@
 #include "propertyexport.hxx"
 #include <xmloff/xmlexp.hxx>
 #include "strings.hxx"
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/xmluconv.hxx>
 #include <xmloff/families.hxx>
 #include <osl/diagnose.h>
diff --git a/xmloff/source/forms/propertyimport.cxx b/xmloff/source/forms/propertyimport.cxx
index de57eadb69ae..1fdb85067f3d 100644
--- a/xmloff/source/forms/propertyimport.cxx
+++ b/xmloff/source/forms/propertyimport.cxx
@@ -34,7 +34,7 @@
 #include <osl/diagnose.h>
 #include <comphelper/extract.hxx>
 #include "callbacks.hxx"
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <tools/date.hxx>
 #include <tools/time.hxx>
 #include <tools/datetime.hxx>