callcatcher: update used code post-stlification

Change-Id: Ife742cfbb5295fafe36ba608744a3b3e356cc061

2 files changed, 2 insertions, 36 deletions

diff --git a/sfx2/inc/sfx2/docfile.hxx b/sfx2/inc/sfx2/docfile.hxx
index 044ae4ba8ce1..563fd0f5adcd 100644
--- a/sfx2/inc/sfx2/docfile.hxx
+++ b/sfx2/inc/sfx2/docfile.hxx
@@ -100,13 +100,7 @@ public:
 
                         SfxMedium( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage,
                                     const String& rBaseURL,
-                                    const SfxItemSet* pSet=0,
-                                    sal_Bool bRoot = sal_False );
-                        SfxMedium( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage,
-                                    const String& rBaseURL,
-									const String& rTypeName,
-                                    const SfxItemSet* pSet=0,
-                                    sal_Bool bRoot = sal_False );
+                                    const SfxItemSet* pSet=0 );
                         SfxMedium( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aArgs );
 
                         ~SfxMedium();
@@ -158,7 +152,6 @@ public:
     void                CloseInStream();
     sal_Bool            CloseOutStream();
 
-    sal_Bool            IsRoot() const;
     void                CloseStorage();
 
     StreamMode          GetOpenMode() const;
diff --git a/sfx2/source/doc/docfile.cxx b/sfx2/source/doc/docfile.cxx
index b0e0640b810f..99242432e336 100644
--- a/sfx2/source/doc/docfile.cxx
+++ b/sfx2/source/doc/docfile.cxx
@@ -260,7 +260,6 @@ public:
     bool m_bGotDateTime:1;
     bool m_bRemoveBackup:1;
     bool m_bOriginallyReadOnly:1;
-    bool m_bRoot:1;
     bool m_bTriedStorage:1;
     bool m_bRemote:1;
     bool m_bInputStreamIsReadOnly:1;
@@ -334,7 +333,6 @@ SfxMedium_Impl::SfxMedium_Impl( SfxMedium* pAntiImplP ) :
     m_bGotDateTime( false ),
     m_bRemoveBackup( false ),
     m_bOriginallyReadOnly(false),
-    m_bRoot(false),
     m_bTriedStorage(false),
     m_bRemote(false),
     m_bInputStreamIsReadOnly(false),
@@ -1436,11 +1434,6 @@ void SfxMedium::CloseZipStorage_Impl()
     }
 }
 
-sal_Bool SfxMedium::IsRoot() const
-{
-    return pImp->m_bRoot;
-}
-
 void SfxMedium::CloseStorage()
 {
     if ( pImp->xStorage.is() )
@@ -2904,11 +2897,9 @@ SfxMedium::SfxMedium( const ::com::sun::star::uno::Sequence< ::com::sun::star::b
 
 //------------------------------------------------------------------
 
-SfxMedium::SfxMedium( const uno::Reference < embed::XStorage >& rStor, const String& rBaseURL, const SfxItemSet* p, sal_Bool bRootP ) :
+SfxMedium::SfxMedium( const uno::Reference < embed::XStorage >& rStor, const String& rBaseURL, const SfxItemSet* p ) :
     pImp(new SfxMedium_Impl(this))
 {
-    pImp->m_bRoot = bRootP;
-
     String aType = SfxFilter::GetTypeFromStorage( rStor );
     pImp->m_pFilter = SFX_APP()->GetFilterMatcher().GetFilter4EA( aType );
     DBG_ASSERT( pImp->m_pFilter, "No Filter for storage found!" );
@@ -2923,24 +2914,6 @@ SfxMedium::SfxMedium( const uno::Reference < embed::XStorage >& rStor, const Str
         GetItemSet()->Put( *p );
 }
 
-SfxMedium::SfxMedium( const uno::Reference < embed::XStorage >& rStor, const String& rBaseURL, const String& rTypeName, const SfxItemSet* p, sal_Bool bRootP ) :
-    pImp(new SfxMedium_Impl(this))
-{
-    pImp->m_bRoot = bRootP;
-
-    pImp->m_pFilter = SFX_APP()->GetFilterMatcher().GetFilter4EA( rTypeName );
-    DBG_ASSERT( pImp->m_pFilter, "No Filter for storage found!" );
-
-    Init_Impl();
-    pImp->xStorage = rStor;
-    pImp->bDisposeStorage = false;
-
-    // always take BaseURL first, could be overwritten by ItemSet
-    GetItemSet()->Put( SfxStringItem( SID_DOC_BASEURL, rBaseURL ) );
-    if ( p )
-        GetItemSet()->Put( *p );
-}
-
 //------------------------------------------------------------------
 
 SfxMedium::~SfxMedium()