2 files changed, 1 insertions, 11 deletions
diff --git a/svx/source/gallery2/galmisc.cxx b/svx/source/gallery2/galmisc.cxx
index 6469a4a5bea9..5cc0006b9c7e 100644
--- a/svx/source/gallery2/galmisc.cxx
+++ b/svx/source/gallery2/galmisc.cxx
@@ -380,7 +380,6 @@ GalleryTransferable::GalleryTransferable( GalleryTheme* pTheme, sal_uInt32 nObje
     meObjectKind( mpTheme->GetObjectKind( nObjectPos ) ),
     mnObjectPos( nObjectPos ),
     mpGraphicObject( nullptr ),
-    mpImageMap( nullptr ),
     mpURL( nullptr )
 {
 
@@ -496,11 +495,6 @@ bool GalleryTransferable::GetData( const datatransfer::DataFlavor& rFlavor, cons
     {
         bRet = ( mxModelStream.is() && SetObject( mxModelStream.get(), 0, rFlavor ) );
     }
-    else if( ( SotClipboardFormatId::SVIM == nFormat ) && mpImageMap )
-    {
-        // TODO/MBA: do we need a BaseURL here?!
-        bRet = SetImageMap( *mpImageMap );
-    }
     else if( ( SotClipboardFormatId::SIMPLE_FILE == nFormat ) && mpURL )
     {
         bRet = SetString( mpURL->GetMainURL( INetURLObject::DecodeMechanism::NONE ), rFlavor );
@@ -552,8 +546,6 @@ void GalleryTransferable::ObjectReleased()
     mxModelStream.clear();
     delete mpGraphicObject;
     mpGraphicObject = nullptr;
-    delete mpImageMap;
-    mpImageMap = nullptr;
     delete mpURL;
     mpURL = nullptr;
 }
diff --git a/svx/source/svdraw/svdviter.cxx b/svx/source/svdraw/svdviter.cxx
index 044526e6e638..d77f7a3780fc 100644
--- a/svx/source/svdraw/svdviter.cxx
+++ b/svx/source/svdraw/svdviter.cxx
@@ -40,7 +40,6 @@ SdrViewIter::SdrViewIter(const SdrPage* pPage)
     mpPage = pPage;
     mpModel = pPage ? &pPage->getSdrModelFromSdrPage() : nullptr;
     mpObject = nullptr;
-    mbNoMasterPage = false;
     ImpInitVars();
 }
 
@@ -50,7 +49,6 @@ SdrViewIter::SdrViewIter(const SdrObject* pObject)
     mpObject = pObject;
     mpModel = pObject ? &pObject->getSdrModelFromSdrObject() : nullptr;
     mpPage = pObject ? pObject->GetPage() : nullptr;
-    mbNoMasterPage = false;
 
     if(!mpModel || !mpPage)
     {
@@ -86,7 +84,7 @@ bool SdrViewIter::ImpCheckPageView(SdrPageView const * pPV) const
             return true;
         }
     }
-    else if(!mbNoMasterPage && bMaster && (!mpObject || !mpObject->IsNotVisibleAsMaster()))
+    else if(bMaster && (!mpObject || !mpObject->IsNotVisibleAsMaster()))
     {
         if(pPg->TRG_HasMasterPage())
         {