From 005f5d443e432130b902e1c78283c5f57f34d2b5 Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Thu, 25 Aug 2011 09:40:40 +0100 Subject: remove freshly unused methods --- sfx2/inc/sfx2/dispatch.hxx | 3 -- sfx2/inc/sfx2/mnuitem.hxx | 3 -- sfx2/inc/sfx2/mnumgr.hxx | 1 - sfx2/source/control/dispatch.cxx | 47 ------------------------ sfx2/source/menu/mnuitem.cxx | 16 --------- sfx2/source/menu/mnumgr.cxx | 8 ----- svl/inc/svl/style.hxx | 6 ---- svl/source/items/slstitm.cxx | 40 --------------------- svl/source/items/style.cxx | 8 ----- svtools/inc/svtools/framestatuslistener.hxx | 2 -- svtools/source/uno/framestatuslistener.cxx | 43 ---------------------- unusedcode.easy | 1 - xmloff/source/style/impastp4.cxx | 55 ----------------------------- xmloff/source/style/impastpl.hxx | 4 --- 14 files changed, 237 deletions(-) diff --git a/sfx2/inc/sfx2/dispatch.hxx b/sfx2/inc/sfx2/dispatch.hxx index 9a0b4f96e62f..ac2ec043fbb1 100644 --- a/sfx2/inc/sfx2/dispatch.hxx +++ b/sfx2/inc/sfx2/dispatch.hxx @@ -140,9 +140,6 @@ friend class SfxHelp; void _Execute( SfxShell &rShell, const SfxSlot &rSlot, SfxRequest &rReq, SfxCallMode eCall = SFX_CALLMODE_STANDARD); - const SfxPoolItem* _Execute( sal_uInt16 nSlot, SfxCallMode eCall, - va_list pArgs, const SfxPoolItem *pArg1 ); - #endif protected: void FlushImpl(); diff --git a/sfx2/inc/sfx2/mnuitem.hxx b/sfx2/inc/sfx2/mnuitem.hxx index 49051160d761..62ebce679ed4 100644 --- a/sfx2/inc/sfx2/mnuitem.hxx +++ b/sfx2/inc/sfx2/mnuitem.hxx @@ -84,13 +84,10 @@ class SfxUnoMenuControl : public SfxMenuControl { SfxUnoControllerItem* pUnoCtrl; public: - SfxUnoMenuControl( const String&, sal_uInt16 nId, Menu&, - SfxBindings&, SfxVirtualMenu* ); SfxUnoMenuControl( const String&, sal_uInt16 nId, Menu&, const String&, SfxBindings&, SfxVirtualMenu* ); ~SfxUnoMenuControl(); - void Select(); }; typedef SfxMenuControl* (*SfxMenuControlCtor)( sal_uInt16 nId, Menu &, SfxBindings & ); diff --git a/sfx2/inc/sfx2/mnumgr.hxx b/sfx2/inc/sfx2/mnumgr.hxx index 58d412b35408..6b65fe939751 100644 --- a/sfx2/inc/sfx2/mnumgr.hxx +++ b/sfx2/inc/sfx2/mnumgr.hxx @@ -89,7 +89,6 @@ public: class SAL_DLLPUBLIC_EXPORT SfxPopupMenuManager : public SfxMenuManager { private: - DECL_LINK( SelectHdl, void * ); Menu* pSVMenu; // when #i107205 gets fixed this one should be superfluous. diff --git a/sfx2/source/control/dispatch.cxx b/sfx2/source/control/dispatch.cxx index 0b0b7c4cfcfe..58a2d0c25c4d 100644 --- a/sfx2/source/control/dispatch.cxx +++ b/sfx2/source/control/dispatch.cxx @@ -1332,53 +1332,6 @@ const SfxPoolItem* SfxDispatcher::Execute return 0; } -//-------------------------------------------------------------------- -const SfxPoolItem* SfxDispatcher::_Execute -( - sal_uInt16 nSlot, // the Id of the executing function - SfxCallMode eCall, // SFX_CALLMODE_SYNCRHON, ..._ASYNCHRON or - //..._SLOT - va_list pVarArgs, // Parameter list from the 2nd parameter - const SfxPoolItem* pArg1 // First parameter -) - -/* [Description] - - Method to excecute a s over the Slot-Id. - - [Return value] - - const SfxPoolItem* Pointer to the SfxPoolItem valid to the next run - though the Message-Loop, which contains the return - value. - - Or a NULL-Pointer, when the function was not - executed (for example canceled by the user). -*/ - -{ - if ( IsLocked(nSlot) ) - return 0; - - SfxShell *pShell = 0; - const SfxSlot *pSlot = 0; - if ( GetShellAndSlot_Impl( nSlot, &pShell, &pSlot, sal_False, - SFX_CALLMODE_MODAL==(eCall&SFX_CALLMODE_MODAL) ) ) - { - SfxAllItemSet aSet( pShell->GetPool() ); - - for ( const SfxPoolItem *pArg = pArg1; - pArg; - pArg = va_arg( pVarArgs, const SfxPoolItem* ) ) - MappedPut_Impl( aSet, *pArg ); - - SfxRequest aReq( nSlot, eCall, aSet ); - _Execute( *pShell, *pSlot, aReq, eCall ); - return aReq.GetReturnValue(); - } - return 0; -} - //-------------------------------------------------------------------- const SfxPoolItem* SfxDispatcher::Execute ( diff --git a/sfx2/source/menu/mnuitem.cxx b/sfx2/source/menu/mnuitem.cxx index 560f51af4a5c..20547592b1b5 100644 --- a/sfx2/source/menu/mnuitem.cxx +++ b/sfx2/source/menu/mnuitem.cxx @@ -469,17 +469,6 @@ SfxUnoMenuControl* SfxMenuControl::CreateControl( const String& rCmd, return new SfxUnoMenuControl( rCmd, nId, rMenu, sItemText, rBindings, pVirt); } -SfxUnoMenuControl::SfxUnoMenuControl( const String& rCmd, sal_uInt16 nSlotId, - Menu& rMenu, SfxBindings& rBindings, SfxVirtualMenu* pVirt ) - : SfxMenuControl( nSlotId, rBindings ) -{ - Bind( pVirt, nSlotId, rMenu.GetItemText(nSlotId), rBindings); - UnBind(); - pUnoCtrl = new SfxUnoControllerItem( this, rBindings, rCmd ); - pUnoCtrl->acquire(); - pUnoCtrl->GetNewDispatch(); -} - SfxUnoMenuControl::SfxUnoMenuControl( const String& rCmd, sal_uInt16 nSlotId, Menu& /*rMenu*/, const String& rItemText, @@ -499,9 +488,4 @@ SfxUnoMenuControl::~SfxUnoMenuControl() pUnoCtrl->release(); } -void SfxUnoMenuControl::Select() -{ - pUnoCtrl->Execute(); -} - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sfx2/source/menu/mnumgr.cxx b/sfx2/source/menu/mnumgr.cxx index fc42a3e71e68..3bc9252d14da 100644 --- a/sfx2/source/menu/mnumgr.cxx +++ b/sfx2/source/menu/mnumgr.cxx @@ -307,14 +307,6 @@ sal_uInt16 SfxPopupMenuManager::Execute( const Point& rPos, Window* pWindow ) return nVal; } -//-------------------------------------------------------------------- - -IMPL_LINK_INLINE_START( SfxPopupMenuManager, SelectHdl, void *, EMPTYARG ) -{ - return 1; -} -IMPL_LINK_INLINE_END( SfxPopupMenuManager, SelectHdl, void *, EMPTYARG ) - //------------------------------------------------------------------------- SfxMenuManager::SfxMenuManager( Menu* pMenuArg, SfxBindings &rBindings ) diff --git a/svl/inc/svl/style.hxx b/svl/inc/svl/style.hxx index 1f809bc2f92a..4f478c0c37b6 100644 --- a/svl/inc/svl/style.hxx +++ b/svl/inc/svl/style.hxx @@ -65,11 +65,6 @@ pointer to the . The actions are: The following methods already broadcast themself -SfxStyleSheetHint(SFX_STYLESHEET_MODIFIED) from: - SfxStyleSheetBase::SetName( const String& rName ) - SfxStyleSheetBase::SetParent( const String& rName ) - SfxStyleSheetBase::SetFollow( const String& rName ) - SfxSimpleHint(SFX_HINT_DYING) from: SfxStyleSheetBasePool::~SfxStyleSheetBasePool() @@ -346,7 +341,6 @@ class SVL_DLLPUBLIC SfxStyleSheetHint: public SfxHint public: TYPEINFO(); - SfxStyleSheetHint( sal_uInt16 ); SfxStyleSheetHint( sal_uInt16, SfxStyleSheetBase& ); SfxStyleSheetBase* GetStyleSheet() const { return pStyleSh; } diff --git a/svl/source/items/slstitm.cxx b/svl/source/items/slstitm.cxx index ffaaf8390d6a..8bf6776d0a5b 100644 --- a/svl/source/items/slstitm.cxx +++ b/svl/source/items/slstitm.cxx @@ -51,7 +51,6 @@ public: SfxImpStringList() { nRefCount = 1; } ~SfxImpStringList(); - void Sort( sal_Bool bAscending); }; //------------------------------------------------------------------------ @@ -62,45 +61,6 @@ SfxImpStringList::~SfxImpStringList() nRefCount = 0xffff; } -//------------------------------------------------------------------------ - -void SfxImpStringList::Sort( sal_Bool bAscending) -{ - sal_uLong nCount = aList.size(); - if( nCount > 1 ) - { - nCount -= 2; - // Bubble Dir Einen - sal_Bool bSwapped = sal_True; - while( bSwapped ) - { - bSwapped = sal_False; - for( sal_uLong nCur = 0; nCur <= nCount; nCur++ ) - { - String aStr1 = aList[nCur]; - String aStr2 = aList[nCur+1]; - // COMPARE_GREATER => pStr2 ist groesser als pStr1 - StringCompare eCompare = aStr1.CompareIgnoreCaseToAscii( aStr2 ); //@@@ - sal_Bool bSwap = sal_False; - if( bAscending ) - { - if( eCompare == COMPARE_LESS ) - bSwap = sal_True; - } - else if( eCompare == COMPARE_GREATER ) - bSwap = sal_True; - - if( bSwap ) - { - bSwapped = sal_True; - aList[nCur+1] = aStr1; - aList[nCur] = aStr2; - } - } - } - } -} - // class SfxStringListItem ----------------------------------------------- SfxStringListItem::SfxStringListItem() : diff --git a/svl/source/items/style.cxx b/svl/source/items/style.cxx index 1830f25a2f5a..1078c7f3462d 100644 --- a/svl/source/items/style.cxx +++ b/svl/source/items/style.cxx @@ -101,14 +101,6 @@ SfxStyleSheetHint::SfxStyleSheetHint nHint( nAction ) {} -SfxStyleSheetHint::SfxStyleSheetHint -( - sal_uInt16 nAction // SFX_STYLESHEET_... (s.o.) -) -: pStyleSh( NULL ), - nHint( nAction ) -{} - //========================================================================= class SfxStyleSheetBasePool_Impl diff --git a/svtools/inc/svtools/framestatuslistener.hxx b/svtools/inc/svtools/framestatuslistener.hxx index ba909d30bfe5..3e5b8713e893 100644 --- a/svtools/inc/svtools/framestatuslistener.hxx +++ b/svtools/inc/svtools/framestatuslistener.hxx @@ -56,8 +56,6 @@ class SVT_DLLPUBLIC FrameStatusListener : public ::com::sun::star::frame::XStatu const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& xFrame ); virtual ~FrameStatusListener(); - void updateStatus( const rtl::OUString aCommandURL ); - // methods to support status forwarder, known by the old sfx2 toolbox controller implementation void addStatusListener( const rtl::OUString& aCommandURL ); void removeStatusListener( const rtl::OUString& aCommandURL ); diff --git a/svtools/source/uno/framestatuslistener.cxx b/svtools/source/uno/framestatuslistener.cxx index a86fb21128f7..a0cefd6b8d02 100644 --- a/svtools/source/uno/framestatuslistener.cxx +++ b/svtools/source/uno/framestatuslistener.cxx @@ -380,49 +380,6 @@ void FrameStatusListener::unbindListener() } } -void FrameStatusListener::updateStatus( const rtl::OUString aCommandURL ) -{ - Reference< XDispatch > xDispatch; - Reference< XStatusListener > xStatusListener; - com::sun::star::util::URL aTargetURL; - - { - SolarMutexGuard aSolarMutexGuard; - - if ( !m_bInitialized ) - return; - - // Try to find a dispatch object for the requested command URL - Reference< XDispatchProvider > xDispatchProvider( m_xFrame, UNO_QUERY ); - xStatusListener = Reference< XStatusListener >( static_cast< OWeakObject* >( this ), UNO_QUERY ); - if ( m_xServiceManager.is() && xDispatchProvider.is() ) - { - Reference< XURLTransformer > xURLTransformer( m_xServiceManager->createInstance( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.util.URLTransformer" ))), - UNO_QUERY ); - aTargetURL.Complete = aCommandURL; - xURLTransformer->parseStrict( aTargetURL ); - xDispatch = xDispatchProvider->queryDispatch( aTargetURL, rtl::OUString(), 0 ); - } - } - - if ( xDispatch.is() && xStatusListener.is() ) - { - // Catch exception as we release our mutex, it is possible that someone else - // has already disposed this instance! - // Add/remove status listener to get a update status information from the - // requested command. - try - { - xDispatch->addStatusListener( xStatusListener, aTargetURL ); - xDispatch->removeStatusListener( xStatusListener, aTargetURL ); - } - catch ( Exception& ) - { - } - } -} - } // svt /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/unusedcode.easy b/unusedcode.easy index a3e38141fae4..64f8bed0026c 100644 --- a/unusedcode.easy +++ b/unusedcode.easy @@ -953,7 +953,6 @@ SfxUShortRanges::Contains(unsigned short) const SfxUShortRanges::Intersects(SfxUShortRanges const&) const SfxUShortRanges::SfxUShortRanges(int, int, int, ...) SfxUShortRangesItem::SfxUShortRangesItem(unsigned short, unsigned short const*) -SfxUnoMenuControl::Select() SfxUnoStyleSheet::SfxUnoStyleSheet(SfxStyleSheet const&) SfxVersionTableDtor::GetVersions() const SfxViewFactory::~SfxViewFactory() diff --git a/xmloff/source/style/impastp4.cxx b/xmloff/source/style/impastp4.cxx index d6032f54b4ce..cea98ddda481 100644 --- a/xmloff/source/style/impastp4.cxx +++ b/xmloff/source/style/impastp4.cxx @@ -267,29 +267,6 @@ sal_Bool SvXMLAutoStylePoolP_Impl::AddNamed(const OUString& rName, sal_Int32 nFa return bRet; } -OUString SvXMLAutoStylePoolP_Impl::AddToCache( sal_Int32 nFamily, - const OUString& rParent ) -{ - sal_uLong nPos; - - XMLFamilyData_Impl *pFamily = 0; - XMLFamilyData_Impl aTmp( nFamily ); - if( maFamilyList.Seek_Entry( &aTmp, &nPos ) ) - { - pFamily = maFamilyList.GetObject( nPos ); - } - - DBG_ASSERT( pFamily, "SvXMLAutoStylePool_Impl::Add: unknown family" ); - if( pFamily ) - { - if( !pFamily->pCache ) - pFamily->pCache = new SvXMLAutoStylePoolCache_Impl(); - if( pFamily->pCache->size() < MAX_CACHE_SIZE ) - pFamily->pCache->push_back( new OUString( rParent ) ); - } - - return rParent; -} /////////////////////////////////////////////////////////////////////////////// // // Search for a array of XMLPropertyState ( vector< XMLPropertyState > ) in list @@ -324,38 +301,6 @@ OUString SvXMLAutoStylePoolP_Impl::Find( sal_Int32 nFamily, return sName; } -OUString SvXMLAutoStylePoolP_Impl::FindAndRemoveCached( sal_Int32 nFamily ) const -{ - OUString sName; - - sal_uLong nPos; - XMLFamilyData_Impl aTmp( nFamily ); - XMLFamilyData_Impl *pFamily = 0; - if( maFamilyList.Seek_Entry( &aTmp, &nPos ) ) - { - pFamily = maFamilyList.GetObject( nPos ); - } - - DBG_ASSERT( pFamily, "SvXMLAutoStylePool_Impl::Find: unknown family" ); - - if( pFamily ) - { - DBG_ASSERT( pFamily->pCache, "family doesn't have a cache" ); - - // The cache may be empty already. This happens if it was filled - // completly. - if( pFamily->pCache && !pFamily->pCache->empty() ) - { - OUString *pName = (*pFamily->pCache)[ 0 ]; - pFamily->pCache->erase( pFamily->pCache->begin() ); - sName = *pName; - delete pName; - } - } - - return sName; -} - /////////////////////////////////////////////////////////////////////////////// // // export diff --git a/xmloff/source/style/impastpl.hxx b/xmloff/source/style/impastpl.hxx index 77597257803a..5225a4409358 100644 --- a/xmloff/source/style/impastpl.hxx +++ b/xmloff/source/style/impastpl.hxx @@ -200,13 +200,9 @@ public: const ::rtl::OUString& rParent, const ::std::vector< XMLPropertyState >& rProperties ); - ::rtl::OUString AddToCache( sal_Int32 nFamily, - const ::rtl::OUString& rParent ); ::rtl::OUString Find( sal_Int32 nFamily, const ::rtl::OUString& rParent, const ::std::vector< XMLPropertyState >& rProperties ) const; - ::rtl::OUString FindAndRemoveCached( sal_Int32 nFamily ) const; - void exportXML( sal_Int32 nFamily, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XDocumentHandler > & rHandler, const SvXMLUnitConverter& rUnitConverter, -- cgit