cbosdo02: merging changesets up to DEV300_m69

14 files changed, 33 insertions, 28 deletions

diff --git a/xmloff/inc/VisAreaContext.hxx b/xmloff/inc/VisAreaContext.hxx
index ddfff6716772..7a99c4240395 100644
--- a/xmloff/inc/VisAreaContext.hxx
+++ b/xmloff/inc/VisAreaContext.hxx
@@ -32,7 +32,7 @@
 #define _XMLOFF_VISAREACONTEXT_HXX
 
 #include <xmloff/xmlictxt.hxx>
-#include <vcl/mapunit.hxx>
+#include <tools/mapunit.hxx>
 
 class Rectangle;
 
diff --git a/xmloff/inc/VisAreaExport.hxx b/xmloff/inc/VisAreaExport.hxx
index e49b09801257..e2ce09472607 100644
--- a/xmloff/inc/VisAreaExport.hxx
+++ b/xmloff/inc/VisAreaExport.hxx
@@ -31,7 +31,7 @@
 #ifndef _XMLOFF_VISAREAEXPORT_HXX
 #define _XMLOFF_VISAREAEXPORT_HXX
 
-#include <vcl/mapunit.hxx>
+#include <tools/mapunit.hxx>
 #include <sal/types.h>
 
 class SvXMLExport;
diff --git a/xmloff/inc/pch/precompiled_xmloff.hxx b/xmloff/inc/pch/precompiled_xmloff.hxx
index f8f890e9050f..06c27d0a7103 100644
--- a/xmloff/inc/pch/precompiled_xmloff.hxx
+++ b/xmloff/inc/pch/precompiled_xmloff.hxx
@@ -436,15 +436,15 @@
 
 #include "sot/clsids.hxx"
 
-#include "svtools/cntnrsrt.hxx"
-#include "svtools/itemset.hxx"
-#include "svtools/moduleoptions.hxx"
-#include "svtools/nfsymbol.hxx"
-#include "svtools/numuno.hxx"
-#include "svtools/poolitem.hxx"
-#include "svtools/svarray.hxx"
-#include "svtools/svstdarr.hxx"
-#include "svtools/urihelper.hxx"
+#include "svl/cntnrsrt.hxx"
+#include "svl/itemset.hxx"
+#include "unotools/moduleoptions.hxx"
+#include "svl/nfsymbol.hxx"
+#include "svl/numuno.hxx"
+#include "svl/poolitem.hxx"
+#include "svl/svarray.hxx"
+#include "svl/svstdarr.hxx"
+#include "svl/urihelper.hxx"
 
 
 #include "tools/bigint.hxx"
@@ -469,9 +469,9 @@
 #include "unotools/processfactory.hxx"
 #include "unotools/streamwrap.hxx"
 
-#include "vcl/fldunit.hxx"
-#include "vcl/fontcvt.hxx"
-#include "vcl/mapunit.hxx"
+#include "tools/fldunit.hxx"
+#include "unotools/fontcvt.hxx"
+#include "tools/mapunit.hxx"
 
 #include "vos/mutex.hxx"
 #include "vos/ref.hxx"
diff --git a/xmloff/inc/txtfldi.hxx b/xmloff/inc/txtfldi.hxx
index b361081a7ce2..96e7e7fee238 100644
--- a/xmloff/inc/txtfldi.hxx
+++ b/xmloff/inc/txtfldi.hxx
@@ -745,6 +745,11 @@ class XMLUserDocInfoImportContext : public XMLSimpleDocInfoImportContext
 {
     rtl::OUString aName;
     const ::rtl::OUString sPropertyName;
+    const ::rtl::OUString sPropertyNumberFormat;
+    const ::rtl::OUString sPropertyIsFixedLanguage;
+    sal_Int32   nFormat;
+    sal_Bool    bFormatOK;
+    sal_Bool    bIsDefaultLanguage;
 
 public:
 
diff --git a/xmloff/inc/xexptran.hxx b/xmloff/inc/xexptran.hxx
index 10b89e6291b3..39529a04c88d 100644
--- a/xmloff/inc/xexptran.hxx
+++ b/xmloff/inc/xexptran.hxx
@@ -38,7 +38,7 @@
 #include <com/sun/star/drawing/FlagSequenceSequence.hpp>
 #include <com/sun/star/drawing/FlagSequence.hpp>
 #include <com/sun/star/drawing/HomogenMatrix.hpp>
-#include <vcl/mapunit.hxx>
+#include <tools/mapunit.hxx>
 
 #include <vector>
 
diff --git a/xmloff/inc/xmlcnitm.hxx b/xmloff/inc/xmlcnitm.hxx
index 93777391b9bc..0da5b64369a9 100644
--- a/xmloff/inc/xmlcnitm.hxx
+++ b/xmloff/inc/xmlcnitm.hxx
@@ -31,7 +31,7 @@
 #ifndef _XMLOFF_XMLCNITM_HXX
 #define _XMLOFF_XMLCNITM_HXX
 
-#include <svtools/poolitem.hxx>
+#include <svl/poolitem.hxx>
 
 class SvXMLNamespaceMap;
 namespace rtl { class OUString; }
diff --git a/xmloff/inc/xmlehelp.hxx b/xmloff/inc/xmlehelp.hxx
index d5ffaafed3dc..bdf0fad3be3e 100644
--- a/xmloff/inc/xmlehelp.hxx
+++ b/xmloff/inc/xmlehelp.hxx
@@ -31,7 +31,7 @@
 #ifndef _XMLOFF_XMLEHELP_HXX
 #define _XMLOFF_XMLEHELP_HXX
 
-#include <vcl/mapunit.hxx>
+#include <tools/mapunit.hxx>
 
 namespace rtl { class OUStringBuffer; }
 
diff --git a/xmloff/inc/xmloff/ProgressBarHelper.hxx b/xmloff/inc/xmloff/ProgressBarHelper.hxx
index 7908b575ec36..383f35059ee9 100644
--- a/xmloff/inc/xmloff/ProgressBarHelper.hxx
+++ b/xmloff/inc/xmloff/ProgressBarHelper.hxx
@@ -52,7 +52,7 @@ class XMLOFF_DLLPUBLIC ProgressBarHelper
             // #96469#; if the value goes over the Range the progressbar starts again
             sal_Bool                                                                        bRepeat;
 
-#ifndef PRODUCT
+#ifdef DBG_UTIL
             sal_Bool                                                                        bFailure;
 #endif
 public:
diff --git a/xmloff/inc/xmloff/maptype.hxx b/xmloff/inc/xmloff/maptype.hxx
index ba85669d8be2..69d94145d6fc 100644
--- a/xmloff/inc/xmloff/maptype.hxx
+++ b/xmloff/inc/xmloff/maptype.hxx
@@ -34,7 +34,7 @@
 #include <tools/solar.h>
 #include <com/sun/star/uno/Any.hxx>
 #include <xmloff/xmltoken.hxx>
-#include <svtools/saveopt.hxx>
+#include <unotools/saveopt.hxx>
 
 ///////////////////////////////////////////////////////////////////////////
 //
diff --git a/xmloff/inc/xmloff/styleexp.hxx b/xmloff/inc/xmloff/styleexp.hxx
index e18547c62688..a11b24857b46 100644
--- a/xmloff/inc/xmloff/styleexp.hxx
+++ b/xmloff/inc/xmloff/styleexp.hxx
@@ -36,7 +36,7 @@
 #include <com/sun/star/uno/Reference.h>
 
 #ifndef _VCL_MAPUNIT_HXX
-//#include <vcl/mapunit.hxx>
+//#include <tools/mapunit.hxx>
 #endif
 #include <xmloff/uniref.hxx>
 
diff --git a/xmloff/inc/xmloff/xmlcnimp.hxx b/xmloff/inc/xmloff/xmlcnimp.hxx
index d964e73a3fed..d0b6ab4d7a63 100644
--- a/xmloff/inc/xmloff/xmlcnimp.hxx
+++ b/xmloff/inc/xmloff/xmlcnimp.hxx
@@ -35,11 +35,11 @@
 #include "xmloff/dllapi.h"
 #include "sal/types.h"
 #include <com/sun/star/container/XNameAccess.hpp>
-#include <svtools/svarray.hxx>
+#include <svl/svarray.hxx>
 #include <xmloff/nmspmap.hxx>
 
 #define _SVSTDARR_USHORTS
-#include <svtools/svstdarr.hxx>
+#include <svl/svstdarr.hxx>
 
 namespace rtl { class OUString; }
 
diff --git a/xmloff/inc/xmloff/xmlexp.hxx b/xmloff/inc/xmloff/xmlexp.hxx
index b4d388957f0f..2133a108da78 100644
--- a/xmloff/inc/xmloff/xmlexp.hxx
+++ b/xmloff/inc/xmloff/xmlexp.hxx
@@ -45,7 +45,7 @@
 #include <com/sun/star/util/XNumberFormatsSupplier.hpp>
 #include <com/sun/star/lang/XUnoTunnel.hpp>
 #include <rtl/ustring.hxx>
-#include <vcl/mapunit.hxx>
+#include <tools/mapunit.hxx>
 #include <xmloff/txtparae.hxx>
 #include <xmloff/formlayerexport.hxx>
 #include <xmloff/xmlnumfe.hxx>
@@ -68,7 +68,7 @@
 #include <com/sun/star/lang/XEventListener.hpp>
 #include <com/sun/star/container/XNamed.hpp>
 
-#include <svtools/saveopt.hxx>
+#include <unotools/saveopt.hxx>
 
 #include <xmloff/XMLPageExport.hxx>
 #include <xmloff/ProgressBarHelper.hxx>
@@ -87,7 +87,7 @@ class XMLImageMapExport;
 class XMLErrors;
 
 // --> OD 2006-03-14 #i51726#
-#include <svtools/moduleoptions.hxx>
+#include <unotools/moduleoptions.hxx>
 // <--
 
 namespace rtl { class OUString; }
@@ -380,7 +380,7 @@ public:
         = ::rtl::OUString::createFromAscii("gen") );
 
     // Check if common attribute list is empty.
-#ifdef PRODUCT
+#ifndef DBG_UTIL
     void CheckAttrList() {}
 #else
     void CheckAttrList();
diff --git a/xmloff/inc/xmloff/xmlnume.hxx b/xmloff/inc/xmloff/xmlnume.hxx
index 498ad92813fe..7543cddb0bce 100644
--- a/xmloff/inc/xmloff/xmlnume.hxx
+++ b/xmloff/inc/xmloff/xmlnume.hxx
@@ -32,7 +32,7 @@
 #define _XMLOFF_XMLNUME_HXX
 
 #include <rtl/ustring.hxx>
-#include <vcl/mapunit.hxx>
+#include <tools/mapunit.hxx>
 #include <xmloff/XMLStringVector.hxx>
 #include <xmloff/attrlist.hxx>
 
diff --git a/xmloff/inc/xmloff/xmluconv.hxx b/xmloff/inc/xmloff/xmluconv.hxx
index f71741f8a51b..607a0771e291 100644
--- a/xmloff/inc/xmloff/xmluconv.hxx
+++ b/xmloff/inc/xmloff/xmluconv.hxx
@@ -38,7 +38,7 @@
 #include <limits.h>
 #include <tools/solar.h>
 #include <tools/color.hxx>
-#include <vcl/mapunit.hxx>
+#include <tools/mapunit.hxx>
 #include <xmloff/xmlement.hxx>
 #include <xmloff/xmltoken.hxx>
 #include <com/sun/star/util/Date.hpp>