|
 |
91334d |
From e4d3b23009a323efc8b31431107cc2d2a529b118 Mon Sep 17 00:00:00 2001
|
|
|
91334d |
From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm@redhat.com>
|
|
|
91334d |
Date: Mon, 8 May 2017 15:27:49 +0100
|
|
|
91334d |
Subject: [PATCH 1/5] fold SfxPickList::Get and ::ensure together
|
|
|
91334d |
|
|
|
91334d |
Change-Id: Iab68095a9733393b656623ddd6bb8705f7cfda82
|
|
|
91334d |
(cherry picked from commit f17d55e5495859b2a78ed625fc2573391e26cdf1)
|
|
|
91334d |
---
|
|
|
91334d |
sfx2/source/appl/sfxpicklist.cxx | 3 +--
|
|
|
91334d |
sfx2/source/inc/sfxpicklist.hxx | 3 +--
|
|
|
91334d |
2 files changed, 2 insertions(+), 4 deletions(-)
|
|
|
91334d |
|
|
|
91334d |
diff --git a/sfx2/source/appl/sfxpicklist.cxx b/sfx2/source/appl/sfxpicklist.cxx
|
|
|
91334d |
index be48209..cc3a5cf 100644
|
|
|
91334d |
--- a/sfx2/source/appl/sfxpicklist.cxx
|
|
|
91334d |
+++ b/sfx2/source/appl/sfxpicklist.cxx
|
|
|
91334d |
@@ -167,10 +167,9 @@ void SfxPickList::AddDocumentToPickList( SfxObjectShell* pDocSh )
|
|
|
91334d |
(pFilter) ? pFilter->GetServiceName() : OUString() );
|
|
|
91334d |
}
|
|
|
91334d |
|
|
|
91334d |
-SfxPickList& SfxPickList::Get()
|
|
|
91334d |
+void SfxPickList::ensure()
|
|
|
91334d |
{
|
|
|
91334d |
static SfxPickList aUniqueInstance(SvtHistoryOptions().GetSize(ePICKLIST));
|
|
|
91334d |
- return aUniqueInstance;
|
|
|
91334d |
}
|
|
|
91334d |
|
|
|
91334d |
SfxPickList::SfxPickList( sal_uInt32 nAllowedMenuSize ) :
|
|
|
91334d |
diff --git a/sfx2/source/inc/sfxpicklist.hxx b/sfx2/source/inc/sfxpicklist.hxx
|
|
|
91334d |
index e77d6ed..b1e86b0 100644
|
|
|
91334d |
--- a/sfx2/source/inc/sfxpicklist.hxx
|
|
|
91334d |
+++ b/sfx2/source/inc/sfxpicklist.hxx
|
|
|
91334d |
@@ -45,8 +45,7 @@ class SfxPickList : public SfxListener
|
|
|
91334d |
static void AddDocumentToPickList( SfxObjectShell* pDocShell );
|
|
|
91334d |
|
|
|
91334d |
public:
|
|
|
91334d |
- static SfxPickList& Get();
|
|
|
91334d |
- static void ensure() { Get(); }
|
|
|
91334d |
+ static void ensure();
|
|
|
91334d |
|
|
|
91334d |
virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) override;
|
|
|
91334d |
};
|
|
|
91334d |
--
|
|
|
91334d |
2.9.3
|
|
|
91334d |
|