diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-06-19 19:45:10 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-06-19 19:45:10 +0000 |
| commit | 400442d9616d02a4dae52999195cbd37421cb527 (patch) | |
| tree | d97965561621e12a39bacdb66055aba2437885b6 /svtools/source/config/itemholder2.cxx | |
| parent | aefe042f45dba7c08eac14937252fc737c574f82 (diff) | |
INTEGRATION: CWS warnings01 (1.7.62); FILE MERGED
2006/01/27 16:43:21 sb 1.7.62.4: #i53898# Made code warning-free.
2006/01/25 19:40:40 sb 1.7.62.3: RESYNC: (1.7-1.8); FILE MERGED
2005/11/14 14:23:35 pl 1.7.62.2: #i55991# removed warnings
2005/10/25 12:44:21 pl 1.7.62.1: #i55991# removed warnings for linux platform
Diffstat (limited to 'svtools/source/config/itemholder2.cxx')
| -rw-r--r-- | svtools/source/config/itemholder2.cxx | 31 |
1 files changed, 8 insertions, 23 deletions
diff --git a/svtools/source/config/itemholder2.cxx b/svtools/source/config/itemholder2.cxx index 413f05f99894..d564c3272a2e 100644 --- a/svtools/source/config/itemholder2.cxx +++ b/svtools/source/config/itemholder2.cxx @@ -4,9 +4,9 @@ * * $RCSfile: itemholder2.cxx,v $ * - * $Revision: 1.8 $ + * $Revision: 1.9 $ * - * last change: $Author: rt $ $Date: 2005-11-11 08:50:34 $ + * last change: $Author: hr $ $Date: 2006-06-19 20:45:10 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -64,6 +64,7 @@ #include <syslocaleoptions.hxx> #include <undoopt.hxx> #include <useroptions.hxx> +#include "options.hxx" #include <tools/debug.hxx> @@ -126,7 +127,7 @@ void ItemHolder2::holdConfigItem(EItem eItem) } //----------------------------------------------- -void SAL_CALL ItemHolder2::disposing(const css::lang::EventObject& aEvent) +void SAL_CALL ItemHolder2::disposing(const css::lang::EventObject&) throw(css::uno::RuntimeException) { impl_releaseAllItems(); @@ -230,6 +231,10 @@ void ItemHolder2::impl_newItem(TItemInfo& rItem) case E_USEROPTIONS : rItem.pItem = new SvtUserOptions(); break; + + default: + OSL_ASSERT(false); + break; } } @@ -241,24 +246,4 @@ void ItemHolder2::impl_deleteItem(TItemInfo& rItem) delete rItem.pItem; rItem.pItem = 0; } -/* - switch(rItem.eItem) - { - case E_SYSLOCALEOPTIONS : - delete (SvtSysLocaleOptions*)rItem.pItem; - break; - - case E_UNDOOPTIONS : - delete (SvtUndoOptions*)rItem.pItem; - break; - - case E_USEROPTIONS : - delete (SvtUserOptions*)rItem.pItem; - break; - - case E_HELPOPTIONS : - delete (SvtHelpOptions*)rItem.pItem; - break; - } -*/ } |