diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2011-09-11 23:07:40 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2011-09-12 09:10:03 +0100 |
| commit | 64541bfe53137af1a5532c334c4bb65bc0dc54bd (patch) | |
| tree | 803e9c9b821c0d78c4e9da3d5359bd4b4448638e /svx/inc | |
| parent | 06e0aff60a7ac8b3a92253ff30dec55f71e437de (diff) | |
can return a ref instead of a pointer, ensure dtor on singleton
Diffstat (limited to 'svx/inc')
| -rw-r--r-- | svx/inc/tbunosearchcontrollers.hxx | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/svx/inc/tbunosearchcontrollers.hxx b/svx/inc/tbunosearchcontrollers.hxx index 47d1897d4837..2bfa26547af1 100644 --- a/svx/inc/tbunosearchcontrollers.hxx +++ b/svx/inc/tbunosearchcontrollers.hxx @@ -80,7 +80,7 @@ public: SearchToolbarControllersManager(); ~SearchToolbarControllersManager(); - static SearchToolbarControllersManager* createControllersManager(); + static SearchToolbarControllersManager& createControllersManager(); void registryController( const css::uno::Reference< css::frame::XFrame >& xFrame, const css::uno::Reference< css::frame::XStatusListener >& xStatusListener, const ::rtl::OUString& sCommandURL ); void freeController ( const css::uno::Reference< css::frame::XFrame >& xFrame, const css::uno::Reference< css::frame::XStatusListener >& xStatusListener, const ::rtl::OUString& sCommandURL ); @@ -88,8 +88,6 @@ public: private: - static SearchToolbarControllersManager* m_pInstance; - typedef ::comphelper::SequenceAsVector< css::beans::PropertyValue > SearchToolbarControllersVec; typedef ::std::map< css::uno::Reference< css::frame::XFrame >, SearchToolbarControllersVec > SearchToolbarControllersMap; SearchToolbarControllersMap aSearchToolbarControllersMap; |