diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2014-11-24 13:38:32 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2014-11-24 16:35:58 +0000 |
| commit | 49bbd88605cf4106773c35f3c0d81068fd2b3394 (patch) | |
| tree | 832e4e29ef380aea18b92a952689d0f3706a709d /sc | |
| parent | 80a60371b3fbdfff01a0e59a56a53da9587f9b14 (diff) | |
show that GetImageManager never has a NULL module
and remove resulting dead branches
Change-Id: I969c943b9ff7e56d22efb4eff5bee644f9792676
Diffstat (limited to 'sc')
| -rw-r--r-- | sc/source/ui/app/inputwin.cxx | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sc/source/ui/app/inputwin.cxx b/sc/source/ui/app/inputwin.cxx index 534a921df464..7a1a84fb711b 100644 --- a/sc/source/ui/app/inputwin.cxx +++ b/sc/source/ui/app/inputwin.cxx @@ -187,7 +187,7 @@ ScInputWindow::ScInputWindow( vcl::Window* pParent, SfxBindings* pBind ) : mbIsMultiLine ( lcl_isExperimentalMode() ) { ScModule* pScMod = SC_MOD(); - SfxImageManager* pImgMgr = SfxImageManager::GetImageManager( pScMod ); + SfxImageManager* pImgMgr = SfxImageManager::GetImageManager(*pScMod); // #i73615# don't rely on SfxViewShell::Current while constructing the input line // (also for GetInputHdl below) @@ -281,7 +281,7 @@ ScInputWindow::~ScInputWindow() } } - SfxImageManager::GetImageManager( SC_MOD() )->ReleaseToolBox( this ); + SfxImageManager::GetImageManager( *SC_MOD() )->ReleaseToolBox( this ); } void ScInputWindow::SetInputHandler( ScInputHandler* pNew ) @@ -648,7 +648,7 @@ void ScInputWindow::SetOkCancelMode() EnableButtons( pViewFrm && !pViewFrm->GetChildWindow( SID_OPENDLG_FUNCTION ) ); ScModule* pScMod = SC_MOD(); - SfxImageManager* pImgMgr = SfxImageManager::GetImageManager( pScMod ); + SfxImageManager* pImgMgr = SfxImageManager::GetImageManager(*pScMod); if (!bIsOkCancelMode) { RemoveItem( 3 ); // Remove SID_INPUT_SUM and SID_INPUT_EQUAL @@ -670,7 +670,7 @@ void ScInputWindow::SetSumAssignMode() EnableButtons( pViewFrm && !pViewFrm->GetChildWindow( SID_OPENDLG_FUNCTION ) ); ScModule* pScMod = SC_MOD(); - SfxImageManager* pImgMgr = SfxImageManager::GetImageManager( pScMod ); + SfxImageManager* pImgMgr = SfxImageManager::GetImageManager(*pScMod); if (bIsOkCancelMode) { // Remove SID_INPUT_CANCEL, and SID_INPUT_OK @@ -783,7 +783,7 @@ void ScInputWindow::DataChanged( const DataChangedEvent& rDCEvt ) { // update item images ScModule* pScMod = SC_MOD(); - SfxImageManager* pImgMgr = SfxImageManager::GetImageManager( pScMod ); + SfxImageManager* pImgMgr = SfxImageManager::GetImageManager(*pScMod); // IMAGE macro uses pScMod, pImgMg SetItemImage( SID_INPUT_FUNCTION, IMAGE( SID_INPUT_FUNCTION ) ); |