diff options
| author | Bjoern Michaelsen <b_michaelsen@openoffice.org> | 2010-01-22 14:49:55 +0100 |
|---|---|---|
| committer | Bjoern Michaelsen <b_michaelsen@openoffice.org> | 2010-01-22 14:49:55 +0100 |
| commit | a1d57594cffc6d93bb637247a74c86f138b8ffc5 (patch) | |
| tree | 3c6473872ecaeac1ce5138a4f06a800372219e83 /svtools/source/config/itemholder2.cxx | |
| parent | d919fae167e345762843da3e50054963dcc5cf45 (diff) | |
| parent | 8765a3bf9f2926a50d0f644e4263782269abe023 (diff) | |
cbosdo02: merging changesets up to DEV300_m69
Diffstat (limited to 'svtools/source/config/itemholder2.cxx')
| -rw-r--r-- | svtools/source/config/itemholder2.cxx | 42 |
1 files changed, 4 insertions, 38 deletions
diff --git a/svtools/source/config/itemholder2.cxx b/svtools/source/config/itemholder2.cxx index 590e0f85ade1..759fabbee686 100644 --- a/svtools/source/config/itemholder2.cxx +++ b/svtools/source/config/itemholder2.cxx @@ -31,11 +31,6 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svtools.hxx" -#ifdef SVL_DLLIMPLEMENTATION -#undef SVL_DLLIMPLEMENTATION -#endif -#define SVT_DLLIMPLEMENTATION - #include "itemholder2.hxx" //----------------------------------------------- @@ -45,18 +40,12 @@ #include <svtools/accessibilityoptions.hxx> #include <apearcfg.hxx> -#include <svtools/cjkoptions.hxx> +#include <svtools/menuoptions.hxx> #include <svtools/colorcfg.hxx> -#include <svtools/ctloptions.hxx> #include <fontsubstconfig.hxx> #include <svtools/helpopt.hxx> -#include <svtools/languageoptions.hxx> -#include <misccfg.hxx> #include <svtools/printoptions.hxx> -#include <svtools/syslocaleoptions.hxx> -#include <svtools/undoopt.hxx> -#include <svtools/useroptions.hxx> -#include <svtools/options.hxx> +#include <unotools/options.hxx> #include <svtools/miscopt.hxx> @@ -178,18 +167,10 @@ void ItemHolder2::impl_newItem(TItemInfo& rItem) // no ref count rItem.pItem = new SvtTabAppearanceCfg(); break; - case E_CJKOPTIONS : - rItem.pItem = new SvtCJKOptions(); - break; - case E_COLORCFG : rItem.pItem = new ::svtools::ColorConfig(); break; - case E_CTLOPTIONS : - rItem.pItem = new SvtCTLOptions(); - break; - case E_FONTSUBSTCONFIG : // no ref count rItem.pItem = new SvtFontSubstConfig(); break; @@ -198,12 +179,8 @@ void ItemHolder2::impl_newItem(TItemInfo& rItem) rItem.pItem = new SvtHelpOptions(); break; - case E_LANGUAGEOPTIONS : -// capsulate CTL and CJL options ! rItem.pItem = new SvtLanguageOptions(); - break; - - case E_MISCCFG : -// no ref count rItem.pItem = new SfxMiscCfg(); + case E_MENUOPTIONS : + rItem.pItem = new SvtMenuOptions(); break; case E_PRINTOPTIONS : @@ -214,17 +191,6 @@ void ItemHolder2::impl_newItem(TItemInfo& rItem) rItem.pItem = new SvtPrintFileOptions(); break; - case E_SYSLOCALEOPTIONS : - rItem.pItem = new SvtSysLocaleOptions(); - break; - - case E_UNDOOPTIONS : - rItem.pItem = new SvtUndoOptions(); - break; - - case E_USEROPTIONS : - rItem.pItem = new SvtUserOptions(); - break; case E_MISCOPTIONS : rItem.pItem = new SvtMiscOptions(); break; |