diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2005-03-11 09:41:10 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2005-03-11 09:41:10 +0000 |
| commit | f893b4b8ef9374c1e7b87d39f37da97ab826d0ea (patch) | |
| tree | 2cc63ea3e4ad5563386e1e22a49515e4f1ff4371 /svtools | |
| parent | 865788f62d1d596f44ebcb66b0509ba27831a2c6 (diff) | |
INTEGRATION: CWS os54 (1.3.120); FILE MERGED
2005/02/25 14:57:46 os 1.3.120.1: #i43462# help options: notification enabled
Diffstat (limited to 'svtools')
| -rw-r--r-- | svtools/source/config/itemholder1.cxx | 13 | ||||
| -rw-r--r-- | svtools/source/config/itemholder2.cxx | 14 |
2 files changed, 14 insertions, 13 deletions
diff --git a/svtools/source/config/itemholder1.cxx b/svtools/source/config/itemholder1.cxx index 80a7f5cfe36a..c15fc124f9e2 100644 --- a/svtools/source/config/itemholder1.cxx +++ b/svtools/source/config/itemholder1.cxx @@ -2,9 +2,9 @@ * * $RCSfile: itemholder1.cxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: rt $ $Date: 2004-11-25 11:30:09 $ + * last change: $Author: vg $ $Date: 2005-03-11 10:40:56 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -76,7 +76,6 @@ #include <addxmltostorageoptions.hxx> #include <extendedsecurityoptions.hxx> #include <fontoptions.hxx> -#include <helpopt.hxx> #include <historyoptions.hxx> #include <inetoptions.hxx> #include <internaloptions.hxx> @@ -188,10 +187,6 @@ void ItemHolder1::impl_newItem(TItemInfo& rItem) rItem.pItem = new SvtFontOptions(); break; - case E_HELPOPTIONS : - rItem.pItem = new SvtHelpOptions(); - break; - case E_HISTORYOPTIONS : rItem.pItem = new SvtHistoryOptions(); break; @@ -254,10 +249,6 @@ void ItemHolder1::impl_deleteItem(TItemInfo& rItem) delete (SvtFontOptions*)rItem.pItem; break; - case E_HELPOPTIONS : - delete (SvtHelpOptions*)rItem.pItem; - break; - case E_HISTORYOPTIONS : delete (SvtHistoryOptions*)rItem.pItem; break; diff --git a/svtools/source/config/itemholder2.cxx b/svtools/source/config/itemholder2.cxx index e941cddbbf3f..2f256e787e3d 100644 --- a/svtools/source/config/itemholder2.cxx +++ b/svtools/source/config/itemholder2.cxx @@ -2,9 +2,9 @@ * * $RCSfile: itemholder2.cxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: rt $ $Date: 2004-11-25 11:29:57 $ + * last change: $Author: vg $ $Date: 2005-03-11 10:41:10 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -72,6 +72,7 @@ #include <com/sun/star/lang/XComponent.hpp> #endif +#include <helpopt.hxx> #include <syslocaleoptions.hxx> #include <undoopt.hxx> #include <useroptions.hxx> @@ -170,6 +171,10 @@ void ItemHolder2::impl_newItem(TItemInfo& rItem) case E_USEROPTIONS : rItem.pItem = new SvtUserOptions(); break; + + case E_HELPOPTIONS : + rItem.pItem = new SvtHelpOptions(); + break; } } @@ -192,6 +197,11 @@ void ItemHolder2::impl_deleteItem(TItemInfo& rItem) case E_USEROPTIONS : delete (SvtUserOptions*)rItem.pItem; break; + + case E_HELPOPTIONS : + delete (SvtHelpOptions*)rItem.pItem; + break; + } rItem.pItem = 0; |