diff options
| author | Chris Sherlock <chris.sherlock79@gmail.com> | 2016-02-09 18:16:42 +1100 |
|---|---|---|
| committer | Chris Sherlock <chris.sherlock79@gmail.com> | 2016-02-09 08:18:05 +0000 |
| commit | a238b1f8d304bf1e2ffb357937f3ec888ee8ac89 (patch) | |
| tree | 083c0582d4bf80e313ed256ca476ba8f69c7f7a6 /sfx2 | |
| parent | 538f276ae0414ea34ede6090b5f56e8fecd6fc65 (diff) | |
Remove excess newlines
A ridiculously fast way of doing this is:
for i in $(pcregrep -l -M -r --include='.*[hc]xx$' \
--exclude-dir=workdir --exclude-dir=instdir '^
{3,}' .)
do
perl -0777 -i -pe 's/^
{3,}/
/gm' $i
done
Change-Id: Iebb93eccbee9e4fc5c4380474ba595858a27ac2c
Reviewed-on: https://gerrit.libreoffice.org/22224
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Chris Sherlock <chris.sherlock79@gmail.com>
Diffstat (limited to 'sfx2')
105 files changed, 0 insertions, 878 deletions
diff --git a/sfx2/inc/srchdlg.hxx b/sfx2/inc/srchdlg.hxx index ca7c60f7270e..728fd86986dc 100644 --- a/sfx2/inc/srchdlg.hxx +++ b/sfx2/inc/srchdlg.hxx @@ -26,7 +26,6 @@ #include <sfx2/basedlgs.hxx> - namespace sfx2 { @@ -79,11 +78,9 @@ public: }; - } // namespace sfx2 - #endif // INCLUDED_SFX2_INC_SRCHDLG_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sfx2/source/appl/app.cxx b/sfx2/source/appl/app.cxx index b97e9b2c1ef1..a82ae7f62281 100644 --- a/sfx2/source/appl/app.cxx +++ b/sfx2/source/appl/app.cxx @@ -248,7 +248,6 @@ SfxApplication::~SfxApplication() } - const OUString& SfxApplication::GetLastDir_Impl() const /* [Description] @@ -282,7 +281,6 @@ const OUString& SfxApplication::GetLastSaveDirectory() const } - void SfxApplication::SetLastDir_Impl ( const OUString& rNewDir /* Complete directory path as a string */ @@ -302,14 +300,12 @@ void SfxApplication::SetLastDir_Impl } - void SfxApplication::ResetLastDir() { pAppData_Impl->aLastDir.clear(); } - SfxDispatcher* SfxApplication::GetDispatcher_Impl() { return pAppData_Impl->pViewFrame? pAppData_Impl->pViewFrame->GetDispatcher(): pAppData_Impl->pAppDispat; @@ -387,7 +383,6 @@ ResMgr* SfxApplication::GetSfxResManager() } - void SfxApplication::SetProgress_Impl ( SfxProgress *pProgress @@ -409,21 +404,18 @@ void SfxApplication::SetProgress_Impl } - sal_uInt16 SfxApplication::GetFreeIndex() { return pAppData_Impl->aIndexBitSet.GetFreeIndex()+1; } - void SfxApplication::ReleaseIndex(sal_uInt16 i) { pAppData_Impl->aIndexBitSet.ReleaseIndex(i-1); } - vcl::Window* SfxApplication::GetTopWindow() const { SfxWorkWindow* pWork = GetWorkWindow_Impl( SfxViewFrame::Current() ); diff --git a/sfx2/source/appl/appbas.cxx b/sfx2/source/appl/appbas.cxx index 028c2791c3e8..2e8876b6ed13 100644 --- a/sfx2/source/appl/appbas.cxx +++ b/sfx2/source/appl/appbas.cxx @@ -119,7 +119,6 @@ XLibraryContainer * SfxApplication::GetDialogContainer() } - XLibraryContainer * SfxApplication::GetBasicContainer() { #if !HAVE_FEATURE_SCRIPTING diff --git a/sfx2/source/appl/appcfg.cxx b/sfx2/source/appl/appcfg.cxx index 0f8b31993c1f..98a10f9e3839 100644 --- a/sfx2/source/appl/appcfg.cxx +++ b/sfx2/source/appl/appcfg.cxx @@ -80,7 +80,6 @@ using namespace ::com::sun::star::frame; using namespace ::com::sun::star::beans; - class SfxEventAsyncer_Impl : public SfxListener { SfxEventHint aHint; @@ -95,7 +94,6 @@ public: }; - void SfxEventAsyncer_Impl::Notify( SfxBroadcaster&, const SfxHint& rHint ) { const SfxSimpleHint* pHint = dynamic_cast<const SfxSimpleHint*>(&rHint); @@ -107,7 +105,6 @@ void SfxEventAsyncer_Impl::Notify( SfxBroadcaster&, const SfxHint& rHint ) } - SfxEventAsyncer_Impl::SfxEventAsyncer_Impl( const SfxEventHint& rHint ) : aHint( rHint ) { @@ -120,14 +117,12 @@ SfxEventAsyncer_Impl::SfxEventAsyncer_Impl( const SfxEventHint& rHint ) } - SfxEventAsyncer_Impl::~SfxEventAsyncer_Impl() { delete pIdle; } - IMPL_LINK_TYPED(SfxEventAsyncer_Impl, IdleHdl, Idle*, pAsyncIdle, void) { SfxObjectShellRef xRef( aHint.GetObjShell() ); @@ -147,8 +142,6 @@ IMPL_LINK_TYPED(SfxEventAsyncer_Impl, IdleHdl, Idle*, pAsyncIdle, void) } - - void SfxApplication::GetOptions( SfxItemSet& rSet ) { bool bRet = false; diff --git a/sfx2/source/appl/appchild.cxx b/sfx2/source/appl/appchild.cxx index 554406f1ef93..5475b22cea9b 100644 --- a/sfx2/source/appl/appchild.cxx +++ b/sfx2/source/appl/appchild.cxx @@ -35,8 +35,6 @@ #include <sfx2/sfxsids.hrc> - - void SfxApplication::RegisterChildWindow_Impl( SfxModule *pMod, SfxChildWinFactory *pFact ) { if ( pMod ) @@ -126,7 +124,6 @@ void SfxApplication::RegisterChildWindowContext_Impl( SfxModule *pMod, sal_uInt1 } - SfxChildWinFactArr_Impl& SfxApplication::GetChildWinFactories_Impl() const { return ( *(pAppData_Impl->pFactArr)); diff --git a/sfx2/source/appl/appdde.cxx b/sfx2/source/appl/appdde.cxx index b90122788e58..59bb5f6ed917 100644 --- a/sfx2/source/appl/appdde.cxx +++ b/sfx2/source/appl/appdde.cxx @@ -376,7 +376,6 @@ bool SfxObjectShell::DdeGetData( const OUString&, // the Item to be } - /* [Description] This method can be overridden by application developers, to receive diff --git a/sfx2/source/appl/appinit.cxx b/sfx2/source/appl/appinit.cxx index 2b9ebd1f1dcc..1434494c09dd 100644 --- a/sfx2/source/appl/appinit.cxx +++ b/sfx2/source/appl/appinit.cxx @@ -151,7 +151,6 @@ Sequence< OUString > SAL_CALL SfxTerminateListener_Impl::getSupportedServiceName } - typedef bool ( *PFunc_getSpecialCharsForEdit)( vcl::Window* i_pParent, const vcl::Font& i_rFont, OUString& o_rOutString ); @@ -199,7 +198,6 @@ OUString GetSpecialCharsForEdit(vcl::Window* pParent, const vcl::Font& rFont) } - void SfxApplication::Initialize_Impl() { #ifdef TLX_VALIDATE diff --git a/sfx2/source/appl/appmain.cxx b/sfx2/source/appl/appmain.cxx index ed854b65d672..d70a95231d52 100644 --- a/sfx2/source/appl/appmain.cxx +++ b/sfx2/source/appl/appmain.cxx @@ -43,7 +43,6 @@ #include "workwin.hxx" - SfxFilterMatcher& SfxApplication::GetFilterMatcher() { if( !pAppData_Impl->pMatcher ) diff --git a/sfx2/source/appl/appopen.cxx b/sfx2/source/appl/appopen.cxx index b7bf6f79d761..61b7dcd3fadc 100644 --- a/sfx2/source/appl/appopen.cxx +++ b/sfx2/source/appl/appopen.cxx @@ -145,7 +145,6 @@ private: } - ::comphelper::DocPasswordVerifierResult SfxDocPasswordVerifier::verifyEncryptionData( const uno::Sequence< beans::NamedValue >& rEncryptionData ) { ::comphelper::DocPasswordVerifierResult eResult = ::comphelper::DocPasswordVerifierResult_WRONG_PASSWORD; @@ -177,9 +176,6 @@ private: } - - - sal_uInt32 CheckPasswd_Impl ( SfxObjectShell* pDoc, @@ -282,8 +278,6 @@ sal_uInt32 CheckPasswd_Impl } - - sal_uIntPtr SfxApplication::LoadTemplate( SfxObjectShellLock& xDoc, const OUString &rFileName, bool bCopy, SfxItemSet* pSet ) { const SfxFilter* pFilter = nullptr; @@ -408,7 +402,6 @@ sal_uIntPtr SfxApplication::LoadTemplate( SfxObjectShellLock& xDoc, const OUStri } - void SfxApplication::NewDocDirectExec_Impl( SfxRequest& rReq ) { const SfxStringItem* pFactoryItem = rReq.GetArg<SfxStringItem>(SID_NEWDOCDIRECT); @@ -441,7 +434,6 @@ void SfxApplication::NewDocDirectExec_Impl( SfxRequest& rReq ) } - void SfxApplication::NewDocExec_Impl( SfxRequest& rReq ) { // No Parameter from BASIC only Factory given? @@ -547,7 +539,6 @@ void SfxApplication::NewDocExec_Impl( SfxRequest& rReq ) } - namespace { /** diff --git a/sfx2/source/appl/appreg.cxx b/sfx2/source/appl/appreg.cxx index a77744082c55..44e571f8b719 100644 --- a/sfx2/source/appl/appreg.cxx +++ b/sfx2/source/appl/appreg.cxx @@ -40,7 +40,6 @@ #include <sfx2/mnuitem.hxx> - void SfxApplication::Registrations_Impl() { // Interfaces @@ -63,7 +62,6 @@ void SfxApplication::Registrations_Impl() } - void SfxApplication::RegisterToolBoxControl_Impl( SfxModule *pMod, const SfxTbxCtrlFactory& rFact ) { if ( pMod ) @@ -88,7 +86,6 @@ void SfxApplication::RegisterToolBoxControl_Impl( SfxModule *pMod, const SfxTbxC } - void SfxApplication::RegisterStatusBarControl_Impl( SfxModule *pMod, const SfxStbCtrlFactory& rFact ) { if ( pMod ) @@ -113,7 +110,6 @@ void SfxApplication::RegisterStatusBarControl_Impl( SfxModule *pMod, const SfxSt } - void SfxApplication::RegisterMenuControl_Impl( SfxModule *pMod, const SfxMenuCtrlFactory& rFact ) { if ( pMod ) diff --git a/sfx2/source/appl/appserv.cxx b/sfx2/source/appl/appserv.cxx index 040374870fa6..cd18dbc29eb7 100644 --- a/sfx2/source/appl/appserv.cxx +++ b/sfx2/source/appl/appserv.cxx @@ -689,7 +689,6 @@ void SfxApplication::MiscExec_Impl( SfxRequest& rReq ) } - void SfxApplication::MiscState_Impl(SfxItemSet &rSet) { const sal_uInt16 *pRanges = rSet.GetRanges(); diff --git a/sfx2/source/appl/appuno.cxx b/sfx2/source/appl/appuno.cxx index 42f4b5434701..fc2ceb42fb98 100644 --- a/sfx2/source/appl/appuno.cxx +++ b/sfx2/source/appl/appuno.cxx @@ -1671,7 +1671,6 @@ uno::Sequence< beans::PropertyValue > SAL_CALL } - RequestFilterOptions::RequestFilterOptions( uno::Reference< frame::XModel > rModel, const uno::Sequence< beans::PropertyValue >& rProperties ) { diff --git a/sfx2/source/appl/childwin.cxx b/sfx2/source/appl/childwin.cxx index f744948f6eec..650057fda829 100644 --- a/sfx2/source/appl/childwin.cxx +++ b/sfx2/source/appl/childwin.cxx @@ -68,7 +68,6 @@ struct SfxChildWindow_Impl }; - class DisposeListener : public ::cppu::WeakImplHelper< css::lang::XEventListener > { public: @@ -112,7 +111,6 @@ class DisposeListener : public ::cppu::WeakImplHelper< css::lang::XEventListener }; - bool GetPosSizeFromString( const OUString& rStr, Point& rPos, Size& rSize ) { if ( comphelper::string::getTokenCount(rStr, '/') != 4 ) diff --git a/sfx2/source/appl/fileobj.cxx b/sfx2/source/appl/fileobj.cxx index e65276830c0a..895b5c9ed0b4 100644 --- a/sfx2/source/appl/fileobj.cxx +++ b/sfx2/source/appl/fileobj.cxx @@ -558,7 +558,6 @@ bool SvFileObject::IsDataComplete() const } - void SvFileObject::CancelTransfers() { // unsubscribe from the cache if in the middle of loading diff --git a/sfx2/source/appl/helpdispatch.cxx b/sfx2/source/appl/helpdispatch.cxx index 25ac27d7497d..57e11602715e 100644 --- a/sfx2/source/appl/helpdispatch.cxx +++ b/sfx2/source/appl/helpdispatch.cxx @@ -41,7 +41,6 @@ HelpDispatch_Impl::HelpDispatch_Impl( HelpInterceptor_Impl& _rInterceptor, } - HelpDispatch_Impl::~HelpDispatch_Impl() { } @@ -88,7 +87,6 @@ void SAL_CALL HelpDispatch_Impl::dispatch( } - void SAL_CALL HelpDispatch_Impl::addStatusListener( const Reference< XStatusListener >& xControl, const URL& aURL ) throw( RuntimeException, std::exception ) @@ -99,7 +97,6 @@ void SAL_CALL HelpDispatch_Impl::addStatusListener( } - void SAL_CALL HelpDispatch_Impl::removeStatusListener( const Reference< XStatusListener >& xControl, const URL& aURL ) throw( RuntimeException, std::exception ) diff --git a/sfx2/source/appl/helpinterceptor.cxx b/sfx2/source/appl/helpinterceptor.cxx index cb7c58680a44..b8f63d69b1ff 100644 --- a/sfx2/source/appl/helpinterceptor.cxx +++ b/sfx2/source/appl/helpinterceptor.cxx @@ -46,7 +46,6 @@ HelpInterceptor_Impl::HelpInterceptor_Impl() : } - HelpInterceptor_Impl::~HelpInterceptor_Impl() { if ( m_pHistory ) @@ -58,7 +57,6 @@ HelpInterceptor_Impl::~HelpInterceptor_Impl() } - void HelpInterceptor_Impl::addURL( const OUString& rURL ) { if ( !m_pHistory ) @@ -103,7 +101,6 @@ void HelpInterceptor_Impl::addURL( const OUString& rURL ) } - void HelpInterceptor_Impl::setInterception( Reference< XFrame > xFrame ) { m_xIntercepted.set( xFrame, UNO_QUERY ); @@ -113,7 +110,6 @@ void HelpInterceptor_Impl::setInterception( Reference< XFrame > xFrame ) } - bool HelpInterceptor_Impl::HasHistoryPred() const { return m_pHistory && ( m_nCurPos > 0 ); @@ -125,7 +121,6 @@ bool HelpInterceptor_Impl::HasHistorySucc() const } - // XDispatchProvider Reference< XDispatch > SAL_CALL HelpInterceptor_Impl::queryDispatch( @@ -152,7 +147,6 @@ Reference< XDispatch > SAL_CALL HelpInterceptor_Impl::queryDispatch( } - Sequence < Reference < XDispatch > > SAL_CALL HelpInterceptor_Impl::queryDispatches( const Sequence< DispatchDescriptor >& aDescripts ) @@ -182,7 +176,6 @@ Reference< XDispatchProvider > SAL_CALL HelpInterceptor_Impl::getSlaveDispatchPr } - void SAL_CALL HelpInterceptor_Impl::setSlaveDispatchProvider( const Reference< XDispatchProvider >& xNewSlave ) throw( RuntimeException, std::exception ) @@ -192,7 +185,6 @@ void SAL_CALL HelpInterceptor_Impl::setSlaveDispatchProvider( const Reference< X } - Reference< XDispatchProvider > SAL_CALL HelpInterceptor_Impl::getMasterDispatchProvider() throw( RuntimeException, std::exception ) @@ -202,7 +194,6 @@ Reference< XDispatchProvider > SAL_CALL HelpInterceptor_Impl::getMasterDispatchP } - void SAL_CALL HelpInterceptor_Impl::setMasterDispatchProvider( const Reference< XDispatchProvider >& xNewMaster ) throw( RuntimeException, std::exception ) @@ -264,7 +255,6 @@ void SAL_CALL HelpInterceptor_Impl::dispatch( } - void SAL_CALL HelpInterceptor_Impl::addStatusListener( const Reference< XStatusListener >& xControl, const URL& ) throw( RuntimeException, std::exception ) { @@ -273,7 +263,6 @@ void SAL_CALL HelpInterceptor_Impl::addStatusListener( } - void SAL_CALL HelpInterceptor_Impl::removeStatusListener( const Reference< XStatusListener >&, const URL&) throw( RuntimeException, std::exception ) { @@ -289,7 +278,6 @@ HelpListener_Impl::HelpListener_Impl( HelpInterceptor_Impl* pInter ) } - void SAL_CALL HelpListener_Impl::statusChanged( const css::frame::FeatureStateEvent& Event ) throw( css::uno::RuntimeException, std::exception ) { @@ -299,7 +287,6 @@ void SAL_CALL HelpListener_Impl::statusChanged( const css::frame::FeatureStateEv } - void SAL_CALL HelpListener_Impl::disposing( const css::lang::EventObject& ) throw( css::uno::RuntimeException, std::exception ) { diff --git a/sfx2/source/appl/helpinterceptor.hxx b/sfx2/source/appl/helpinterceptor.hxx index 442b5fb4d3ca..86af5a62201d 100644 --- a/sfx2/source/appl/helpinterceptor.hxx +++ b/sfx2/source/appl/helpinterceptor.hxx @@ -77,7 +77,6 @@ public: OUString GetCurrentURL() const { return m_aCurrentURL; } - const css::uno::Any& GetViewData()const {return m_aViewData;} bool HasHistoryPred() const; // is there a predecessor for the current in the history diff --git a/sfx2/source/appl/linkmgr2.cxx b/sfx2/source/appl/linkmgr2.cxx index 6f1baf276bbb..2794ea263d55 100644 --- a/sfx2/source/appl/linkmgr2.cxx +++ b/sfx2/source/appl/linkmgr2.cxx @@ -103,7 +103,6 @@ void LinkManager::CloseCachedComps() } - void LinkManager::Remove( SvBaseLink *pLink ) { // No duplicate links inserted @@ -344,7 +343,6 @@ void LinkManager::UpdateAllLinks( } - SvLinkSourceRef LinkManager::CreateObj( SvBaseLink * pLink ) { switch( pLink->GetObjType() ) @@ -510,7 +508,6 @@ SotClipboardFormatId LinkManager::RegisterStatusInfoId() } - bool LinkManager::GetGraphicFromAny( const OUString& rMimeType, const css::uno::Any & rValue, Graphic& rGrf ) @@ -554,7 +551,6 @@ bool LinkManager::GetGraphicFromAny( const OUString& rMimeType, } - OUString lcl_DDE_RelToAbs( const OUString& rTopic, const OUString& rBaseURL ) { OUString sRet; @@ -694,5 +690,4 @@ bool SvxInternalLink::Connect( sfx2::SvBaseLink* pLink ) } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sfx2/source/appl/lnkbase2.cxx b/sfx2/source/appl/lnkbase2.cxx index d0344768bff4..e24af8c885d8 100644 --- a/sfx2/source/appl/lnkbase2.cxx +++ b/sfx2/source/appl/lnkbase2.cxx @@ -121,7 +121,6 @@ public: }; - SvBaseLink::SvBaseLink() : pImpl ( new BaseLink_Impl ), m_bIsReadOnly(false) @@ -133,7 +132,6 @@ SvBaseLink::SvBaseLink() } - SvBaseLink::SvBaseLink( SfxLinkUpdateMode nUpdateMode, SotClipboardFormatId nContentType ) : pImpl( new BaseLink_Impl ), m_bIsReadOnly(false) @@ -255,7 +253,6 @@ IMPL_LINK_TYPED( SvBaseLink, EndEditHdl, const OUString&, _rNewName, void ) } - void SvBaseLink::SetObjType( sal_uInt16 nObjTypeP ) { DBG_ASSERT( nObjType != OBJECT_CLIENT_DDE, "type already set" ); @@ -265,14 +262,12 @@ void SvBaseLink::SetObjType( sal_uInt16 nObjTypeP ) } - void SvBaseLink::SetName( const OUString & rNm ) { aLinkName = rNm; } - void SvBaseLink::SetObj( SvLinkSource * pObj ) { DBG_ASSERT( (nObjType & OBJECT_CLIENT_SO && @@ -283,7 +278,6 @@ void SvBaseLink::SetObj( SvLinkSource * pObj ) } - void SvBaseLink::SetLinkSourceName( const OUString & rLnkNm ) { if( aLinkName == rLnkNm ) @@ -301,10 +295,6 @@ void SvBaseLink::SetLinkSourceName( const OUString & rLnkNm ) } - - - - void SvBaseLink::SetUpdateMode( SfxLinkUpdateMode nMode ) { if( ( OBJECT_CLIENT_SO & nObjType ) && diff --git a/sfx2/source/appl/module.cxx b/sfx2/source/appl/module.cxx index 5e2e7ad44c8e..6ddcf09c77c7 100644 --- a/sfx2/source/appl/module.cxx +++ b/sfx2/source/appl/module.cxx @@ -175,7 +175,6 @@ void SfxModule::Construct_Impl() } - SfxModule::~SfxModule() { if( !bDummy ) @@ -202,14 +201,12 @@ SfxModule::~SfxModule() } - SfxSlotPool* SfxModule::GetSlotPool() const { return pImpl->pSlotPool; } - void SfxModule::RegisterChildWindow(SfxChildWinFactory *pFact) { DBG_ASSERT( pImpl, "No real Module!" ); @@ -231,7 +228,6 @@ void SfxModule::RegisterChildWindow(SfxChildWinFactory *pFact) } - void SfxModule::RegisterToolBoxControl( const SfxTbxCtrlFactory& rFact ) { if (!pImpl->pTbxCtrlFac) @@ -253,7 +249,6 @@ void SfxModule::RegisterToolBoxControl( const SfxTbxCtrlFactory& rFact ) } - void SfxModule::RegisterStatusBarControl( const SfxStbCtrlFactory& rFact ) { if (!pImpl->pStbCtrlFac) @@ -275,7 +270,6 @@ void SfxModule::RegisterStatusBarControl( const SfxStbCtrlFactory& rFact ) } - void SfxModule::RegisterMenuControl( const SfxMenuCtrlFactory& rFact ) { if (!pImpl->pMenuCtrlFac) @@ -297,28 +291,24 @@ void SfxModule::RegisterMenuControl( const SfxMenuCtrlFactory& rFact ) } - SfxTbxCtrlFactArr_Impl* SfxModule::GetTbxCtrlFactories_Impl() const { return pImpl->pTbxCtrlFac; } - SfxStbCtrlFactArr_Impl* SfxModule::GetStbCtrlFactories_Impl() const { return pImpl->pStbCtrlFac; } - SfxMenuCtrlFactArr_Impl* SfxModule::GetMenuCtrlFactories_Impl() const { return pImpl->pMenuCtrlFac; } - SfxChildWinFactArr_Impl* SfxModule::GetChildWinFactories_Impl() const { return pImpl->pFactArr; diff --git a/sfx2/source/appl/newhelp.cxx b/sfx2/source/appl/newhelp.cxx index d6eabd4ea63a..506bd1b427b8 100644 --- a/sfx2/source/appl/newhelp.cxx +++ b/sfx2/source/appl/newhelp.cxx @@ -339,7 +339,6 @@ void ContentListBox_Impl::InitRoot() } - void ContentListBox_Impl::ClearChildren( SvTreeListEntry* pParent ) { SvTreeListEntry* pEntry = FirstChild( pParent ); @@ -352,7 +351,6 @@ void ContentListBox_Impl::ClearChildren( SvTreeListEntry* pParent ) } - void ContentListBox_Impl::RequestingChildren( SvTreeListEntry* pParent ) { try @@ -398,7 +396,6 @@ void ContentListBox_Impl::RequestingChildren( SvTreeListEntry* pParent ) } - bool ContentListBox_Impl::Notify( NotifyEvent& rNEvt ) { bool bHandled = false; @@ -413,7 +410,6 @@ bool ContentListBox_Impl::Notify( NotifyEvent& rNEvt ) } - OUString ContentListBox_Impl::GetSelectEntry() const { OUString aRet; @@ -513,7 +509,6 @@ void IndexBox_Impl::UserDraw( const UserDrawEvent& rUDEvt ) } - bool IndexBox_Impl::Notify( NotifyEvent& rNEvt ) { bool bHandled = false; @@ -528,7 +523,6 @@ bool IndexBox_Impl::Notify( NotifyEvent& rNEvt ) } - void IndexBox_Impl::SelectExecutableEntry() { sal_Int32 nPos = GetEntryPos( GetText() ); @@ -583,7 +577,6 @@ void IndexTabPage_Impl::dispose() } - namespace sfx2 { typedef std::unordered_map< OUString, int, OUStringHash > KeywordInfo; @@ -609,7 +602,6 @@ namespace sfx2 { m_pIndexCB->SetEntryData( nPos, NEW_ENTRY( aRefList[j], insert ) ); - void IndexTabPage_Impl::InitializeIndex() { WaitObject aWaitCursor( this ); @@ -726,7 +718,6 @@ void IndexTabPage_Impl::InitializeIndex() #undef UNIFY_AND_INSERT_TOKEN - void IndexTabPage_Impl::ClearIndex() { const sal_Int32 nCount = m_pIndexCB->GetEntryCount(); @@ -796,7 +787,6 @@ void IndexTabPage_Impl::SetFactory( const OUString& rFactory ) } - OUString IndexTabPage_Impl::GetSelectEntry() const { OUString aRet; @@ -807,7 +797,6 @@ OUString IndexTabPage_Impl::GetSelectEntry() const } - void IndexTabPage_Impl::SetKeyword( const OUString& rKeyword ) { sKeyword = rKeyword; @@ -819,7 +808,6 @@ void IndexTabPage_Impl::SetKeyword( const OUString& rKeyword ) } - bool IndexTabPage_Impl::HasKeyword() const { bool bRet = false; @@ -833,7 +821,6 @@ bool IndexTabPage_Impl::HasKeyword() const } - bool IndexTabPage_Impl::HasKeywordIgnoreCase() { bool bRet = false; @@ -857,7 +844,6 @@ bool IndexTabPage_Impl::HasKeywordIgnoreCase() } - void IndexTabPage_Impl::OpenKeyword() { if ( !sKeyword.isEmpty() ) @@ -894,7 +880,6 @@ bool SearchBox_Impl::PreNotify( NotifyEvent& rNEvt ) } - void SearchBox_Impl::Select() { if ( !IsTravelSelect() ) @@ -1012,7 +997,6 @@ void SearchTabPage_Impl::dispose() } - void SearchTabPage_Impl::ClearSearchResults() { const sal_Int32 nCount = m_pResultsLB->GetEntryCount(); @@ -1023,7 +1007,6 @@ void SearchTabPage_Impl::ClearSearchResults() } - void SearchTabPage_Impl::RememberSearchText( const OUString& rSearchText ) { for ( sal_Int32 i = 0; i < m_pSearchED->GetEntryCount(); ++i ) @@ -1039,7 +1022,6 @@ void SearchTabPage_Impl::RememberSearchText( const OUString& rSearchText ) } - IMPL_LINK_NOARG_TYPED(SearchTabPage_Impl, ClickHdl, Button*, void) { SearchHdl(nullptr); @@ -1111,7 +1093,6 @@ void SearchTabPage_Impl::SetDoubleClickHdl( const Link<ListBox&,void>& rLink ) } - OUString SearchTabPage_Impl::GetSelectEntry() const { OUString aRet; @@ -1122,7 +1103,6 @@ OUString SearchTabPage_Impl::GetSelectEntry() const } - void SearchTabPage_Impl::ClearPage() { ClearSearchResults(); @@ -1130,7 +1110,6 @@ void SearchTabPage_Impl::ClearPage() } - bool SearchTabPage_Impl::OpenKeyword( const OUString& rKeyword ) { bool bRet = false; @@ -1204,7 +1183,6 @@ void BookmarksBox_Impl::dispose() } - void BookmarksBox_Impl::DoAction( sal_uInt16 nAction ) { switch ( nAction ) @@ -1255,7 +1233,6 @@ void BookmarksBox_Impl::DoAction( sal_uInt16 nAction ) } - bool BookmarksBox_Impl::Notify( NotifyEvent& rNEvt ) { bool bRet = false; @@ -1363,7 +1340,6 @@ OUString BookmarksTabPage_Impl::GetSelectEntry() const } - void BookmarksTabPage_Impl::AddBookmarks( const OUString& rTitle, const OUString& rURL ) { OUString aImageURL = IMAGE_URL; @@ -1471,7 +1447,6 @@ SfxHelpIndexWindow_Impl::SfxHelpIndexWindow_Impl(SfxHelpWindow_Impl* _pParent) } - SfxHelpIndexWindow_Impl::~SfxHelpIndexWindow_Impl() { disposeOnce(); @@ -1500,7 +1475,6 @@ void SfxHelpIndexWindow_Impl::dispose() } - void SfxHelpIndexWindow_Impl::Initialize() { OUStringBuffer aHelpURL(HELP_URL); @@ -1524,7 +1498,6 @@ void SfxHelpIndexWindow_Impl::Initialize() } - void SfxHelpIndexWindow_Impl::SetActiveFactory() { DBG_ASSERT( pIPage, "index page not initialized" ); @@ -1551,7 +1524,6 @@ void SfxHelpIndexWindow_Impl::SetActiveFactory() } - HelpTabPage_Impl* SfxHelpIndexWindow_Impl::GetCurrentPage( sal_uInt16& rCurId ) { rCurId = m_pTabCtrl->GetCurPageId(); @@ -1707,7 +1679,6 @@ bool SfxHelpIndexWindow_Impl::PreNotify(NotifyEvent& rNEvt) } - void SfxHelpIndexWindow_Impl::DataChanged( const DataChangedEvent& rDCEvt ) { Window::DataChanged( rDCEvt ); @@ -1721,7 +1692,6 @@ void SfxHelpIndexWindow_Impl::DataChanged( const DataChangedEvent& rDCEvt ) } - void SfxHelpIndexWindow_Impl::SetDoubleClickHdl( const Link<Control*,bool>& rLink ) { aPageDoubleClickLink = rLink; @@ -1783,7 +1753,6 @@ void SfxHelpIndexWindow_Impl::AddBookmarks( const OUString& rTitle, const OUStri } - bool SfxHelpIndexWindow_Impl::IsValidFactory( const OUString& _rFactory ) { bool bValid = false; @@ -1800,7 +1769,6 @@ bool SfxHelpIndexWindow_Impl::IsValidFactory( const OUString& _rFactory ) } - void SfxHelpIndexWindow_Impl::ClearSearchPage() { if ( pSPage ) @@ -1954,7 +1922,6 @@ SfxHelpTextWindow_Impl::SfxHelpTextWindow_Impl( SfxHelpWindow_Impl* pParent ) : } - SfxHelpTextWindow_Impl::~SfxHelpTextWindow_Impl() { disposeOnce(); @@ -1975,7 +1942,6 @@ void SfxHelpTextWindow_Impl::dispose() } - bool SfxHelpTextWindow_Impl::HasSelection() const { // is there any selection in the text and not only a cursor? @@ -1992,7 +1958,6 @@ bool SfxHelpTextWindow_Impl::HasSelection() const } - void SfxHelpTextWindow_Impl::InitToolBoxImages() { bool bLarge = SvtMiscOptions().AreCurrentSymbolsLarge(); @@ -2036,7 +2001,6 @@ void SfxHelpTextWindow_Impl::InitToolBoxImages() } - void SfxHelpTextWindow_Impl::InitOnStartupBox( bool bOnlyText ) { sCurrentFactory = SfxHelp::GetCurrentModuleIdentifier(); @@ -2130,7 +2094,6 @@ void SfxHelpTextWindow_Impl::InitOnStartupBox( bool bOnlyText ) } - void SfxHelpTextWindow_Impl::SetOnStartupBoxPosition() { long nX = std::max( GetOutputSizePixel().Width() - aOnStartupCB->GetSizePixel().Width(), nMinPos ); @@ -2140,7 +2103,6 @@ void SfxHelpTextWindow_Impl::SetOnStartupBoxPosition() } - Reference< XBreakIterator > SfxHelpTextWindow_Impl::GetBreakIterator() { if ( !xBreakIterator.is() ) @@ -2150,7 +2112,6 @@ Reference< XBreakIterator > SfxHelpTextWindow_Impl::GetBreakIterator() } - Reference< XTextRange > SfxHelpTextWindow_Impl::getCursor() const { // return the current cursor @@ -2182,7 +2143,6 @@ Reference< XTextRange > SfxHelpTextWindow_Impl::getCursor() const } - bool SfxHelpTextWindow_Impl::isHandledKey( const vcl::KeyCode& _rKeyCode ) { bool bRet = false; @@ -2204,7 +2164,6 @@ bool SfxHelpTextWindow_Impl::isHandledKey( const vcl::KeyCode& _rKeyCode ) } - IMPL_LINK_NOARG_TYPED(SfxHelpTextWindow_Impl, SelectHdl, Idle *, void) { try @@ -2245,7 +2204,6 @@ IMPL_LINK_NOARG_TYPED(SfxHelpTextWindow_Impl, SelectHdl, Idle *, void) } - IMPL_LINK_NOARG_TYPED( SfxHelpTextWindow_Impl, NotifyHdl, LinkParamNone*, void ) { InitToolBoxImages(); @@ -2254,7 +2212,6 @@ IMPL_LINK_NOARG_TYPED( SfxHelpTextWindow_Impl, NotifyHdl, LinkParamNone*, void ) } - IMPL_LINK_TYPED( SfxHelpTextWindow_Impl, FindHdl, sfx2::SearchDialog&, rDlg, void ) { FindHdl(&rDlg); @@ -2340,14 +2297,12 @@ void SfxHelpTextWindow_Impl::FindHdl(sfx2::SearchDialog* pDlg) } - IMPL_LINK_NOARG_TYPED( SfxHelpTextWindow_Impl, CloseHdl, sfx2::SearchDialog*, void ) { pSrchDlg.clear(); } - IMPL_LINK_TYPED( SfxHelpTextWindow_Impl, CheckHdl, Button*, pButton, void ) { CheckBox* pBox = static_cast<CheckBox*>(pButton); @@ -2370,7 +2325,6 @@ IMPL_LINK_TYPED( SfxHelpTextWindow_Impl, CheckHdl, Button*, pButton, void ) } - void SfxHelpTextWindow_Impl::Resize() { Size aSize = GetOutputSizePixel(); @@ -2381,7 +2335,6 @@ void SfxHelpTextWindow_Impl::Resize() } - bool SfxHelpTextWindow_Impl::PreNotify( NotifyEvent& rNEvt ) { bool bDone = false; @@ -2507,7 +2460,6 @@ bool SfxHelpTextWindow_Impl::PreNotify( NotifyEvent& rNEvt ) } - void SfxHelpTextWindow_Impl::GetFocus() { if ( !bIsInClose ) @@ -2529,7 +2481,6 @@ void SfxHelpTextWindow_Impl::GetFocus() } - void SfxHelpTextWindow_Impl::DataChanged( const DataChangedEvent& rDCEvt ) { Window::DataChanged( rDCEvt ); @@ -2544,7 +2495,6 @@ void SfxHelpTextWindow_Impl::DataChanged( const DataChangedEvent& rDCEvt ) } - void SfxHelpTextWindow_Impl::ToggleIndex( bool bOn ) { bIsIndexOn = bOn; @@ -2561,7 +2511,6 @@ void SfxHelpTextWindow_Impl::ToggleIndex( bool bOn ) } - void SfxHelpTextWindow_Impl::SelectSearchText( const OUString& rSearchText, bool _bIsFullWordSearch ) { aSearchText = rSearchText; @@ -2570,7 +2519,6 @@ void SfxHelpTextWindow_Impl::SelectSearchText( const OUString& rSearchText, bool } - void SfxHelpTextWindow_Impl::SetPageStyleHeaderOff() const { #ifdef DBG_UTIL @@ -2631,7 +2579,6 @@ void SfxHelpTextWindow_Impl::SetPageStyleHeaderOff() const } - void SfxHelpTextWindow_Impl::CloseFrame() { bIsInClose = true; @@ -2647,7 +2594,6 @@ void SfxHelpTextWindow_Impl::CloseFrame() } - void SfxHelpTextWindow_Impl::DoSearch() { if ( !pSrchDlg ) @@ -2678,7 +2624,6 @@ void SfxHelpWindow_Impl::Resize() } - void SfxHelpWindow_Impl::Split() { static long nMinSplitSize = 5; @@ -2773,7 +2718,6 @@ void SfxHelpWindow_Impl::MakeLayout() } - void SfxHelpWindow_Impl::InitSizes() { if ( xWindow.is() ) @@ -2795,7 +2739,6 @@ void SfxHelpWindow_Impl::InitSizes() } - void SfxHelpWindow_Impl::LoadConfig() { SvtViewOptions aViewOpt( E_WINDOW, CONFIGNAME_HELPWIN ); @@ -2833,7 +2776,6 @@ void SfxHelpWindow_Impl::LoadConfig() } - void SfxHelpWindow_Impl::SaveConfig() { SvtViewOptions aViewOpt( E_WINDOW, CONFIGNAME_HELPWIN ); @@ -2866,7 +2808,6 @@ void SfxHelpWindow_Impl::SaveConfig() } - void SfxHelpWindow_Impl::ShowStartPage() { OUString sHelpURL = SfxHelpWindow_Impl::buildHelpURL(pIndexWin->GetFactory(), @@ -2877,7 +2818,6 @@ void SfxHelpWindow_Impl::ShowStartPage() } - IMPL_LINK_TYPED( SfxHelpWindow_Impl, SelectHdl, ToolBox* , pToolBox, void ) { if ( pToolBox ) @@ -2888,7 +2828,6 @@ IMPL_LINK_TYPED( SfxHelpWindow_Impl, SelectHdl, ToolBox* , pToolBox, void ) } - IMPL_LINK_NOARG_TYPED(SfxHelpWindow_Impl, OpenHdl, Control*, bool) { pIndexWin->SelectExecutableEntry(); @@ -2930,7 +2869,6 @@ IMPL_LINK_NOARG_TYPED(SfxHelpWindow_Impl, OpenHdl, Control*, bool) } - IMPL_LINK_TYPED( SfxHelpWindow_Impl, SelectFactoryHdl, SfxHelpIndexWindow_Impl* , pWin, void ) { if ( sTitle.isEmpty() ) @@ -2948,14 +2886,12 @@ IMPL_LINK_TYPED( SfxHelpWindow_Impl, SelectFactoryHdl, SfxHelpIndexWindow_Impl* } - IMPL_LINK_TYPED( SfxHelpWindow_Impl, ChangeHdl, HelpListener_Impl&, rListener, void ) { SetFactory( rListener.GetFactory() ); } - void SfxHelpWindow_Impl::openDone(const OUString& sURL , bool bSuccess) { @@ -3008,7 +2944,6 @@ void SfxHelpWindow_Impl::openDone(const OUString& sURL , } - SfxHelpWindow_Impl::SfxHelpWindow_Impl( const css::uno::Reference < css::frame::XFrame2 >& rFrame, vcl::Window* pParent, WinBits ) : @@ -3050,7 +2985,6 @@ SfxHelpWindow_Impl::SfxHelpWindow_Impl( } - SfxHelpWindow_Impl::~SfxHelpWindow_Impl() { disposeOnce(); @@ -3101,7 +3035,6 @@ void SfxHelpWindow_Impl::SetFactory( const OUString& rFactory ) } - void SfxHelpWindow_Impl::SetHelpURL( const OUString& rURL ) { INetURLObject aObj( rURL ); @@ -3110,7 +3043,6 @@ void SfxHelpWindow_Impl::SetHelpURL( const OUString& rURL ) } - void SfxHelpWindow_Impl::DoAction( sal_uInt16 nActionId ) { switch ( nActionId ) @@ -3211,7 +3143,6 @@ void SfxHelpWindow_Impl::DoAction( sal_uInt16 nActionId ) } - void SfxHelpWindow_Impl::CloseWindow() { try @@ -3238,7 +3169,6 @@ void SfxHelpWindow_Impl::CloseWindow() } - void SfxHelpWindow_Impl::UpdateToolbox() { pTextWin->GetToolBox().EnableItem( TBI_BACKWARD, pHelpInterceptor->HasHistoryPred() ); @@ -3246,14 +3176,12 @@ void SfxHelpWindow_Impl::UpdateToolbox() } - bool SfxHelpWindow_Impl::HasHistoryPredecessor() const { return pHelpInterceptor->HasHistoryPred(); } - bool SfxHelpWindow_Impl::HasHistorySuccessor() const { return pHelpInterceptor->HasHistorySucc(); diff --git a/sfx2/source/appl/opengrf.cxx b/sfx2/source/appl/opengrf.cxx index bd42619f9b72..a98514c1dce3 100644 --- a/sfx2/source/appl/opengrf.cxx +++ b/sfx2/source/appl/opengrf.cxx @@ -46,7 +46,6 @@ #include <sfx2/sfxresid.hxx> - using namespace ::com::sun::star; using namespace ::com::sun::star::lang; using namespace ::com::sun::star::ui::dialogs; @@ -54,8 +53,6 @@ using namespace ::com::sun::star::uno; using namespace ::cppu; - - sal_uInt16 SvxOpenGrfErr2ResId( short err ) { switch( err ) diff --git a/sfx2/source/appl/sfxpicklist.cxx b/sfx2/source/appl/sfxpicklist.cxx index 6e07c1bdfe4b..9edb6ff3ea12 100644 --- a/sfx2/source/appl/sfxpicklist.cxx +++ b/sfx2/source/appl/sfxpicklist.cxx @@ -37,7 +37,6 @@ #include <cppuhelper/implbase.hxx> - #include <sfx2/app.hxx> #include "sfxpicklist.hxx" #include <sfx2/sfxuno.hxx> @@ -58,13 +57,11 @@ #include <algorithm> - using namespace ::com::sun::star::uno; using namespace ::com::sun::star::beans; using namespace ::com::sun::star::util; - class StringLength : public ::cppu::WeakImplHelper< XStringWidth > { public: diff --git a/sfx2/source/appl/shutdownicon.cxx b/sfx2/source/appl/shutdownicon.cxx index 13e11cbf25f2..f0836521e270 100644 --- a/sfx2/source/appl/shutdownicon.cxx +++ b/sfx2/source/appl/shutdownicon.cxx @@ -230,7 +230,6 @@ ShutdownIcon::~ShutdownIcon() } - void ShutdownIcon::OpenURL( const OUString& aURL, const OUString& rTarget, const Sequence< PropertyValue >& aArgs ) { if ( getInstance() && getInstance()->m_xDesktop.is() ) @@ -263,7 +262,6 @@ void ShutdownIcon::OpenURL( const OUString& aURL, const OUString& rTarget, const } - void ShutdownIcon::FileOpen() { if ( getInstance() && getInstance()->m_xDesktop.is() ) @@ -275,7 +273,6 @@ void ShutdownIcon::FileOpen() } - void ShutdownIcon::FromTemplate() { if ( getInstance() && getInstance()->m_xDesktop.is() ) @@ -331,7 +328,6 @@ OUString ShutdownIcon::GetResString( int id ) } - OUString ShutdownIcon::GetUrlDescription( const OUString& aUrl ) { ::SolarMutexGuard aGuard; @@ -340,7 +336,6 @@ OUString ShutdownIcon::GetUrlDescription( const OUString& aUrl ) } - void ShutdownIcon::StartFileDialog() { ::SolarMutexGuard aGuard; @@ -363,7 +358,6 @@ void ShutdownIcon::StartFileDialog() } - IMPL_LINK_TYPED( ShutdownIcon, DialogClosedHdl_Impl, FileDialogHelper*, /*unused*/, void ) { DBG_ASSERT( m_pFileDlg, "ShutdownIcon, DialogClosedHdl_Impl(): no file dialog" ); @@ -506,7 +500,6 @@ IMPL_LINK_TYPED( ShutdownIcon, DialogClosedHdl_Impl, FileDialogHelper*, /*unused } - void ShutdownIcon::addTerminateListener() { ShutdownIcon* pInst = getInstance(); @@ -525,7 +518,6 @@ void ShutdownIcon::addTerminateListener() } - void ShutdownIcon::terminateDesktop() { ShutdownIcon* pInst = getInstance(); @@ -550,7 +542,6 @@ void ShutdownIcon::terminateDesktop() } - ShutdownIcon* ShutdownIcon::getInstance() { OSL_ASSERT( pShutdownIcon ); @@ -558,7 +549,6 @@ ShutdownIcon* ShutdownIcon::getInstance() } - ShutdownIcon* ShutdownIcon::createInstance() { if (pShutdownIcon) @@ -591,7 +581,6 @@ void ShutdownIcon::init() throw( css::uno::Exception, std::exception ) } - void SAL_CALL ShutdownIcon::disposing() { m_xContext.clear(); @@ -601,7 +590,6 @@ void SAL_CALL ShutdownIcon::disposing() } - // XEventListener void SAL_CALL ShutdownIcon::disposing( const css::lang::EventObject& ) throw(css::uno::RuntimeException, std::exception) @@ -609,7 +597,6 @@ void SAL_CALL ShutdownIcon::disposing( const css::lang::EventObject& ) } - // XTerminateListener void SAL_CALL ShutdownIcon::queryTermination( const css::lang::EventObject& ) throw(css::frame::TerminationVetoException, css::uno::RuntimeException, std::exception) @@ -622,16 +609,12 @@ throw(css::frame::TerminationVetoException, css::uno::RuntimeException, std::exc } - - void SAL_CALL ShutdownIcon::notifyTermination( const css::lang::EventObject& ) throw(css::uno::RuntimeException, std::exception) { } - - void SAL_CALL ShutdownIcon::initialize( const css::uno::Sequence< css::uno::Any>& aArguments ) throw( css::uno::Exception, std::exception ) { @@ -681,14 +664,12 @@ void SAL_CALL ShutdownIcon::initialize( const css::uno::Sequence< css::uno::Any> } - void ShutdownIcon::EnterModalMode() { bModalMode = true; } - void ShutdownIcon::LeaveModalMode() { bModalMode = false; @@ -712,7 +693,6 @@ bool ShutdownIcon::IsQuickstarterInstalled() #endif // !WNT - #if defined (ENABLE_QUICKSTART_APPLET) && defined (UNX) /** * Return the XDG autostart directory. diff --git a/sfx2/source/appl/shutdowniconw32.cxx b/sfx2/source/appl/shutdowniconw32.cxx index c0096912ed1f..34cfb292c831 100644 --- a/sfx2/source/appl/shutdowniconw32.cxx +++ b/sfx2/source/appl/shutdowniconw32.cxx @@ -89,7 +89,6 @@ typedef struct tagMYITEM } MYITEM; - static void addMenuItem( HMENU hMenu, UINT id, UINT iconId, const OUString& text, int& pos, int bOwnerdraw, const OUString& module ) { MENUITEMINFOW mi; @@ -134,7 +133,6 @@ static void addMenuItem( HMENU hMenu, UINT id, UINT iconId, const OUString& text } - static HMENU createSystrayMenu( ) { SvtModuleOptions aModuleOptions; @@ -200,7 +198,6 @@ static HMENU createSystrayMenu( ) } - // insert the remaining menu entries addMenuItem( hMenu, IDM_TEMPLATE, ICON_TEMPLATE, pShutdownIcon->GetResString( STR_QUICKSTART_FROMTEMPLATE ), pos, true, ""); @@ -218,7 +215,6 @@ static HMENU createSystrayMenu( ) } - static void deleteSystrayMenu( HMENU hMenu ) { if( !hMenu || !IsMenu( hMenu )) @@ -243,7 +239,6 @@ static void deleteSystrayMenu( HMENU hMenu ) } - static void addTaskbarIcon( HWND hWnd ) { OUString strTip; @@ -268,7 +263,6 @@ static void addTaskbarIcon( HWND hWnd ) } - LRESULT CALLBACK listenerWndProc( HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam) { static UINT s_uTaskbarRestart = 0; @@ -387,7 +381,6 @@ LRESULT CALLBACK listenerWndProc( HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lP } - LRESULT CALLBACK executerWndProc( HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam) { switch (uMsg) @@ -445,8 +438,6 @@ LRESULT CALLBACK executerWndProc( HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lP } - - DWORD WINAPI SystrayThread( LPVOID /*lpParam*/ ) { osl_setThreadName("SystrayThread"); @@ -477,7 +468,6 @@ DWORD WINAPI SystrayThread( LPVOID /*lpParam*/ ) } - void win32_init_sys_tray() { if ( ShutdownIcon::IsQuickstarterInstalled() ) @@ -534,7 +524,6 @@ void win32_init_sys_tray() } - void win32_shutdown_sys_tray() { if ( ShutdownIcon::IsQuickstarterInstalled() ) @@ -552,9 +541,6 @@ void win32_shutdown_sys_tray() } - - - void OnMeasureItem(HWND hwnd, LPMEASUREITEMSTRUCT lpmis) { MYITEM *pMyItem = (MYITEM *) lpmis->itemData; diff --git a/sfx2/source/appl/workwin.cxx b/sfx2/source/appl/workwin.cxx index 7f4d5bbb078c..b5d8267da4b8 100644 --- a/sfx2/source/appl/workwin.cxx +++ b/sfx2/source/appl/workwin.cxx @@ -476,7 +476,6 @@ void SfxWorkWindow::Sort_Impl() } - // constructor for workwin of a Frame SfxFrameWorkWin_Impl::SfxFrameWorkWin_Impl( vcl::Window *pWin, SfxFrame *pFrm, SfxFrame* pMaster ) @@ -734,7 +733,6 @@ void SfxFrameWorkWin_Impl::ArrangeChildren_Impl( bool bForce ) } - SvBorder SfxWorkWindow::Arrange_Impl() /* [Description] @@ -899,7 +897,6 @@ bool SfxWorkWindow::PrepareClose_Impl() } - SfxChild_Impl* SfxWorkWindow::RegisterChild_Impl( vcl::Window& rWindow, SfxChildAlignment eAlign, bool bCanGetFocus ) { @@ -922,7 +919,6 @@ SfxChild_Impl* SfxWorkWindow::RegisterChild_Impl( vcl::Window& rWindow, } - void SfxWorkWindow::ReleaseChild_Impl( vcl::Window& rWindow ) { @@ -948,7 +944,6 @@ void SfxWorkWindow::ReleaseChild_Impl( vcl::Window& rWindow ) } - SfxChild_Impl* SfxWorkWindow::FindChild_Impl( const vcl::Window& rWindow ) const { @@ -964,7 +959,6 @@ SfxChild_Impl* SfxWorkWindow::FindChild_Impl( const vcl::Window& rWindow ) const } - void SfxWorkWindow::ShowChildren_Impl() { @@ -1015,7 +1009,6 @@ void SfxWorkWindow::ShowChildren_Impl() } - void SfxWorkWindow::HideChildren_Impl() { for ( sal_uInt16 nPos = aChildren.size(); nPos > 0; --nPos ) @@ -1027,7 +1020,6 @@ void SfxWorkWindow::HideChildren_Impl() } - void SfxWorkWindow::ResetObjectBars_Impl() { sal_uInt16 n; @@ -1092,7 +1084,6 @@ bool SfxWorkWindow::KnowsObjectBar_Impl( sal_uInt16 nPos ) const } - bool SfxWorkWindow::IsVisible_Impl( sal_uInt16 nMode ) const { switch( nUpdateMode ) @@ -1175,7 +1166,6 @@ Reference< css::task::XStatusIndicator > SfxWorkWindow::GetStatusIndicator() } - bool SfxWorkWindow::IsPluginMode( SfxObjectShell* pObjShell ) { if ( pObjShell && pObjShell->GetMedium() ) @@ -1189,7 +1179,6 @@ bool SfxWorkWindow::IsPluginMode( SfxObjectShell* pObjShell ) } - css::uno::Reference< css::frame::XFrame > SfxWorkWindow::GetFrameInterface() { css::uno::Reference< css::frame::XFrame > xFrame; @@ -1206,7 +1195,6 @@ css::uno::Reference< css::frame::XFrame > SfxWorkWindow::GetFrameInterface() } - void SfxWorkWindow::UpdateObjectBars_Impl() { // Lock SplitWindows (which means suppressing the Resize-Reaction of the @@ -1572,7 +1560,6 @@ void SfxWorkWindow::HidePopups_Impl(bool bHide, bool bParent, sal_uInt16 nId ) } - void SfxWorkWindow::ConfigChild_Impl(SfxChildIdentifier eChild, SfxDockingConfig eConfig, sal_uInt16 nId) { @@ -1806,7 +1793,6 @@ void SfxWorkWindow::ConfigChild_Impl(SfxChildIdentifier eChild, } - void SfxWorkWindow::SetChildWindowVisible_Impl( sal_uInt32 lId, bool bEnabled, sal_uInt16 nMode ) { sal_uInt16 nInter = (sal_uInt16) ( lId >> 16 ); @@ -1978,7 +1964,6 @@ void SfxWorkWindow::ToggleChildWindow_Impl(sal_uInt16 nId, bool bSetFocus) } - bool SfxWorkWindow::HasChildWindow_Impl(sal_uInt16 nId) { sal_uInt16 nCount = aChildWins.size(); @@ -2057,7 +2042,6 @@ bool SfxWorkWindow::IsFloating( sal_uInt16 nId ) } - bool SfxWorkWindow::KnowsChildWindow_Impl(sal_uInt16 nId) { SfxChildWin_Impl *pCW=nullptr; @@ -2083,7 +2067,6 @@ bool SfxWorkWindow::KnowsChildWindow_Impl(sal_uInt16 nId) } - void SfxWorkWindow::SetChildWindow_Impl(sal_uInt16 nId, bool bOn, bool bSetFocus) { SfxChildWin_Impl *pCW=nullptr; @@ -2135,7 +2118,6 @@ void SfxWorkWindow::SetChildWindow_Impl(sal_uInt16 nId, bool bOn, bool bSetFocus } - void SfxWorkWindow::ShowChildWindow_Impl(sal_uInt16 nId, bool bVisible, bool bSetFocus) { sal_uInt16 nCount = aChildWins.size(); @@ -2223,7 +2205,6 @@ void SfxWorkWindow::ShowChildWindow_Impl(sal_uInt16 nId, bool bVisible, bool bSe } - SfxChildWindow* SfxWorkWindow::GetChildWindow_Impl(sal_uInt16 nId) { sal_uInt16 nCount = aChildWins.size(); @@ -2240,7 +2221,6 @@ SfxChildWindow* SfxWorkWindow::GetChildWindow_Impl(sal_uInt16 nId) } - void SfxWorkWindow::ResetChildWindows_Impl() { for ( size_t n = 0; n < aChildWins.size(); ++n ) diff --git a/sfx2/source/bastyp/bitset.cxx b/sfx2/source/bastyp/bitset.cxx index b13220507aea..df4c2c726c0d 100644 --- a/sfx2/source/bastyp/bitset.cxx +++ b/sfx2/source/bastyp/bitset.cxx @@ -74,7 +74,6 @@ IndexBitSet& IndexBitSet::operator|=( sal_uInt16 nBit ) } - // determines if the bit is set (may be the only one) bool IndexBitSet::Contains( sal_uInt16 nBit ) const diff --git a/sfx2/source/bastyp/fltfnc.cxx b/sfx2/source/bastyp/fltfnc.cxx index 863b736be192..a2893a524223 100644 --- a/sfx2/source/bastyp/fltfnc.cxx +++ b/sfx2/source/bastyp/fltfnc.cxx @@ -180,20 +180,17 @@ const SfxFilter* SfxFilterContainer::GetAnyFilter( SfxFilterFlags nMust, SfxFilt } - SfxFilterContainer::SfxFilterContainer( const OUString& rName ) : pImpl( new SfxFilterContainer_Impl( rName ) ) { } - SfxFilterContainer::~SfxFilterContainer() { } - const OUString SfxFilterContainer::GetName() const { return pImpl->aName; @@ -253,8 +250,6 @@ const SfxFilter* SfxFilterContainer::GetDefaultFilter_Impl( const OUString& rNam } - - // Impl-Data is shared between all FilterMatchers of the same factory class SfxFilterMatcher_Impl { @@ -377,7 +372,6 @@ const SfxFilter* SfxFilterMatcher::GetAnyFilter( SfxFilterFlags nMust, SfxFilter } - sal_uInt32 SfxFilterMatcher::GuessFilterIgnoringContent( SfxMedium& rMedium, const SfxFilter**ppFilter, @@ -408,14 +402,12 @@ sal_uInt32 SfxFilterMatcher::GuessFilterIgnoringContent( } - sal_uInt32 SfxFilterMatcher::GuessFilter( SfxMedium& rMedium, const SfxFilter**ppFilter, SfxFilterFlags nMust, SfxFilterFlags nDont ) const { return GuessFilterControlDefaultUI( rMedium, ppFilter, nMust, nDont ); } - sal_uInt32 SfxFilterMatcher::GuessFilterControlDefaultUI( SfxMedium& rMedium, const SfxFilter** ppFilter, SfxFilterFlags nMust, SfxFilterFlags nDont, bool /*bDefUI*/ ) const { const SfxFilter* pOldFilter = *ppFilter; @@ -850,7 +842,6 @@ IMPL_LINK_TYPED( SfxFilterMatcher, MaybeFileHdl_Impl, OUString*, pString, bool ) } - SfxFilterMatcherIter::SfxFilterMatcherIter( const SfxFilterMatcher& rMatcher, SfxFilterFlags nOrMaskP, SfxFilterFlags nAndMaskP ) @@ -863,7 +854,6 @@ SfxFilterMatcherIter::SfxFilterMatcherIter( } - const SfxFilter* SfxFilterMatcherIter::Find_Impl() { const SfxFilter* pFilter = nullptr; @@ -886,7 +876,6 @@ const SfxFilter* SfxFilterMatcherIter::First() } - const SfxFilter* SfxFilterMatcherIter::Next() { return Find_Impl(); diff --git a/sfx2/source/bastyp/helper.cxx b/sfx2/source/bastyp/helper.cxx index fb48980d4a7e..eeb981e38a3f 100644 --- a/sfx2/source/bastyp/helper.cxx +++ b/sfx2/source/bastyp/helper.cxx @@ -123,7 +123,6 @@ std::vector<OUString> SfxContentHelper::GetResultSet( const OUString& rURL ) } - std::vector< OUString > SfxContentHelper::GetHelpTreeViewContents( const OUString& rURL ) { vector< OUString > aProperties; @@ -189,7 +188,6 @@ std::vector< OUString > SfxContentHelper::GetHelpTreeViewContents( const OUStrin } - OUString SfxContentHelper::GetActiveHelpString( const OUString& rURL ) { OUStringBuffer aRet; @@ -221,7 +219,6 @@ OUString SfxContentHelper::GetActiveHelpString( const OUString& rURL ) } - bool SfxContentHelper::IsHelpErrorDocument( const OUString& rURL ) { bool bRet = false; @@ -243,7 +240,6 @@ bool SfxContentHelper::IsHelpErrorDocument( const OUString& rURL ) } - sal_Int64 SfxContentHelper::GetSize( const OUString& rContent ) { sal_Int64 nSize = 0; diff --git a/sfx2/source/bastyp/progress.cxx b/sfx2/source/bastyp/progress.cxx index 343d191eb722..5d3700abb547 100644 --- a/sfx2/source/bastyp/progress.cxx +++ b/sfx2/source/bastyp/progress.cxx @@ -72,7 +72,6 @@ struct SfxProgress_Impl }; - void SfxProgress_Impl::Enable_Impl( bool bEnable ) { SfxObjectShell* pDoc = bAllDocs ? nullptr : static_cast<SfxObjectShell*>(xObjSh); @@ -95,7 +94,6 @@ void SfxProgress_Impl::Enable_Impl( bool bEnable ) } - SfxProgress_Impl::SfxProgress_Impl( const OUString &/*rTitle*/ ) : nMax(0) , nCreate(0) @@ -112,7 +110,6 @@ SfxProgress_Impl::SfxProgress_Impl( const OUString &/*rTitle*/ ) } - SfxProgress::SfxProgress ( SfxObjectShell* pObjSh, /* The action is performed on the @@ -169,7 +166,6 @@ SfxProgress::SfxProgress } - SfxProgress::~SfxProgress() /* [Description] @@ -186,7 +182,6 @@ SfxProgress::~SfxProgress() } - void SfxProgress::Stop() /* [Description] @@ -315,7 +310,6 @@ bool SfxProgress::SetState } - void SfxProgress::Resume() /* [Description] @@ -361,7 +355,6 @@ void SfxProgress::Resume() } - void SfxProgress::Suspend() /* [Description] @@ -403,7 +396,6 @@ void SfxProgress::Suspend() } - void SfxProgress::UnLock() { if( pImp->pActiveProgress ) return; @@ -416,7 +408,6 @@ void SfxProgress::UnLock() } - void SfxProgress::Reschedule() /* [Description] @@ -439,7 +430,6 @@ void SfxProgress::Reschedule() } - SfxProgress* SfxProgress::GetActiveProgress ( SfxObjectShell* pDocSh /* the <SfxObjectShell>, which should be @@ -488,14 +478,12 @@ SfxProgress* SfxProgress::GetActiveProgress } - void SfxProgress::EnterLock() { SfxGetpApp()->Get_Impl()->nRescheduleLocks++; } - void SfxProgress::LeaveLock() { SfxAppData_Impl *pImp = SfxGetpApp()->Get_Impl(); diff --git a/sfx2/source/bastyp/sfxresid.cxx b/sfx2/source/bastyp/sfxresid.cxx index efe4e88dd0cd..fd3774f00767 100644 --- a/sfx2/source/bastyp/sfxresid.cxx +++ b/sfx2/source/bastyp/sfxresid.cxx @@ -22,7 +22,6 @@ #include "tools/resmgr.hxx" - static ResMgr* pMgr=nullptr; SfxResId::SfxResId( sal_uInt16 nId ) : diff --git a/sfx2/source/config/evntconf.cxx b/sfx2/source/config/evntconf.cxx index 7613a9ab41cb..babdcf471f4e 100644 --- a/sfx2/source/config/evntconf.cxx +++ b/sfx2/source/config/evntconf.cxx @@ -48,7 +48,6 @@ #include <com/sun/star/uno/Reference.hxx> - using namespace com::sun::star; SfxEventNamesList& SfxEventNamesList::operator=( const SfxEventNamesList& rTbl ) @@ -133,9 +132,6 @@ void SfxEventNamesItem::AddEvent( const OUString& rName, const OUString& rUIName } - - - uno::Any CreateEventData_Impl( const SvxMacro *pMacro ) { /* diff --git a/sfx2/source/control/bindings.cxx b/sfx2/source/control/bindings.cxx index c1d7e5f837a4..07c2d437e7b4 100644 --- a/sfx2/source/control/bindings.cxx +++ b/sfx2/source/control/bindings.cxx @@ -79,7 +79,6 @@ static sal_uInt16 nTimeOut = 300; typedef std::unordered_map< sal_uInt16, bool > InvalidateSlotMap; - typedef std::vector<SfxStateCache*> SfxStateCacheArr_Impl; struct SfxFoundCache_Impl @@ -256,7 +255,6 @@ SfxBindings::SfxBindings() } - SfxBindings::~SfxBindings() /* [Description] @@ -291,7 +289,6 @@ SfxBindings::~SfxBindings() } - void SfxBindings::DeleteControllers_Impl() { // in the first round delete SfxPopupWindows @@ -354,7 +351,6 @@ void SfxBindings::DeleteControllers_Impl() } - void SfxBindings::HidePopups( bool bHide ) { // Hide SfxPopupWindows @@ -389,7 +385,6 @@ void SfxBindings::HidePopupCtrls_Impl( bool bHide ) } - void SfxBindings::Update_Impl ( SfxStateCache* pCache // The up to date SfxStatusCache @@ -447,7 +442,6 @@ void SfxBindings::Update_Impl } - void SfxBindings::InvalidateSlotsInMap_Impl() { InvalidateSlotMap::const_iterator pIter = pImp->m_aInvalidateSlots.begin(); @@ -460,14 +454,12 @@ void SfxBindings::InvalidateSlotsInMap_Impl() } - void SfxBindings::AddSlotToInvalidateSlotsMap_Impl( sal_uInt16 nId ) { pImp->m_aInvalidateSlots[nId] = true; } - void SfxBindings::Update ( sal_uInt16 nId // the bound and up-to-date Slot-Id @@ -530,7 +522,6 @@ void SfxBindings::Update } - void SfxBindings::Update() { DBG_ASSERT( pImp->pCaches != nullptr, "SfxBindings not initialized" ); @@ -554,7 +545,6 @@ void SfxBindings::Update() } - void SfxBindings::SetState ( const SfxItemSet& rSet // status values to be set @@ -598,7 +588,6 @@ void SfxBindings::SetState } - void SfxBindings::SetState ( const SfxPoolItem& rItem // Status value to be set @@ -631,8 +620,6 @@ void SfxBindings::SetState } - - SfxStateCache* SfxBindings::GetAnyStateCache_Impl( sal_uInt16 nId ) { SfxStateCache* pCache = GetStateCache( nId ); @@ -674,7 +661,6 @@ SfxStateCache* SfxBindings::GetStateCache } - void SfxBindings::InvalidateAll ( bool bWithMsg /* true Mark Slot Server as invalid @@ -711,7 +697,6 @@ void SfxBindings::InvalidateAll } - void SfxBindings::Invalidate ( const sal_uInt16* pIds /* numerically sorted NULL-terminated array of @@ -763,7 +748,6 @@ void SfxBindings::Invalidate } - void SfxBindings::InvalidateShell ( const SfxShell& rSh, /* <SfxShell> whose Slot-Ids should be @@ -820,7 +804,6 @@ void SfxBindings::InvalidateShell } - void SfxBindings::Invalidate ( sal_uInt16 nId // Status value to be set @@ -855,7 +838,6 @@ void SfxBindings::Invalidate } - void SfxBindings::Invalidate ( sal_uInt16 nId, // Status value to be set @@ -892,7 +874,6 @@ void SfxBindings::Invalidate } - bool SfxBindings::IsBound( sal_uInt16 nSlotId, sal_uInt16 nStartSearchAt ) { DBG_ASSERT( pImp->pCaches != nullptr, "SfxBindings not initialized" ); @@ -900,7 +881,6 @@ bool SfxBindings::IsBound( sal_uInt16 nSlotId, sal_uInt16 nStartSearchAt ) } - sal_uInt16 SfxBindings::GetSlotPos( sal_uInt16 nId, sal_uInt16 nStartSearchAt ) { DBG_ASSERT( pImp->pCaches != nullptr, "SfxBindings not initialized" ); @@ -1012,7 +992,6 @@ void SfxBindings::Register_Impl( SfxControllerItem& rItem, bool bInternal ) } - void SfxBindings::Release( SfxControllerItem& rItem ) { DBG_ASSERT( pImp->pCaches != nullptr, "SfxBindings not initialized" ); @@ -1276,7 +1255,6 @@ void SfxBindings::Execute_Impl( SfxRequest& aReq, const SfxSlot* pSlot, SfxShell } - void SfxBindings::UpdateSlotServer_Impl() { DBG_ASSERT( pImp->pCaches != nullptr, "SfxBindings not initialized" ); @@ -1308,7 +1286,6 @@ void SfxBindings::UpdateSlotServer_Impl() } - SfxItemSet* SfxBindings::CreateSet_Impl ( SfxStateCache*& pCache, // in: Status-Cache from nId @@ -1442,7 +1419,6 @@ SfxItemSet* SfxBindings::CreateSet_Impl } - void SfxBindings::UpdateControllers_Impl ( const SfxInterface* pIF, // Id of the current serving Interface @@ -1660,7 +1636,6 @@ bool SfxBindings::NextJob_Impl(Timer * pTimer) } - sal_uInt16 SfxBindings::EnterRegistrations(const char *pFile, int nLine) { SAL_INFO( @@ -1771,7 +1746,6 @@ void SfxBindings::LeaveRegistrations( sal_uInt16 nLevel, const char *pFile, int } - void SfxBindings::SetDispatcher( SfxDispatcher *pDisp ) { SfxDispatcher *pOldDispat = pDispatcher; @@ -1837,7 +1811,6 @@ void SfxBindings::SetDispatcher( SfxDispatcher *pDisp ) } - void SfxBindings::ClearCache_Impl( sal_uInt16 nSlotId ) { SfxStateCache* pCache = GetStateCache(nSlotId); @@ -1861,7 +1834,6 @@ void SfxBindings::StartUpdate_Impl( bool bComplete ) } - SfxItemState SfxBindings::QueryState( sal_uInt16 nSlot, std::unique_ptr<SfxPoolItem> &rpState ) { css::uno::Reference< css::frame::XDispatch > xDisp; diff --git a/sfx2/source/control/ctrlitem.cxx b/sfx2/source/control/ctrlitem.cxx index 9f2b6040824c..fb8e7bf8b21d 100644 --- a/sfx2/source/control/ctrlitem.cxx +++ b/sfx2/source/control/ctrlitem.cxx @@ -99,8 +99,6 @@ void SfxControllerItem::BindInternal_Impl( sal_uInt16 nNewId, SfxBindings *pBind } - - void SfxControllerItem::UnBind() /* [Description] @@ -124,7 +122,6 @@ void SfxControllerItem::UnBind() } - void SfxControllerItem::ReBind() /* [Description] @@ -147,7 +144,6 @@ void SfxControllerItem::ReBind() } - void SfxControllerItem::ClearCache() /* [Description] @@ -196,7 +192,6 @@ void SfxControllerItem::SetId( sal_uInt16 nItemId ) } - // creates a atomic item for a controller without registration. SfxControllerItem::SfxControllerItem(): @@ -262,7 +257,6 @@ void SfxControllerItem::StateChanged } - void SfxStatusForwarder::StateChanged ( sal_uInt16 nSID, // <SID> of the triggering slot @@ -275,7 +269,6 @@ void SfxStatusForwarder::StateChanged } - SfxStatusForwarder::SfxStatusForwarder( sal_uInt16 nSlotId, SfxControllerItem& rMaster ): @@ -285,7 +278,6 @@ SfxStatusForwarder::SfxStatusForwarder( } - SfxItemState SfxControllerItem::GetItemState ( const SfxPoolItem* pState /* Pointer to <SfxPoolItem>, which @@ -330,7 +322,6 @@ SfxItemState SfxControllerItem::GetItemState } - SfxMapUnit SfxControllerItem::GetCoreMetric() const /* [Description] diff --git a/sfx2/source/control/minfitem.cxx b/sfx2/source/control/minfitem.cxx index a6f5e438d84e..e734694e5d57 100644 --- a/sfx2/source/control/minfitem.cxx +++ b/sfx2/source/control/minfitem.cxx @@ -22,7 +22,6 @@ SfxPoolItem* SfxMacroInfoItem::CreateDefault() { DBG_ASSERT(false, "No SfxMacroInfItem factory available"); return nullptr; } - SfxMacroInfoItem::SfxMacroInfoItem( sal_uInt16 nWhichId, // Slot-ID const BasicManager* pMgr, @@ -40,7 +39,6 @@ SfxMacroInfoItem::SfxMacroInfoItem( } - // copy constructor SfxMacroInfoItem::SfxMacroInfoItem(const SfxMacroInfoItem& rCopy): @@ -54,7 +52,6 @@ SfxMacroInfoItem::SfxMacroInfoItem(const SfxMacroInfoItem& rCopy): } - // op == bool SfxMacroInfoItem::operator==( const SfxPoolItem& rCmp) const @@ -69,14 +66,12 @@ bool SfxMacroInfoItem::operator==( const SfxPoolItem& rCmp) const } - SfxPoolItem *SfxMacroInfoItem::Clone( SfxItemPool *) const { return new SfxMacroInfoItem(*this); } - OUString SfxMacroInfoItem::GetQualifiedName() const { OUString aMacroName = aLibName; diff --git a/sfx2/source/control/msg.cxx b/sfx2/source/control/msg.cxx index 688c948b5def..947a5276fdfb 100644 --- a/sfx2/source/control/msg.cxx +++ b/sfx2/source/control/msg.cxx @@ -42,7 +42,6 @@ SfxSlotKind SfxSlot::GetKind() const } - sal_uInt16 SfxSlot::GetWhich( const SfxItemPool &rPool ) const { if ( !nMasterSlotId || nMasterSlotId == USHRT_MAX ) diff --git a/sfx2/source/control/msgpool.cxx b/sfx2/source/control/msgpool.cxx index eafca7394d5e..70598d07004e 100644 --- a/sfx2/source/control/msgpool.cxx +++ b/sfx2/source/control/msgpool.cxx @@ -94,7 +94,6 @@ void SfxSlotPool::RegisterInterface( SfxInterface& rInterface ) } - const std::type_info* SfxSlotPool::GetSlotType( sal_uInt16 nId ) const { const SfxSlot* pSlot = (const_cast <SfxSlotPool*> (this))->GetSlot( nId ); @@ -137,7 +136,6 @@ const SfxSlot* SfxSlotPool::GetSlot( sal_uInt16 nId ) } - // skips to the next group OUString SfxSlotPool::SeekGroup( sal_uInt16 nNo ) @@ -181,16 +179,12 @@ OUString SfxSlotPool::SeekGroup( sal_uInt16 nNo ) } - - sal_uInt16 SfxSlotPool::GetGroupCount() { return _pGroups->size(); } - - // internal search loop const SfxSlot* SfxSlotPool::SeekSlot( sal_uInt16 nStartInterface ) @@ -280,7 +274,6 @@ const SfxSlot* SfxSlotPool::NextSlot() } - // Query SlotName with help text @@ -293,8 +286,6 @@ SfxInterface* SfxSlotPool::FirstInterface() } - - const SfxSlot* SfxSlotPool::GetUnoSlot( const OUString& rName ) { const SfxSlot *pSlot = nullptr; diff --git a/sfx2/source/control/objface.cxx b/sfx2/source/control/objface.cxx index ecaebd93e416..ece51f4e1891 100644 --- a/sfx2/source/control/objface.cxx +++ b/sfx2/source/control/objface.cxx @@ -275,7 +275,6 @@ void SfxInterface::SetSlotMap( SfxSlot& rSlotMap, sal_uInt16 nSlotCount ) } - SfxInterface::~SfxInterface() { SfxModule *pMod = pImpData->pModule; @@ -292,7 +291,6 @@ SfxInterface::~SfxInterface() } - // searches for the specified func const SfxSlot* SfxInterface::GetSlot( sal_uInt16 nFuncId ) const @@ -329,7 +327,6 @@ const SfxSlot* SfxInterface::GetSlot( const OUString& rCommand ) const } - const SfxSlot* SfxInterface::GetRealSlot( const SfxSlot *pSlot ) const { @@ -348,7 +345,6 @@ const SfxSlot* SfxInterface::GetRealSlot( const SfxSlot *pSlot ) const } - const SfxSlot* SfxInterface::GetRealSlot( sal_uInt16 nSlotId ) const { @@ -501,8 +497,6 @@ sal_uInt32 SfxInterface::GetChildWindowFeature (sal_uInt16 nNo) const } - - sal_uInt16 SfxInterface::GetChildWindowCount() const { if (pGenoType) diff --git a/sfx2/source/control/querystatus.cxx b/sfx2/source/control/querystatus.cxx index a49315143c6c..2e6fa9801842 100644 --- a/sfx2/source/control/querystatus.cxx +++ b/sfx2/source/control/querystatus.cxx @@ -204,7 +204,6 @@ SfxItemState SfxQueryStatus_Impl::QueryState( SfxPoolItem*& rpPoolItem ) } - SfxQueryStatus::SfxQueryStatus( const Reference< XDispatchProvider >& rDispatchProvider, sal_uInt16 nSlotId, const OUString& rCommand ) { m_pSfxQueryStatusImpl = new SfxQueryStatus_Impl( rDispatchProvider, nSlotId, rCommand ); diff --git a/sfx2/source/control/request.cxx b/sfx2/source/control/request.cxx index a98579171530..119880e37356 100644 --- a/sfx2/source/control/request.cxx +++ b/sfx2/source/control/request.cxx @@ -42,7 +42,6 @@ #include <rtl/strbuf.hxx> - using namespace ::com::sun::star; struct SfxRequest_Impl: public SfxListener @@ -94,8 +93,6 @@ struct SfxRequest_Impl: public SfxListener }; - - void SfxRequest_Impl::Notify( SfxBroadcaster&, const SfxHint &rHint ) { const SfxSimpleHint* pSimpleHint = dynamic_cast<const SfxSimpleHint*>(&rHint); @@ -104,7 +101,6 @@ void SfxRequest_Impl::Notify( SfxBroadcaster&, const SfxHint &rHint ) } - void SfxRequest_Impl::SetPool( SfxItemPool *pNewPool ) { if ( pNewPool != pPool ) @@ -118,8 +114,6 @@ void SfxRequest_Impl::SetPool( SfxItemPool *pNewPool ) } - - SfxRequest::~SfxRequest() { // Leave out Done() marked requests with 'rem' @@ -134,7 +128,6 @@ SfxRequest::~SfxRequest() } - SfxRequest::SfxRequest ( const SfxRequest& rOrig @@ -164,7 +157,6 @@ SfxRequest::SfxRequest } - SfxRequest::SfxRequest ( SfxViewFrame* pViewFrame, @@ -210,8 +202,6 @@ SfxRequest::SfxRequest } - - SfxRequest::SfxRequest ( sal_uInt16 nSlotId, // executed <Slot-Id> @@ -256,7 +246,6 @@ SfxRequest::SfxRequest } - SfxRequest::SfxRequest ( sal_uInt16 nSlotId, @@ -286,14 +275,12 @@ SfxCallMode SfxRequest::GetCallMode() const } - bool SfxRequest::IsSynchronCall() const { return SfxCallMode::SYNCHRON == ( SfxCallMode::SYNCHRON & pImp->nCallMode ); } - void SfxRequest::SetSynchronCall( bool bSynchron ) { if ( bSynchron ) @@ -314,8 +301,6 @@ const SfxItemSet* SfxRequest::GetInternalArgs_Impl() const } - - void SfxRequest_Impl::Record ( const uno::Sequence < beans::PropertyValue >& rArgs // current Parameter @@ -372,7 +357,6 @@ void SfxRequest_Impl::Record } - void SfxRequest::Record_Impl ( SfxShell& rSh, // the <SfxShell>, which has executed the Request @@ -397,7 +381,6 @@ void SfxRequest::Record_Impl } - void SfxRequest::SetArgs( const SfxAllItemSet& rArgs ) { delete pArgs; @@ -406,7 +389,6 @@ void SfxRequest::SetArgs( const SfxAllItemSet& rArgs ) } - void SfxRequest::AppendItem(const SfxPoolItem &rItem) { if(!pArgs) @@ -415,7 +397,6 @@ void SfxRequest::AppendItem(const SfxPoolItem &rItem) } - void SfxRequest::RemoveItem( sal_uInt16 nID ) { if (pArgs) @@ -435,14 +416,12 @@ void SfxRequest::SetReturnValue(const SfxPoolItem &rItem) } - const SfxPoolItem* SfxRequest::GetReturnValue() const { return pImp->pRetVal; } - void SfxRequest::Done ( const SfxItemSet& rSet, /* parameters passed on by the application, @@ -503,8 +482,6 @@ void SfxRequest::Done } - - void SfxRequest::Done( bool bRelease ) // [<SfxRequest::Done(SfxItemSet&)>] { @@ -514,7 +491,6 @@ void SfxRequest::Done( bool bRelease ) } - void SfxRequest::ForgetAllArgs() { DELETEZ( pArgs ); @@ -522,14 +498,12 @@ void SfxRequest::ForgetAllArgs() } - bool SfxRequest::IsCancelled() const { return pImp->bCancelled; } - void SfxRequest::Cancel() /* [Description] @@ -545,8 +519,6 @@ void SfxRequest::Cancel() } - - void SfxRequest::Ignore() /* [Description] @@ -567,7 +539,6 @@ void SfxRequest::Ignore() } - void SfxRequest::Done_Impl ( const SfxItemSet* pSet /* parameters passed on by the application, @@ -682,7 +653,6 @@ void SfxRequest::Done_Impl } - bool SfxRequest::IsDone() const /* [Description] @@ -705,7 +675,6 @@ bool SfxRequest::IsDone() const } - css::uno::Reference< css::frame::XDispatchRecorder > SfxRequest::GetMacroRecorder( SfxViewFrame* pView ) /* [Description] @@ -742,8 +711,6 @@ bool SfxRequest::HasMacroRecorder( SfxViewFrame* pView ) } - - bool SfxRequest::IsAPI() const /* [Description] @@ -769,7 +736,6 @@ sal_uInt16 SfxRequest::GetModifier() const } - void SfxRequest::AllowRecording( bool bSet ) { pImp->bAllowRecording = bSet; diff --git a/sfx2/source/control/sorgitm.cxx b/sfx2/source/control/sorgitm.cxx index bfc2cc6a5020..1d4395fc6d02 100644 --- a/sfx2/source/control/sorgitm.cxx +++ b/sfx2/source/control/sorgitm.cxx @@ -34,7 +34,6 @@ SfxScriptOrganizerItem::SfxScriptOrganizerItem() : } - SfxScriptOrganizerItem::SfxScriptOrganizerItem( const SfxScriptOrganizerItem& rItem ) : SfxStringItem( rItem ), @@ -45,20 +44,17 @@ SfxScriptOrganizerItem::SfxScriptOrganizerItem( const SfxScriptOrganizerItem& rI } - SfxScriptOrganizerItem::~SfxScriptOrganizerItem() { } - SfxPoolItem* SfxScriptOrganizerItem::Clone( SfxItemPool * ) const { return new SfxScriptOrganizerItem( *this ); } - bool SfxScriptOrganizerItem::operator==( const SfxPoolItem& rItem) const { return typeid(rItem) == typeid(*this) && diff --git a/sfx2/source/control/statcach.cxx b/sfx2/source/control/statcach.cxx index 7a47fb645a83..9891d850b40e 100644 --- a/sfx2/source/control/statcach.cxx +++ b/sfx2/source/control/statcach.cxx @@ -317,8 +317,6 @@ const SfxSlotServer* SfxStateCache::GetSlotServer( SfxDispatcher &rDispat , cons } - - // Set Status in all Controllers void SfxStateCache::SetState @@ -340,7 +338,6 @@ void SfxStateCache::SetState } - void SfxStateCache::SetVisibleState( bool bShow ) { if ( bShow != bItemVisible ) @@ -386,7 +383,6 @@ void SfxStateCache::SetVisibleState( bool bShow ) } - void SfxStateCache::SetState_Impl ( SfxItemState eState, // <SfxItemState> from 'pState' @@ -447,7 +443,6 @@ void SfxStateCache::SetState_Impl } - // Set old status again in all the controllers void SfxStateCache::SetCachedState( bool bAlways ) @@ -477,7 +472,6 @@ void SfxStateCache::SetCachedState( bool bAlways ) } - css::uno::Reference< css::frame::XDispatch > SfxStateCache::GetDispatch() const { if ( pDispatch ) diff --git a/sfx2/source/control/templateabstractview.cxx b/sfx2/source/control/templateabstractview.cxx index 544c3e04b111..d0e6ccd61e73 100644 --- a/sfx2/source/control/templateabstractview.cxx +++ b/sfx2/source/control/templateabstractview.cxx @@ -206,8 +206,6 @@ void TemplateAbstractView::insertItems(const std::vector<TemplateItemProperties> } - - void TemplateAbstractView::setOpenRegionHdl(const Link<void*,void> &rLink) { maOpenRegionHdl = rLink; diff --git a/sfx2/source/dialog/backingcomp.cxx b/sfx2/source/dialog/backingcomp.cxx index d62f23d371ff..e25888f4e29e 100644 --- a/sfx2/source/dialog/backingcomp.cxx +++ b/sfx2/source/dialog/backingcomp.cxx @@ -155,13 +155,11 @@ BackingComp::BackingComp( const css::uno::Reference< css::uno::XComponentContext } - BackingComp::~BackingComp() { } - /** return information about supported interfaces. Some interfaces are supported by his class directly, but some other ones are @@ -215,7 +213,6 @@ css::uno::Any SAL_CALL BackingComp::queryInterface( /*IN*/ const css::uno::Type& } - /** increase ref count of this instance. */ @@ -226,7 +223,6 @@ void SAL_CALL BackingComp::acquire() } - /** decrease ref count of this instance. */ @@ -237,7 +233,6 @@ void SAL_CALL BackingComp::release() } - /** return collection about all supported interfaces. Optimize this method ! @@ -287,7 +282,6 @@ css::uno::Sequence< css::uno::Type > SAL_CALL BackingComp::getTypes() } - /** create one unique Id for all instances of this class. Optimize this method @@ -453,7 +447,6 @@ void SAL_CALL BackingComp::attachFrame( /*IN*/ const css::uno::Reference< css::f } - /** not supported. This component does not know any model. It will be represented by a window and @@ -469,7 +462,6 @@ sal_Bool SAL_CALL BackingComp::attachModel( /*IN*/ const css::uno::Reference< cs } - /** not supported. This component does not know any model. It will be represented by a window and @@ -485,7 +477,6 @@ css::uno::Reference< css::frame::XModel > SAL_CALL BackingComp::getModel() } - /** not supported. return An empty value. @@ -498,7 +489,6 @@ css::uno::Any SAL_CALL BackingComp::getViewData() } - /** not supported. @param aData @@ -511,7 +501,6 @@ void SAL_CALL BackingComp::restoreViewData( /*IN*/ const css::uno::Any& ) } - /** returns the attached frame for this component. @see attachFrame() @@ -530,7 +519,6 @@ css::uno::Reference< css::frame::XFrame > SAL_CALL BackingComp::getFrame() } - /** ask controller for its current working state. If someone wishes to close this component, it must suspend the controller before. @@ -552,7 +540,6 @@ sal_Bool SAL_CALL BackingComp::suspend( /*IN*/ sal_Bool ) } - /** callback from our window member. Our internal saved window wish to die. It will be disposed from outside (may be the frame) @@ -588,7 +575,6 @@ void SAL_CALL BackingComp::disposing( /*IN*/ const css::lang::EventObject& aEven } - /** kill this instance. It can be called from our owner frame only. But there is no possibility to check the calli. @@ -640,7 +626,6 @@ void SAL_CALL BackingComp::dispose() } - /** not supported. @param xListener @@ -660,7 +645,6 @@ void SAL_CALL BackingComp::addEventListener( /*IN*/ const css::uno::Reference< c } - /** not supported. Because registration is not supported too, we must do nothing here. Nobody can call this method really. @@ -675,7 +659,6 @@ void SAL_CALL BackingComp::removeEventListener( /*IN*/ const css::uno::Reference } - /** force initialiation for this component. @@ -739,7 +722,6 @@ void SAL_CALL BackingComp::initialize( /*IN*/ const css::uno::Sequence< css::uno } - /** */ @@ -749,7 +731,6 @@ void SAL_CALL BackingComp::keyPressed( /*IN*/ const css::awt::KeyEvent& ) } - /** */ diff --git a/sfx2/source/dialog/basedlgs.cxx b/sfx2/source/dialog/basedlgs.cxx index cd86096f1416..851eb5430938 100644 --- a/sfx2/source/dialog/basedlgs.cxx +++ b/sfx2/source/dialog/basedlgs.cxx @@ -102,7 +102,6 @@ void SfxFloatingWindow_Impl::Notify( SfxBroadcaster&, const SfxHint& rHint ) } - void SfxModalDialog::SetDialogData_Impl() { // save settings (position and user data) @@ -123,7 +122,6 @@ void SfxModalDialog::SetDialogData_Impl() } - void SfxModalDialog::GetDialogData_Impl() /* [Description] @@ -188,7 +186,6 @@ void SfxModalDialog::CreateOutputItemSet( SfxItemPool& rPool ) } - void SfxModalDialog::CreateOutputItemSet( const SfxItemSet& rSet ) { DBG_ASSERT( !pOutputSet, "Double creation of OutputSet!" ); @@ -375,7 +372,6 @@ void SfxModelessDialog::dispose() } - bool SfxModelessDialog::Close() /* [Description] @@ -396,7 +392,6 @@ bool SfxModelessDialog::Close() } - void SfxModelessDialog::FillInfo(SfxChildWinInfo& rInfo) const /* [Description] @@ -415,7 +410,6 @@ void SfxModelessDialog::FillInfo(SfxChildWinInfo& rInfo) const } - bool SfxFloatingWindow::Notify( NotifyEvent& rEvt ) /* [Description] @@ -511,7 +505,6 @@ bool SfxFloatingWindow::Close() } - SfxFloatingWindow::~SfxFloatingWindow() { disposeOnce(); @@ -603,7 +596,6 @@ void SfxFloatingWindow::Initialize(SfxChildWinInfo *pInfo) } - void SfxFloatingWindow::FillInfo(SfxChildWinInfo& rInfo) const /* [Description] @@ -679,7 +671,6 @@ IMPL_LINK_NOARG_TYPED(SfxSingleTabDialog, OKHdl_Impl, Button*, void) } - SfxSingleTabDialog::SfxSingleTabDialog(vcl::Window *pParent, const SfxItemSet& rSet, const OUString& rID, const OUString& rUIXMLDescription) : SfxModalDialog(pParent, rID, rUIXMLDescription) diff --git a/sfx2/source/dialog/dinfdlg.cxx b/sfx2/source/dialog/dinfdlg.cxx index 75e03a572fb0..6287e7141b3e 100644 --- a/sfx2/source/dialog/dinfdlg.cxx +++ b/sfx2/source/dialog/dinfdlg.cxx @@ -276,7 +276,6 @@ SfxDocumentInfoItem::SfxDocumentInfoItem( const OUString& rFile, } - SfxDocumentInfoItem::SfxDocumentInfoItem( const SfxDocumentInfoItem& rItem ) : SfxStringItem( rItem ) , m_AutoloadDelay( rItem.getAutoloadDelay() ) @@ -439,7 +438,6 @@ void SfxDocumentInfoItem::UpdateDocumentInfo( } - void SfxDocumentInfoItem::SetDeleteUserData( bool bSet ) { m_bDeleteUserData = bSet; @@ -1232,7 +1230,6 @@ SfxDocumentInfoDialog::SfxDocumentInfoDialog( vcl::Window* pParent, } - void SfxDocumentInfoDialog::PageCreated( sal_uInt16 nId, SfxTabPage &rPage ) { if ( m_nDocInfoId == nId ) diff --git a/sfx2/source/dialog/dockwin.cxx b/sfx2/source/dialog/dockwin.cxx index 788f7c06c244..d82ffa2ed304 100644 --- a/sfx2/source/dialog/dockwin.cxx +++ b/sfx2/source/dialog/dockwin.cxx @@ -1774,7 +1774,6 @@ SplitWindowItemFlags SfxDockingWindow::GetWinBits_Impl() const } - void SfxDockingWindow::SetItemSize_Impl( const Size& rSize ) { pImp->aSplitSize = rSize; diff --git a/sfx2/source/dialog/filtergrouping.cxx b/sfx2/source/dialog/filtergrouping.cxx index 203c665e4233..f14c57f1fc77 100644 --- a/sfx2/source/dialog/filtergrouping.cxx +++ b/sfx2/source/dialog/filtergrouping.cxx @@ -119,8 +119,6 @@ namespace sfx2 */ - - typedef StringPair FilterDescriptor; // a single filter or a filter class (display name and filter mask) typedef ::std::list< FilterDescriptor > FilterGroup; // a list of single filter entries typedef ::std::list< FilterGroup > GroupedFilterList; // a list of all filters, already grouped @@ -149,7 +147,6 @@ namespace sfx2 // = reading of configuration data - void lcl_ReadFilterClass( const OConfigurationNode& _rClassesNode, const OUString& _rLogicalClassName, FilterClass& /* [out] */ _rClass ) { @@ -337,7 +334,6 @@ namespace sfx2 // = grouping and classifying - // a struct which adds helps remembering a reference to a class entry struct ReferToFilterEntry : public ::std::unary_function< FilterName, void > { @@ -759,7 +755,6 @@ namespace sfx2 // = handling for the "all files" entry - bool lcl_hasAllFilesFilter( TSortedFilterList& _rFilterMatcher, OUString& /* [out] */ _rAllFilterName ) { bool bHasAll = false; @@ -796,7 +791,6 @@ namespace sfx2 // = filling an XFilterManager - struct AppendFilterGroup : public ::std::unary_function< FilterGroup, void > { protected: @@ -1187,5 +1181,4 @@ namespace sfx2 } // namespace sfx2 - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sfx2/source/dialog/itemconnect.cxx b/sfx2/source/dialog/itemconnect.cxx index f5c60ab41896..3335f78d9080 100644 --- a/sfx2/source/dialog/itemconnect.cxx +++ b/sfx2/source/dialog/itemconnect.cxx @@ -38,7 +38,6 @@ TriState lclConvertToTriState( bool bKnown, bool bIsKnownFlag, bool bIsUnknownFl } // namespace - sal_uInt16 ItemWrapperHelper::GetWhichId( const SfxItemSet& rItemSet, sal_uInt16 nSlot ) { return rItemSet.GetPool()->GetWhich( nSlot ); @@ -103,7 +102,6 @@ void DummyWindowWrapper::SetControlValue( void* ) } - CheckBoxWrapper::CheckBoxWrapper( CheckBox& rCheckBox ) : SingleControlWrapperType( rCheckBox ) { @@ -131,7 +129,6 @@ void CheckBoxWrapper::SetControlValue( bool bValue ) } - ColorListBoxWrapper::ColorListBoxWrapper(ColorListBox & rListBox): SingleControlWrapper< ColorListBox, Color >(rListBox) {} @@ -323,7 +320,6 @@ bool ItemConnectionArrayImpl::FillItemSet( SfxItemSet& rDestSet, const SfxItemSe } - ItemConnectionArray::ItemConnectionArray() : mxImpl( new ItemConnectionArrayImpl ) { @@ -354,7 +350,6 @@ bool ItemConnectionArray::FillItemSet( SfxItemSet& rDestSet, const SfxItemSet& r } - } // namespace sfx /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sfx2/source/dialog/mgetempl.cxx b/sfx2/source/dialog/mgetempl.cxx index 0c69f24a4ac7..a5fbf5cdd09d 100644 --- a/sfx2/source/dialog/mgetempl.cxx +++ b/sfx2/source/dialog/mgetempl.cxx @@ -248,7 +248,6 @@ SfxManageStyleSheetPage::SfxManageStyleSheetPage(vcl::Window* pParent, const Sfx } - SfxManageStyleSheetPage::~SfxManageStyleSheetPage() { disposeOnce(); @@ -277,7 +276,6 @@ void SfxManageStyleSheetPage::dispose() } - void SfxManageStyleSheetPage::UpdateName_Impl( ListBox* pBox, const OUString& rNew ) @@ -305,7 +303,6 @@ void SfxManageStyleSheetPage::UpdateName_Impl( ListBox* pBox, } - void SfxManageStyleSheetPage::SetDescriptionText_Impl() /* [Description] @@ -488,7 +485,6 @@ bool SfxManageStyleSheetPage::FillItemSet( SfxItemSet* rSet ) } - void SfxManageStyleSheetPage::Reset( const SfxItemSet* /*rAttrSet*/ ) /* [Description] @@ -557,7 +553,6 @@ void SfxManageStyleSheetPage::Reset( const SfxItemSet* /*rAttrSet*/ ) } - VclPtr<SfxTabPage> SfxManageStyleSheetPage::Create( vcl::Window* pParent, const SfxItemSet *rAttrSet ) { @@ -565,7 +560,6 @@ VclPtr<SfxTabPage> SfxManageStyleSheetPage::Create( vcl::Window* pParent, } - void SfxManageStyleSheetPage::ActivatePage( const SfxItemSet& rSet) /* [Description] @@ -596,7 +590,6 @@ void SfxManageStyleSheetPage::ActivatePage( const SfxItemSet& rSet) } - SfxTabPage::sfxpg SfxManageStyleSheetPage::DeactivatePage( SfxItemSet* pItemSet ) /* [Description] diff --git a/sfx2/source/dialog/partwnd.cxx b/sfx2/source/dialog/partwnd.cxx index 08dfbe6228b3..cff3136c1fd7 100644 --- a/sfx2/source/dialog/partwnd.cxx +++ b/sfx2/source/dialog/partwnd.cxx @@ -139,7 +139,6 @@ SfxPartDockWnd_Impl::SfxPartDockWnd_Impl } - void SfxPartDockWnd_Impl::Resize() /* [Description] @@ -152,7 +151,6 @@ void SfxPartDockWnd_Impl::Resize() } - bool SfxPartDockWnd_Impl::QueryClose() { bool bClose = true; @@ -172,7 +170,6 @@ bool SfxPartDockWnd_Impl::QueryClose() } - bool SfxPartDockWnd_Impl::Notify( NotifyEvent& rEvt ) { if( rEvt.GetType() == MouseNotifyEvent::GETFOCUS ) diff --git a/sfx2/source/dialog/passwd.cxx b/sfx2/source/dialog/passwd.cxx index 0bc687c7842e..9aff690b72ac 100644 --- a/sfx2/source/dialog/passwd.cxx +++ b/sfx2/source/dialog/passwd.cxx @@ -28,7 +28,6 @@ #include "dialog.hrc" - IMPL_LINK_TYPED( SfxPasswordDialog, EditModifyHdl, Edit&, rEdit, void ) { ModifyHdl(&rEdit); @@ -167,7 +166,6 @@ void SfxPasswordDialog::SetPasswdText( ) } - void SfxPasswordDialog::SetMinLen( sal_uInt16 nLen ) { mnMinLen = nLen; @@ -181,7 +179,6 @@ void SfxPasswordDialog::ShowMinLengthText(bool bShow) } - short SfxPasswordDialog::Execute() { mpUserFT->Hide(); diff --git a/sfx2/source/dialog/securitypage.cxx b/sfx2/source/dialog/securitypage.cxx index 29ff9e2a551c..23a9fd3f5d79 100644 --- a/sfx2/source/dialog/securitypage.cxx +++ b/sfx2/source/dialog/securitypage.cxx @@ -45,7 +45,6 @@ using namespace ::com::sun::star; - namespace { enum RedliningMode { RL_NONE, RL_WRITER, RL_CALC }; @@ -429,7 +428,6 @@ SfxSecurityPage::SfxSecurityPage( vcl::Window* pParent, const SfxItemSet& rItemS } - bool SfxSecurityPage::FillItemSet( SfxItemSet * rItemSet ) { bool bModified = false; diff --git a/sfx2/source/dialog/splitwin.cxx b/sfx2/source/dialog/splitwin.cxx index 16e5a5b48300..701bc9ac3bd6 100644 --- a/sfx2/source/dialog/splitwin.cxx +++ b/sfx2/source/dialog/splitwin.cxx @@ -174,7 +174,6 @@ void SfxEmptySplitWin_Impl::FadeIn() } - void SfxSplitWindow::MouseButtonDown( const MouseEvent& rMEvt ) { if ( rMEvt.GetClicks() != 2 ) @@ -187,7 +186,6 @@ void SfxEmptySplitWin_Impl::MouseMove( const MouseEvent& rMEvt ) } - SfxSplitWindow::SfxSplitWindow( vcl::Window* pParent, SfxChildAlignment eAl, SfxWorkWindow *pW, bool bWithButtons, WinBits nBits ) @@ -301,7 +299,6 @@ SfxSplitWindow::SfxSplitWindow( vcl::Window* pParent, SfxChildAlignment eAl, } - SfxSplitWindow::~SfxSplitWindow() { disposeOnce(); @@ -364,7 +361,6 @@ void SfxSplitWindow::SaveConfig_Impl() } - void SfxSplitWindow::StartSplit() { long nSize = 0; @@ -393,7 +389,6 @@ void SfxSplitWindow::StartSplit() } - void SfxSplitWindow::SplitResize() { if ( bPinned ) @@ -406,7 +401,6 @@ void SfxSplitWindow::SplitResize() } - void SfxSplitWindow::Split() { if ( pEmptyWin ) @@ -458,7 +452,6 @@ void SfxSplitWindow::Split() } - void SfxSplitWindow::InsertWindow( SfxDockingWindow* pDockWin, const Size& rSize) /* @@ -550,7 +543,6 @@ void SfxSplitWindow::InsertWindow( SfxDockingWindow* pDockWin, const Size& rSize } - void SfxSplitWindow::ReleaseWindow_Impl(SfxDockingWindow *pDockWin, bool bSave) { // The docking window is no longer stored in the internal data. @@ -574,7 +566,6 @@ void SfxSplitWindow::ReleaseWindow_Impl(SfxDockingWindow *pDockWin, bool bSave) } - void SfxSplitWindow::MoveWindow( SfxDockingWindow* pDockWin, const Size& rSize, sal_uInt16 nLine, sal_uInt16 nPos, bool bNewLine) @@ -598,7 +589,6 @@ void SfxSplitWindow::MoveWindow( SfxDockingWindow* pDockWin, const Size& rSize, } - void SfxSplitWindow::InsertWindow( SfxDockingWindow* pDockWin, const Size& rSize, sal_uInt16 nLine, sal_uInt16 nPos, bool bNewLine) @@ -668,7 +658,6 @@ void SfxSplitWindow::InsertWindow( SfxDockingWindow* pDockWin, const Size& rSize } - void SfxSplitWindow::InsertWindow_Impl( SfxDock_Impl* pDock, const Size& rSize, sal_uInt16 nLine, sal_uInt16 nPos, bool bNewLine) @@ -800,7 +789,6 @@ void SfxSplitWindow::InsertWindow_Impl( SfxDock_Impl* pDock, } - void SfxSplitWindow::RemoveWindow( SfxDockingWindow* pDockWin, bool bHide ) /* [Description] @@ -863,7 +851,6 @@ void SfxSplitWindow::RemoveWindow( SfxDockingWindow* pDockWin, bool bHide ) }; - bool SfxSplitWindow::GetWindowPos( const SfxDockingWindow* pWindow, sal_uInt16& rLine, sal_uInt16& rPos ) const /* [Description] @@ -883,7 +870,6 @@ bool SfxSplitWindow::GetWindowPos( const SfxDockingWindow* pWindow, } - bool SfxSplitWindow::GetWindowPos( const Point& rTestPos, sal_uInt16& rLine, sal_uInt16& rPos ) const /* [Description] @@ -904,7 +890,6 @@ bool SfxSplitWindow::GetWindowPos( const Point& rTestPos, } - sal_uInt16 SfxSplitWindow::GetLineCount() const /* [Description] @@ -916,7 +901,6 @@ sal_uInt16 SfxSplitWindow::GetLineCount() const } - long SfxSplitWindow::GetLineSize( sal_uInt16 nLine ) const /* [Description] @@ -929,7 +913,6 @@ long SfxSplitWindow::GetLineSize( sal_uInt16 nLine ) const } - sal_uInt16 SfxSplitWindow::GetWindowCount( sal_uInt16 nLine ) const /* [Description] @@ -942,7 +925,6 @@ sal_uInt16 SfxSplitWindow::GetWindowCount( sal_uInt16 nLine ) const } - sal_uInt16 SfxSplitWindow::GetWindowCount() const /* [Description] @@ -954,14 +936,12 @@ sal_uInt16 SfxSplitWindow::GetWindowCount() const } - void SfxSplitWindow::Command( const CommandEvent& rCEvt ) { SplitWindow::Command( rCEvt ); } - IMPL_LINK_TYPED( SfxSplitWindow, TimerHdl, Timer*, pTimer, void) { if ( pTimer ) @@ -1032,7 +1012,6 @@ IMPL_LINK_TYPED( SfxSplitWindow, TimerHdl, Timer*, pTimer, void) } - bool SfxSplitWindow::CursorIsOverRect( bool bForceAdding ) const { bool bVisible = IsVisible(); @@ -1073,7 +1052,6 @@ bool SfxSplitWindow::CursorIsOverRect( bool bForceAdding ) const } - SplitWindow* SfxSplitWindow::GetSplitWindow() { if ( !bPinned || !pEmptyWin->bFadeIn ) @@ -1093,7 +1071,6 @@ bool SfxSplitWindow::IsAutoHide( bool bSelf ) const } - void SfxSplitWindow::SetPinned_Impl( bool bOn ) { if ( bPinned == bOn ) @@ -1148,7 +1125,6 @@ void SfxSplitWindow::SetPinned_Impl( bool bOn ) } - void SfxSplitWindow::SetFadeIn_Impl( bool bOn ) { if ( bOn == pEmptyWin->bFadeIn ) diff --git a/sfx2/source/dialog/srchdlg.cxx b/sfx2/source/dialog/srchdlg.cxx index d0e953011f98..c3aad423cf7f 100644 --- a/sfx2/source/dialog/srchdlg.cxx +++ b/sfx2/source/dialog/srchdlg.cxx @@ -30,7 +30,6 @@ using namespace ::com::sun::star::uno; - namespace sfx2 { #define MAX_SAVE_COUNT (sal_uInt16)10 @@ -177,9 +176,7 @@ void SearchDialog::Move() } - } // namespace sfx2 - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sfx2/source/dialog/styfitem.cxx b/sfx2/source/dialog/styfitem.cxx index e5e3be7b7ae8..4abdb0a35629 100644 --- a/sfx2/source/dialog/styfitem.cxx +++ b/sfx2/source/dialog/styfitem.cxx @@ -22,7 +22,6 @@ #include <tools/debug.hxx> - // Implementierung des Resource-Konstruktors SfxStyleFamilyItem::SfxStyleFamilyItem( const ResId &rResId ) : @@ -72,7 +71,6 @@ SfxStyleFamilyItem::SfxStyleFamilyItem( const ResId &rResId ) : } - // Destructor; releases the internal data SfxStyleFamilyItem::~SfxStyleFamilyItem() @@ -83,7 +81,6 @@ SfxStyleFamilyItem::~SfxStyleFamilyItem() } - // Implementation of the resource constructor SfxStyleFamilies::SfxStyleFamilies( const ResId& rResId ) : @@ -104,7 +101,6 @@ SfxStyleFamilies::SfxStyleFamilies( const ResId& rResId ) : } - // Destructor; releases the internal data SfxStyleFamilies::~SfxStyleFamilies() @@ -115,8 +111,6 @@ SfxStyleFamilies::~SfxStyleFamilies() } - - void SfxStyleFamilies::updateImages( const ResId& _rId ) { ::svt::OLocalResourceAccess aLocalRes( _rId ); diff --git a/sfx2/source/dialog/styledlg.cxx b/sfx2/source/dialog/styledlg.cxx index e2ed267c3723..bd7b1a73faeb 100644 --- a/sfx2/source/dialog/styledlg.cxx +++ b/sfx2/source/dialog/styledlg.cxx @@ -69,7 +69,6 @@ SfxStyleDialog::SfxStyleDialog } - SfxStyleDialog::~SfxStyleDialog() { disposeOnce(); @@ -89,7 +88,6 @@ void SfxStyleDialog::dispose() } - void SfxStyleDialog::RefreshInputSet() /* [Description] @@ -103,7 +101,6 @@ void SfxStyleDialog::RefreshInputSet() } - short SfxStyleDialog::Ok() /* [Description] @@ -117,7 +114,6 @@ short SfxStyleDialog::Ok() } - IMPL_LINK_NOARG_TYPED( SfxStyleDialog, CancelHdl, Button *, void ) /* [Description] diff --git a/sfx2/source/dialog/tabdlg.cxx b/sfx2/source/dialog/tabdlg.cxx index e67eb62de8c1..cdec405a15df 100644 --- a/sfx2/source/dialog/tabdlg.cxx +++ b/sfx2/source/dialog/tabdlg.cxx @@ -224,7 +224,6 @@ SfxTabPage::sfxpg SfxTabPage::DeactivatePage( SfxItemSet* ) } - void SfxTabPage::FillUserData() /* [Description] @@ -238,14 +237,12 @@ void SfxTabPage::FillUserData() } - bool SfxTabPage::IsReadOnly() const { return false; } - const SfxPoolItem* SfxTabPage::GetItem( const SfxItemSet& rSet, sal_uInt16 nSlot, bool bDeep ) /* [Description] @@ -266,7 +263,6 @@ const SfxPoolItem* SfxTabPage::GetItem( const SfxItemSet& rSet, sal_uInt16 nSlot } - const SfxPoolItem* SfxTabPage::GetOldItem( const SfxItemSet& rSet, sal_uInt16 nSlot, bool bDeep ) @@ -310,7 +306,6 @@ SfxTabDialog* SfxTabPage::GetTabDialog() const } - SfxTabDialog::SfxTabDialog /* [Description] @@ -338,7 +333,6 @@ SfxTabDialog::SfxTabDialog } - SfxTabDialog::~SfxTabDialog() { disposeOnce(); @@ -517,7 +511,6 @@ short SfxTabDialog::Execute() } - void SfxTabDialog::StartExecuteModal( const Link<Dialog&,void>& rEndDialogHdl ) { if ( !m_pTabCtrl->GetPageCount() ) @@ -527,7 +520,6 @@ void SfxTabDialog::StartExecuteModal( const Link<Dialog&,void>& rEndDialogHdl ) } - void SfxTabDialog::Start( bool bShow ) { pImpl->bModal = false; @@ -541,7 +533,6 @@ void SfxTabDialog::Start( bool bShow ) } - void SfxTabDialog::SetApplyHandler(const Link<Button*, void>& _rHdl) { DBG_ASSERT( m_pApplyBtn, "SfxTabDialog::GetApplyHandler: no apply button enabled!" ); @@ -550,7 +541,6 @@ void SfxTabDialog::SetApplyHandler(const Link<Button*, void>& _rHdl) } - void SfxTabDialog::Start_Impl() { assert(pImpl->aData.size() == m_pTabCtrl->GetPageCount() @@ -631,7 +621,6 @@ sal_uInt16 SfxTabDialog::AddTabPage } - void SfxTabDialog::AddTabPage /* [Description] @@ -709,7 +698,6 @@ void SfxTabDialog::RemoveTabPage(const OString &rName) } - void SfxTabDialog::PageCreated /* [Description] @@ -727,7 +715,6 @@ void SfxTabDialog::PageCreated } - SfxItemSet* SfxTabDialog::GetInputSetImpl() /* [Description] @@ -741,7 +728,6 @@ SfxItemSet* SfxTabDialog::GetInputSetImpl() } - SfxTabPage* SfxTabDialog::GetTabPage( sal_uInt16 nPageId ) const /* [Description] @@ -768,7 +754,6 @@ void SfxTabDialog::SavePosAndId() } - short SfxTabDialog::Ok() /* [Description] @@ -841,7 +826,6 @@ IMPL_LINK_NOARG_TYPED(SfxTabDialog, CancelHdl, Button*, void) } - SfxItemSet* SfxTabDialog::CreateInputItemSet( sal_uInt16 ) /* [Description] @@ -856,7 +840,6 @@ SfxItemSet* SfxTabDialog::CreateInputItemSet( sal_uInt16 ) } - void SfxTabDialog::RefreshInputSet() /* [Description] @@ -871,7 +854,6 @@ void SfxTabDialog::RefreshInputSet() } - IMPL_LINK_NOARG_TYPED(SfxTabDialog, OkHdl, Button*, void) /* [Description] @@ -915,7 +897,6 @@ bool SfxTabDialog::Apply() } - bool SfxTabDialog::PrepareLeaveCurrentPage() { sal_uInt16 const nId = m_pTabCtrl->GetCurPageId(); @@ -950,8 +931,6 @@ bool SfxTabDialog::PrepareLeaveCurrentPage() } - - IMPL_LINK_NOARG_TYPED(SfxTabDialog, UserHdl, Button*, void) /* [Description] @@ -976,7 +955,6 @@ IMPL_LINK_NOARG_TYPED(SfxTabDialog, UserHdl, Button*, void) } - IMPL_LINK_NOARG_TYPED(SfxTabDialog, ResetHdl, Button*, void) /* [Description] @@ -1002,7 +980,6 @@ IMPL_LINK_NOARG_TYPED(SfxTabDialog, ResetHdl, Button*, void) } - IMPL_LINK_NOARG_TYPED(SfxTabDialog, BaseFmtHdl, Button*, void) /* [Description] @@ -1079,7 +1056,6 @@ IMPL_LINK_NOARG_TYPED(SfxTabDialog, BaseFmtHdl, Button*, void) } - IMPL_LINK_TYPED( SfxTabDialog, ActivatePageHdl, TabControl *, pTabCtrl, void ) /* [Description] @@ -1183,7 +1159,6 @@ IMPL_LINK_TYPED( SfxTabDialog, ActivatePageHdl, TabControl *, pTabCtrl, void ) } - IMPL_LINK_TYPED( SfxTabDialog, DeactivatePageHdl, TabControl *, pTabCtrl, bool ) /* [Description] @@ -1269,7 +1244,6 @@ IMPL_LINK_TYPED( SfxTabDialog, DeactivatePageHdl, TabControl *, pTabCtrl, bool ) } - void SfxTabDialog::ShowPage( sal_uInt16 nId ) /* [Description] @@ -1283,7 +1257,6 @@ void SfxTabDialog::ShowPage( sal_uInt16 nId ) } - const sal_uInt16* SfxTabDialog::GetInputRanges( const SfxItemPool& rPool ) /* [Description] @@ -1351,7 +1324,6 @@ const sal_uInt16* SfxTabDialog::GetInputRanges( const SfxItemPool& rPool ) } - void SfxTabDialog::SetInputSet( const SfxItemSet* pInSet ) /* [Description] diff --git a/sfx2/source/dialog/templdlg.cxx b/sfx2/source/dialog/templdlg.cxx index 033141e5f0c4..89601b84317c 100644 --- a/sfx2/source/dialog/templdlg.cxx +++ b/sfx2/source/dialog/templdlg.cxx @@ -180,7 +180,6 @@ static sal_uInt16 nLastItemId = USHRT_MAX; #define MAX_FILTER_ENTRIES 14 - class SfxCommonTemplateDialog_Impl::DeletionWatcher : private boost::noncopyable { typedef void (DeletionWatcher::* bool_type)(); @@ -570,7 +569,6 @@ void StyleTree_Impl::Put(StyleTree_Impl* pIns, sal_uIntPtr lPos) } - StyleTreeArr_Impl& MakeTree_Impl(StyleTreeArr_Impl& rArr) { const sal_uInt16 nCount = rArr.size(); diff --git a/sfx2/source/dialog/tplpitem.cxx b/sfx2/source/dialog/tplpitem.cxx index c47850da2242..6df782b266d2 100644 --- a/sfx2/source/dialog/tplpitem.cxx +++ b/sfx2/source/dialog/tplpitem.cxx @@ -39,7 +39,6 @@ SfxTemplateItem::SfxTemplateItem } - // copy constuctor SfxTemplateItem::SfxTemplateItem( const SfxTemplateItem& rCopy ) : @@ -50,7 +49,6 @@ SfxTemplateItem::SfxTemplateItem( const SfxTemplateItem& rCopy ) : } - // op == bool SfxTemplateItem::operator==( const SfxPoolItem& rCmp ) const @@ -60,7 +58,6 @@ bool SfxTemplateItem::operator==( const SfxPoolItem& rCmp ) const } - SfxPoolItem* SfxTemplateItem::Clone( SfxItemPool *) const { return new SfxTemplateItem(*this); @@ -94,7 +91,6 @@ bool SfxTemplateItem::PutValue( const css::uno::Any& rVal, sal_uInt8 /*nMemberId } - sal_uInt8 SfxTemplateItem::GetFlagCount() const { return sizeof(sal_uInt16) * 8; diff --git a/sfx2/source/doc/DocumentMetadataAccess.cxx b/sfx2/source/doc/DocumentMetadataAccess.cxx index 4cc541d3c674..87d5b282030e 100644 --- a/sfx2/source/doc/DocumentMetadataAccess.cxx +++ b/sfx2/source/doc/DocumentMetadataAccess.cxx @@ -766,7 +766,6 @@ static void init(struct DocumentMetadataAccess_Impl & i_rImpl) } - DocumentMetadataAccess::DocumentMetadataAccess( uno::Reference< uno::XComponentContext > const & i_xContext, const IXmlIdRegistrySupplier & i_rRegistrySupplier) diff --git a/sfx2/source/doc/Metadatable.cxx b/sfx2/source/doc/Metadatable.cxx index f64da90a2146..229659b050f6 100644 --- a/sfx2/source/doc/Metadatable.cxx +++ b/sfx2/source/doc/Metadatable.cxx @@ -124,7 +124,6 @@ static bool isStylesFile (OUString const & i_rPath) } - // XML ID handling --------------------------------------------------- /** handles registration of XMetadatable. @@ -342,7 +341,6 @@ private: }; - // XmlIdRegistry ::sfx2::IXmlIdRegistry * createXmlIdRegistry(const bool i_DocIsClipboard) @@ -477,7 +475,6 @@ struct XmlIdRegistryDocument::XmlIdRegistry_Impl }; - static void rmIter(XmlIdMap_t & i_rXmlIdMap, XmlIdMap_t::iterator const& i_rIter, OUString const & i_rStream, Metadatable const& i_rObject) @@ -495,7 +492,6 @@ rmIter(XmlIdMap_t & i_rXmlIdMap, XmlIdMap_t::iterator const& i_rIter, } - const XmlIdList_t * XmlIdRegistryDocument::XmlIdRegistry_Impl::LookupElementList( const OUString & i_rStreamName, @@ -793,7 +789,6 @@ void XmlIdRegistryDocument::RemoveXmlIdForElement(const Metadatable& i_rObject) } - void XmlIdRegistryDocument::RegisterCopy(Metadatable const& i_rSource, Metadatable & i_rCopy, const bool i_bCopyPrecedesSource) { @@ -892,7 +887,6 @@ XmlIdRegistryDocument::JoinMetadatables( } - // Clipboard XML ID Registry (_Impl) struct RMapEntry @@ -952,7 +946,6 @@ struct XmlIdRegistryClipboard::XmlIdRegistry_Impl }; - static void rmIter(ClipboardXmlIdMap_t & i_rXmlIdMap, ClipboardXmlIdMap_t::iterator const& i_rIter, @@ -974,7 +967,6 @@ rmIter(ClipboardXmlIdMap_t & i_rXmlIdMap, } - Metadatable* const* XmlIdRegistryClipboard::XmlIdRegistry_Impl::LookupEntry( const OUString & i_rStreamName, @@ -1219,7 +1211,6 @@ void XmlIdRegistryClipboard::RemoveXmlIdForElement(const Metadatable& i_rObject) } - std::shared_ptr<MetadatableClipboard> XmlIdRegistryClipboard::CreateClipboard(const bool i_isInContent) { @@ -1278,7 +1269,6 @@ XmlIdRegistryClipboard::SourceLink(Metadatable const& i_rObject) } - // Metadatable mixin @@ -1558,7 +1548,6 @@ Metadatable::JoinMetadatable(Metadatable const & i_rOther, } - // XMetadatable mixin // css::rdf::XNode: @@ -1650,8 +1639,6 @@ throw (uno::RuntimeException, std::exception) } // namespace sfx2 - - #if OSL_DEBUG_LEVEL > 1 #include <stdio.h> diff --git a/sfx2/source/doc/SfxDocumentMetaData.cxx b/sfx2/source/doc/SfxDocumentMetaData.cxx index dee9a73bbdc1..cfdb4d9bf23d 100644 --- a/sfx2/source/doc/SfxDocumentMetaData.cxx +++ b/sfx2/source/doc/SfxDocumentMetaData.cxx @@ -1347,7 +1347,6 @@ void SAL_CALL SfxDocumentMetaData::init( } - SfxDocumentMetaData::SfxDocumentMetaData( css::uno::Reference< css::uno::XComponentContext > const & context) : BaseMutex() diff --git a/sfx2/source/doc/docfac.cxx b/sfx2/source/doc/docfac.cxx index db7bd7f6b76f..9443ac9a254e 100644 --- a/sfx2/source/doc/docfac.cxx +++ b/sfx2/source/doc/docfac.cxx @@ -56,7 +56,6 @@ using namespace ::com::sun::star; - typedef std::vector<SfxViewFactory*> SfxViewFactoryArr_Impl; struct SfxObjectFactory_Impl @@ -76,14 +75,12 @@ struct SfxObjectFactory_Impl }; - SfxFilterContainer* SfxObjectFactory::GetFilterContainer( bool /*bForceLoad*/ ) const { return pImpl->pFilterContainer; } - SfxObjectFactory::SfxObjectFactory ( const SvGlobalName& rName, @@ -115,7 +112,6 @@ SfxObjectFactory::SfxObjectFactory } - SfxObjectFactory::~SfxObjectFactory() { delete pImpl->pNameResId; @@ -123,7 +119,6 @@ SfxObjectFactory::~SfxObjectFactory() } - void SfxObjectFactory::RegisterViewFactory ( SfxViewFactory &rFactory @@ -153,21 +148,18 @@ void SfxObjectFactory::RegisterViewFactory } - sal_uInt16 SfxObjectFactory::GetViewFactoryCount() const { return pImpl->aViewFactoryArr.size(); } - SfxViewFactory& SfxObjectFactory::GetViewFactory(sal_uInt16 i) const { return *pImpl->aViewFactoryArr[i]; } - SfxModule* SfxObjectFactory::GetModule() const { return pImpl->pModule; diff --git a/sfx2/source/doc/docfile.cxx b/sfx2/source/doc/docfile.cxx index 0f4ec6794ddd..fbff6954e5c8 100644 --- a/sfx2/source/doc/docfile.cxx +++ b/sfx2/source/doc/docfile.cxx @@ -2229,7 +2229,6 @@ void SfxMedium::DoInternalBackup_Impl( const ::ucbhelper::Content& aOriginalCont } - void SfxMedium::DoBackup_Impl() { // source file name is the logical name of this medium @@ -2628,14 +2627,12 @@ SfxMedium::SfxMedium() : pImp(new SfxMedium_Impl) } - void SfxMedium::UseInteractionHandler( bool bUse ) { pImp->bAllowDefaultIntHdl = bUse; } - css::uno::Reference< css::task::XInteractionHandler > SfxMedium::GetInteractionHandler( bool bGetAlways ) { @@ -2668,7 +2665,6 @@ SfxMedium::GetInteractionHandler( bool bGetAlways ) } - void SfxMedium::SetFilter( const SfxFilter* pFilterP, bool /*bResetOrig*/ ) { pImp->m_pFilter = pFilterP; @@ -2680,14 +2676,12 @@ const SfxFilter* SfxMedium::GetFilter() const } - const SfxFilter* SfxMedium::GetOrigFilter( bool bNotCurrent ) const { return ( pImp->pOrigFilter || bNotCurrent ) ? pImp->pOrigFilter : pImp->m_pFilter; } - sal_uInt32 SfxMedium::CreatePasswordToModifyHash( const OUString& aPasswd, bool bWriter ) { sal_uInt32 nHash = 0; @@ -2709,7 +2703,6 @@ sal_uInt32 SfxMedium::CreatePasswordToModifyHash( const OUString& aPasswd, bool } - void SfxMedium::Close() { if ( pImp->xStorage.is() ) @@ -2850,7 +2843,6 @@ void SfxMedium::CloseStreams_Impl() } - void SfxMedium::SetIsRemote_Impl() { INetURLObject aObj( GetName() ); @@ -2873,7 +2865,6 @@ void SfxMedium::SetIsRemote_Impl() } - void SfxMedium::SetName( const OUString& aNameP, bool bSetOrigURL ) { if (pImp->aOrigURL.isEmpty()) @@ -2893,7 +2884,6 @@ const OUString& SfxMedium::GetOrigURL() const } - void SfxMedium::SetPhysicalName_Impl( const OUString& rNameP ) { if ( rNameP != pImp->m_aName ) @@ -2914,7 +2904,6 @@ void SfxMedium::SetPhysicalName_Impl( const OUString& rNameP ) } - void SfxMedium::ReOpen() { bool bUseInteractionHandler = pImp->bUseInteractionHandler; @@ -2924,7 +2913,6 @@ void SfxMedium::ReOpen() } - void SfxMedium::CompleteReOpen() { // do not use temporary file for reopen and in case of success throw the temporary file away @@ -3054,8 +3042,6 @@ SfxMedium::SfxMedium( const uno::Sequence<beans::PropertyValue>& aArgs ) : } - - SfxMedium::SfxMedium( const uno::Reference < embed::XStorage >& rStor, const OUString& rBaseURL, const SfxItemSet* p ) : pImp(new SfxMedium_Impl) { @@ -3074,7 +3060,6 @@ SfxMedium::SfxMedium( const uno::Reference < embed::XStorage >& rStor, const OUS } - SfxMedium::SfxMedium( const uno::Reference < embed::XStorage >& rStor, const OUString& rBaseURL, const OUString &rTypeName, const SfxItemSet* p ) : pImp(new SfxMedium_Impl) { @@ -3092,7 +3077,6 @@ SfxMedium::SfxMedium( const uno::Reference < embed::XStorage >& rStor, const OUS } - SfxMedium::~SfxMedium() { // if there is a requirement to clean the backup this is the last possibility to do it diff --git a/sfx2/source/doc/doctempl.cxx b/sfx2/source/doc/doctempl.cxx index 1b0b5c58ff39..23672caee0ae 100644 --- a/sfx2/source/doc/doctempl.cxx +++ b/sfx2/source/doc/doctempl.cxx @@ -98,14 +98,12 @@ using ::std::vector; using ::std::advance; - #define TITLE "Title" #define TARGET_URL "TargetURL" #define COMMAND_TRANSFER "transfer" - class RegionData_Impl; namespace DocTempl { @@ -147,7 +145,6 @@ public: using namespace ::DocTempl; - class RegionData_Impl { const SfxDocTemplate_Impl* mpParent; @@ -190,7 +187,6 @@ public: typedef vector< RegionData_Impl* > RegionList_Impl; - class SfxDocTemplate_Impl : public SvRefBase { uno::Reference< XPersist > mxInfo; @@ -241,7 +237,6 @@ public: }; - class DocTemplLocker_Impl { SfxDocTemplate_Impl& m_aDocTempl; @@ -259,7 +254,6 @@ public: }; - #ifndef SFX_DECL_DOCTEMPLATES_DEFINED #define SFX_DECL_DOCTEMPLATES_DEFINED typedef tools::SvRef<SfxDocTemplate_Impl> SfxDocTemplate_ImplRef; @@ -268,13 +262,11 @@ typedef tools::SvRef<SfxDocTemplate_Impl> SfxDocTemplate_ImplRef; SfxDocTemplate_Impl *gpTemplateData = nullptr; - static bool getTextProperty_Impl( Content& rContent, const OUString& rPropName, OUString& rPropValue ); - OUString SfxDocumentTemplates::GetFullRegionName ( sal_uInt16 nIdx // vcl::Region Index @@ -310,7 +302,6 @@ OUString SfxDocumentTemplates::GetFullRegionName } - const OUString& SfxDocumentTemplates::GetRegionName ( sal_uInt16 nIdx // vcl::Region Index @@ -346,7 +337,6 @@ const OUString& SfxDocumentTemplates::GetRegionName } - sal_uInt16 SfxDocumentTemplates::GetRegionCount() const /* [Description] @@ -369,7 +359,6 @@ sal_uInt16 SfxDocumentTemplates::GetRegionCount() const } - sal_uInt16 SfxDocumentTemplates::GetCount ( sal_uInt16 nRegion /* vcl::Region index whose number is @@ -400,7 +389,6 @@ sal_uInt16 SfxDocumentTemplates::GetCount } - const OUString& SfxDocumentTemplates::GetName ( sal_uInt16 nRegion, // vcl::Region Index, in which the entry lies @@ -441,7 +429,6 @@ const OUString& SfxDocumentTemplates::GetName } - OUString SfxDocumentTemplates::GetPath ( sal_uInt16 nRegion, // vcl::Region Index, in which the entry lies @@ -475,7 +462,6 @@ OUString SfxDocumentTemplates::GetPath } - OUString SfxDocumentTemplates::GetTemplateTargetURLFromComponent( const OUString& aGroupName, const OUString& aTitle ) { @@ -506,7 +492,6 @@ OUString SfxDocumentTemplates::GetTemplateTargetURLFromComponent( const OUString } - /** Convert a resource string - a template name - to its localised pair if it exists. @param nSourceResIds Resource ID where the list of original en-US template names begin. @@ -531,7 +516,6 @@ OUString SfxDocumentTemplates::ConvertResourceString ( } - bool SfxDocumentTemplates::CopyOrMove ( sal_uInt16 nTargetRegion, // Target vcl::Region Index @@ -637,7 +621,6 @@ bool SfxDocumentTemplates::CopyOrMove } - bool SfxDocumentTemplates::Move ( sal_uInt16 nTargetRegion, // Target vcl::Region Index @@ -667,7 +650,6 @@ bool SfxDocumentTemplates::Move } - bool SfxDocumentTemplates::Copy ( sal_uInt16 nTargetRegion, // Target vcl::Region Index @@ -698,7 +680,6 @@ bool SfxDocumentTemplates::Copy } - bool SfxDocumentTemplates::CopyTo ( sal_uInt16 nRegion, // vcl::Region of the template to be exported @@ -770,7 +751,6 @@ bool SfxDocumentTemplates::CopyTo } - bool SfxDocumentTemplates::CopyFrom ( sal_uInt16 nRegion, /* vcl::Region in which the template is to be @@ -914,7 +894,6 @@ bool SfxDocumentTemplates::CopyFrom } - bool SfxDocumentTemplates::Delete ( sal_uInt16 nRegion, // vcl::Region Index @@ -978,7 +957,6 @@ bool SfxDocumentTemplates::Delete } - bool SfxDocumentTemplates::InsertDir ( const OUString& rText, // the logical name of the new Region @@ -1098,7 +1076,6 @@ bool SfxDocumentTemplates::SetName( const OUString& rName, sal_uInt16 nRegion, s } - bool SfxDocumentTemplates::GetFull ( const OUString &rRegion, // vcl::Region Name @@ -1154,7 +1131,6 @@ bool SfxDocumentTemplates::GetFull } - bool SfxDocumentTemplates::GetLogicNames ( const OUString &rPath, // Full Path to the template @@ -1222,7 +1198,6 @@ bool SfxDocumentTemplates::GetLogicNames } - SfxDocumentTemplates::SfxDocumentTemplates() /* [Description] @@ -1237,7 +1212,6 @@ SfxDocumentTemplates::SfxDocumentTemplates() } - SfxDocumentTemplates::~SfxDocumentTemplates() /* [Description] @@ -1499,7 +1473,6 @@ int RegionData_Impl::Compare( RegionData_Impl* pCompare ) const } - SfxDocTemplate_Impl::SfxDocTemplate_Impl() : mbConstructed( false ) , mnLockCounter( 0 ) @@ -1799,7 +1772,6 @@ bool SfxDocTemplate_Impl::GetTitleFromURL( const OUString& rURL, } - void SfxDocTemplate_Impl::Clear() { ::osl::MutexGuard aGuard( maMutex ); diff --git a/sfx2/source/doc/doctemplates.cxx b/sfx2/source/doc/doctemplates.cxx index 31f603f07bf5..a6dad472493d 100644 --- a/sfx2/source/doc/doctemplates.cxx +++ b/sfx2/source/doc/doctemplates.cxx @@ -142,7 +142,6 @@ public: #define Y_OFFSET 15 - struct NamePair_Impl { OUString maShortName; @@ -309,7 +308,6 @@ public: }; - class Updater_Impl : public ::osl::Thread { private: @@ -324,7 +322,6 @@ public: }; - class DocTemplates_EntryData_Impl { OUString maTitle; @@ -361,7 +358,6 @@ public: }; - class GroupData_Impl { vector< DocTemplates_EntryData_Impl* > maEntries; @@ -1347,7 +1343,6 @@ void SfxDocTplService_Impl::RemoveUINamesForTemplateDir_Impl( const OUString& aU } - bool SfxDocTplService_Impl::WriteUINamesForTemplateDir_Impl( const OUString& aUserPath, const uno::Sequence< beans::StringPair >& aUINames ) { @@ -2260,7 +2255,6 @@ SfxDocTplService::SfxDocTplService( const uno::Reference< XComponentContext >& x } - SfxDocTplService::~SfxDocTplService() { delete pImp; @@ -2277,7 +2271,6 @@ lang::Locale SAL_CALL SfxDocTplService::getLocale() } - void SAL_CALL SfxDocTplService::setLocale( const lang::Locale & rLocale ) throw( uno::RuntimeException, std::exception ) { @@ -2389,7 +2382,6 @@ void SAL_CALL SfxDocTplService::update() } - Updater_Impl::Updater_Impl( SfxDocTplService_Impl* pTemplates ) { mpDocTemplates = pTemplates; diff --git a/sfx2/source/doc/doctemplateslocal.cxx b/sfx2/source/doc/doctemplateslocal.cxx index e83c93102435..d65d970369b9 100644 --- a/sfx2/source/doc/doctemplateslocal.cxx +++ b/sfx2/source/doc/doctemplateslocal.cxx @@ -88,8 +88,6 @@ void SAL_CALL DocTemplLocaleHelper::WriteGroupLocalizationSequence( const uno::R } - - uno::Sequence< beans::StringPair > SAL_CALL DocTemplLocaleHelper::ReadLocalizationSequence_Impl( const uno::Reference< io::XInputStream >& xInStream, const OUString& aStringID, const uno::Reference< uno::XComponentContext > xContext ) throw( uno::Exception ) { diff --git a/sfx2/source/doc/frmdescr.cxx b/sfx2/source/doc/frmdescr.cxx index e40fd8952f42..c0746480f33a 100644 --- a/sfx2/source/doc/frmdescr.cxx +++ b/sfx2/source/doc/frmdescr.cxx @@ -184,14 +184,12 @@ bool SfxFrameDescriptorItem::operator==( const SfxPoolItem& rAttr ) const } - SfxPoolItem* SfxFrameDescriptorItem::Clone( SfxItemPool* ) const { return new SfxFrameDescriptorItem( *this ); } - bool SfxFrameDescriptorItem::GetPresentation ( SfxItemPresentation /*ePres*/, diff --git a/sfx2/source/doc/guisaveas.cxx b/sfx2/source/doc/guisaveas.cxx index ddf888c6c841..44b153f7148a 100644 --- a/sfx2/source/doc/guisaveas.cxx +++ b/sfx2/source/doc/guisaveas.cxx @@ -515,7 +515,6 @@ uno::Sequence< beans::PropertyValue > ModelData_Impl::GetDocServiceDefaultFilter } - uno::Sequence< beans::PropertyValue > ModelData_Impl::GetDocServiceAnyFilter( SfxFilterFlags nMust, SfxFilterFlags nDont ) { uno::Sequence< beans::NamedValue > aSearchRequest { { "DocumentService", css::uno::makeAny(GetDocServiceName()) } }; @@ -1253,7 +1252,6 @@ OUString ModelData_Impl::GetRecommendedName( const OUString& aSuggestedName, con } - // class SfxStoringHelper diff --git a/sfx2/source/doc/new.cxx b/sfx2/source/doc/new.cxx index 163899e73638..603de57c5be5 100644 --- a/sfx2/source/doc/new.cxx +++ b/sfx2/source/doc/new.cxx @@ -344,7 +344,6 @@ void SfxNewFileDialog_Impl::SetTemplateFlags(SfxTemplateFlags nSet) } - SfxNewFileDialog_Impl::SfxNewFileDialog_Impl( SfxNewFileDialog* pAntiImplP, sal_uInt16 nFl) : aNone(SfxResId(STR_NONE).toString()) diff --git a/sfx2/source/doc/objcont.cxx b/sfx2/source/doc/objcont.cxx index 30971be768a3..1024dadf5687 100644 --- a/sfx2/source/doc/objcont.cxx +++ b/sfx2/source/doc/objcont.cxx @@ -84,7 +84,6 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::uno; - static bool operator> (const util::DateTime& i_rLeft, const util::DateTime& i_rRight) { @@ -176,7 +175,6 @@ SfxObjectShell::CreatePreviewMetaFile_Impl( bool bFullContent ) const } - void SfxObjectShell::UpdateDocInfoForSave() { uno::Reference<document::XDocumentProperties> xDocProps(getDocProperties()); @@ -213,7 +211,6 @@ void SfxObjectShell::UpdateDocInfoForSave() } - static void lcl_add(util::Duration & rDur, tools::Time const& rTime) { @@ -285,7 +282,6 @@ void SfxObjectShell::UpdateTime_Impl( } - VclPtr<SfxDocumentInfoDialog> SfxObjectShell::CreateDocumentInfoDialog ( vcl::Window* pParent, @@ -296,8 +292,6 @@ VclPtr<SfxDocumentInfoDialog> SfxObjectShell::CreateDocumentInfoDialog } - - std::set<Color> SfxObjectShell::GetDocColors() { std::set<Color> empty; diff --git a/sfx2/source/doc/objmisc.cxx b/sfx2/source/doc/objmisc.cxx index b721eaf30978..b8fe4074acf1 100644 --- a/sfx2/source/doc/objmisc.cxx +++ b/sfx2/source/doc/objmisc.cxx @@ -161,7 +161,6 @@ public: }; - sal_uInt16 const aTitleMap_Impl[3][2] = { // local remote @@ -171,21 +170,18 @@ sal_uInt16 const aTitleMap_Impl[3][2] = }; - void SfxObjectShell::AbortImport() { pImp->bIsAbortingImport = true; } - bool SfxObjectShell::IsAbortingImport() const { return pImp->bIsAbortingImport; } - uno::Reference<document::XDocumentProperties> SfxObjectShell::getDocProperties() { @@ -199,13 +195,11 @@ SfxObjectShell::getDocProperties() } - void SfxObjectShell::DoFlushDocInfo() { } - // Note: the only thing that calls this is the modification event handler // that is installed at the XDocumentProperties void SfxObjectShell::FlushDocInfo() @@ -223,7 +217,6 @@ void SfxObjectShell::FlushDocInfo() } - void SfxObjectShell::SetError( sal_uInt32 lErr, const OUString& aLogMessage ) { if(pImp->lErr==ERRCODE_NONE) @@ -236,14 +229,12 @@ void SfxObjectShell::SetError( sal_uInt32 lErr, const OUString& aLogMessage ) } - sal_uInt32 SfxObjectShell::GetError() const { return ERRCODE_TOERROR(GetErrorCode()); } - sal_uInt32 SfxObjectShell::GetErrorCode() const { sal_uInt32 lError=pImp->lErr; @@ -253,7 +244,6 @@ sal_uInt32 SfxObjectShell::GetErrorCode() const } - void SfxObjectShell::ResetError() { if( pImp->lErr != ERRCODE_NONE ) @@ -266,14 +256,12 @@ void SfxObjectShell::ResetError() } - bool SfxObjectShell::IsTemplate() const { return pImp->bIsTemplate; } - void SfxObjectShell::EnableSetModified( bool bEnable ) { #ifdef DBG_UTIL @@ -284,14 +272,12 @@ void SfxObjectShell::EnableSetModified( bool bEnable ) } - bool SfxObjectShell::IsEnableSetModified() const { return pImp->m_bEnableSetModified && !IsReadOnly(); } - bool SfxObjectShell::IsModified() { if ( pImp->m_bIsModified ) @@ -334,7 +320,6 @@ bool SfxObjectShell::IsModified() } - void SfxObjectShell::SetModified( bool bModifiedP ) { #ifdef DBG_UTIL @@ -353,7 +338,6 @@ void SfxObjectShell::SetModified( bool bModifiedP ) } - void SfxObjectShell::ModifyChanged() { if ( pImp->bClosing ) @@ -373,7 +357,6 @@ void SfxObjectShell::ModifyChanged() } - bool SfxObjectShell::IsReadOnlyUI() const /* [Description] @@ -387,7 +370,6 @@ bool SfxObjectShell::IsReadOnlyUI() const } - bool SfxObjectShell::IsReadOnlyMedium() const /* [Description] @@ -407,7 +389,6 @@ bool SfxObjectShell::IsOriginallyReadOnlyMedium() const } - void SfxObjectShell::SetReadOnlyUI( bool bReadOnly ) /* [Description] @@ -425,7 +406,6 @@ void SfxObjectShell::SetReadOnlyUI( bool bReadOnly ) } - void SfxObjectShell::SetReadOnly() { // Let the document be completely readonly, means that the @@ -458,7 +438,6 @@ bool SfxObjectShell::IsReadOnly() const } - bool SfxObjectShell::IsInModalMode() const { return pImp->bModalMode || pImp->bRunningMacro; @@ -470,7 +449,6 @@ bool SfxObjectShell::AcceptStateUpdate() const } - void SfxObjectShell::SetMacroMode_Impl( bool bModal ) { if ( !pImp->bRunningMacro != !bModal ) @@ -481,7 +459,6 @@ void SfxObjectShell::SetMacroMode_Impl( bool bModal ) } - void SfxObjectShell::SetModalMode_Impl( bool bModal ) { // Broadcast only if modified, or otherwise it will possibly go into @@ -617,7 +594,6 @@ bool SfxObjectShell::SwitchToShared( bool bShared, bool bSave ) } - void SfxObjectShell::FreeSharedFile() { if ( pMedium ) @@ -684,7 +660,6 @@ bool SfxObjectShell::IsDocShared() const } - OUString SfxObjectShell::GetSharedFileURL() const { #if HAVE_FEATURE_MULTIUSER_ENVIRONMENT @@ -700,8 +675,6 @@ Size SfxObjectShell::GetFirstPageSize() } - - IndexBitSet& SfxObjectShell::GetNoSet_Impl() { return pImp->aBitSet; @@ -752,7 +725,6 @@ void SfxObjectShell::SetTitle } - #if OSL_DEBUG_LEVEL > 1 OUString X(const OUString &rRet) { @@ -950,7 +922,6 @@ OUString SfxObjectShell::GetTitle } - void SfxObjectShell::InvalidateName() /* [Description] @@ -967,7 +938,6 @@ void SfxObjectShell::InvalidateName() } - void SfxObjectShell::SetNamedVisibility_Impl() { if ( !pImp->bIsNamedVisible ) @@ -990,14 +960,12 @@ void SfxObjectShell::SetNoName() } - SfxProgress* SfxObjectShell::GetProgress() const { return pImp->pProgress; } - void SfxObjectShell::SetProgress_Impl ( SfxProgress *pProgress /* to started <SfxProgress> or 0, @@ -1018,7 +986,6 @@ void SfxObjectShell::SetProgress_Impl } - void SfxObjectShell::PostActivateEvent_Impl( SfxViewFrame* pFrame ) { SfxApplication* pSfxApp = SfxGetpApp(); @@ -1038,7 +1005,6 @@ void SfxObjectShell::PostActivateEvent_Impl( SfxViewFrame* pFrame ) } - void SfxObjectShell::SetActivateEvent_Impl(sal_uInt16 nId ) { if ( GetFactory().GetFlags() & SfxObjectShellFlags::HASOPENDOC ) @@ -1379,7 +1345,6 @@ void SfxObjectShell::TemplateDisconnectionAfterLoad() } - void SfxObjectShell::PositionView_Impl() { MarkData_Impl *pMark = Get_Impl()->pMarkData; @@ -1395,7 +1360,6 @@ void SfxObjectShell::PositionView_Impl() } - bool SfxObjectShell::IsLoading() const /* [Description] @@ -1406,7 +1370,6 @@ bool SfxObjectShell::IsLoading() const } - void SfxObjectShell::CancelTransfers() /* [Description] @@ -1423,7 +1386,6 @@ void SfxObjectShell::CancelTransfers() } - AutoReloadTimer_Impl::AutoReloadTimer_Impl( const OUString& rURL, sal_uInt32 nTime, SfxObjectShell* pSh ) : aUrl( rURL ), pObjSh( pSh ) @@ -1432,7 +1394,6 @@ AutoReloadTimer_Impl::AutoReloadTimer_Impl( } - void AutoReloadTimer_Impl::Invoke() { SfxViewFrame *pFrame = SfxViewFrame::GetFirst( pObjSh ); diff --git a/sfx2/source/doc/objserv.cxx b/sfx2/source/doc/objserv.cxx index 06af9ff094a4..8880f48de430 100644 --- a/sfx2/source/doc/objserv.cxx +++ b/sfx2/source/doc/objserv.cxx @@ -237,7 +237,6 @@ SfxInstanceCloseGuard_Impl::~SfxInstanceCloseGuard_Impl() } - void SfxObjectShell::PrintExec_Impl(SfxRequest &rReq) { SfxViewFrame *pFrame = SfxViewFrame::GetFirst(this); @@ -249,7 +248,6 @@ void SfxObjectShell::PrintExec_Impl(SfxRequest &rReq) } - void SfxObjectShell::PrintState_Impl(SfxItemSet &rSet) { bool bPrinting = false; @@ -898,7 +896,6 @@ void SfxObjectShell::ExecFile_Impl(SfxRequest &rReq) } - void SfxObjectShell::GetState_Impl(SfxItemSet &rSet) { SfxWhichIter aIter( rSet ); @@ -1115,7 +1112,6 @@ void SfxObjectShell::GetState_Impl(SfxItemSet &rSet) } - void SfxObjectShell::ExecProps_Impl(SfxRequest &rReq) { switch ( rReq.GetSlot() ) @@ -1157,7 +1153,6 @@ void SfxObjectShell::ExecProps_Impl(SfxRequest &rReq) } - void SfxObjectShell::StateProps_Impl(SfxItemSet &rSet) { SfxWhichIter aIter(rSet); @@ -1234,7 +1229,6 @@ void SfxObjectShell::StateProps_Impl(SfxItemSet &rSet) } - void SfxObjectShell::ExecView_Impl(SfxRequest &rReq) { switch ( rReq.GetSlot() ) @@ -1271,7 +1265,6 @@ void SfxObjectShell::ExecView_Impl(SfxRequest &rReq) } - void SfxObjectShell::StateView_Impl(SfxItemSet& /*rSet*/) { } diff --git a/sfx2/source/doc/objstor.cxx b/sfx2/source/doc/objstor.cxx index fe4b46193540..c6fc52a94038 100644 --- a/sfx2/source/doc/objstor.cxx +++ b/sfx2/source/doc/objstor.cxx @@ -161,28 +161,24 @@ void impl_addToModelCollection(const css::uno::Reference< css::frame::XModel >& } - bool SfxObjectShell::Save() { return SaveChildren(); } - bool SfxObjectShell::SaveAs( SfxMedium& rMedium ) { return SaveAsChildren( rMedium ); } - bool SfxObjectShell::QuerySlotExecutable( sal_uInt16 /*nSlotId*/ ) { return true; } - bool GetEncryptionData_Impl( const SfxItemSet* pSet, uno::Sequence< beans::NamedValue >& o_rEncryptionData ) { bool bResult = false; @@ -624,7 +620,6 @@ bool SfxObjectShell::ImportFromGeneratedStream_Impl( } - bool SfxObjectShell::DoLoad( SfxMedium *pMed ) { ModifyBlocker_Impl aBlock( this ); @@ -977,7 +972,6 @@ sal_uInt32 SfxObjectShell::HandleFilter( SfxMedium* pMedium, SfxObjectShell* pDo } - bool SfxObjectShell::IsOwnStorageFormat_Impl(const SfxMedium &rMedium) const { return !rMedium.GetFilter() || // Embedded @@ -987,7 +981,6 @@ bool SfxObjectShell::IsOwnStorageFormat_Impl(const SfxMedium &rMedium) const } - bool SfxObjectShell::IsPackageStorageFormat_Impl(const SfxMedium &rMedium) const { return !rMedium.GetFilter() || // Embedded @@ -996,7 +989,6 @@ bool SfxObjectShell::IsPackageStorageFormat_Impl(const SfxMedium &rMedium) const } - bool SfxObjectShell::DoSave() // DoSave is only invoked for OLE. Save your own documents in the SFX through // DoSave_Impl order to allow for the creation of backups. @@ -1091,7 +1083,6 @@ void Lock_Impl( SfxObjectShell* pDoc, bool bLock ) } - bool SfxObjectShell::SaveTo_Impl ( SfxMedium &rMedium, // Medium, in which it will be stored @@ -1809,7 +1800,6 @@ bool SfxObjectShell::DisconnectStorage_Impl( SfxMedium& rSrcMedium, SfxMedium& r } - bool SfxObjectShell::ConnectTmpStorage_Impl( const uno::Reference< embed::XStorage >& xStorage, SfxMedium* pMediumArg ) @@ -1891,7 +1881,6 @@ bool SfxObjectShell::ConnectTmpStorage_Impl( } - bool SfxObjectShell::DoSaveObjectAs( SfxMedium& rMedium, bool bCommit ) { bool bOk = false; @@ -1953,7 +1942,6 @@ bool SfxObjectShell::DoSaveAs( SfxMedium& rMedium ) } - bool SfxObjectShell::DoSaveCompleted( SfxMedium* pNewMed ) { bool bOk = true; @@ -2123,7 +2111,6 @@ void SfxObjectShell::AddToRecentlyUsedList() } - bool SfxObjectShell::ConvertFrom ( SfxMedium& /*rMedium*/ /* <SfxMedium>, which describes the source file @@ -2433,7 +2420,6 @@ bool SfxObjectShell::ExportTo( SfxMedium& rMedium ) } - bool SfxObjectShell::ConvertTo ( SfxMedium& /*rMedium*/ /* <SfxMedium>, which describes the target file @@ -2490,7 +2476,6 @@ bool SfxObjectShell::ConvertTo } - bool SfxObjectShell::DoSave_Impl( const SfxItemSet* pArgs ) { SfxMedium* pRetrMedium = GetMedium(); @@ -2578,7 +2563,6 @@ bool SfxObjectShell::DoSave_Impl( const SfxItemSet* pArgs ) } - bool SfxObjectShell::Save_Impl( const SfxItemSet* pSet ) { if ( IsReadOnly() ) @@ -2882,7 +2866,6 @@ bool SfxObjectShell::PreDoSaveAs_Impl(const OUString& rFileName, const OUString& } - bool SfxObjectShell::LoadFrom( SfxMedium& /*rMedium*/ ) { SAL_WARN( "sfx.doc", "Base implementation, must not be called in general!" ); @@ -2929,7 +2912,6 @@ bool SfxObjectShell::CanReload_Impl() } - HiddenInformation SfxObjectShell::GetHiddenInformationState( HiddenInformation nStates ) { HiddenInformation nState = HiddenInformation::NONE; diff --git a/sfx2/source/doc/objxtor.cxx b/sfx2/source/doc/objxtor.cxx index 94ed0f2893fe..09172c26bba8 100644 --- a/sfx2/source/doc/objxtor.cxx +++ b/sfx2/source/doc/objxtor.cxx @@ -147,7 +147,6 @@ OString lclGetVBAGlobalConstName( const Reference< XInterface >& rxComponent ) } // namespace - class SfxModelListener_Impl : public ::cppu::WeakImplHelper< css::util::XCloseListener > { SfxObjectShell* mpDoc; @@ -203,7 +202,6 @@ void SAL_CALL SfxModelListener_Impl::disposing( const css::lang::EventObject& _r } - SfxObjectShell_Impl::SfxObjectShell_Impl( SfxObjectShell& _rDocShell ) :mpObjectContainer(nullptr) ,rDocShell( _rDocShell ) @@ -273,13 +271,11 @@ SfxObjectShell_Impl::SfxObjectShell_Impl( SfxObjectShell& _rDocShell ) } - SfxObjectShell_Impl::~SfxObjectShell_Impl() { } - SfxObjectShell::SfxObjectShell( const SfxModelFlags i_nCreationFlags ) : pImp(new SfxObjectShell_Impl(*this)) , pMedium(nullptr) @@ -381,21 +377,18 @@ SfxObjectShell::~SfxObjectShell() } - void SfxObjectShell::Stamp_SetPrintCancelState(bool bState) { pImp->bIsPrintJobCancelable = bState; } - bool SfxObjectShell::Stamp_GetPrintCancelState() const { return pImp->bIsPrintJobCancelable; } - // closes the Object and all its views bool SfxObjectShell::Close() @@ -525,7 +518,6 @@ SfxObjectShell* SfxObjectShell::GetNext } - SfxObjectShell* SfxObjectShell::Current() { SfxViewFrame *pFrame = SfxViewFrame::Current(); @@ -533,14 +525,12 @@ SfxObjectShell* SfxObjectShell::Current() } - bool SfxObjectShell::IsInPrepareClose() const { return pImp->bInPrepareClose; } - struct BoolEnv_Impl { SfxObjectShell_Impl* pImp; @@ -857,21 +847,18 @@ void SfxObjectShell::InitBasicManager_Impl() } - bool SfxObjectShell::DoClose() { return Close(); } - SfxObjectShell* SfxObjectShell::GetObjectShell() { return this; } - uno::Sequence< OUString > SfxObjectShell::GetEventNames() { static uno::Sequence< OUString >* pEventNameContainer = nullptr; @@ -890,7 +877,6 @@ uno::Sequence< OUString > SfxObjectShell::GetEventNames() } - css::uno::Reference< css::frame::XModel > SfxObjectShell::GetModel() const { return GetBaseModel(); @@ -907,7 +893,6 @@ void SfxObjectShell::SetBaseModel( SfxBaseModel* pModel ) } - css::uno::Reference< css::frame::XModel > SfxObjectShell::GetBaseModel() const { return pImp->pBaseModel.get(); diff --git a/sfx2/source/doc/oleprops.cxx b/sfx2/source/doc/oleprops.cxx index 0d160dc86c62..ff3e23fb5f25 100644 --- a/sfx2/source/doc/oleprops.cxx +++ b/sfx2/source/doc/oleprops.cxx @@ -27,10 +27,6 @@ #include <rtl/strbuf.hxx> - - - - #define STREAM_BUFFER_SIZE 2048 // usings @@ -67,7 +63,6 @@ bool operator==(const util::Date &i_rLeft, const util::Date &i_rRight) } - /** Property representing a signed 32-bit integer value. */ class SfxOleInt32Property : public SfxOlePropertyBase { @@ -85,7 +80,6 @@ private: }; - /** Property representing a floating-point value. */ class SfxOleDoubleProperty : public SfxOlePropertyBase { @@ -103,7 +97,6 @@ private: }; - /** Property representing a boolean value. */ class SfxOleBoolProperty : public SfxOlePropertyBase { @@ -121,7 +114,6 @@ private: }; - /** Base class for properties that contain a single string value. */ class SfxOleStringPropertyBase : public SfxOlePropertyBase, public SfxOleStringHelper { @@ -144,7 +136,6 @@ private: }; - /** Property representing a bytestring value. */ class SfxOleString8Property : public SfxOleStringPropertyBase { @@ -161,7 +152,6 @@ private: }; - /** Property representing a Unicode string value. */ class SfxOleString16Property : public SfxOleStringPropertyBase { @@ -174,7 +164,6 @@ private: }; - /** Property representing a filetime value as defined by the Windows API. */ class SfxOleFileTimeProperty : public SfxOlePropertyBase { @@ -212,7 +201,6 @@ private: }; - /** Property representing a thumbnail picture. Currently, only saving this property is implemented. @@ -234,7 +222,6 @@ private: }; - /** Property representing a BLOB (which presumably stands for binary large object). @@ -256,7 +243,6 @@ private: }; - sal_uInt16 SfxOleTextEncoding::GetCodePage() const { sal_uInt16 nCodePage = IsUnicode() ? CODEPAGE_UNICODE : @@ -277,7 +263,6 @@ void SfxOleTextEncoding::SetCodePage( sal_uInt16 nCodePage ) } - OUString SfxOleStringHelper::LoadString8( SvStream& rStrm ) const { return IsUnicode() ? ImplLoadString16( rStrm ) : ImplLoadString8( rStrm ); @@ -378,7 +363,6 @@ void SfxOleStringHelper::ImplSaveString16( SvStream& rStrm, const OUString& rVal } - SfxOleObjectBase::~SfxOleObjectBase() { } @@ -410,7 +394,6 @@ void SfxOleObjectBase::SaveObject( SvStream& rStrm, SfxOleObjectBase& rObj ) } - SfxOleCodePageProperty::SfxOleCodePageProperty() : SfxOlePropertyBase( PROPID_CODEPAGE, PROPTYPE_INT16 ) { @@ -431,7 +414,6 @@ void SfxOleCodePageProperty::ImplSave( SvStream& rStrm ) } - SfxOleInt32Property::SfxOleInt32Property( sal_Int32 nPropId, sal_Int32 nValue ) : SfxOlePropertyBase( nPropId, PROPTYPE_INT32 ), mnValue( nValue ) @@ -449,7 +431,6 @@ void SfxOleInt32Property::ImplSave( SvStream& rStrm ) } - SfxOleDoubleProperty::SfxOleDoubleProperty( sal_Int32 nPropId, double fValue ) : SfxOlePropertyBase( nPropId, PROPTYPE_DOUBLE ), mfValue( fValue ) @@ -467,7 +448,6 @@ void SfxOleDoubleProperty::ImplSave( SvStream& rStrm ) } - SfxOleBoolProperty::SfxOleBoolProperty( sal_Int32 nPropId, bool bValue ) : SfxOlePropertyBase( nPropId, PROPTYPE_BOOL ), mbValue( bValue ) @@ -487,7 +467,6 @@ void SfxOleBoolProperty::ImplSave( SvStream& rStrm ) } - SfxOleStringPropertyBase::SfxOleStringPropertyBase( sal_Int32 nPropId, sal_Int32 nPropType, const SfxOleTextEncoding& rTextEnc ) : SfxOlePropertyBase( nPropId, nPropType ), @@ -511,7 +490,6 @@ SfxOleStringPropertyBase::SfxOleStringPropertyBase( } - SfxOleString8Property::SfxOleString8Property( sal_Int32 nPropId, const SfxOleTextEncoding& rTextEnc ) : SfxOleStringPropertyBase( nPropId, PROPTYPE_STRING8, rTextEnc ) @@ -535,7 +513,6 @@ void SfxOleString8Property::ImplSave( SvStream& rStrm ) } - SfxOleString16Property::SfxOleString16Property( sal_Int32 nPropId ) : SfxOleStringPropertyBase( nPropId, PROPTYPE_STRING16, RTL_TEXTENCODING_UCS2 ) { @@ -552,7 +529,6 @@ void SfxOleString16Property::ImplSave( SvStream& rStrm ) } - SfxOleFileTimeProperty::SfxOleFileTimeProperty( sal_Int32 nPropId ) : SfxOlePropertyBase( nPropId, PROPTYPE_FILETIME ) { @@ -637,7 +613,6 @@ void SfxOleDateProperty::ImplSave( SvStream& rStrm ) } - SfxOleThumbnailProperty::SfxOleThumbnailProperty( sal_Int32 nPropId, const uno::Sequence<sal_uInt8> & i_rData) : SfxOlePropertyBase( nPropId, PROPTYPE_CLIPFMT ), @@ -687,7 +662,6 @@ void SfxOleThumbnailProperty::ImplSave( SvStream& rStrm ) } - SfxOleBlobProperty::SfxOleBlobProperty( sal_Int32 nPropId, const uno::Sequence<sal_uInt8> & i_rData) : SfxOlePropertyBase( nPropId, PROPTYPE_BLOB ), @@ -712,7 +686,6 @@ void SfxOleBlobProperty::ImplSave( SvStream& rStrm ) } - SfxOleDictionaryProperty::SfxOleDictionaryProperty( const SfxOleTextEncoding& rTextEnc ) : SfxOlePropertyBase( PROPID_DICTIONARY, 0 ), SfxOleStringHelper( rTextEnc ) @@ -759,7 +732,6 @@ void SfxOleDictionaryProperty::ImplSave( SvStream& rStrm ) } - SfxOleSection::SfxOleSection( bool bSupportsDict ) : maDictProp( maCodePageProp ), mnStartPos( 0 ), @@ -1145,7 +1117,6 @@ void SfxOleSection::SaveProperty( SvStream& rStrm, SfxOlePropertyBase& rProp, sa } - ErrCode SfxOlePropertySet::LoadPropertySet( SotStorage* pStrg, const OUString& rStrmName ) { if( pStrg ) @@ -1294,7 +1265,6 @@ const SvGlobalName& SfxOlePropertySet::GetSectionGuid( SfxOleSectionType eSectio } - //} // namespace /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sfx2/source/doc/oleprops.hxx b/sfx2/source/doc/oleprops.hxx index 3d1fa0c9f798..d0174b901df6 100644 --- a/sfx2/source/doc/oleprops.hxx +++ b/sfx2/source/doc/oleprops.hxx @@ -31,8 +31,6 @@ #include <com/sun/star/util/Date.hpp> - - //namespace { @@ -94,7 +92,6 @@ const sal_Int32 CLIPFMT_WIN = -1; const sal_Int32 CLIPDATAFMT_DIB = 8; - /** Helper for classes that need text encoding settings. Classes derived from this class will include functions to store and use @@ -131,7 +128,6 @@ private: }; - /** Helper for classes that need to load or save string values. Classes derived from this class contain functions to load and save string @@ -165,7 +161,6 @@ private: }; - /** Base class for all classes related to OLE property sets. Derived classes have to implement the pure virtual functions ImplLoad() and @@ -207,7 +202,6 @@ private: }; - /** Base class for all OLE property objects. */ class SfxOlePropertyBase : public SfxOleObjectBase { @@ -241,7 +235,6 @@ private: }; - /** Property containing custom names for other properties in the property set. */ class SfxOleDictionaryProperty : public SfxOlePropertyBase, public SfxOleStringHelper { @@ -268,7 +261,6 @@ private: }; - /** A section in a property set. Contains properties with unique identifiers. */ class SfxOleSection : public SfxOleObjectBase { @@ -356,7 +348,6 @@ private: typedef std::shared_ptr< SfxOleSection > SfxOleSectionRef; - /** Enumerates different section types in OLE property sets. */ enum SfxOleSectionType { @@ -366,7 +357,6 @@ enum SfxOleSectionType }; - /** Represents a complete property set, may consist of several property sections. */ class SfxOlePropertySet : public SfxOleObjectBase { diff --git a/sfx2/source/doc/printhelper.cxx b/sfx2/source/doc/printhelper.cxx index d1768dd91517..8ce5f7824e5b 100644 --- a/sfx2/source/doc/printhelper.cxx +++ b/sfx2/source/doc/printhelper.cxx @@ -581,8 +581,6 @@ class ImplUCBPrintWatcher : public ::osl::Thread }; - - // XPrintable void SAL_CALL SfxPrintHelper::print(const uno::Sequence< beans::PropertyValue >& rOptions) diff --git a/sfx2/source/doc/sfxbasemodel.cxx b/sfx2/source/doc/sfxbasemodel.cxx index 850de4d41af9..1b342e9d340c 100644 --- a/sfx2/source/doc/sfxbasemodel.cxx +++ b/sfx2/source/doc/sfxbasemodel.cxx @@ -181,7 +181,6 @@ void SAL_CALL SfxDocInfoListener_Impl::disposing( const lang::EventObject& ) // impl. declarations - struct IMPL_SfxBaseModel_DataContainer : public ::sfx2::IModifiableDocument { // counter for SfxBaseModel instances created. @@ -310,7 +309,6 @@ struct IMPL_SfxBaseModel_DataContainer : public ::sfx2::IModifiableDocument sal_Int64 IMPL_SfxBaseModel_DataContainer::g_nInstanceCounter = 0; - // Listener that forwards notifications from the PrintHelper to the "real" listeners class SfxPrintHelperListener_Impl : public ::cppu::WeakImplHelper< view::XPrintJobListener > { @@ -713,7 +711,6 @@ void SAL_CALL SfxBaseModel::addDialog( const OUString& LibraryName, const OUStri } - // XChild @@ -844,7 +841,6 @@ SfxBaseModel::getDocumentProperties() } - // lang::XEventListener @@ -2186,7 +2182,6 @@ Any SAL_CALL SfxBaseModel::getTransferData( const datatransfer::DataFlavor& aFla // XTransferable - Sequence< datatransfer::DataFlavor > SAL_CALL SfxBaseModel::getTransferDataFlavors() throw (RuntimeException, std::exception) { @@ -2254,7 +2249,6 @@ Sequence< datatransfer::DataFlavor > SAL_CALL SfxBaseModel::getTransferDataFlavo // XTransferable - sal_Bool SAL_CALL SfxBaseModel::isDataFlavorSupported( const datatransfer::DataFlavor& aFlavor ) throw (RuntimeException, std::exception) { @@ -2311,7 +2305,6 @@ sal_Bool SAL_CALL SfxBaseModel::isDataFlavorSupported( const datatransfer::DataF } - // XEventsSupplier @@ -3413,7 +3406,6 @@ Sequence< OUString > SAL_CALL SfxBaseModel::getDocumentSubStoragesNames() // XScriptProviderSupplier - Reference< script::provider::XScriptProvider > SAL_CALL SfxBaseModel::getScriptProvider() throw ( RuntimeException, std::exception ) { diff --git a/sfx2/source/doc/syspathw32.cxx b/sfx2/source/doc/syspathw32.cxx index e673749c2161..422a0e0c2e89 100644 --- a/sfx2/source/doc/syspathw32.cxx +++ b/sfx2/source/doc/syspathw32.cxx @@ -18,7 +18,6 @@ */ - #ifdef WNT #ifdef _MSC_VER #pragma warning(disable:4917) diff --git a/sfx2/source/doc/zoomitem.cxx b/sfx2/source/doc/zoomitem.cxx index 0217acdb51b4..da35e86a9ab2 100644 --- a/sfx2/source/doc/zoomitem.cxx +++ b/sfx2/source/doc/zoomitem.cxx @@ -27,7 +27,6 @@ #include <sfx2/sfx.hrc> - SfxPoolItem* SvxZoomItem::CreateDefault() { return new SvxZoomItem; } #define ZOOM_PARAM_VALUE "Value" @@ -36,7 +35,6 @@ SfxPoolItem* SvxZoomItem::CreateDefault() { return new SvxZoomItem; } #define ZOOM_PARAMS 3 - SvxZoomItem::SvxZoomItem ( SvxZoomType eZoomType, @@ -50,7 +48,6 @@ SvxZoomItem::SvxZoomItem } - SvxZoomItem::SvxZoomItem( const SvxZoomItem& rOrig ) : SfxUInt16Item( rOrig.Which(), rOrig.GetValue() ), nValueSet( rOrig.GetValueSet() ), @@ -59,20 +56,17 @@ SvxZoomItem::SvxZoomItem( const SvxZoomItem& rOrig ) } - SvxZoomItem::~SvxZoomItem() { } - SfxPoolItem* SvxZoomItem::Clone( SfxItemPool * /*pPool*/ ) const { return new SvxZoomItem( *this ); } - SfxPoolItem* SvxZoomItem::Create( SvStream& rStrm, sal_uInt16 /*nVersion*/ ) const { sal_uInt16 nValue; @@ -85,7 +79,6 @@ SfxPoolItem* SvxZoomItem::Create( SvStream& rStrm, sal_uInt16 /*nVersion*/ ) con } - SvStream& SvxZoomItem::Store( SvStream& rStrm, sal_uInt16 /*nItemVersion*/ ) const { rStrm.WriteUInt16( GetValue() ) @@ -95,7 +88,6 @@ SvStream& SvxZoomItem::Store( SvStream& rStrm, sal_uInt16 /*nItemVersion*/ ) con } - bool SvxZoomItem::operator==( const SfxPoolItem& rAttr ) const { DBG_ASSERT( SfxPoolItem::operator==(rAttr), "unequal types" ); diff --git a/sfx2/source/explorer/nochaos.cxx b/sfx2/source/explorer/nochaos.cxx index 1d8cf28a24c8..b9716e887570 100644 --- a/sfx2/source/explorer/nochaos.cxx +++ b/sfx2/source/explorer/nochaos.cxx @@ -52,9 +52,6 @@ public: }; - - - class CntItemPool: public SfxItemPool { static CntItemPool* _pThePool; @@ -70,8 +67,6 @@ public: }; - - // static SfxItemPool* NoChaos::GetItemPool() { diff --git a/sfx2/source/inc/eventsupplier.hxx b/sfx2/source/inc/eventsupplier.hxx index 51797ccf71c0..2d3462ec96e6 100644 --- a/sfx2/source/inc/eventsupplier.hxx +++ b/sfx2/source/inc/eventsupplier.hxx @@ -49,7 +49,6 @@ class SfxObjectShell; class SvxMacro; - class SfxEvents_Impl : public ::cppu::WeakImplHelper< css::container::XNameReplace, css::document::XEventListener > { css::uno::Sequence< OUString > maEventNames; diff --git a/sfx2/source/inc/sfxtypes.hxx b/sfx2/source/inc/sfxtypes.hxx index a5c5d54d2ac8..dd55b761147a 100644 --- a/sfx2/source/inc/sfxtypes.hxx +++ b/sfx2/source/inc/sfxtypes.hxx @@ -69,7 +69,6 @@ public: #endif - struct StringList_Impl : private Resource { diff --git a/sfx2/source/inc/statcach.hxx b/sfx2/source/inc/statcach.hxx index 844ef68fcf40..51d9e2a48408 100644 --- a/sfx2/source/inc/statcach.hxx +++ b/sfx2/source/inc/statcach.hxx @@ -113,7 +113,6 @@ public: }; - // clears Cached-Item inline void SfxStateCache::ClearCache() @@ -122,7 +121,6 @@ inline void SfxStateCache::ClearCache() } - // registeres a item representing this function inline SfxControllerItem* SfxStateCache::ChangeItemLink( SfxControllerItem* pNewBinding ) diff --git a/sfx2/source/inc/virtmenu.hxx b/sfx2/source/inc/virtmenu.hxx index 2f5e8b1bb6cc..2009db827d65 100644 --- a/sfx2/source/inc/virtmenu.hxx +++ b/sfx2/source/inc/virtmenu.hxx @@ -98,7 +98,6 @@ public: }; - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sfx2/source/inc/workwin.hxx b/sfx2/source/inc/workwin.hxx index 4b711577c04f..a54cb823da56 100644 --- a/sfx2/source/inc/workwin.hxx +++ b/sfx2/source/inc/workwin.hxx @@ -162,7 +162,6 @@ enum class SfxDockingConfig #define SFX_SPLITWINDOWS_MAX 4 - class LayoutManagerListener : public ::cppu::WeakImplHelper< css::frame::XLayoutManagerListener, css::lang::XComponent > diff --git a/sfx2/source/inet/inettbc.cxx b/sfx2/source/inet/inettbc.cxx index a83e84b7f47d..31c4a02a4a04 100644 --- a/sfx2/source/inet/inettbc.cxx +++ b/sfx2/source/inet/inettbc.cxx @@ -76,7 +76,6 @@ SvtURLBox* SfxURLToolBoxControl_Impl::GetURLBox() const } - void SfxURLToolBoxControl_Impl::OpenURL( const OUString& rName, bool /*bNew*/ ) const { OUString aName; @@ -132,7 +131,6 @@ void SfxURLToolBoxControl_Impl::OpenURL( const OUString& rName, bool /*bNew*/ ) } - IMPL_STATIC_LINK_TYPED( SfxURLToolBoxControl_Impl, ExecuteHdl_Impl, void*, p, void ) { ExecuteInfo* pExecuteInfo = static_cast<ExecuteInfo*>(p); @@ -187,7 +185,6 @@ IMPL_LINK_NOARG_TYPED(SfxURLToolBoxControl_Impl, OpenHdl, SvtURLBox*, void) } - void SfxURLToolBoxControl_Impl::StateChanged ( sal_uInt16 nSID, diff --git a/sfx2/source/menu/mnuitem.cxx b/sfx2/source/menu/mnuitem.cxx index b871d7120069..8d62caf6e66b 100644 --- a/sfx2/source/menu/mnuitem.cxx +++ b/sfx2/source/menu/mnuitem.cxx @@ -66,7 +66,6 @@ using namespace ::com::sun::star::beans; using namespace ::com::sun::star::util; - // binds the instance to the specified id and assignes the title void SfxMenuControl::Bind( @@ -89,8 +88,6 @@ void SfxMenuControl::Bind( } - - // binds the item to the specified menu and assignes the title void SfxMenuControl::Bind( @@ -108,7 +105,6 @@ void SfxMenuControl::Bind( } - // Constructor for explicit registration SfxMenuControl::SfxMenuControl( bool bShowStrings ) @@ -119,7 +115,6 @@ SfxMenuControl::SfxMenuControl( bool bShowStrings ) } - // Constructor for array SfxMenuControl::SfxMenuControl(): pOwnMenu(nullptr), @@ -129,7 +124,6 @@ SfxMenuControl::SfxMenuControl(): } - SfxMenuControl::SfxMenuControl(sal_uInt16 nSlotId, SfxBindings& rBindings): SfxControllerItem(nSlotId, rBindings), pOwnMenu(nullptr), @@ -144,15 +138,12 @@ SfxMenuControl::SfxMenuControl(sal_uInt16 nSlotId, SfxBindings& rBindings): } - - SfxMenuControl::~SfxMenuControl() { delete pSubMenu; } - // changes the state in the virtual menu void SfxMenuControl::StateChanged @@ -238,7 +229,6 @@ void SfxMenuControl::StateChanged } - SfxMenuControl* SfxMenuControl::CreateImpl( sal_uInt16 /*nId*/, Menu& /*rMenu*/, SfxBindings& /*rBindings*/ ) { return new SfxMenuControl( true ); @@ -290,7 +280,6 @@ SfxMenuControl* SfxMenuControl::CreateControl( sal_uInt16 nId, Menu &rMenu, SfxB } - SfxUnoMenuControl* SfxMenuControl::CreateControl( const OUString& rCmd, sal_uInt16 nId, Menu& rMenu, const OUString& sItemText, SfxBindings& rBindings, SfxVirtualMenu* pVirt) diff --git a/sfx2/source/menu/mnumgr.cxx b/sfx2/source/menu/mnumgr.cxx index 5883cb2c6114..aca28a807867 100644 --- a/sfx2/source/menu/mnumgr.cxx +++ b/sfx2/source/menu/mnumgr.cxx @@ -76,7 +76,6 @@ void TryToHideDisabledEntries_Impl( Menu* pMenu ) } - SfxMenuManager::~SfxMenuManager() { pBindings->ENTERREGISTRATIONS(); @@ -85,7 +84,6 @@ SfxMenuManager::~SfxMenuManager() } - void SfxMenuManager::Construct( SfxVirtualMenu& rMenu ) { pMenu = &rMenu; @@ -200,7 +198,6 @@ PopupMenu* InsertThesaurusSubmenu_Impl( SfxBindings* pBindings, Menu* pSVMenu ) } - // executes the function for the selected item IMPL_LINK_TYPED( SfxMenuManager, Select, Menu *, pSelMenu, bool ) { @@ -239,7 +236,6 @@ SfxPopupMenuManager::~SfxPopupMenuManager() } - void SfxPopupMenuManager::RemoveDisabledEntries() { if ( pSVMenu ) @@ -247,14 +243,12 @@ void SfxPopupMenuManager::RemoveDisabledEntries() } - void SfxPopupMenuManager::Execute( const Point& rPos, vcl::Window* pWindow ) { static_cast<PopupMenu*>( GetMenu()->GetSVMenu() )->Execute( pWindow, rPos ); } - SfxMenuManager::SfxMenuManager( Menu* pMenuArg, SfxBindings &rBindings ) : pMenu(nullptr), pBindings(&rBindings) diff --git a/sfx2/source/menu/thessubmenu.cxx b/sfx2/source/menu/thessubmenu.cxx index f1548fe8ee99..93ee0b665bee 100644 --- a/sfx2/source/menu/thessubmenu.cxx +++ b/sfx2/source/menu/thessubmenu.cxx @@ -136,5 +136,4 @@ OUString SfxThesSubMenuHelper::GetThesImplName( const lang::Locale &rLocale ) co } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sfx2/source/menu/thessubmenu.hxx b/sfx2/source/menu/thessubmenu.hxx index 8953537b26e5..145ed4f449fa 100644 --- a/sfx2/source/menu/thessubmenu.hxx +++ b/sfx2/source/menu/thessubmenu.hxx @@ -55,7 +55,6 @@ public: }; - #endif diff --git a/sfx2/source/menu/virtmenu.cxx b/sfx2/source/menu/virtmenu.cxx index f356b7cde568..bf0c2c5113b7 100644 --- a/sfx2/source/menu/virtmenu.cxx +++ b/sfx2/source/menu/virtmenu.cxx @@ -108,7 +108,6 @@ void SfxMenuImageControl_Impl::Update() } - static Image RetrieveAddOnImage( Reference< css::frame::XFrame >& rFrame, const OUString& aImageId, const OUString& aURL, @@ -132,7 +131,6 @@ static Image RetrieveAddOnImage( Reference< css::frame::XFrame >& rFrame, } - /* This helper function checks whether a Slot-id in the current application status is visible or not. This relates to the application status to see if the OLE server application exist or not. @@ -151,7 +149,6 @@ bool IsItemHidden_Impl( sal_uInt16 nItemId, bool bOleServer, bool bMac ) } - void SfxVirtualMenu::Construct_Impl() { pSVMenu->SetHighlightHdl( LINK(this, SfxVirtualMenu, Highlight) ); @@ -164,7 +161,6 @@ void SfxVirtualMenu::Construct_Impl() } - SfxVirtualMenu::SfxVirtualMenu( sal_uInt16 nOwnId, SfxVirtualMenu* pOwnParent, Menu& rMenu, bool bWithHelp, SfxBindings &rBindings, bool bOLEServer, bool bRes, bool bIsAddonMenu ): @@ -195,7 +191,6 @@ SfxVirtualMenu::SfxVirtualMenu( sal_uInt16 nOwnId, } - // creates a virtual menu from a StarView MenuBar or PopupMenu SfxVirtualMenu::SfxVirtualMenu( Menu *pStarViewMenu, bool bWithHelp, @@ -228,7 +223,6 @@ SfxVirtualMenu::SfxVirtualMenu( Menu *pStarViewMenu, bool bWithHelp, } - /* The destructor of the class SfxVirtualMenu releases bounded items and the associated StarView-PopupMenu is released from its parent. If it is related to the Pickmenu or the MDI-menu, it is unregistered here. @@ -480,7 +474,6 @@ void SfxVirtualMenu::CreateFromSVMenu() } - // called on activation of the SV-Menu IMPL_STATIC_LINK_NOARG_TYPED( @@ -555,7 +548,6 @@ IMPL_LINK_NOARG_TYPED(SfxVirtualMenu, SettingsChanged, LinkParamNone*, void) } - void SfxVirtualMenu::UpdateImages( Menu* pMenu ) { if ( !pMenu ) @@ -596,7 +588,6 @@ void SfxVirtualMenu::UpdateImages( Menu* pMenu ) } - void SfxVirtualMenu::RemoveMenuImages( Menu* pMenu ) { if ( !pMenu ) @@ -615,7 +606,6 @@ void SfxVirtualMenu::RemoveMenuImages( Menu* pMenu ) } - bool SfxVirtualMenu::Bind_Impl( Menu *pMenu ) { // Search , as SV with 'sal_uInt16 nSID = pSVMenu->GetCurItemId();' always @@ -730,7 +720,6 @@ void SfxVirtualMenu::UnbindControllers() } - void SfxVirtualMenu::InsertAddOnsMenuItem( Menu* pMenu ) { // Create special popup menu that is filled with the 3rd party components popup menu items @@ -769,7 +758,6 @@ void SfxVirtualMenu::InsertAddOnsMenuItem( Menu* pMenu ) } - // called on activation of the SV-Menu IMPL_LINK_TYPED( SfxVirtualMenu, Activate, Menu *, pMenu, bool ) @@ -907,7 +895,6 @@ IMPL_LINK_TYPED( SfxVirtualMenu, Activate, Menu *, pMenu, bool ) } - IMPL_LINK_TYPED( SfxVirtualMenu, Deactivate, Menu *, pMenu, bool ) { SAL_INFO( @@ -976,12 +963,9 @@ IMPL_LINK_TYPED( SfxVirtualMenu, Select, Menu *, pMenu, bool ) } - // returns the associated StarView-menu - - // set the checkmark of the specified item void SfxVirtualMenu::CheckItem( sal_uInt16 nItemId, bool bCheck ) @@ -1013,8 +997,6 @@ void SfxVirtualMenu::SetItemText( sal_uInt16 nItemId, const OUString& rText ) } - - void SfxVirtualMenu::SetPopupMenu( sal_uInt16 nItemId, PopupMenu *pMenu ) { @@ -1029,7 +1011,6 @@ void SfxVirtualMenu::SetPopupMenu( sal_uInt16 nItemId, PopupMenu *pMenu ) } - // Forces the initialization, which is otherwise only happens in Activate void SfxVirtualMenu::InitPopup( sal_uInt16 nPos, bool /*bOLE*/ ) diff --git a/sfx2/source/notify/eventsupplier.cxx b/sfx2/source/notify/eventsupplier.cxx index b61e19002261..8e4e5232f3f1 100644 --- a/sfx2/source/notify/eventsupplier.cxx +++ b/sfx2/source/notify/eventsupplier.cxx @@ -48,7 +48,6 @@ #include <macroloader.hxx> - #define MACRO_PRFIX "macro://" #define MACRO_POSTFIX "()" @@ -315,7 +314,6 @@ void SAL_CALL SfxEvents_Impl::disposing( const lang::EventObject& /*Source*/ ) t } - SfxEvents_Impl::SfxEvents_Impl( SfxObjectShell* pShell, uno::Reference< document::XEventBroadcaster > xBroadcaster ) { diff --git a/sfx2/source/statbar/stbitem.cxx b/sfx2/source/statbar/stbitem.cxx index d8816c4c670d..693d164c402f 100644 --- a/sfx2/source/statbar/stbitem.cxx +++ b/sfx2/source/statbar/stbitem.cxx @@ -52,7 +52,6 @@ using namespace ::com::sun::star; - sal_uInt16 SfxStatusBarControl::convertAwtToVCLMouseButtons( sal_Int16 nAwtMouseButtons ) { sal_uInt16 nVCLMouseButtons( 0 ); @@ -68,7 +67,6 @@ sal_uInt16 SfxStatusBarControl::convertAwtToVCLMouseButtons( sal_Int16 nAwtMouse } - svt::StatusbarController* SAL_CALL SfxStatusBarControllerFactory( const uno::Reference< frame::XFrame >& rFrame, StatusBar* pStatusBar, @@ -130,7 +128,6 @@ svt::StatusbarController* SAL_CALL SfxStatusBarControllerFactory( } - SfxStatusBarControl::SfxStatusBarControl ( sal_uInt16 nSlotID, /* Slot-Id which is connected to this @@ -163,7 +160,6 @@ SfxStatusBarControl::SfxStatusBarControl } - SfxStatusBarControl::~SfxStatusBarControl() /* [Description] @@ -334,7 +330,6 @@ throw ( uno::RuntimeException, std::exception ) } - sal_Bool SAL_CALL SfxStatusBarControl::mouseMove( const awt::MouseEvent& rMouseEvent ) throw (uno::RuntimeException, std::exception) @@ -351,7 +346,6 @@ throw (uno::RuntimeException, std::exception) } - sal_Bool SAL_CALL SfxStatusBarControl::mouseButtonUp( const ::awt::MouseEvent& rMouseEvent ) throw ( uno::RuntimeException, std::exception ) @@ -368,7 +362,6 @@ throw ( uno::RuntimeException, std::exception ) } - void SAL_CALL SfxStatusBarControl::command( const awt::Point& rPos, ::sal_Int32 nCommand, @@ -384,7 +377,6 @@ throw (css::uno::RuntimeException, std::exception) } - void SAL_CALL SfxStatusBarControl::paint( const uno::Reference< awt::XGraphics >& xGraphics, const awt::Rectangle& rOutputRectangle, @@ -403,7 +395,6 @@ throw ( ::uno::RuntimeException, std::exception ) } - void SAL_CALL SfxStatusBarControl::click( const awt::Point& ) throw ( uno::RuntimeException, std::exception ) { @@ -412,7 +403,6 @@ throw ( uno::RuntimeException, std::exception ) } - void SAL_CALL SfxStatusBarControl::doubleClick( const awt::Point& ) throw ( uno::RuntimeException, std::exception ) { @@ -457,7 +447,6 @@ void SfxStatusBarControl::StateChanged } - bool SfxStatusBarControl::MouseButtonDown( const MouseEvent & ) /* [Description] @@ -484,7 +473,6 @@ bool SfxStatusBarControl::MouseButtonDown( const MouseEvent & ) } - bool SfxStatusBarControl::MouseMove( const MouseEvent & ) /* [Description] @@ -537,7 +525,6 @@ bool SfxStatusBarControl::MouseButtonUp( const MouseEvent & ) } - void SfxStatusBarControl::Command( const CommandEvent& ) /* [Description] @@ -552,7 +539,6 @@ void SfxStatusBarControl::Command( const CommandEvent& ) } - void SfxStatusBarControl::Click() /* [Description] @@ -567,7 +553,6 @@ void SfxStatusBarControl::Click() } - void SfxStatusBarControl::Paint ( const UserDrawEvent& /* Reference to an UserDrawEvent */ @@ -587,7 +572,6 @@ void SfxStatusBarControl::Paint } - SfxStatusBarControl* SfxStatusBarControl::CreateControl ( sal_uInt16 nSlotID, diff --git a/sfx2/source/toolbox/imgmgr.cxx b/sfx2/source/toolbox/imgmgr.cxx index c04831ed15c7..a2d4a58aa0be 100644 --- a/sfx2/source/toolbox/imgmgr.cxx +++ b/sfx2/source/toolbox/imgmgr.cxx @@ -119,7 +119,6 @@ SfxImageManager_Impl::SfxImageManager_Impl(SfxModule& rModule) } - SfxImageManager_Impl::~SfxImageManager_Impl() { m_aOpt.RemoveListenerLink( LINK( this, SfxImageManager_Impl, OptionsChanged_Impl ) ); @@ -130,7 +129,6 @@ SfxImageManager_Impl::~SfxImageManager_Impl() } - ImageList* SfxImageManager_Impl::GetImageList( bool bBig ) { sal_Int32 nIndex = impl_convertBools( bBig ); @@ -143,7 +141,6 @@ ImageList* SfxImageManager_Impl::GetImageList( bool bBig ) } - Image SfxImageManager_Impl::GetImage( sal_uInt16 nId, bool bBig ) { ImageList* pImageList = GetImageList( bBig ); @@ -153,7 +150,6 @@ Image SfxImageManager_Impl::GetImage( sal_uInt16 nId, bool bBig ) } - void SfxImageManager_Impl::SetSymbolsSize_Impl( sal_Int16 nNewSymbolsSize ) { SolarMutexGuard aGuard; @@ -199,14 +195,12 @@ void SfxImageManager_Impl::SetSymbolsSize_Impl( sal_Int16 nNewSymbolsSize ) } - IMPL_LINK_NOARG_TYPED(SfxImageManager_Impl, OptionsChanged_Impl, LinkParamNone*, void) { SetSymbolsSize_Impl( m_aOpt.GetCurrentSymbolsSize() ); } - IMPL_LINK_TYPED( SfxImageManager_Impl, SettingsChanged_Impl, VclSimpleEvent&, rEvent, void) { switch (rEvent.GetId()) @@ -305,7 +299,6 @@ void SfxImageManager::RegisterToolBox( ToolBox *pBox, SfxToolboxFlags nFlags ) } - void SfxImageManager::ReleaseToolBox( ToolBox *pBox ) { SolarMutexGuard aGuard; diff --git a/sfx2/source/toolbox/tbxitem.cxx b/sfx2/source/toolbox/tbxitem.cxx index f49b7dd13a35..ec0b2f577eea 100644 --- a/sfx2/source/toolbox/tbxitem.cxx +++ b/sfx2/source/toolbox/tbxitem.cxx @@ -104,7 +104,6 @@ using namespace ::com::sun::star::container; using namespace ::com::sun::star::ui; - SFX_IMPL_TOOLBOX_CONTROL_ARG(SfxToolBoxControl, SfxStringItem, true); static vcl::Window* GetTopMostParentSystemWindow( vcl::Window* pWindow ) @@ -210,7 +209,6 @@ IMPL_LINK_TYPED( SfxToolBoxControl_Impl, WindowEventListener, VclWindowEvent&, r } - SfxToolBoxControl::SfxToolBoxControl( sal_uInt16 nSlotID, sal_uInt16 nID, @@ -229,14 +227,12 @@ SfxToolBoxControl::SfxToolBoxControl( } - SfxToolBoxControl::~SfxToolBoxControl() { delete pImpl; } - ToolBox& SfxToolBoxControl::GetToolBox() const { return *pImpl->pBox; @@ -251,7 +247,6 @@ unsigned short SfxToolBoxControl::GetSlotId() const } - void SAL_CALL SfxToolBoxControl::dispose() throw (css::uno::RuntimeException, std::exception) { if ( m_bDisposed ) @@ -623,7 +618,6 @@ void SfxToolBoxControl::SetPopupWindow( SfxPopupWindow* pWindow ) } - IMPL_LINK_NOARG_TYPED(SfxToolBoxControl, PopupModeEndHdl, FloatingWindow*, void) { if ( pImpl->mpPopupWindow->IsVisible() ) @@ -655,7 +649,6 @@ IMPL_LINK_TYPED( SfxToolBoxControl, ClosePopupWindow, SfxPopupWindow *, pWindow, } - void SfxToolBoxControl::StateChanged ( sal_uInt16 nId, @@ -714,26 +707,22 @@ void SfxToolBoxControl::StateChanged } - void SfxToolBoxControl::Select( sal_uInt16 nSelectModifier ) { svt::ToolboxController::execute( nSelectModifier ); } - void SfxToolBoxControl::DoubleClick() { } - void SfxToolBoxControl::Click() { } - VclPtr<SfxPopupWindow> SfxToolBoxControl::CreatePopupWindow() { return nullptr; @@ -769,13 +758,11 @@ SfxFrameStatusListener::SfxFrameStatusListener( } - SfxFrameStatusListener::~SfxFrameStatusListener() { } - // XStatusListener void SAL_CALL SfxFrameStatusListener::statusChanged( const css::frame::FeatureStateEvent& rEvent ) throw ( css::uno::RuntimeException, std::exception ) @@ -982,7 +969,6 @@ void SfxPopupWindow::dispose() } - void SfxPopupWindow::GetOrCreateStatusListener() { if ( !m_xStatusListener.is() ) @@ -996,7 +982,6 @@ void SfxPopupWindow::GetOrCreateStatusListener() } - void SfxPopupWindow::BindListener() { GetOrCreateStatusListener(); @@ -1005,7 +990,6 @@ void SfxPopupWindow::BindListener() } - void SfxPopupWindow::UnbindListener() { GetOrCreateStatusListener(); @@ -1014,7 +998,6 @@ void SfxPopupWindow::UnbindListener() } - void SfxPopupWindow::AddStatusListener( const OUString& rCommandURL ) { GetOrCreateStatusListener(); @@ -1023,7 +1006,6 @@ void SfxPopupWindow::AddStatusListener( const OUString& rCommandURL ) } - bool SfxPopupWindow::Close() { m_bFloating = false; @@ -1034,7 +1016,6 @@ bool SfxPopupWindow::Close() } - void SfxPopupWindow::PopupModeEnd() { //! to allow PopupModeEndHdl to be called @@ -1051,7 +1032,6 @@ void SfxPopupWindow::PopupModeEnd() } - void SfxPopupWindow::DeleteFloatingWindow() { if ( m_bFloating ) @@ -1062,7 +1042,6 @@ void SfxPopupWindow::DeleteFloatingWindow() } - void SfxPopupWindow::MouseMove( const ::MouseEvent& rMEvt ) { if ( !m_bCascading ) @@ -1088,14 +1067,12 @@ void SfxPopupWindow::MouseMove( const ::MouseEvent& rMEvt ) } - void SfxPopupWindow::StartCascading() { m_bCascading = true; } - void SfxPopupWindow::StateChanged( sal_uInt16 /*nSID*/, SfxItemState eState, @@ -1122,7 +1099,6 @@ void SfxPopupWindow::StateChanged( } - void SfxPopupWindow::Delete() { m_aDeleteLink.Call( this ); diff --git a/sfx2/source/view/frame.cxx b/sfx2/source/view/frame.cxx index 603b39989c49..fd8d4fafcdcc 100644 --- a/sfx2/source/view/frame.cxx +++ b/sfx2/source/view/frame.cxx @@ -91,7 +91,6 @@ void SfxFrame::Construct_Impl() } - SfxFrame::~SfxFrame() { RemoveTopFrame_Impl( this ); @@ -237,7 +236,6 @@ bool SfxFrame::PrepareClose_Impl( bool bUI ) } - SfxFrame* SfxFrame::GetChildFrame( sal_uInt16 nPos ) const { if ( pChildArr && pChildArr->size() > nPos ) @@ -455,7 +453,6 @@ void SfxFrame::UpdateDescriptor( SfxObjectShell *pDoc ) } - SfxFrameDescriptor* SfxFrame::GetDescriptor() const { // Create a FrameDescriptor On Demand; if there is no TopLevel-Frame diff --git a/sfx2/source/view/frame2.cxx b/sfx2/source/view/frame2.cxx index 53502456e48c..60fcc2f0bded 100644 --- a/sfx2/source/view/frame2.cxx +++ b/sfx2/source/view/frame2.cxx @@ -62,7 +62,6 @@ using ::com::sun::star::lang::XComponent; using ::com::sun::star::frame::XComponentLoader; - class SfxFrameWindow_Impl : public vcl::Window { public: diff --git a/sfx2/source/view/ipclient.cxx b/sfx2/source/view/ipclient.cxx index a51e23b447ed..abf5df204132 100644 --- a/sfx2/source/view/ipclient.cxx +++ b/sfx2/source/view/ipclient.cxx @@ -597,7 +597,6 @@ IMPL_LINK_NOARG_TYPED(SfxInPlaceClient_Impl, TimerHdl, Timer *, void) } - // SfxInPlaceClient @@ -617,7 +616,6 @@ SfxInPlaceClient::SfxInPlaceClient( SfxViewShell* pViewShell, vcl::Window *pDraw } - SfxInPlaceClient::~SfxInPlaceClient() { m_pViewSh->IPClientGone_Impl(this); diff --git a/sfx2/source/view/printer.cxx b/sfx2/source/view/printer.cxx index ee8dfef79036..566351dce72e 100644 --- a/sfx2/source/view/printer.cxx +++ b/sfx2/source/view/printer.cxx @@ -84,7 +84,6 @@ VclPtr<SfxPrinter> SfxPrinter::Create( SvStream& rStream, SfxItemSet* pOptions ) } - void SfxPrinter::Store( SvStream& rStream ) const /* [Description] @@ -97,7 +96,6 @@ void SfxPrinter::Store( SvStream& rStream ) const } - SfxPrinter::SfxPrinter( SfxItemSet* pTheOptions ) : /* [Description] @@ -114,7 +112,6 @@ SfxPrinter::SfxPrinter( SfxItemSet* pTheOptions ) : } - SfxPrinter::SfxPrinter( SfxItemSet* pTheOptions, const JobSetup& rTheOrigJobSetup ) : @@ -131,7 +128,6 @@ SfxPrinter::SfxPrinter( SfxItemSet* pTheOptions, } - SfxPrinter::SfxPrinter( SfxItemSet* pTheOptions, const OUString& rPrinterName ) : @@ -145,7 +141,6 @@ SfxPrinter::SfxPrinter( SfxItemSet* pTheOptions, } - SfxPrinter::SfxPrinter( const SfxPrinter& rPrinter ) : Printer ( rPrinter.GetName() ), @@ -165,7 +160,6 @@ SfxPrinter::SfxPrinter( const SfxPrinter& rPrinter ) : } - VclPtr<SfxPrinter> SfxPrinter::Clone() const { if ( IsDefPrinter() ) @@ -185,7 +179,6 @@ VclPtr<SfxPrinter> SfxPrinter::Clone() const } - SfxPrinter::~SfxPrinter() { disposeOnce(); @@ -199,14 +192,12 @@ void SfxPrinter::dispose() } - void SfxPrinter::SetOptions( const SfxItemSet &rNewOptions ) { pOptions->Set(rNewOptions); } - SfxPrintOptionsDialog::SfxPrintOptionsDialog(vcl::Window *pParent, SfxViewShell *pViewShell, const SfxItemSet *pSet) @@ -231,7 +222,6 @@ SfxPrintOptionsDialog::SfxPrintOptionsDialog(vcl::Window *pParent, } - SfxPrintOptionsDialog::~SfxPrintOptionsDialog() { disposeOnce(); @@ -246,7 +236,6 @@ void SfxPrintOptionsDialog::dispose() } - short SfxPrintOptionsDialog::Execute() { if( ! pPage ) @@ -261,7 +250,6 @@ short SfxPrintOptionsDialog::Execute() } - bool SfxPrintOptionsDialog::Notify( NotifyEvent& rNEvt ) { if ( rNEvt.GetType() == MouseNotifyEvent::KEYINPUT ) @@ -274,7 +262,6 @@ bool SfxPrintOptionsDialog::Notify( NotifyEvent& rNEvt ) } - void SfxPrintOptionsDialog::DisableHelp() { pDlgImpl->mbHelpDisabled = true; diff --git a/sfx2/source/view/sfxbasecontroller.cxx b/sfx2/source/view/sfxbasecontroller.cxx index f159814b0f8e..66836406e73d 100644 --- a/sfx2/source/view/sfxbasecontroller.cxx +++ b/sfx2/source/view/sfxbasecontroller.cxx @@ -1487,7 +1487,6 @@ IMPL_LINK_NOARG_TYPED ( SfxBaseController, CheckOutHandler, Button*, void ) } - Reference< frame::XTitle > SfxBaseController::impl_getTitleHelper () { SolarMutexGuard aGuard; diff --git a/sfx2/source/view/viewfrm2.cxx b/sfx2/source/view/viewfrm2.cxx index c854d5f5af72..1901ff8aff85 100644 --- a/sfx2/source/view/viewfrm2.cxx +++ b/sfx2/source/view/viewfrm2.cxx @@ -77,8 +77,6 @@ void SfxFrameViewWindow_Impl::Resize() } - - void SfxViewFrame::UpdateTitle() /* [Description] diff --git a/sfx2/source/view/viewsh.cxx b/sfx2/source/view/viewsh.cxx index c18e338a6938..db2f60f7d263 100644 --- a/sfx2/source/view/viewsh.cxx +++ b/sfx2/source/view/viewsh.cxx @@ -96,7 +96,6 @@ using namespace ::cppu; #include "sfxslots.hxx" - class SfxClipboardChangeListener : public ::cppu::WeakImplHelper< datatransfer::clipboard::XClipboardListener > { @@ -401,9 +400,6 @@ void SfxViewShell::IPClientGone_Impl( SfxInPlaceClient *pIPClient ) } - - - void SfxViewShell::ExecMisc_Impl( SfxRequest &rReq ) { const sal_uInt16 nId = rReq.GetSlot(); @@ -752,7 +748,6 @@ void SfxViewShell::ExecMisc_Impl( SfxRequest &rReq ) } - void SfxViewShell::GetState_Impl( SfxItemSet &rSet ) { @@ -825,7 +820,6 @@ void SfxViewShell::GetState_Impl( SfxItemSet &rSet ) } - void SfxViewShell::SetZoomFactor( const Fraction &rZoomX, const Fraction &rZoomY ) { @@ -851,7 +845,6 @@ ErrCode SfxViewShell::DoVerb(long /*nVerb*/) } - void SfxViewShell::OutplaceActivated( bool bActive, SfxInPlaceClient* /*pClient*/ ) { if ( !bActive ) @@ -859,7 +852,6 @@ void SfxViewShell::OutplaceActivated( bool bActive, SfxInPlaceClient* /*pClient* } - void SfxViewShell::UIActivating( SfxInPlaceClient* /*pClient*/ ) { uno::Reference < frame::XFrame > xOwnFrame( pFrame->GetFrame().GetFrameInterface() ); @@ -872,7 +864,6 @@ void SfxViewShell::UIActivating( SfxInPlaceClient* /*pClient*/ ) } - void SfxViewShell::UIDeactivated( SfxInPlaceClient* /*pClient*/ ) { if ( !pFrame->GetFrame().IsClosing_Impl() || SfxViewFrame::Current() != pFrame ) @@ -883,7 +874,6 @@ void SfxViewShell::UIDeactivated( SfxInPlaceClient* /*pClient*/ ) } - SfxInPlaceClient* SfxViewShell::FindIPClient ( const uno::Reference < embed::XEmbeddedObject >& xObj, @@ -907,14 +897,12 @@ SfxInPlaceClient* SfxViewShell::FindIPClient } - SfxInPlaceClient* SfxViewShell::GetIPClient() const { return GetUIActiveClient(); } - SfxInPlaceClient* SfxViewShell::GetUIActiveIPClient_Impl() const { // this method is needed as long as SFX still manages the border space for ChildWindows (see SfxFrame::Resize) @@ -949,7 +937,6 @@ SfxInPlaceClient* SfxViewShell::GetUIActiveClient() const } - void SfxViewShell::Activate( bool bMDI ) { if ( bMDI ) @@ -963,13 +950,11 @@ void SfxViewShell::Activate( bool bMDI ) } - void SfxViewShell::Deactivate(bool /*bMDI*/) { } - void SfxViewShell::AdjustPosSizePixel ( const Point& /*rToolOffset*/,// Upper left corner Tools in Frame-Window @@ -980,7 +965,6 @@ void SfxViewShell::AdjustPosSizePixel } - void SfxViewShell::Move() /* [Description] @@ -1002,7 +986,6 @@ void SfxViewShell::Move() } - void SfxViewShell::OuterResizePixel ( const Point& /*rToolOffset*/,// Upper left corner Tools in Frame-Window @@ -1052,7 +1035,6 @@ void SfxViewShell::OuterResizePixel } - void SfxViewShell::InnerResizePixel ( const Point& /*rToolOffset*/,// Upper left corner Tools in Frame-Window @@ -1102,7 +1084,6 @@ void SfxViewShell::InnerResizePixel } - void SfxViewShell::InvalidateBorder() { DBG_ASSERT( GetViewFrame(), "SfxViewShell without SfxViewFrame" ); @@ -1115,7 +1096,6 @@ void SfxViewShell::InvalidateBorder() } - void SfxViewShell::SetBorderPixel( const SvBorder &rBorder ) { DBG_ASSERT( GetViewFrame(), "SfxViewShell without SfxViewFrame" ); @@ -1130,7 +1110,6 @@ void SfxViewShell::SetBorderPixel( const SvBorder &rBorder ) } - const SvBorder& SfxViewShell::GetBorderPixel() const { DBG_ASSERT( GetViewFrame(), "SfxViewShell without SfxViewFrame" ); @@ -1139,7 +1118,6 @@ const SvBorder& SfxViewShell::GetBorderPixel() const } - void SfxViewShell::SetWindow ( vcl::Window* pViewPort // For example Null pointer in the Destructor. @@ -1181,7 +1159,6 @@ void SfxViewShell::SetWindow } - SfxViewShell::SfxViewShell ( SfxViewFrame* pViewFrame, /* <SfxViewFrame>, which will be @@ -1214,7 +1191,6 @@ SfxViewShell::SfxViewShell } - SfxViewShell::~SfxViewShell() { @@ -1266,7 +1242,6 @@ bool SfxViewShell::PrepareClose } - SfxViewShell* SfxViewShell::Current() { SfxViewFrame *pCurrent = SfxViewFrame::Current(); @@ -1274,7 +1249,6 @@ SfxViewShell* SfxViewShell::Current() } - SfxViewShell* SfxViewShell::Get( const Reference< XController>& i_rController ) { if ( !i_rController.is() ) @@ -1292,7 +1266,6 @@ SfxViewShell* SfxViewShell::Get( const Reference< XController>& i_rController ) } - SdrView* SfxViewShell::GetDrawView() const /* [Description] @@ -1308,7 +1281,6 @@ SdrView* SfxViewShell::GetDrawView() const } - OUString SfxViewShell::GetSelectionText ( bool /*bCompleteWords*/ /* FALSE (default) @@ -1338,7 +1310,6 @@ OUString SfxViewShell::GetSelectionText } - bool SfxViewShell::HasSelection( bool ) const /* [Description] @@ -1419,13 +1390,11 @@ void SfxViewShell::PushSubShells_Impl( bool bPush ) } - void SfxViewShell::WriteUserData( OUString&, bool ) { } - void SfxViewShell::ReadUserData(const OUString&, bool ) { } @@ -1439,7 +1408,6 @@ void SfxViewShell::WriteUserDataSequence ( uno::Sequence < beans::PropertyValue } - // returns the first shell of spec. type viewing the specified doc. SfxViewShell* SfxViewShell::GetFirst ( @@ -1518,7 +1486,6 @@ SfxViewShell* SfxViewShell::GetNext } - void SfxViewShell::Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) { @@ -1613,7 +1580,6 @@ bool SfxViewShell::GlobalKeyInput_Impl( const KeyEvent &rKeyEvent ) } - void SfxViewShell::ShowCursor( bool /*bOn*/ ) /* [Description] @@ -1626,7 +1592,6 @@ void SfxViewShell::ShowCursor( bool /*bOn*/ ) } - void SfxViewShell::ResetAllClients_Impl( SfxInPlaceClient *pIP ) { @@ -1643,7 +1608,6 @@ void SfxViewShell::ResetAllClients_Impl( SfxInPlaceClient *pIP ) } - void SfxViewShell::DisconnectAllClients() { SfxInPlaceClientList *pClients = pImp->GetIPClientList_Impl(false); @@ -1656,13 +1620,11 @@ void SfxViewShell::DisconnectAllClients() } - void SfxViewShell::QueryObjAreaPixel( Rectangle& ) const { } - void SfxViewShell::VisAreaChanged(const Rectangle& /*rVisArea*/) { SfxInPlaceClientList *pClients = pImp->GetIPClientList_Impl(false); @@ -1736,14 +1698,12 @@ void SfxViewShell::DiscardClients_Impl() } - SfxObjectShell* SfxViewShell::GetObjectShell() { return pFrame ? pFrame->GetObjectShell() : nullptr; } - Reference< XModel > SfxViewShell::GetCurrentDocument() const { Reference< XModel > xDocument; @@ -1756,7 +1716,6 @@ Reference< XModel > SfxViewShell::GetCurrentDocument() const } - void SfxViewShell::SetCurrentDocument() const { uno::Reference< frame::XModel > xDocument( GetCurrentDocument() ); @@ -1765,14 +1724,12 @@ void SfxViewShell::SetCurrentDocument() const } - const Size& SfxViewShell::GetMargin() const { return pImp->aMargin; } - void SfxViewShell::SetMargin( const Size& rSize ) { // the default margin was verified using www.apple.com !! |