[Libreoffice-commits] .: Branch 'libreoffice-3-4-0' - sfx2/source

[Petr Mladek]

 sfx2/source/appl/appdata.cxx |    1 +
 sfx2/source/appl/appinit.cxx |    3 ++-
 sfx2/source/inc/appdata.hxx  |    1 +
 3 files changed, 4 insertions(+), 1 deletion(-)

New commits:
commit 765eacf33347838bac2f49f8414a6c9a830b4b3f
Author: Noel Power <nopower at novell.com>
Date:   Tue May 24 11:34:20 2011 +0100

    initialize resource manager to get verbose basic errors fdo#37370
    
    Signed-off-by: Michael Meeks <michael.meeks at novell.com>
    Signed-off-by: Petr Mladek <pmladek at suse.cz>
    Signed-off-by: Tor Lillqvist <tlillqvist at novell.com>

diff --git a/sfx2/source/appl/appdata.cxx b/sfx2/source/appl/appdata.cxx
index 0eb99fa..ea1f3e2 100644
--- a/sfx2/source/appl/appdata.cxx
+++ b/sfx2/source/appl/appdata.cxx
@@ -97,6 +97,7 @@ SfxAppData_Impl::SfxAppData_Impl( SfxApplication* ) :
         pTopFrames( new SfxFrameArr_Impl ),
         pInitLinkList(0),
         pMatcher( 0 ),
+        pBasicResMgr( 0 ),
         pAppDispatch(NULL),
         pTemplates( 0 ),
         pPool(0),
diff --git a/sfx2/source/appl/appinit.cxx b/sfx2/source/appl/appinit.cxx
index 103d981..edf489e 100644
--- a/sfx2/source/appl/appinit.cxx
+++ b/sfx2/source/appl/appinit.cxx
@@ -257,12 +257,13 @@ bool SfxApplication::Initialize_Impl()
     // not processed are given to SFX as Errorcode 1.
     new SimpleErrorHandler;
 #endif
+    pAppData_Impl->pBasicResMgr = CreateResManager("sb");
     new SfxErrorHandler(RID_ERRHDL, ERRCODE_AREA_TOOLS, ERRCODE_AREA_LIB1);
 
     new SfxErrorHandler(
         RID_SO_ERROR_HANDLER, ERRCODE_AREA_SO, ERRCODE_AREA_SO_END);
     new SfxErrorHandler(
-        RID_BASIC_START, ERRCODE_AREA_SBX, ERRCODE_AREA_SBX_END );
+        RID_BASIC_START, ERRCODE_AREA_SBX, ERRCODE_AREA_SBX_END, pAppData_Impl->pBasicResMgr );
 
     // diverse Pointer
     SfxPickList::GetOrCreate( SvtHistoryOptions().GetSize( ePICKLIST ) );
diff --git a/sfx2/source/inc/appdata.hxx b/sfx2/source/inc/appdata.hxx
index 8df9b89..35e3153 100644
--- a/sfx2/source/inc/appdata.hxx
+++ b/sfx2/source/inc/appdata.hxx
@@ -110,6 +110,7 @@ public:
 
     // application members
     SfxFilterMatcher*                   pMatcher;
+    ResMgr*                             pBasicResMgr;
     ResMgr*                             pLabelResMgr;
     SfxStatusDispatcher*				pAppDispatch;
     SfxDocumentTemplates*               pTemplates;