diff options
author | Caolán McNamara <caolanm@redhat.com> | 2014-02-25 08:53:25 +0000 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2014-02-25 10:45:27 +0000 |
commit | 58ba105a0328a932ff3dd86b043a909d01dacf5d (patch) | |
tree | 35d2e72bad7bc10cbc6ba7cfdc69023767c94521 | |
parent | 94ffeed68f14be4790fd537b8fb1431472613373 (diff) |
callcatcher: update unused code
Change-Id: Ia8e6abffb85b92ee4538fb0aeaee4e4aa18f2772
-rw-r--r-- | cui/source/options/optaboutconfig.cxx | 5 | ||||
-rw-r--r-- | cui/source/options/optaboutconfig.hxx | 1 | ||||
-rw-r--r-- | editeng/source/editeng/impedit.hxx | 4 | ||||
-rw-r--r-- | editeng/source/editeng/impedit2.cxx | 1 | ||||
-rw-r--r-- | editeng/source/editeng/impedit3.cxx | 7 | ||||
-rw-r--r-- | sfx2/source/doc/graphhelp.cxx | 55 | ||||
-rw-r--r-- | sfx2/source/doc/graphhelp.hxx | 4 | ||||
-rw-r--r-- | svx/source/accessibility/svxpixelctlaccessiblecontext.cxx | 22 | ||||
-rw-r--r-- | svx/source/inc/svxpixelctlaccessiblecontext.hxx | 12 | ||||
-rw-r--r-- | unusedcode.easy | 12 | ||||
-rw-r--r-- | vcl/inc/impimagetree.hxx | 5 | ||||
-rw-r--r-- | vcl/source/gdi/impimagetree.cxx | 46 |
12 files changed, 3 insertions, 171 deletions
diff --git a/cui/source/options/optaboutconfig.cxx b/cui/source/options/optaboutconfig.cxx index 18981dd62b60..6e0a0f345f7e 100644 --- a/cui/source/options/optaboutconfig.cxx +++ b/cui/source/options/optaboutconfig.cxx @@ -458,11 +458,6 @@ CuiAboutConfigValueDialog::CuiAboutConfigValueDialog( Window* pWindow, } -IMPL_LINK( CuiAboutConfigTabPage, HeaderSelect_Impl, HeaderBar*, /*pBar*/ ) -{ - return 0; -} - IMPL_LINK_NOARG( CuiAboutConfigTabPage, ResetBtnHdl_Impl ) { Reset(); diff --git a/cui/source/options/optaboutconfig.hxx b/cui/source/options/optaboutconfig.hxx index 7d6017da630b..0f8027219b1b 100644 --- a/cui/source/options/optaboutconfig.hxx +++ b/cui/source/options/optaboutconfig.hxx @@ -53,7 +53,6 @@ private: void AddToModifiedVector( const boost::shared_ptr< Prop_Impl >& rProp ); std::vector< OUString > commaStringToSequence( const OUString& rCommaSepString ); - DECL_LINK( HeaderSelect_Impl, HeaderBar * ); DECL_LINK( StandardHdl_Impl, void * ); DECL_LINK( ResetBtnHdl_Impl, void * ); diff --git a/editeng/source/editeng/impedit.hxx b/editeng/source/editeng/impedit.hxx index 46516bdb4e17..d644265ef40e 100644 --- a/editeng/source/editeng/impedit.hxx +++ b/editeng/source/editeng/impedit.hxx @@ -491,7 +491,6 @@ private: bool bInSelection:1; bool bIsInUndo:1; bool bUpdate:1; - bool bUpdateForAcc:1; bool bUndoEnabled:1; bool bOwnerOfRefDev:1; bool bDowning:1; @@ -696,9 +695,6 @@ public: void SetUpdateMode( bool bUp, EditView* pCurView = 0, sal_Bool bForceUpdate = sal_False ); bool GetUpdateMode() const { return bUpdate; } - void SetUpdateModeForAcc(bool bUp); - bool GetUpdateModeForAcc() const { return bUpdateForAcc; } - ViewsType& GetEditViews() { return aEditViews; } const ViewsType& GetEditViews() const { return aEditViews; } diff --git a/editeng/source/editeng/impedit2.cxx b/editeng/source/editeng/impedit2.cxx index db8da11a289e..06a7f52aefe3 100644 --- a/editeng/source/editeng/impedit2.cxx +++ b/editeng/source/editeng/impedit2.cxx @@ -93,7 +93,6 @@ ImpEditEngine::ImpEditEngine( EditEngine* pEE, SfxItemPool* pItemPool ) : bInSelection(false), bIsInUndo(false), bUpdate(true), - bUpdateForAcc(true), bUndoEnabled(true), bOwnerOfRefDev(false), bDowning(false), diff --git a/editeng/source/editeng/impedit3.cxx b/editeng/source/editeng/impedit3.cxx index ab8c3d800611..6539762a47cb 100644 --- a/editeng/source/editeng/impedit3.cxx +++ b/editeng/source/editeng/impedit3.cxx @@ -364,7 +364,7 @@ void ImpEditEngine::FormatFullDoc() void ImpEditEngine::FormatDoc() { - if (!GetUpdateMode() || IsFormatting() || !GetUpdateModeForAcc()) + if (!GetUpdateMode() || IsFormatting()) return; EnterBlockNotifications(); @@ -3857,11 +3857,6 @@ void ImpEditEngine::InsertContent( ContentNode* pNode, sal_Int32 nPos ) GetEditEnginePtr()->ParagraphInserted( nPos ); } -void ImpEditEngine::SetUpdateModeForAcc(bool bUp) -{ - bUpdateForAcc = bUp; -} - EditPaM ImpEditEngine::SplitContent( sal_Int32 nNode, sal_Int32 nSepPos ) { ContentNode* pNode = aEditDoc.GetObject( nNode ); diff --git a/sfx2/source/doc/graphhelp.cxx b/sfx2/source/doc/graphhelp.cxx index 6a6597d9197d..60329d0740aa 100644 --- a/sfx2/source/doc/graphhelp.cxx +++ b/sfx2/source/doc/graphhelp.cxx @@ -206,61 +206,6 @@ sal_Bool GraphicHelper::supportsMetaFileHandle_Impl() // static -sal_Bool GraphicHelper::mergeBitmaps_Impl( const BitmapEx& rBmpEx, const BitmapEx& rOverlay, - const Rectangle& rOverlayRect, BitmapEx& rReturn ) -{ - // the implementation is provided by KA - - Point aNullPt; - Rectangle aBmpRect( aNullPt, rBmpEx.GetSizePixel() ); - VirtualDevice aVDev; - - if( !rReturn.IsEmpty() ) - rReturn.SetEmpty(); - - if( !rBmpEx.IsEmpty() && aVDev.SetOutputSizePixel( aBmpRect.GetSize() ) ) - { - Rectangle aOverlayRect( rOverlayRect ); - - aOverlayRect.Intersection( aBmpRect ); - - if( rOverlay.IsEmpty() || rOverlayRect.IsEmpty() ) - rReturn = rBmpEx; - else - { - aVDev.DrawBitmap( aNullPt, aVDev.GetOutputSizePixel(), rBmpEx.GetBitmap() ); - aVDev.DrawBitmapEx( aOverlayRect.TopLeft(), aOverlayRect.GetSize(), rOverlay ); - - Bitmap aBmp( aVDev.GetBitmap( aNullPt, aVDev.GetOutputSizePixel() ) ); - aBmp.Convert( BMP_CONVERSION_24BIT ); - - if( !rBmpEx.IsTransparent() ) - rReturn = aBmp; - else - { - aVDev.DrawBitmap( aNullPt, aVDev.GetOutputSizePixel(), rBmpEx.GetMask() ); - Bitmap aOverlayMergeBmp( aVDev.GetBitmap( aOverlayRect.TopLeft(), aOverlayRect.GetSize() ) ); - - if( rOverlay.IsTransparent() ) - aVDev.DrawBitmap( aOverlayRect.TopLeft(), aOverlayRect.GetSize(), rOverlay.GetMask() ); - else - { - aVDev.SetLineColor( COL_BLACK ); - aVDev.SetFillColor( COL_BLACK ); - aVDev.DrawRect( aOverlayRect); - } - - aOverlayMergeBmp.CombineSimple( aVDev.GetBitmap( aOverlayRect.TopLeft(), aOverlayRect.GetSize() ), BMP_COMBINE_AND ); - aVDev.DrawBitmap( aOverlayRect.TopLeft(), aOverlayRect.GetSize(), aOverlayMergeBmp ); - rReturn = BitmapEx( aBmp, aVDev.GetBitmap( aNullPt, aVDev.GetOutputSizePixel() ) ); - } - } - } - - return !rReturn.IsEmpty(); -} - -// static sal_Bool GraphicHelper::getThumbnailFormatFromGDI_Impl( GDIMetaFile* pMetaFile, const uno::Reference< io::XStream >& xStream ) { diff --git a/sfx2/source/doc/graphhelp.hxx b/sfx2/source/doc/graphhelp.hxx index 8acec37a19a9..f9beeded2030 100644 --- a/sfx2/source/doc/graphhelp.hxx +++ b/sfx2/source/doc/graphhelp.hxx @@ -30,10 +30,6 @@ class BitmapEx; class GraphicHelper { - - static sal_Bool mergeBitmaps_Impl( const BitmapEx& rBmpEx, const BitmapEx& rOverlay, - const Rectangle& rOverlayRect, BitmapEx& rReturn ); - public: static SvMemoryStream* getFormatStrFromGDI_Impl( const GDIMetaFile* pGDIMeta, sal_uInt32 nFormat ); diff --git a/svx/source/accessibility/svxpixelctlaccessiblecontext.cxx b/svx/source/accessibility/svxpixelctlaccessiblecontext.cxx index f4926b93a9fd..cd2fd9062407 100644 --- a/svx/source/accessibility/svxpixelctlaccessiblecontext.cxx +++ b/svx/source/accessibility/svxpixelctlaccessiblecontext.cxx @@ -485,23 +485,6 @@ void SvxPixelCtlAccessible::ensureIsValidColumn( sal_Int32 nColumn ) OUString( RTL_CONSTASCII_USTRINGPARAM("column index is invalid") ), *this ); } -void SvxPixelCtlAccessible::ensureIsValidAddress( - sal_Int32 nRow, sal_Int32 nColumn ) - throw ( lang::IndexOutOfBoundsException ) -{ - ensureIsValidRow( nRow ); - ensureIsValidColumn( nColumn ); -} - -void SvxPixelCtlAccessible::ensureIsValidIndex( sal_Int32 nChildIndex ) - throw ( lang::IndexOutOfBoundsException ) -{ - if( nChildIndex >= pPixelCtl->GetSquares()) - throw lang::IndexOutOfBoundsException( - OUString( RTL_CONSTASCII_USTRINGPARAM("child index is invalid") ), *this ); -} - - //XAccessibleEventBroadcaster void SAL_CALL SvxPixelCtlAccessible::addAccessibleEventListener( const uno::Reference< XAccessibleEventListener >& xListener ) throw( RuntimeException ) { @@ -559,11 +542,6 @@ void SAL_CALL SvxPixelCtlAccessible::disposing() } } -void SvxPixelCtlAccessible::Invalidate() -{ - pPixelCtl = 0; -} - void SvxPixelCtlAccessible::IsValid() throw (uno::RuntimeException) { if(!pPixelCtl) diff --git a/svx/source/inc/svxpixelctlaccessiblecontext.hxx b/svx/source/inc/svxpixelctlaccessiblecontext.hxx index 23172d1ac46b..36c797c9cc30 100644 --- a/svx/source/inc/svxpixelctlaccessiblecontext.hxx +++ b/svx/source/inc/svxpixelctlaccessiblecontext.hxx @@ -244,7 +244,6 @@ public: void LoseFocus(); - void Invalidate(); /// @returns true if it's disposed or in disposing inline sal_Bool IsAlive( void ) const; /// @returns true if it's not disposed and no in disposing @@ -261,17 +260,6 @@ protected: If the specified column index is invalid. */ void ensureIsValidColumn( sal_Int32 nColumn ) throw ( ::com::sun::star::lang::IndexOutOfBoundsException ); - /** @attention This method requires locked mutex's and a living object. - @throws <type>IndexOutOfBoundsException</type> - If the specified cell address is invalid. */ - void ensureIsValidAddress( sal_Int32 nRow, sal_Int32 nColumn ) - throw ( ::com::sun::star::lang::IndexOutOfBoundsException ); - /** @attention This method requires locked mutex's and a living object. - @throws <type>IndexOutOfBoundsException</type> - If the specified child index is invalid. */ - void ensureIsValidIndex( sal_Int32 nChildIndex ) - throw ( ::com::sun::star::lang::IndexOutOfBoundsException ); - ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible> m_xCurChild; public: diff --git a/unusedcode.easy b/unusedcode.easy index d02ca32204e4..de0b159472ff 100644 --- a/unusedcode.easy +++ b/unusedcode.easy @@ -3,15 +3,11 @@ BigInt::BigInt(unsigned int) BigInt::GetString() const CalcUnoApiTest::CalcUnoApiTest(rtl::OUString const&) Chart2ExportTest::testFdo74115WallGradientFill() -Chart2ImportTest::testODPChartSeries() -Chart2ImportTest::testPPTChartSeries() -Chart2ImportTest::testPPTXChartSeries() CodeCompleteDataCache::GetVars() const CodeCompleteDataCache::SetVars(boost::unordered::unordered_map<rtl::OUString, boost::unordered::unordered_map<rtl::OUString, rtl::OUString, rtl::OUStringHash, std::equal_to<rtl::OUString>, std::allocator<std::pair<rtl::OUString const, rtl::OUString> > >, rtl::OUStringHash, std::equal_to<rtl::OUString>, std::allocator<std::pair<rtl::OUString const, boost::unordered::unordered_map<rtl::OUString, rtl::OUString, rtl::OUStringHash, std::equal_to<rtl::OUString>, std::allocator<std::pair<rtl::OUString const, rtl::OUString> > > > > > const&) CodeCompleteDataCache::print() const ComboBox::GetMRUCount() const ConfigurationAccess::getPath(rtl::OUString const&) -CuiAboutConfigTabPage::LinkStubHeaderSelect_Impl(void*, void*) DocxSdrExport::setFrameBtLr(bool) EditEngine::IsIdleFormatterActive() const EditSelection::IsInvalid() const @@ -26,8 +22,7 @@ GDriveDocument::GDriveDocument(GDriveSession*) GDriveFolder::GDriveFolder(GDriveSession*) GDriveProperty::GDriveProperty() GDriveSession::GDriveSession() -GraphicHelper::mergeBitmaps_Impl(BitmapEx const&, BitmapEx const&, Rectangle const&, BitmapEx&) -ImpEditEngine::SetUpdateModeForAcc(bool) +ImplImageTree::checkStyle(rtl::OUString const&) ImplRegionBand::IsInside(long, long) ImplRegionBand::IsOver(long, long) ImportExcel::GetLastFormula(short) @@ -142,9 +137,6 @@ SvxDistributePage::GetRanges() SvxNumRule::Create(SvStream&) SvxNumberFormat::Create(SvStream&) SvxNumberFormatShell::IsAdded_Impl(unsigned long) -SvxPixelCtlAccessible::Invalidate() -SvxPixelCtlAccessible::ensureIsValidAddress(int, int) -SvxPixelCtlAccessible::ensureIsValidIndex(int) SvxRectCtlAccessibleContext::FireAccessibleEvent(short, com::sun::star::uno::Any const&, com::sun::star::uno::Any const&) SwAccessibleField::SwAccessibleField(SwField*, SwAccessibleParagraph*, short) SwAccessibleParagraph::GetTOCLevel() @@ -366,7 +358,7 @@ svl::SharedStringPool::SharedStringPool() svx::frame::Style::Style(editeng::SvxBorderLine const&, double, unsigned short) utl::MediaDescriptor::PROP_DEEPDETECTION() utl::toISO8601(com::sun::star::util::Time const&) -vcl::MapChar(vcl::_TrueTypeFont*, unsigned short, int) +vcl::MapChar(vcl::_TrueTypeFont*, unsigned short, bool) writerfilter::dump(writerfilter::OutputWithDepth<std::basic_string<char, std::char_traits<char>, std::allocator<char> > >&, char const*, boost::shared_ptr<writerfilter::Reference<writerfilter::BinaryObj> >) writerfilter::dump(writerfilter::OutputWithDepth<std::basic_string<char, std::char_traits<char>, std::allocator<char> > >&, char const*, boost::shared_ptr<writerfilter::Reference<writerfilter::Properties> >) writerfilter::dump(writerfilter::OutputWithDepth<std::basic_string<char, std::char_traits<char>, std::allocator<char> > >&, char const*, rtl::OUString const&) diff --git a/vcl/inc/impimagetree.hxx b/vcl/inc/impimagetree.hxx index 68cb2418271a..85e3640ece86 100644 --- a/vcl/inc/impimagetree.hxx +++ b/vcl/inc/impimagetree.hxx @@ -42,9 +42,6 @@ public: ~ImplImageTree(); - /// check whether the icon style is installed - bool checkStyle(OUString const & style); - bool loadImage( OUString const & name, OUString const & style, BitmapEx & bitmap, bool localized = false, bool loadMissing = false ); @@ -77,7 +74,6 @@ private: OUString m_style; Path m_path; - CheckStyleCache m_checkStyleCache; IconCache m_iconCache; bool m_cacheIcons; IconLinkHash m_linkHash; @@ -86,7 +82,6 @@ private: void resetPaths(); - bool checkStyleCacheLookup( OUString const & style, bool &exists ); bool iconCacheLookup( OUString const & name, bool localized, BitmapEx & bitmap ); bool find(std::vector< OUString > const & paths, BitmapEx & bitmap ); diff --git a/vcl/source/gdi/impimagetree.cxx b/vcl/source/gdi/impimagetree.cxx index e6722c679c0d..96aab03eeada 100644 --- a/vcl/source/gdi/impimagetree.cxx +++ b/vcl/source/gdi/impimagetree.cxx @@ -116,39 +116,6 @@ ImplImageTree::ImplImageTree() { m_cacheIcons = true; } ImplImageTree::~ImplImageTree() {} -bool ImplImageTree::checkStyle(OUString const & style) -{ - bool exists; - - // using cache because setStyle is an expensive operation - // setStyle calls resetPaths => closes any opened zip files with icons, cleans the icon cache, ... - if (checkStyleCacheLookup(style, exists)) { - return exists; - } - - setStyle(style); - - exists = false; - OUString aURL = m_path.first; - - osl::File aZip(aURL + ".zip"); - if (aZip.open(osl_File_OpenFlag_Read) == ::osl::FileBase::E_None) { - aZip.close(); - exists = true; - } - - osl::Directory aLookaside(aURL); - if (aLookaside.open() == ::osl::FileBase::E_None) { - aLookaside.close(); - exists = true; - m_cacheIcons = false; - } else { - m_cacheIcons = true; - } - m_checkStyleCache[style] = exists; - return exists; -} - bool ImplImageTree::loadImage( OUString const & name, OUString const & style, BitmapEx & bitmap, bool localized, bool loadMissing ) @@ -222,7 +189,6 @@ void ImplImageTree::shutDown() { m_style = OUString(); // for safety; empty m_style means "not initialized" m_iconCache.clear(); - m_checkStyleCache.clear(); m_linkHash.clear(); } @@ -254,18 +220,6 @@ void ImplImageTree::resetPaths() { url, css::uno::Reference< css::container::XNameAccess >()); } -bool ImplImageTree::checkStyleCacheLookup( - OUString const & style, bool &exists) -{ - CheckStyleCache::iterator i(m_checkStyleCache.find(style)); - if (i != m_checkStyleCache.end()) { - exists = i->second; - return true; - } else { - return false; - } -} - bool ImplImageTree::iconCacheLookup( OUString const & name, bool localized, BitmapEx & bitmap) { |