diff options
| author | Matúš Kukan <matus.kukan@gmail.com> | 2012-07-26 11:55:39 +0200 |
|---|---|---|
| committer | Matúš Kukan <matus.kukan@gmail.com> | 2012-07-26 15:59:19 +0200 |
| commit | bb9399e2cf0072d1de7cb0aea162d107ebde4360 (patch) | |
| tree | 217696157c18ed2a291845191cc60e2b39bbf9d8 /sc | |
| parent | c55b2d0b32dd210c2a809ce2b5ebca12bfb5b1d8 (diff) | |
tubes: kill double-singletonning of TeleManager
I am not sure why it was introduced in
0dae49a03c9b4816d8cdde69e30bcd2db2e30724
and hope that it's safe to remove it now.
Change-Id: I62f0ac230a83473386eabc45c9fcc387f62631e3
Diffstat (limited to 'sc')
| -rw-r--r-- | sc/source/ui/collab/contacts.cxx | 4 | ||||
| -rw-r--r-- | sc/source/ui/collab/sendfunc.cxx | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/sc/source/ui/collab/contacts.cxx b/sc/source/ui/collab/contacts.cxx index 80cb756d095f..8529b3d7a004 100644 --- a/sc/source/ui/collab/contacts.cxx +++ b/sc/source/ui/collab/contacts.cxx @@ -170,7 +170,7 @@ public: maBtnListen( this, ScResId( BTN_LISTEN ) ), maListContainer( this, ScResId( CTL_LIST ) ), maList( maListContainer ), - mpManager( TeleManager::get() ) + mpManager( new TeleManager() ) { Hide(); maBtnConnect.SetClickHdl( LINK( this, TubeContacts, BtnConnectHdl ) ); @@ -196,7 +196,7 @@ public: } virtual ~TubeContacts() { - mpManager->unref(); + delete mpManager; } static rtl::OUString fromUTF8( const char *pStr ) diff --git a/sc/source/ui/collab/sendfunc.cxx b/sc/source/ui/collab/sendfunc.cxx index a366956821ad..b78d34c1bb9e 100644 --- a/sc/source/ui/collab/sendfunc.cxx +++ b/sc/source/ui/collab/sendfunc.cxx @@ -355,9 +355,9 @@ ScDocFunc *ScDocShell::CreateDocFunc() ScDocFuncDirect *pDirect = new ScDocFuncDirect( *this ); ScDocFuncRecv *pReceiver = new ScDocFuncRecv( pDirect ); ScDocFuncSend *pSender = new ScDocFuncSend( *this, pReceiver ); - TeleManager *pManager = TeleManager::get(); + TeleManager *pManager = new TeleManager(); pSender->SetCollaboration( pManager->getConference() ); - pManager->unref(); + delete pManager; return pSender; } else |