From 141c1c7bc6ac9bfadaf3fad6aba16a03836701b1 Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Tue, 24 Jan 2012 22:04:29 +0000 Subject: callcatcher: remove some unused code --- svtools/inc/svtools/treelist.hxx | 1 - svtools/source/contnr/treelist.cxx | 10 ---------- unusedcode.easy | 5 ----- vcl/inc/vcl/octree.hxx | 5 +---- vcl/source/gdi/octree.cxx | 24 ------------------------ xmloff/inc/xmloff/txtparae.hxx | 4 ---- xmloff/source/text/txtparae.cxx | 10 ---------- 7 files changed, 1 insertion(+), 58 deletions(-) diff --git a/svtools/inc/svtools/treelist.hxx b/svtools/inc/svtools/treelist.hxx index 1e0c2669a819..9db33bbe887a 100644 --- a/svtools/inc/svtools/treelist.hxx +++ b/svtools/inc/svtools/treelist.hxx @@ -444,7 +444,6 @@ protected: public: SvListView(); // !!! setzt das Model auf 0 - SvListView( SvTreeList* pModel ); virtual ~SvListView(); void Clear(); SvTreeList* GetModel() const { return pModel; } diff --git a/svtools/source/contnr/treelist.cxx b/svtools/source/contnr/treelist.cxx index 51a0d1e222c3..7ea23f39bcac 100644 --- a/svtools/source/contnr/treelist.cxx +++ b/svtools/source/contnr/treelist.cxx @@ -1423,16 +1423,6 @@ SvListEntry* SvTreeList::GetRootLevelParent( SvListEntry* pEntry ) const DBG_NAME(SvListView); -SvListView::SvListView( SvTreeList* pModell ) -{ - DBG_CTOR(SvListView,0); - pModel = 0; - nSelectionCount = 0; - nVisibleCount = 0; - bVisPositionsValid = sal_False; - SetModel( pModell ); -} - SvListView::SvListView() { DBG_CTOR(SvListView,0); diff --git a/unusedcode.easy b/unusedcode.easy index a9e5a1a5fa29..bf2c723d2e3a 100644 --- a/unusedcode.easy +++ b/unusedcode.easy @@ -109,8 +109,6 @@ NumericFormatter::ConvertToFraction(long) NumericFormatter::ConvertToLong(Fraction const&) OLEObjCache::SetSize(unsigned long) ORegKey::acquireKey(void*) -Octree::AddColor(BitmapColor const&) -Octree::Octree(unsigned long) OutputDevice::LogicToPixel(PolyPolygon const&, MapMode const&) const OutputDevice::PixelToLogic(PolyPolygon const&, MapMode const&) const ParagraphObj::ParagraphObj(ParagraphObj&) @@ -379,13 +377,11 @@ SvLBoxButton::Check(SvLBox*, SvLBoxEntry*, unsigned char) SvLBoxButtonData::SvLBoxButtonData() SvLBoxEntryArr::DeleteAndDestroy(unsigned short, unsigned short) SvLBoxItem::GetSize(SvLBoxEntry*, SvViewDataEntry*) -SvListView::SvListView(SvTreeList*) SvPersistStream::InsertObj(SvPersistBase*) SvPersistStream::RemoveObj(SvPersistBase*) SvPersistStream::SvPersistStream(SvClassManager&, SvStream*, SvPersistStream const&) SvPtrarr::Replace(void* const*, unsigned short, unsigned short) SvStream::ReadLine(ByteString&) -SvStringsISortDtor::Insert(String* const*, unsigned short) SvTabListBox::GetTabJustify(unsigned short) const SvUnoAttributeContainer::getImplementation(com::sun::star::uno::Reference) SvXMLAutoStylePoolNamesP_Impl::GetPos(rtl::OUString const*) const @@ -773,7 +769,6 @@ XMLTextListAutoStylePoolNames_Impl::GetPos(rtl::OUString const*) const XMLTextListAutoStylePoolNames_Impl::Remove(rtl::OUString*) XMLTextListAutoStylePool_Impl::GetPos(XMLTextListAutoStylePoolEntry_Impl const*) const XMLTextListAutoStylePool_Impl::Remove(XMLTextListAutoStylePoolEntry_Impl*) -XMLTextParagraphExport::FindTextStyle(com::sun::star::uno::Reference const&, unsigned char&) const XMLVisAreaContext::XMLVisAreaContext(SvXMLImport&, unsigned short, rtl::OUString const&, com::sun::star::uno::Reference const&, Rectangle&, short) XPropertyList::Clear() XSecController::collectToSign(int, rtl::OUString const&) diff --git a/vcl/inc/vcl/octree.hxx b/vcl/inc/vcl/octree.hxx index 3cef6384a7d6..e458aede251b 100644 --- a/vcl/inc/vcl/octree.hxx +++ b/vcl/inc/vcl/octree.hxx @@ -81,7 +81,7 @@ private: const BitmapReadAccess* pAcc; sal_uInt16 nPalIndex; - Octree() {}; + Octree() {} void CreatePalette( PNODE pNode ); void GetPalIndex( PNODE pNode ); @@ -94,11 +94,8 @@ private: public: Octree( const BitmapReadAccess& rReadAcc, sal_uLong nColors ); - Octree( sal_uLong nColors ); ~Octree(); - void AddColor( const BitmapColor& rColor ); - inline const BitmapPalette& GetPalette(); inline sal_uInt16 GetBestPaletteIndex( const BitmapColor& rColor ); }; diff --git a/vcl/source/gdi/octree.cxx b/vcl/source/gdi/octree.cxx index 844eabbafceb..5f4f8235178a 100644 --- a/vcl/source/gdi/octree.cxx +++ b/vcl/source/gdi/octree.cxx @@ -75,18 +75,6 @@ ImpNodeCache::~ImpNodeCache() // - Octree - // ---------- -Octree::Octree( sal_uLong nColors ) : - nMax ( nColors ), - nLeafCount ( 0L ), - pTree ( NULL ), - pAcc ( NULL ) -{ - pNodeCache = new ImpNodeCache( nColors ); - memset( pReduce, 0, ( OCTREE_BITS + 1 ) * sizeof( PNODE ) ); -} - -// ------------------------------------------------------------------------ - Octree::Octree( const BitmapReadAccess& rReadAcc, sal_uLong nColors ) : nMax ( nColors ), nLeafCount ( 0L ), @@ -108,18 +96,6 @@ Octree::~Octree() // ------------------------------------------------------------------------ -void Octree::AddColor( const BitmapColor& rColor ) -{ - pColor = &(BitmapColor&) rColor; - nLevel = 0L; - ImplAdd( &pTree ); - - while( nLeafCount > nMax ) - ImplReduce(); -} - -// ------------------------------------------------------------------------ - void Octree::ImplCreateOctree() { if( !!*pAcc ) diff --git a/xmloff/inc/xmloff/txtparae.hxx b/xmloff/inc/xmloff/txtparae.hxx index 4fb9ad634b01..02eb4b66d51a 100644 --- a/xmloff/inc/xmloff/txtparae.hxx +++ b/xmloff/inc/xmloff/txtparae.hxx @@ -236,10 +236,6 @@ protected: const SvXMLAutoStylePoolP& GetAutoStylePool() const { return rAutoStylePool; } public: - ::rtl::OUString FindTextStyle( - const ::com::sun::star::uno::Reference < - ::com::sun::star::beans::XPropertySet > & rPropSet, - sal_Bool& rbHasCharStyle ) const; ::rtl::OUString FindTextStyleAndHyperlink( const ::com::sun::star::uno::Reference < ::com::sun::star::beans::XPropertySet > & rPropSet, diff --git a/xmloff/source/text/txtparae.cxx b/xmloff/source/text/txtparae.cxx index 376112129f2f..ca23ab0b115a 100644 --- a/xmloff/source/text/txtparae.cxx +++ b/xmloff/source/text/txtparae.cxx @@ -821,16 +821,6 @@ OUString XMLTextParagraphExport::FindTextStyleAndHyperlink( return sName; } -OUString XMLTextParagraphExport::FindTextStyle( - const Reference < XPropertySet > & rPropSet, - sal_Bool& rHasCharStyle ) const -{ - sal_Bool bDummy; - sal_Bool bDummy2; - return FindTextStyleAndHyperlink( rPropSet, bDummy, rHasCharStyle, bDummy2 ); -} - - // adjustments to support lists independent from list style void XMLTextParagraphExport::exportListChange( const XMLTextNumRuleInfo& rPrevInfo, -- cgit