diff options
| author | Frank Schoenheit [fs] <frank.schoenheit@oracle.com> | 2011-02-03 09:41:02 +0100 |
|---|---|---|
| committer | Frank Schoenheit [fs] <frank.schoenheit@oracle.com> | 2011-02-03 09:41:02 +0100 |
| commit | 62efd695fb99fca30c6b3260f5ce57d5558eb35b (patch) | |
| tree | d7018f23beb9da69d8bd9aa0f388397df1b1eb0d /framework | |
| parent | a1a2a5a68046e75aba3dfd6ba06083a314f12182 (diff) | |
| parent | 10308c2621e2efc89dcb0347b98c025fe7ffbebc (diff) | |
pulled and merged DEV300.m99
Diffstat (limited to 'framework')
| -rw-r--r-- | framework/source/classes/fwktabwindow.cxx | 3 | ||||
| -rw-r--r-- | framework/util/fwk.component | 3 | ||||
| -rw-r--r-- | framework/util/fwl.component | 3 |
3 files changed, 5 insertions, 4 deletions
diff --git a/framework/source/classes/fwktabwindow.cxx b/framework/source/classes/fwktabwindow.cxx index a441f251a592..794a7a798c05 100644 --- a/framework/source/classes/fwktabwindow.cxx +++ b/framework/source/classes/fwktabwindow.cxx @@ -45,6 +45,7 @@ #include <comphelper/processfactory.hxx> #include <toolkit/helper/vclunohelper.hxx> #include <tools/stream.hxx> +#include <tools/diagnose_ex.h> #include <vcl/bitmap.hxx> #include <vcl/image.hxx> #include <vcl/msgbox.hxx> @@ -156,7 +157,7 @@ sal_Bool FwkTabPage::CallMethod( const rtl::OUString& rMethod ) } catch ( uno::Exception& ) { - DBG_ERRORFILE( "FwkTabPage::CallMethod(): exception of XDialogEventHandler::callHandlerMethod()" ); + DBG_UNHANDLED_EXCEPTION(); } } return bRet; diff --git a/framework/util/fwk.component b/framework/util/fwk.component index e6ceb91e8090..c460ecbccd70 100644 --- a/framework/util/fwk.component +++ b/framework/util/fwk.component @@ -139,4 +139,7 @@ <implementation name="com.sun.star.comp.framework.jobs.JobDispatch"> <service name="com.sun.star.frame.ProtocolHandler"/> </implementation> + <implementation name="com.sun.star.comp.framework.TabWindowService"> + <service name="com.sun.star.ui.dialogs.TabContainerWindow"/> + </implementation> </component> diff --git a/framework/util/fwl.component b/framework/util/fwl.component index aa124d1cdc4b..99c5ca7213e6 100644 --- a/framework/util/fwl.component +++ b/framework/util/fwl.component @@ -85,9 +85,6 @@ <implementation name="com.sun.star.comp.framework.SimpleTextStatusbarController"> <service name="com.sun.star.frame.StatusbarController"/> </implementation> - <implementation name="com.sun.star.comp.framework.TabWindowService"> - <service name="com.sun.star.ui.dialogs.TabContainerWindow"/> - </implementation> <implementation name="com.sun.star.comp.framework.ToolBarsMenuController"> <service name="com.sun.star.frame.PopupMenuController"/> </implementation> |