show that GetImageManager never has a NULL module

and remove resulting dead branches

Change-Id: I969c943b9ff7e56d22efb4eff5bee644f9792676

3 files changed, 6 insertions, 6 deletions

diff --git a/sw/source/ui/config/mailconfigpage.cxx b/sw/source/ui/config/mailconfigpage.cxx
index 66206a22dd5c..37da1bffff9a 100644
--- a/sw/source/ui/config/mailconfigpage.cxx
+++ b/sw/source/ui/config/mailconfigpage.cxx
@@ -229,7 +229,7 @@ SwTestAccountSettingsDialog::SwTestAccountSettingsDialog(SwMailConfigPage* pPare
     m_sCompleted = m_pResult1->GetText();
     m_sFailed = m_pResult2->GetText();
 
-    SfxImageManager* pManager = SfxImageManager::GetImageManager( SW_MOD() );
+    SfxImageManager* pManager = SfxImageManager::GetImageManager(*SW_MOD());
     m_aFailedImg = pManager->GetImage(FN_FORMULA_CANCEL);
     m_aCompletedImg = pManager->GetImage(FN_FORMULA_APPLY);
 
diff --git a/sw/source/uibase/ribbar/inputwin.cxx b/sw/source/uibase/ribbar/inputwin.cxx
index faa763352e66..c9cd78a4753b 100644
--- a/sw/source/uibase/ribbar/inputwin.cxx
+++ b/sw/source/uibase/ribbar/inputwin.cxx
@@ -77,7 +77,7 @@ SwInputWindow::SwInputWindow( vcl::Window* pParent, SfxBindings* pBind )
 
     aEdit.SetSizePixel( aEdit.CalcMinimumSize() );
 
-    SfxImageManager* pManager = SfxImageManager::GetImageManager( SW_MOD() );
+    SfxImageManager* pManager = SfxImageManager::GetImageManager( *SW_MOD() );
     pManager->RegisterToolBox(this);
 
     pView = ::GetActiveView();
@@ -127,7 +127,7 @@ SwInputWindow::SwInputWindow( vcl::Window* pParent, SfxBindings* pBind )
 
 SwInputWindow::~SwInputWindow()
 {
-    SfxImageManager::GetImageManager( SW_MOD() )->ReleaseToolBox(this);
+    SfxImageManager::GetImageManager( *SW_MOD() )->ReleaseToolBox(this);
 
     // wake rulers
     if(pView)
@@ -165,7 +165,7 @@ void SwInputWindow::DataChanged( const DataChangedEvent& rDCEvt )
     {
         // update item images
         SwModule *pMod  = SW_MOD();
-        SfxImageManager *pImgMgr = SfxImageManager::GetImageManager( pMod );
+        SfxImageManager *pImgMgr = SfxImageManager::GetImageManager(*pMod);
         SetItemImage( FN_FORMULA_CALC,   pImgMgr->GetImage(FN_FORMULA_CALC   ));
         SetItemImage( FN_FORMULA_CANCEL, pImgMgr->GetImage(FN_FORMULA_CANCEL ));
         SetItemImage( FN_FORMULA_APPLY,  pImgMgr->GetImage(FN_FORMULA_APPLY  ));
diff --git a/sw/source/uibase/utlui/navipi.cxx b/sw/source/uibase/utlui/navipi.cxx
index 0df99243423d..005e20425bd3 100644
--- a/sw/source/uibase/utlui/navipi.cxx
+++ b/sw/source/uibase/utlui/navipi.cxx
@@ -813,7 +813,7 @@ SwNavigationPI::SwNavigationPI( SfxBindings* _pBindings,
     StartListening(*SfxGetpApp());
     if ( pCreateView )
         StartListening(*pCreateView);
-    SfxImageManager* pImgMan = SfxImageManager::GetImageManager( SW_MOD() );
+    SfxImageManager* pImgMan = SfxImageManager::GetImageManager(*SW_MOD());
     pImgMan->RegisterToolBox(&aContentToolBox, SFX_TOOLBOX_CHANGEOUTSTYLE);
     pImgMan->RegisterToolBox(&aGlobalToolBox, SFX_TOOLBOX_CHANGEOUTSTYLE);
 
@@ -862,7 +862,7 @@ SwNavigationPI::~SwNavigationPI()
 
     EndListening(*SfxGetpApp());
 
-    SfxImageManager* pImgMan = SfxImageManager::GetImageManager( SW_MOD() );
+    SfxImageManager* pImgMan = SfxImageManager::GetImageManager(*SW_MOD());
     pImgMan->ReleaseToolBox(&aContentToolBox);
     pImgMan->ReleaseToolBox(&aGlobalToolBox);
     delete aContentToolBox.GetItemWindow(FN_PAGENUMBER);