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/source/appl | |
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/source/appl')
25 files changed, 0 insertions, 215 deletions
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 ) |