4 files changed, 6 insertions, 5 deletions
diff --git a/framework/prj/build.lst b/framework/prj/build.lst
index 2c847918fee4..8fe5b3b2f0ef 100644
--- a/framework/prj/build.lst
+++ b/framework/prj/build.lst
@@ -1,2 +1,2 @@
-fr framework : LIBXSLT:libxslt l10n svtools NULL
+fr framework : LIBXSLT:libxslt L10N:l10n svtools NULL
 fr framework\prj nmake - all fr_all NULL
diff --git a/framework/source/classes/fwktabwindow.cxx b/framework/source/classes/fwktabwindow.cxx
index d7868a3a0857..b41797e63595 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>