From 23eb3939a750fbfd3157bd7d3777ae3ec0282b02 Mon Sep 17 00:00:00 2001
From: Caolán McNamara <caolanm@redhat.com>
Date: Fri, 19 Aug 2011 15:04:07 +0100
Subject: Resolves: fdo#39026 SfxPickList singleton wasn't instantiated

---
 sfx2/source/appl/appinit.cxx    | 4 ++++
 sfx2/source/inc/sfxpicklist.hxx | 1 +
 2 files changed, 5 insertions(+)

(limited to 'sfx2')

diff --git a/sfx2/source/appl/appinit.cxx b/sfx2/source/appl/appinit.cxx
index cafe3ef36ea8..598f41207190 100644
--- a/sfx2/source/appl/appinit.cxx
+++ b/sfx2/source/appl/appinit.cxx
@@ -267,6 +267,10 @@ bool SfxApplication::Initialize_Impl()
     pAppData_Impl->m_pSbxErrorHdl = new SfxErrorHandler(
         RID_BASIC_START, ERRCODE_AREA_SBX, ERRCODE_AREA_SBX_END, pAppData_Impl->pBasicResMgr );
 
+    //ensure instantiation of listener that manages the internal recently-used
+    //list
+    SfxPickList::ensure();
+
     DBG_ASSERT( !pAppData_Impl->pAppDispat, "AppDispatcher already exists" );
     pAppData_Impl->pAppDispat = new SfxDispatcher((SfxDispatcher*)0);
     pAppData_Impl->pSlotPool = new SfxSlotPool;
diff --git a/sfx2/source/inc/sfxpicklist.hxx b/sfx2/source/inc/sfxpicklist.hxx
index 2ac9d8b2d2c5..855eb99f5b99 100644
--- a/sfx2/source/inc/sfxpicklist.hxx
+++ b/sfx2/source/inc/sfxpicklist.hxx
@@ -68,6 +68,7 @@ class SfxPickList : public SfxListener
 
     public:
         static SfxPickList& Get();
+        static void ensure() { Get(); }
 
         sal_uInt32          GetAllowedMenuSize() { return m_nAllowedMenuSize; }
         sal_uInt32          GetNumOfEntries() const { return m_aPicklistVector.size(); }
-- 
cgit