diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2019-04-17 15:59:22 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2019-04-17 22:22:38 +0200 |
| commit | d69db73ec1de29ec5b72cdcd2a64873b92cac672 (patch) | |
| tree | 004a17c7ac877dceee3866ae721fb47955e5da12 /sc | |
| parent | b6075c3afed5837a79a9c509f5b38f38eeacf6dc (diff) | |
m_mapRefWindow is unneeded now
Change-Id: I68811d64ed340f3b5f86d7c13289455009eea74e
Reviewed-on: https://gerrit.libreoffice.org/70890
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'sc')
| -rw-r--r-- | sc/inc/scmod.hxx | 4 | ||||
| -rw-r--r-- | sc/source/ui/app/scmod.cxx | 31 | ||||
| -rw-r--r-- | sc/source/ui/inc/anyrefdg.hxx | 3 |
3 files changed, 0 insertions, 38 deletions
diff --git a/sc/inc/scmod.hxx b/sc/inc/scmod.hxx index 5b4e519fd693..2c517eedf770 100644 --- a/sc/inc/scmod.hxx +++ b/sc/inc/scmod.hxx @@ -108,7 +108,6 @@ class ScModule: public SfxModule, public SfxListener, public utl::ConfigurationL bool m_bIsInSharedDocLoading:1; bool m_bIsInSharedDocSaving:1; - std::map<sal_uInt16, std::vector<VclPtr<vcl::Window> > > m_mapRefWindow; // a way to find existing Dialogs for a given parent Window of the slot type std::map<sal_uInt16, std::vector<std::pair<std::shared_ptr<SfxDialogController>, weld::Window*>>> m_mapRefController; @@ -249,9 +248,6 @@ public: void SetInSharedDocSaving( bool bNew ) { m_bIsInSharedDocSaving = bNew; } bool IsInSharedDocSaving() const { return m_bIsInSharedDocSaving; } - SC_DLLPUBLIC void RegisterRefWindow( sal_uInt16 nSlotId, vcl::Window *pWnd ); - SC_DLLPUBLIC void UnregisterRefWindow( sal_uInt16 nSlotId, vcl::Window *pWnd ); - SC_DLLPUBLIC void RegisterRefController(sal_uInt16 nSlotId, std::shared_ptr<SfxDialogController>& rWnd, weld::Window* pWndAncestor); SC_DLLPUBLIC void UnregisterRefController(sal_uInt16 nSlotId, std::shared_ptr<SfxDialogController>& rWnd); SC_DLLPUBLIC std::shared_ptr<SfxDialogController> Find1RefWindow(sal_uInt16 nSlotId, weld::Window *pWndAncestor); diff --git a/sc/source/ui/app/scmod.cxx b/sc/source/ui/app/scmod.cxx index c701866a66d4..082b4e32c929 100644 --- a/sc/source/ui/app/scmod.cxx +++ b/sc/source/ui/app/scmod.cxx @@ -2197,37 +2197,6 @@ IMPL_LINK( ScModule, CalcFieldValueHdl, EditFieldInfo*, pInfo, void ) } } -void ScModule::RegisterRefWindow( sal_uInt16 nSlotId, vcl::Window *pWnd ) -{ - std::vector<VclPtr<vcl::Window> > & rlRefWindow = m_mapRefWindow[nSlotId]; - - if( std::find( rlRefWindow.begin(), rlRefWindow.end(), pWnd ) == rlRefWindow.end() ) - { - rlRefWindow.emplace_back(pWnd ); - } - -} - -void ScModule::UnregisterRefWindow( sal_uInt16 nSlotId, vcl::Window *pWnd ) -{ - auto iSlot = m_mapRefWindow.find( nSlotId ); - - if( iSlot == m_mapRefWindow.end() ) - return; - - std::vector<VclPtr<vcl::Window> > & rlRefWindow = iSlot->second; - - auto i = std::find( rlRefWindow.begin(), rlRefWindow.end(), pWnd ); - - if( i == rlRefWindow.end() ) - return; - - rlRefWindow.erase( i ); - - if( rlRefWindow.empty() ) - m_mapRefWindow.erase( nSlotId ); -} - void ScModule::RegisterRefController(sal_uInt16 nSlotId, std::shared_ptr<SfxDialogController>& rWnd, weld::Window* pWndAncestor) { std::vector<std::pair<std::shared_ptr<SfxDialogController>, weld::Window*>> & rlRefWindow = m_mapRefController[nSlotId]; diff --git a/sc/source/ui/inc/anyrefdg.hxx b/sc/source/ui/inc/anyrefdg.hxx index 7fd1c4b19381..978c733fb784 100644 --- a/sc/source/ui/inc/anyrefdg.hxx +++ b/sc/source/ui/inc/anyrefdg.hxx @@ -209,19 +209,16 @@ struct ScRefHdlrImpl: ScRefHdlrImplBase< TBase, bBindRef > ScRefHdlrImpl( const T1 & rt1, const T2 & rt2, const T3& rt3, const T4& rt4 ) : ScRefHdlrImplBase<TBase, bBindRef >(rt1, rt2, rt3, rt4) { - SC_MOD()->RegisterRefWindow( static_cast<sal_uInt16>( TDerived::SLOTID ), this ); } template<class T1, class T2, class T3, class T4, class T5> ScRefHdlrImpl( const T1 & rt1, const T2 & rt2, const T3& rt3, const T4& rt4, const T5& rt5 ) : ScRefHdlrImplBase<TBase, bBindRef >(rt1, rt2, rt3, rt4, rt5) { - SC_MOD()->RegisterRefWindow( static_cast<sal_uInt16>( TDerived::SLOTID ), this ); } virtual void dispose() override { - SC_MOD()->UnregisterRefWindow( static_cast<sal_uInt16>( TDerived::SLOTID ), this ); ScRefHdlrImplBase<TBase, bBindRef >::disposeRefHandler(); TBase::dispose(); } |