diff options
-rw-r--r-- | sfx2/inc/sfx2/docfile.hxx | 9 | ||||
-rw-r--r-- | sfx2/source/doc/docfile.cxx | 29 | ||||
-rwxr-xr-x | unusedcode.easy | 15 |
3 files changed, 3 insertions, 50 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() diff --git a/unusedcode.easy b/unusedcode.easy index 87728a5d82c6..6935075a45c5 100755 --- a/unusedcode.easy +++ b/unusedcode.easy @@ -40,7 +40,7 @@ ScVbaFormat<ooo::vba::excel::XStyle>::setNumberFormat(com::sun::star::lang::Loca ScXMLExport::HasDrawPages(com::sun::star::uno::Reference<com::sun::star::sheet::XSpreadsheetDocument>&) ScXMLImport::GetVisibleSheet() SecurityEnvironment_NssImpl::getImplementation(com::sun::star::uno::Reference<com::sun::star::uno::XInterface>) -SfxMedium::SfxMedium(com::sun::star::uno::Reference<com::sun::star::embed::XStorage> const&, String const&, String const&, SfxItemSet const*, unsigned char) +SmRtfExport::HandleUnaryOperation(SmUnHorNode const*, int) SotStorage::GetProperty(String const&, String const&, com::sun::star::uno::Any&) SpinButton::SpinButton(Window*, ResId const&) SrchAttrItemList::Replace(SearchAttrItem const&, unsigned short) @@ -54,7 +54,6 @@ String::String(unsigned short const*, unsigned short) SvPtrarr::Replace(void* const&, unsigned short) SvPtrarr::Replace(void* const*, unsigned short, unsigned short) SvPtrarr::_ForEach(unsigned short, unsigned short, unsigned char (*)(void* const&, void*), void*) -SvStringsISortDtor::Insert(String* const*, unsigned short) SvXMLAutoStylePoolNamesP_Impl::GetPos(rtl::OUString const*) const SvXMLAutoStylePoolNamesP_Impl::Remove(rtl::OUString*) SvXMLAutoStylePoolParentsP_Impl::GetPos(SvXMLAutoStylePoolParentP_Impl const*) const @@ -77,9 +76,6 @@ SwBlockNames::Insert(SwBlockName const**, unsigned short) SwBlockNames::Insert(SwBlockNames const*, unsigned short, unsigned short) SwBlockNames::Remove(SwBlockName const*&, unsigned short) SwBlockNames::Remove(unsigned short, unsigned short) -SwOutlineNodes::Insert(SwNode* const&, unsigned short&) -SwOutlineNodes::Insert(SwNode* const*, unsigned short) -SwOutlineNodes::Insert(SwOutlineNodes const*, unsigned short, unsigned short) SwRects::Replace(SwRect const&, unsigned short) SwRects::Replace(SwRect const*, unsigned short, unsigned short) SwRects::_ForEach(unsigned short, unsigned short, unsigned char (*)(SwRect const&, void*), void*) @@ -90,15 +86,6 @@ SwSortElements::Insert(SwSortElement* const*, unsigned short) SwSortElements::Insert(SwSortElements const*, unsigned short, unsigned short) SwSortElements::Remove(SwSortElement* const&, unsigned short) SwSortElements::Remove(unsigned short, unsigned short) -SwSortTableLines::DeleteAndDestroy(unsigned short, unsigned short) -SwSortTableLines::Insert(SwTableLine* const&) -SwSortTableLines::Insert(SwTableLine* const&, unsigned short&) -SwSortTableLines::Insert(SwTableLine* const*, unsigned short) -SwSortTableLines::Remove(SwTableLine* const&, unsigned short) -SwSortTableLines::Remove(unsigned short, unsigned short) -SwTableSortBoxes::DeleteAndDestroy(unsigned short, unsigned short) -SwTableSortBoxes::Insert(SwTableBox* const&, unsigned short&) -SwTableSortBoxes::Insert(SwTableBox* const*, unsigned short) SwXMLTableColumnsSortByWidth_Impl::GetPos(SwXMLTableColumn_Impl const*) const SwXMLTableColumnsSortByWidth_Impl::Remove(SwXMLTableColumn_Impl*) SwpHtEnd::Insert(SwTxtAttr const*&, unsigned short&) |