diff options
| author | Oliver Bolte <obo@openoffice.org> | 2004-01-20 09:51:22 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2004-01-20 09:51:22 +0000 |
| commit | 568ea4cf0ac1d5618e3edc298add7edbadab4e54 (patch) | |
| tree | 5b1efe974ab2a6eac7520798de752f8aa00a658c /sd/source/ui/dlg/tabtempl.cxx | |
| parent | bbd8d5e6e6cd8303814cb0a6b41547e636efbf0c (diff) | |
INTEGRATION: CWS impress1 (1.5.222); FILE MERGED
2003/09/17 09:24:38 af 1.5.222.1: #111996# Transition to stacked sub-shells. Introduction of namespace sd.
Diffstat (limited to 'sd/source/ui/dlg/tabtempl.cxx')
| -rw-r--r-- | sd/source/ui/dlg/tabtempl.cxx | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/sd/source/ui/dlg/tabtempl.cxx b/sd/source/ui/dlg/tabtempl.cxx index bc86b8c7c0d0..27fb2454015f 100644 --- a/sd/source/ui/dlg/tabtempl.cxx +++ b/sd/source/ui/dlg/tabtempl.cxx @@ -2,9 +2,9 @@ * * $RCSfile: tabtempl.cxx,v $ * - * $Revision: 1.5 $ + * $Revision: 1.6 $ * - * last change: $Author: ka $ $Date: 2002-08-07 12:43:36 $ + * last change: $Author: obo $ $Date: 2004-01-20 10:51:22 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -73,13 +73,19 @@ #include <svx/dialogs.hrc> -#ifdef MAC #ifdef ITEMID_FONTLIST #undef ITEMID_FONTLIST #endif -#endif #define ITEMID_FONTLIST SID_ATTR_CHAR_FONTLIST + +#ifdef ITEMID_ESCAPEMENT +#undef ITEMID_ESCAPEMENT +#endif #define ITEMID_ESCAPEMENT SID_ATTR_CHAR_ESCAPEMENT + +#ifdef ITEMID_CASEMAP +#undef ITEMID_CASEMAP +#endif #define ITEMID_CASEMAP SID_ATTR_CHAR_CASEMAP #include <svx/chardlg.hxx> @@ -112,7 +118,7 @@ #include <svx/xtable.hxx> #endif -#include "docshell.hxx" +#include "DrawDocShell.hxx" #include "tabtempl.hxx" #include "tabtempl.hrc" #include "sdresid.hxx" |