diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2017-05-08 15:27:49 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2017-05-08 15:28:11 +0100 |
| commit | f17d55e5495859b2a78ed625fc2573391e26cdf1 (patch) | |
| tree | e0db4b1241b431df64fd4d29d084fb330447caa6 /sfx2 | |
| parent | 946049692eff89f0571983df8f0362399d2dd656 (diff) | |
fold SfxPickList::Get and ::ensure together
Change-Id: Iab68095a9733393b656623ddd6bb8705f7cfda82
Diffstat (limited to 'sfx2')
| -rw-r--r-- | sfx2/source/appl/sfxpicklist.cxx | 3 | ||||
| -rw-r--r-- | sfx2/source/inc/sfxpicklist.hxx | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/sfx2/source/appl/sfxpicklist.cxx b/sfx2/source/appl/sfxpicklist.cxx index be1eef7aaf13..9e9bf33adc4f 100644 --- a/sfx2/source/appl/sfxpicklist.cxx +++ b/sfx2/source/appl/sfxpicklist.cxx @@ -165,10 +165,9 @@ void SfxPickList::AddDocumentToPickList( SfxObjectShell* pDocSh ) (pFilter) ? pFilter->GetServiceName() : OUString() ); } -SfxPickList& SfxPickList::Get() +void SfxPickList::ensure() { static SfxPickList aUniqueInstance(SvtHistoryOptions().GetSize(ePICKLIST)); - return aUniqueInstance; } SfxPickList::SfxPickList( sal_uInt32 nAllowedMenuSize ) : diff --git a/sfx2/source/inc/sfxpicklist.hxx b/sfx2/source/inc/sfxpicklist.hxx index e77d6ed69c17..b1e86b084f75 100644 --- a/sfx2/source/inc/sfxpicklist.hxx +++ b/sfx2/source/inc/sfxpicklist.hxx @@ -45,8 +45,7 @@ class SfxPickList : public SfxListener static void AddDocumentToPickList( SfxObjectShell* pDocShell ); public: - static SfxPickList& Get(); - static void ensure() { Get(); } + static void ensure(); virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) override; }; |