diff options
| author | Ocke Janssen [oj] <Ocke.Janssen@sun.com> | 2010-01-15 09:58:18 +0100 |
|---|---|---|
| committer | Ocke Janssen [oj] <Ocke.Janssen@sun.com> | 2010-01-15 09:58:18 +0100 |
| commit | 828e92ab9c23d480fa5dba4ffa74b3582d6291f6 (patch) | |
| tree | 7c5b6993531a8c8eb9bc0b14faa7e3c2fb9d4b95 /sw/inc/doc.hxx | |
| parent | 40bf1f9d72b48c7060f388bbfdba5bc6ff5966a3 (diff) | |
| parent | 9a2f7ac34187efbed50e49d1e88d618bb04ec9b2 (diff) | |
dba33b: merge
Diffstat (limited to 'sw/inc/doc.hxx')
| -rw-r--r-- | sw/inc/doc.hxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sw/inc/doc.hxx b/sw/inc/doc.hxx index de82d9056ff9..df81a13dab12 100644 --- a/sw/inc/doc.hxx +++ b/sw/inc/doc.hxx @@ -60,7 +60,7 @@ class SwList; // <-- #include <IDocumentExternalData.hxx> #define _SVSTDARR_STRINGSDTOR -#include <svtools/svstdarr.hxx> +#include <svl/svstdarr.hxx> #include <com/sun/star/embed/XEmbeddedObject.hpp> #include <com/sun/star/embed/XStorage.hpp> #include <vcl/timer.hxx> @@ -77,7 +77,7 @@ class SwList; #include <com/sun/star/linguistic2/XHyphenatedWord.hpp> #include <vos/ref.hxx> #include <svx/svdtypes.hxx> -#include <svtools/style.hxx> +#include <svl/style.hxx> #include <svx/numitem.hxx> #include "comphelper/implementationreference.hxx" #include <com/sun/star/chart2/data/XDataProvider.hpp> @@ -492,7 +492,7 @@ private: bool mbColumnSelection : 1; // true: this content has bee created by a column selection // (clipboard docs only) -#ifndef PRODUCT +#ifdef DBG_UTIL bool mbXMLExport : 1; // TRUE: during XML export #endif @@ -1066,7 +1066,7 @@ public: inline void SetOLEPrtNotifyPending( bool bSet = true ); void PrtOLENotify( sal_Bool bAll ); //Alle oder nur Markierte -#ifndef PRODUCT +#ifdef DBG_UTIL bool InXMLExport() const { return mbXMLExport; } void SetXMLExport( bool bFlag ) { mbXMLExport = bFlag; } #endif |