diff options
| author | Alexander Wilms <f.alexander.wilms@gmail.com> | 2014-02-22 21:20:15 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2014-02-23 03:38:49 +0000 |
| commit | 0ce0c369aa8880dff9fe874ba85ec6f52ee37ddf (patch) | |
| tree | 5024cba9f9ea5e3b23ea26025323f6aef39488d0 /sfx2/source/appl | |
| parent | b81ac16e65b311d6e43c05c22c65d2040c9d7e04 (diff) | |
Remove unneccessary comments
Change-Id: I939160ae72fecbe3d4a60ce755730bd4c38497fb
Reviewed-on: https://gerrit.libreoffice.org/8182
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'sfx2/source/appl')
26 files changed, 305 insertions, 305 deletions
diff --git a/sfx2/source/appl/app.cxx b/sfx2/source/appl/app.cxx index 69d5b9e4161d..7a500e8c0263 100644 --- a/sfx2/source/appl/app.cxx +++ b/sfx2/source/appl/app.cxx @@ -277,7 +277,7 @@ const OUString& SfxApplication::GetLastSaveDirectory() const return GetLastDir_Impl(); } -//-------------------------------------------------------------------- + void SfxApplication::SetLastDir_Impl ( @@ -297,21 +297,21 @@ void SfxApplication::SetLastDir_Impl pAppData_Impl->aLastDir = rNewDir; } -//-------------------------------------------------------------------- + void SfxApplication::ResetLastDir() { pAppData_Impl->aLastDir = ""; } -//-------------------------------------------------------------------- + SfxDispatcher* SfxApplication::GetDispatcher_Impl() { return pAppData_Impl->pViewFrame? pAppData_Impl->pViewFrame->GetDispatcher(): pAppData_Impl->pAppDispat; } -//-------------------------------------------------------------------- + void SfxApplication::SetViewFrame_Impl( SfxViewFrame *pFrame ) { if ( pFrame != pAppData_Impl->pViewFrame ) @@ -377,21 +377,21 @@ void SfxApplication::SetViewFrame_Impl( SfxViewFrame *pFrame ) pFrame->GetViewShell()->SetCurrentDocument(); } -//--------------------------------------------------------------------- + ResMgr* SfxApplication::CreateResManager( const char *pPrefix ) { return ResMgr::CreateResMgr(pPrefix); } -//-------------------------------------------------------------------- + ResMgr* SfxApplication::GetSfxResManager() { return SfxResId::GetResMgr(); } -//------------------------------------------------------------------------ + void SfxApplication::SetProgress_Impl ( @@ -413,21 +413,21 @@ void SfxApplication::SetProgress_Impl pAppData_Impl->pProgress = pProgress; } -//------------------------------------------------------------------------ + sal_uInt16 SfxApplication::GetFreeIndex() { return pAppData_Impl->aIndexBitSet.GetFreeIndex()+1; } -//------------------------------------------------------------------------ + void SfxApplication::ReleaseIndex(sal_uInt16 i) { pAppData_Impl->aIndexBitSet.ReleaseIndex(i-1); } -//-------------------------------------------------------------------- + Window* SfxApplication::GetTopWindow() const { diff --git a/sfx2/source/appl/appbas.cxx b/sfx2/source/appl/appbas.cxx index 2aa0acb4119f..57a3733477b0 100644 --- a/sfx2/source/appl/appbas.cxx +++ b/sfx2/source/appl/appbas.cxx @@ -94,7 +94,7 @@ sal_uInt16 SfxApplication::SaveBasicAndDialogContainer() const return 0; } -//-------------------------------------------------------------------- + SbxVariable* MakeVariable( StarBASIC *pBas, SbxObject *pObject, const char *pName, sal_uInt32 nSID, SbxDataType eType, SbxClassType eClassType ) @@ -116,7 +116,7 @@ SbxVariable* MakeVariable( StarBASIC *pBas, SbxObject *pObject, #endif } -//-------------------------------------------------------------------- + BasicManager* SfxApplication::GetBasicManager() { @@ -127,7 +127,7 @@ BasicManager* SfxApplication::GetBasicManager() #endif } -//-------------------------------------------------------------------- + XLibraryContainer * SfxApplication::GetDialogContainer() { @@ -140,7 +140,7 @@ XLibraryContainer * SfxApplication::GetDialogContainer() #endif } -//-------------------------------------------------------------------- + XLibraryContainer * SfxApplication::GetBasicContainer() { @@ -153,7 +153,7 @@ XLibraryContainer * SfxApplication::GetBasicContainer() #endif } -//-------------------------------------------------------------------- + StarBASIC* SfxApplication::GetBasic() { @@ -164,7 +164,7 @@ StarBASIC* SfxApplication::GetBasic() #endif } -//------------------------------------------------------------------------- + void SfxApplication::PropExec_Impl( SfxRequest &rReq ) { #ifdef DISABLE_SCRIPTING @@ -219,7 +219,7 @@ void SfxApplication::PropExec_Impl( SfxRequest &rReq ) #endif } -//------------------------------------------------------------------------- + void SfxApplication::PropState_Impl( SfxItemSet &rSet ) { #ifdef DISABLE_SCRIPTING diff --git a/sfx2/source/appl/appcfg.cxx b/sfx2/source/appl/appcfg.cxx index 06660f0210ea..c7bdf9703ff5 100644 --- a/sfx2/source/appl/appcfg.cxx +++ b/sfx2/source/appl/appcfg.cxx @@ -78,7 +78,7 @@ using namespace ::com::sun::star::util; using namespace ::com::sun::star::frame; using namespace ::com::sun::star::beans; -//------------------------------------------------------------------------- + class SfxEventAsyncer_Impl : public SfxListener { @@ -93,7 +93,7 @@ public: DECL_LINK( TimerHdl, Timer*); }; -// ----------------------------------------------------------------------- + void SfxEventAsyncer_Impl::Notify( SfxBroadcaster&, const SfxHint& rHint ) { @@ -105,7 +105,7 @@ void SfxEventAsyncer_Impl::Notify( SfxBroadcaster&, const SfxHint& rHint ) } } -// ----------------------------------------------------------------------- + SfxEventAsyncer_Impl::SfxEventAsyncer_Impl( const SfxEventHint& rHint ) : aHint( rHint ) @@ -118,14 +118,14 @@ SfxEventAsyncer_Impl::SfxEventAsyncer_Impl( const SfxEventHint& rHint ) pTimer->Start(); } -// ----------------------------------------------------------------------- + SfxEventAsyncer_Impl::~SfxEventAsyncer_Impl() { delete pTimer; } -// ----------------------------------------------------------------------- + IMPL_LINK(SfxEventAsyncer_Impl, TimerHdl, Timer*, pAsyncTimer) { @@ -148,7 +148,7 @@ IMPL_LINK(SfxEventAsyncer_Impl, TimerHdl, Timer*, pAsyncTimer) } -//-------------------------------------------------------------------- + sal_Bool SfxApplication::GetOptions( SfxItemSet& rSet ) { @@ -771,7 +771,7 @@ void SfxApplication::SetOptions_Impl( const SfxItemSet& rSet ) batch->commit(); } -//-------------------------------------------------------------------- + void SfxApplication::SetOptions(const SfxItemSet &rSet) { SvtPathOptions aPathOptions; @@ -873,7 +873,7 @@ void SfxApplication::SetOptions(const SfxItemSet &rSet) Broadcast( SfxItemSetHint( rSet ) ); } -//-------------------------------------------------------------------- + void SfxApplication::NotifyEvent( const SfxEventHint& rEventHint, bool bSynchron ) { SfxObjectShell *pDoc = rEventHint.GetObjShell(); diff --git a/sfx2/source/appl/appchild.cxx b/sfx2/source/appl/appchild.cxx index 9fa22a32a347..4714bb9026f9 100644 --- a/sfx2/source/appl/appchild.cxx +++ b/sfx2/source/appl/appchild.cxx @@ -125,14 +125,14 @@ void SfxApplication::RegisterChildWindowContext_Impl( SfxModule *pMod, sal_uInt1 OSL_FAIL( "No ChildWindow for this Context!" ); } -//-------------------------------------------------------------------- + SfxChildWinFactArr_Impl& SfxApplication::GetChildWinFactories_Impl() const { return ( *(pAppData_Impl->pFactArr)); } -//-------------------------------------------------------------------- + SfxTemplateDialog* SfxApplication::GetTemplateDialog() { @@ -145,7 +145,7 @@ SfxTemplateDialog* SfxApplication::GetTemplateDialog() return NULL; } -//-------------------------------------------------------------------- + SfxWorkWindow* SfxApplication::GetWorkWindow_Impl(const SfxViewFrame *pFrame) const { diff --git a/sfx2/source/appl/appdde.cxx b/sfx2/source/appl/appdde.cxx index e82cb17a87e0..502759c4c8ad 100644 --- a/sfx2/source/appl/appdde.cxx +++ b/sfx2/source/appl/appdde.cxx @@ -74,7 +74,7 @@ public: virtual bool SysTopicExecute( const OUString* pStr ); }; -//-------------------------------------------------------------------- + namespace { sal_Bool lcl_IsDocument( const OUString& rContent ) @@ -363,7 +363,7 @@ long SfxObjectShell::DdeExecute( const OUString& rCmd ) // Expressed in our B return 1; } -//-------------------------------------------------------------------- + /* [Description] @@ -379,7 +379,7 @@ bool SfxObjectShell::DdeGetData( const OUString&, // the Item to be return false; } -//-------------------------------------------------------------------- + /* [Description] @@ -582,14 +582,14 @@ DdeService* SfxApplication::GetDdeService() return pAppData_Impl->pDdeService; } -//-------------------------------------------------------------------- + bool SfxDdeTriggerTopic_Impl::Execute( const OUString* ) { return true; } -//-------------------------------------------------------------------- + DdeData* SfxDdeDocTopic_Impl::Get( sal_uIntPtr nFormat ) { OUString sMimeType( SotExchange::GetFormatMimeType( nFormat )); diff --git a/sfx2/source/appl/appmain.cxx b/sfx2/source/appl/appmain.cxx index f0a96fd2fdaa..7be5e02cea86 100644 --- a/sfx2/source/appl/appmain.cxx +++ b/sfx2/source/appl/appmain.cxx @@ -53,7 +53,7 @@ DBG_NAME(SfxAppMainCHAOSReg) TYPEINIT2(SfxApplication,SfxShell,SfxBroadcaster); -//-------------------------------------------------------------------- + void SfxApplication::Init ( ) @@ -77,7 +77,7 @@ void SfxApplication::Init { } -//-------------------------------------------------------------------- + void SfxApplication::Exit() @@ -98,7 +98,7 @@ void SfxApplication::Exit() { } -//------------------------------------------------------------------------- + SfxFilterMatcher& SfxApplication::GetFilterMatcher() { diff --git a/sfx2/source/appl/appmisc.cxx b/sfx2/source/appl/appmisc.cxx index a1d7aa6533b7..536105edba7d 100644 --- a/sfx2/source/appl/appmisc.cxx +++ b/sfx2/source/appl/appmisc.cxx @@ -109,7 +109,7 @@ SFX_IMPL_INTERFACE(SfxApplication,SfxShell,SfxResId(RID_DESKTOP)) SFX_CHILDWINDOW_REGISTRATION(SID_DOCKWIN_9); } -//-------------------------------------------------------------------- + SfxProgress* SfxApplication::GetProgress() const /* [Description] @@ -159,7 +159,7 @@ SfxSlotPool& SfxApplication::GetAppSlotPool_Impl() const { return *pAppData_Impl bool SfxApplication::loadBrandSvg(const char *pName, BitmapEx &rBitmap, int nWidth) { // Load from disk - // --------------------------------------------------------------------- + OUString aBaseName = OUString("/") + OUString::createFromAscii( pName ); rtl_Locale *pLoc = NULL; @@ -172,7 +172,7 @@ bool SfxApplication::loadBrandSvg(const char *pName, BitmapEx &rBitmap, int nWid SvgData aSvgData(aObj.PathToFileName()); // transform into [0,0,width,width*aspect] std dimensions - // --------------------------------------------------------------------- + basegfx::B2DRange aRange(aSvgData.getRange()); const double fAspectRatio(aRange.getWidth()/aRange.getHeight()); basegfx::B2DHomMatrix aTransform( @@ -188,7 +188,7 @@ bool SfxApplication::loadBrandSvg(const char *pName, BitmapEx &rBitmap, int nWid aSvgData.getPrimitive2DSequence())); // UNO dance to render from drawinglayer - // --------------------------------------------------------------------- + uno::Reference< uno::XComponentContext > xContext(::comphelper::getProcessComponentContext()); try diff --git a/sfx2/source/appl/appopen.cxx b/sfx2/source/appl/appopen.cxx index 69d0b374fb5f..12100ab243f0 100644 --- a/sfx2/source/appl/appopen.cxx +++ b/sfx2/source/appl/appopen.cxx @@ -166,7 +166,7 @@ private: Reference< embed::XStorage > mxStorage; }; -//-------------------------------------------------------------------- + ::comphelper::DocPasswordVerifierResult SfxDocPasswordVerifier::verifyPassword( const OUString& rPassword, uno::Sequence< beans::NamedValue >& o_rEncryptionData ) { o_rEncryptionData = ::comphelper::OStorageHelper::CreatePackageEncryptionData( rPassword ); @@ -174,7 +174,7 @@ private: } -//-------------------------------------------------------------------- + ::comphelper::DocPasswordVerifierResult SfxDocPasswordVerifier::verifyEncryptionData( const uno::Sequence< beans::NamedValue >& rEncryptionData ) { ::comphelper::DocPasswordVerifierResult eResult = ::comphelper::DocPasswordVerifierResult_WRONG_PASSWORD; @@ -207,7 +207,7 @@ private: //==================================================================== -//-------------------------------------------------------------------- + sal_uInt32 CheckPasswd_Impl ( @@ -312,7 +312,7 @@ sal_uInt32 CheckPasswd_Impl return nRet; } -//-------------------------------------------------------------------- + sal_uIntPtr SfxApplication::LoadTemplate( SfxObjectShellLock& xDoc, const OUString &rFileName, sal_Bool bCopy, SfxItemSet* pSet ) @@ -438,7 +438,7 @@ sal_uIntPtr SfxApplication::LoadTemplate( SfxObjectShellLock& xDoc, const OUStri return xDoc->GetErrorCode(); } -//-------------------------------------------------------------------- + void SfxApplication::NewDocDirectExec_Impl( SfxRequest& rReq ) { @@ -471,7 +471,7 @@ void SfxApplication::NewDocDirectExec_Impl( SfxRequest& rReq ) rReq.SetReturnValue( SfxFrameItem( 0, pItem->GetFrame() ) ); } -//-------------------------------------------------------------------- + void SfxApplication::NewDocExec_Impl( SfxRequest& rReq ) { @@ -577,7 +577,7 @@ void SfxApplication::NewDocExec_Impl( SfxRequest& rReq ) } } -//--------------------------------------------------------------------------- + namespace { diff --git a/sfx2/source/appl/appquit.cxx b/sfx2/source/appl/appquit.cxx index 3ced333d3577..482c0c34f14f 100644 --- a/sfx2/source/appl/appquit.cxx +++ b/sfx2/source/appl/appquit.cxx @@ -74,7 +74,7 @@ sal_Bool SfxApplication::QueryExit_Impl() return sal_True; } -//------------------------------------------------------------------------- + void SfxApplication::Deinitialize() { diff --git a/sfx2/source/appl/appreg.cxx b/sfx2/source/appl/appreg.cxx index 4e7bd4895e44..ce07f9a5749b 100644 --- a/sfx2/source/appl/appreg.cxx +++ b/sfx2/source/appl/appreg.cxx @@ -65,7 +65,7 @@ void SfxApplication::Registrations_Impl() SfxRecentFilesToolBoxControl::RegisterControl( SID_OPENDOC ); }; -//-------------------------------------------------------------------- + void SfxApplication::RegisterToolBoxControl_Impl( SfxModule *pMod, SfxTbxCtrlFactory *pFact ) { @@ -90,7 +90,7 @@ void SfxApplication::RegisterToolBoxControl_Impl( SfxModule *pMod, SfxTbxCtrlFac pAppData_Impl->pTbxCtrlFac->push_back( pFact ); } -//-------------------------------------------------------------------- + void SfxApplication::RegisterStatusBarControl_Impl( SfxModule *pMod, SfxStbCtrlFactory *pFact ) { @@ -115,7 +115,7 @@ void SfxApplication::RegisterStatusBarControl_Impl( SfxModule *pMod, SfxStbCtrlF pAppData_Impl->pStbCtrlFac->push_back( pFact ); } -//-------------------------------------------------------------------- + void SfxApplication::RegisterMenuControl_Impl( SfxModule *pMod, SfxMenuCtrlFactory *pFact ) { diff --git a/sfx2/source/appl/appserv.cxx b/sfx2/source/appl/appserv.cxx index 8faf821e684a..d1f01865bb73 100644 --- a/sfx2/source/appl/appserv.cxx +++ b/sfx2/source/appl/appserv.cxx @@ -698,7 +698,7 @@ void SfxApplication::MiscExec_Impl( SfxRequest& rReq ) rReq.Done(); } -//-------------------------------------------------------------------- + void SfxApplication::MiscState_Impl(SfxItemSet &rSet) { diff --git a/sfx2/source/appl/childwin.cxx b/sfx2/source/appl/childwin.cxx index 06114c61be23..3d2c26b2a354 100644 --- a/sfx2/source/appl/childwin.cxx +++ b/sfx2/source/appl/childwin.cxx @@ -56,7 +56,7 @@ struct SfxChildWindow_Impl SfxWorkWindow* pWorkWin; }; -// ----------------------------------------------------------------------- + class DisposeListener : public ::cppu::WeakImplHelper1< ::com::sun::star::lang::XEventListener > { @@ -100,7 +100,7 @@ class DisposeListener : public ::cppu::WeakImplHelper1< ::com::sun::star::lang:: SfxChildWindow_Impl* m_pData ; }; -// ----------------------------------------------------------------------- + sal_Bool GetPosSizeFromString( const OUString& rStr, Point& rPos, Size& rSize ) { @@ -185,7 +185,7 @@ void SfxChildWindow::Destroy() delete this; } -//------------------------------------------------------------------------- + SfxChildWindow::~SfxChildWindow() { DBG_DTOR(SfxChildWindow,0); @@ -194,7 +194,7 @@ SfxChildWindow::~SfxChildWindow() delete pImp; } -//------------------------------------------------------------------------- + SfxChildWindow* SfxChildWindow::CreateChildWindow( sal_uInt16 nId, Window *pParent, SfxBindings* pBindings, SfxChildWinInfo& rInfo) { @@ -276,7 +276,7 @@ SfxChildWindow* SfxChildWindow::CreateChildWindow( sal_uInt16 nId, return pChild; } -//------------------------------------------------------------------------- + void SfxChildWindow::SaveStatus(const SfxChildWinInfo& rInfo) { sal_uInt16 nID = GetType(); @@ -308,7 +308,7 @@ void SfxChildWindow::SaveStatus(const SfxChildWinInfo& rInfo) pImp->pFact->aInfo = rInfo; } -//------------------------------------------------------------------------- + void SfxChildWindow::SetAlignment(SfxChildAlignment eAlign) { DBG_CHKTHIS(SfxChildWindow,0); @@ -316,7 +316,7 @@ void SfxChildWindow::SetAlignment(SfxChildAlignment eAlign) eChildAlignment = eAlign; } -//------------------------------------------------------------------------- + SfxChildWinInfo SfxChildWindow::GetInfo() const { DBG_CHKTHIS(SfxChildWindow,0); @@ -348,13 +348,13 @@ SfxChildWinInfo SfxChildWindow::GetInfo() const return aInfo; } -//------------------------------------------------------------------------- + sal_uInt16 SfxChildWindow::GetPosition() { return pImp->pFact->nPos; } -//------------------------------------------------------------------------- + void SfxChildWindow::InitializeChildWinFactory_Impl(sal_uInt16 nId, SfxChildWinInfo& rInfo) { // load configuration diff --git a/sfx2/source/appl/fileobj.cxx b/sfx2/source/appl/fileobj.cxx index 13dbfc27354c..c53000fd5baf 100644 --- a/sfx2/source/appl/fileobj.cxx +++ b/sfx2/source/appl/fileobj.cxx @@ -63,7 +63,7 @@ struct Impl_DownLoadData } }; -// -------------------------------------------------------------------------- + SvFileObject::SvFileObject() : diff --git a/sfx2/source/appl/helpdispatch.cxx b/sfx2/source/appl/helpdispatch.cxx index ee6b5d207078..e837e7864a60 100644 --- a/sfx2/source/appl/helpdispatch.cxx +++ b/sfx2/source/appl/helpdispatch.cxx @@ -41,13 +41,13 @@ HelpDispatch_Impl::HelpDispatch_Impl( HelpInterceptor_Impl& _rInterceptor, { } -// ----------------------------------------------------------------------- + HelpDispatch_Impl::~HelpDispatch_Impl() { } -// ----------------------------------------------------------------------- + // XDispatch void SAL_CALL HelpDispatch_Impl::dispatch( @@ -88,7 +88,7 @@ void SAL_CALL HelpDispatch_Impl::dispatch( pHelpWin->loadHelpContent(aURL.Complete); } -// ----------------------------------------------------------------------- + void SAL_CALL HelpDispatch_Impl::addStatusListener( @@ -99,7 +99,7 @@ void SAL_CALL HelpDispatch_Impl::addStatusListener( m_xRealDispatch->addStatusListener( xControl, aURL ); } -// ----------------------------------------------------------------------- + void SAL_CALL HelpDispatch_Impl::removeStatusListener( diff --git a/sfx2/source/appl/helpinterceptor.cxx b/sfx2/source/appl/helpinterceptor.cxx index f126fc681679..9316482c044e 100644 --- a/sfx2/source/appl/helpinterceptor.cxx +++ b/sfx2/source/appl/helpinterceptor.cxx @@ -49,7 +49,7 @@ HelpInterceptor_Impl::HelpInterceptor_Impl() : { } -// ----------------------------------------------------------------------- + HelpInterceptor_Impl::~HelpInterceptor_Impl() { @@ -61,7 +61,7 @@ HelpInterceptor_Impl::~HelpInterceptor_Impl() } } -// ----------------------------------------------------------------------- + void HelpInterceptor_Impl::addURL( const OUString& rURL ) { @@ -106,7 +106,7 @@ void HelpInterceptor_Impl::addURL( const OUString& rURL ) m_pWindow->UpdateToolbox(); } -// ----------------------------------------------------------------------- + void HelpInterceptor_Impl::setInterception( Reference< XFrame > xFrame ) { @@ -116,7 +116,7 @@ void HelpInterceptor_Impl::setInterception( Reference< XFrame > xFrame ) m_xIntercepted->registerDispatchProviderInterceptor( (XDispatchProviderInterceptor*)this ); } -// ----------------------------------------------------------------------- + sal_Bool HelpInterceptor_Impl::HasHistoryPred() const { @@ -129,7 +129,7 @@ sal_Bool HelpInterceptor_Impl::HasHistorySucc() const } -// ----------------------------------------------------------------------- + // XDispatchProvider Reference< XDispatch > SAL_CALL HelpInterceptor_Impl::queryDispatch( @@ -155,7 +155,7 @@ Reference< XDispatch > SAL_CALL HelpInterceptor_Impl::queryDispatch( return xResult; } -// ----------------------------------------------------------------------- + Sequence < Reference < XDispatch > > SAL_CALL HelpInterceptor_Impl::queryDispatches( @@ -174,7 +174,7 @@ Sequence < Reference < XDispatch > > SAL_CALL HelpInterceptor_Impl::queryDispatc return aReturn; } -// ----------------------------------------------------------------------- + // XDispatchProviderInterceptor Reference< XDispatchProvider > SAL_CALL HelpInterceptor_Impl::getSlaveDispatchProvider() @@ -185,7 +185,7 @@ Reference< XDispatchProvider > SAL_CALL HelpInterceptor_Impl::getSlaveDispatchPr return m_xSlaveDispatcher; } -// ----------------------------------------------------------------------- + void SAL_CALL HelpInterceptor_Impl::setSlaveDispatchProvider( const Reference< XDispatchProvider >& xNewSlave ) @@ -195,7 +195,7 @@ void SAL_CALL HelpInterceptor_Impl::setSlaveDispatchProvider( const Reference< X m_xSlaveDispatcher = xNewSlave; } -// ----------------------------------------------------------------------- + Reference< XDispatchProvider > SAL_CALL HelpInterceptor_Impl::getMasterDispatchProvider() @@ -205,7 +205,7 @@ Reference< XDispatchProvider > SAL_CALL HelpInterceptor_Impl::getMasterDispatchP return m_xMasterDispatcher; } -// ----------------------------------------------------------------------- + void SAL_CALL HelpInterceptor_Impl::setMasterDispatchProvider( const Reference< XDispatchProvider >& xNewMaster ) @@ -215,7 +215,7 @@ void SAL_CALL HelpInterceptor_Impl::setMasterDispatchProvider( const Reference< m_xMasterDispatcher = xNewMaster; } -// ----------------------------------------------------------------------- + // XInterceptorInfo Sequence< OUString > SAL_CALL HelpInterceptor_Impl::getInterceptedURLs() @@ -228,7 +228,7 @@ Sequence< OUString > SAL_CALL HelpInterceptor_Impl::getInterceptedURLs() return aURLList; } -// ----------------------------------------------------------------------- + // XDispatch void SAL_CALL HelpInterceptor_Impl::dispatch( @@ -268,7 +268,7 @@ void SAL_CALL HelpInterceptor_Impl::dispatch( } } -// ----------------------------------------------------------------------- + void SAL_CALL HelpInterceptor_Impl::addStatusListener( const Reference< XStatusListener >& xControl, const URL& ) throw( RuntimeException ) @@ -277,7 +277,7 @@ void SAL_CALL HelpInterceptor_Impl::addStatusListener( m_xListener = xControl; } -// ----------------------------------------------------------------------- + void SAL_CALL HelpInterceptor_Impl::removeStatusListener( const Reference< XStatusListener >&, const URL&) throw( RuntimeException ) @@ -293,7 +293,7 @@ HelpListener_Impl::HelpListener_Impl( HelpInterceptor_Impl* pInter ) pInterceptor->addStatusListener( this, ::com::sun::star::util::URL() ); } -// ----------------------------------------------------------------------- + void SAL_CALL HelpListener_Impl::statusChanged( const ::com::sun::star::frame::FeatureStateEvent& Event ) @@ -305,7 +305,7 @@ void SAL_CALL HelpListener_Impl::statusChanged( const ::com::sun::star::frame::F aChangeLink.Call( this ); } -// ----------------------------------------------------------------------- + void SAL_CALL HelpListener_Impl::disposing( const ::com::sun::star::lang::EventObject& ) diff --git a/sfx2/source/appl/linkmgr2.cxx b/sfx2/source/appl/linkmgr2.cxx index 7303a78677e7..f909c0a99f7f 100644 --- a/sfx2/source/appl/linkmgr2.cxx +++ b/sfx2/source/appl/linkmgr2.cxx @@ -103,7 +103,7 @@ void LinkManager::CloseCachedComps() maCachedComps.clear(); } -//-------------------------------------------------------------------------- + void LinkManager::Remove( SvBaseLink *pLink ) { @@ -338,7 +338,7 @@ void LinkManager::UpdateAllLinks( CloseCachedComps(); } -//-------------------------------------------------------------------------- + SvLinkSourceRef LinkManager::CreateObj( SvBaseLink * pLink ) { @@ -503,7 +503,7 @@ sal_uIntPtr LinkManager::RegisterStatusInfoId() return nFormat; } -// ---------------------------------------------------------------------- + sal_Bool LinkManager::GetGraphicFromAny( const OUString& rMimeType, const ::com::sun::star::uno::Any & rValue, @@ -547,7 +547,7 @@ sal_Bool LinkManager::GetGraphicFromAny( const OUString& rMimeType, } -// ---------------------------------------------------------------------- + OUString lcl_DDE_RelToAbs( const OUString& rTopic, const OUString& rBaseURL ) { OUString sRet; diff --git a/sfx2/source/appl/lnkbase2.cxx b/sfx2/source/appl/lnkbase2.cxx index e203472cc265..346ad25ba12f 100644 --- a/sfx2/source/appl/lnkbase2.cxx +++ b/sfx2/source/appl/lnkbase2.cxx @@ -121,7 +121,7 @@ public: sal_Bool IsInDTOR() const { return bIsInDTOR; } }; -//-------------------------------------------------------------------------- + SvBaseLink::SvBaseLink() : m_bIsReadOnly(false) @@ -133,7 +133,7 @@ SvBaseLink::SvBaseLink() bWasLastEditOK = sal_False; } -//-------------------------------------------------------------------------- + SvBaseLink::SvBaseLink( sal_uInt16 nUpdateMode, sal_uIntPtr nContentType ) : m_bIsReadOnly(false) @@ -150,7 +150,7 @@ SvBaseLink::SvBaseLink( sal_uInt16 nUpdateMode, sal_uIntPtr nContentType ) pImplData->ClientType.bIntrnlLnk = sal_False; } -//-------------------------------------------------------------------------- + SvBaseLink::SvBaseLink( const OUString& rLinkName, sal_uInt16 nObjectType, SvLinkSource* pObj ) : pImpl(0) @@ -189,7 +189,7 @@ SvBaseLink::SvBaseLink( const OUString& rLinkName, sal_uInt16 nObjectType, SvLin xObj = pObj; } -//-------------------------------------------------------------------------- + SvBaseLink::~SvBaseLink() { @@ -220,7 +220,7 @@ IMPL_LINK( SvBaseLink, EndEditHdl, OUString*, _pNewName ) return 0; } -//-------------------------------------------------------------------------- + void SvBaseLink::SetObjType( sal_uInt16 nObjTypeP ) { @@ -230,14 +230,14 @@ void SvBaseLink::SetObjType( sal_uInt16 nObjTypeP ) nObjType = nObjTypeP; } -//-------------------------------------------------------------------------- + void SvBaseLink::SetName( const OUString & rNm ) { aLinkName = rNm; } -//-------------------------------------------------------------------------- + void SvBaseLink::SetObj( SvLinkSource * pObj ) { @@ -248,7 +248,7 @@ void SvBaseLink::SetObj( SvLinkSource * pObj ) xObj = pObj; } -//-------------------------------------------------------------------------- + void SvBaseLink::SetLinkSourceName( const OUString & rLnkNm ) { @@ -266,14 +266,14 @@ void SvBaseLink::SetLinkSourceName( const OUString & rLnkNm ) ReleaseRef(); // should be superfluous } -//-------------------------------------------------------------------------- + OUString SvBaseLink::GetLinkSourceName() const { return aLinkName; } -//-------------------------------------------------------------------------- + void SvBaseLink::SetUpdateMode( sal_uInt16 nMode ) { diff --git a/sfx2/source/appl/macroloader.cxx b/sfx2/source/appl/macroloader.cxx index ba1a0dbcd33c..333983531442 100644 --- a/sfx2/source/appl/macroloader.cxx +++ b/sfx2/source/appl/macroloader.cxx @@ -95,7 +95,7 @@ SfxObjectShell* SfxMacroLoader::GetObjectShell_Impl() return pDocShell; } -// ----------------------------------------------------------------------- + uno::Reference<frame::XDispatch> SAL_CALL SfxMacroLoader::queryDispatch( const util::URL& aURL , const OUString& /*sTargetFrameName*/, @@ -107,7 +107,7 @@ uno::Reference<frame::XDispatch> SAL_CALL SfxMacroLoader::queryDispatch( return xDispatcher; } -// ----------------------------------------------------------------------- + uno::Sequence< uno::Reference<frame::XDispatch> > SAL_CALL SfxMacroLoader::queryDispatches( const uno::Sequence < frame::DispatchDescriptor >& seqDescriptor ) throw( uno::RuntimeException ) @@ -121,7 +121,7 @@ uno::Sequence< uno::Reference<frame::XDispatch> > SAL_CALL return lDispatcher; } -// ----------------------------------------------------------------------- + void SAL_CALL SfxMacroLoader::dispatchWithNotification( const util::URL& aURL, const uno::Sequence<beans::PropertyValue>& /*lArgs*/, const uno::Reference<frame::XDispatchResultListener>& xListener ) @@ -177,7 +177,7 @@ void SAL_CALL SfxMacroLoader::addStatusListener( */ } -// ----------------------------------------------------------------------- + void SAL_CALL SfxMacroLoader::removeStatusListener( const uno::Reference< frame::XStatusListener >&, const util::URL& ) diff --git a/sfx2/source/appl/module.cxx b/sfx2/source/appl/module.cxx index 05ebac78ce76..1848e74c4bf7 100644 --- a/sfx2/source/appl/module.cxx +++ b/sfx2/source/appl/module.cxx @@ -176,14 +176,14 @@ SfxModule::~SfxModule() } } -//------------------------------------------------------------------------- + SfxSlotPool* SfxModule::GetSlotPool() const { return pImpl->pSlotPool; } -//------------------------------------------------------------------------- + void SfxModule::RegisterChildWindow(SfxChildWinFactory *pFact) { @@ -205,7 +205,7 @@ void SfxModule::RegisterChildWindow(SfxChildWinFactory *pFact) pImpl->pFactArr->push_back( pFact ); } -//------------------------------------------------------------------------- + void SfxModule::RegisterToolBoxControl( SfxTbxCtrlFactory *pFact ) { @@ -227,7 +227,7 @@ void SfxModule::RegisterToolBoxControl( SfxTbxCtrlFactory *pFact ) pImpl->pTbxCtrlFac->push_back( pFact ); } -//------------------------------------------------------------------------- + void SfxModule::RegisterStatusBarControl( SfxStbCtrlFactory *pFact ) { @@ -249,7 +249,7 @@ void SfxModule::RegisterStatusBarControl( SfxStbCtrlFactory *pFact ) pImpl->pStbCtrlFac->push_back( pFact ); } -//------------------------------------------------------------------------- + void SfxModule::RegisterMenuControl( SfxMenuCtrlFactory *pFact ) { @@ -271,28 +271,28 @@ void SfxModule::RegisterMenuControl( SfxMenuCtrlFactory *pFact ) pImpl->pMenuCtrlFac->push_back( pFact ); } -//------------------------------------------------------------------------- + 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 { diff --git a/sfx2/source/appl/newhelp.cxx b/sfx2/source/appl/newhelp.cxx index 2a1ebe90f8a0..86deefaa3967 100644 --- a/sfx2/source/appl/newhelp.cxx +++ b/sfx2/source/appl/newhelp.cxx @@ -291,7 +291,7 @@ ContentListBox_Impl::ContentListBox_Impl( Window* pParent, const ResId& rResId ) InitRoot(); } -// ----------------------------------------------------------------------- + ContentListBox_Impl::~ContentListBox_Impl() { @@ -305,7 +305,7 @@ ContentListBox_Impl::~ContentListBox_Impl() } } -// ----------------------------------------------------------------------- + void ContentListBox_Impl::InitRoot() { @@ -327,7 +327,7 @@ void ContentListBox_Impl::InitRoot() } } -// ----------------------------------------------------------------------- + void ContentListBox_Impl::ClearChildren( SvTreeListEntry* pParent ) { @@ -340,7 +340,7 @@ void ContentListBox_Impl::ClearChildren( SvTreeListEntry* pParent ) } } -// ----------------------------------------------------------------------- + void ContentListBox_Impl::RequestingChildren( SvTreeListEntry* pParent ) { @@ -386,7 +386,7 @@ void ContentListBox_Impl::RequestingChildren( SvTreeListEntry* pParent ) } } -// ----------------------------------------------------------------------- + bool ContentListBox_Impl::Notify( NotifyEvent& rNEvt ) { @@ -401,7 +401,7 @@ bool ContentListBox_Impl::Notify( NotifyEvent& rNEvt ) return bHandled || SvTreeListBox::Notify( rNEvt ); } -// ----------------------------------------------------------------------- + OUString ContentListBox_Impl::GetSelectEntry() const { @@ -438,7 +438,7 @@ ContentTabPage_Impl::ContentTabPage_Impl( Window* pParent, SfxHelpIndexWindow_Im aContentBox.Show(); } -// ----------------------------------------------------------------------- + void ContentTabPage_Impl::Resize() { @@ -448,7 +448,7 @@ void ContentTabPage_Impl::Resize() aContentBox.SetPosSizePixel( Point( 4, 4 ), aSize ); } -// ----------------------------------------------------------------------- + void ContentTabPage_Impl::ActivatePage() { @@ -456,7 +456,7 @@ void ContentTabPage_Impl::ActivatePage() SetFocusOnBox(); } -// ----------------------------------------------------------------------- + Control* ContentTabPage_Impl::GetLastFocusControl() { @@ -474,7 +474,7 @@ IndexBox_Impl::IndexBox_Impl( Window* pParent, const ResId& rResId ) : EnableUserDraw( true ); } -// ----------------------------------------------------------------------- + void IndexBox_Impl::UserDraw( const UserDrawEvent& rUDEvt ) { @@ -493,7 +493,7 @@ void IndexBox_Impl::UserDraw( const UserDrawEvent& rUDEvt ) DrawEntry( rUDEvt, false, true, true ); } -// ----------------------------------------------------------------------- + bool IndexBox_Impl::Notify( NotifyEvent& rNEvt ) { @@ -508,7 +508,7 @@ bool IndexBox_Impl::Notify( NotifyEvent& rNEvt ) return bHandled || ComboBox::Notify( rNEvt ); } -// ----------------------------------------------------------------------- + void IndexBox_Impl::SelectExecutableEntry() { @@ -555,14 +555,14 @@ IndexTabPage_Impl::IndexTabPage_Impl( Window* pParent, SfxHelpIndexWindow_Impl* nMinWidth = aOpenBtn.GetSizePixel().Width(); } -// ----------------------------------------------------------------------- + IndexTabPage_Impl::~IndexTabPage_Impl() { ClearIndex(); } -// ----------------------------------------------------------------------- + namespace sfx2 { @@ -605,7 +605,7 @@ namespace sfx2 { else \ aIndexCB.SetEntryData( nPos, NEW_ENTRY( aRefList[j], insert ) ); -// ----------------------------------------------------------------------- + void IndexTabPage_Impl::InitializeIndex() { @@ -723,7 +723,7 @@ void IndexTabPage_Impl::InitializeIndex() #undef INSERT_DATA #undef UNIFY_AND_INSERT_TOKEN -// ----------------------------------------------------------------------- + void IndexTabPage_Impl::ClearIndex() { @@ -733,7 +733,7 @@ void IndexTabPage_Impl::ClearIndex() aIndexCB.Clear(); } -// ----------------------------------------------------------------------- + IMPL_LINK_NOARG(IndexTabPage_Impl, OpenHdl) { @@ -741,7 +741,7 @@ IMPL_LINK_NOARG(IndexTabPage_Impl, OpenHdl) return 0; } -// ----------------------------------------------------------------------- + IMPL_LINK( IndexTabPage_Impl, TimeoutHdl, Timer*, pTimer ) { @@ -752,7 +752,7 @@ IMPL_LINK( IndexTabPage_Impl, TimeoutHdl, Timer*, pTimer ) return 0; } -// ----------------------------------------------------------------------- + void IndexTabPage_Impl::Resize() { @@ -782,7 +782,7 @@ void IndexTabPage_Impl::Resize() aOpenBtn.SetPosPixel( aPnt ); } -// ----------------------------------------------------------------------- + void IndexTabPage_Impl::ActivatePage() { @@ -796,21 +796,21 @@ void IndexTabPage_Impl::ActivatePage() SetFocusOnBox(); } -// ----------------------------------------------------------------------- + Control* IndexTabPage_Impl::GetLastFocusControl() { return &aOpenBtn; } -// ----------------------------------------------------------------------- + void IndexTabPage_Impl::SetDoubleClickHdl( const Link& rLink ) { aIndexCB.SetDoubleClickHdl( rLink ); } -// ----------------------------------------------------------------------- + void IndexTabPage_Impl::SetFactory( const OUString& rFactory ) { @@ -833,7 +833,7 @@ void IndexTabPage_Impl::SetFactory( const OUString& rFactory ) } } -// ----------------------------------------------------------------------- + OUString IndexTabPage_Impl::GetSelectEntry() const { @@ -844,7 +844,7 @@ OUString IndexTabPage_Impl::GetSelectEntry() const return aRet; } -// ----------------------------------------------------------------------- + void IndexTabPage_Impl::SetKeyword( const OUString& rKeyword ) { @@ -856,7 +856,7 @@ void IndexTabPage_Impl::SetKeyword( const OUString& rKeyword ) aFactoryTimer.Start(); } -// ----------------------------------------------------------------------- + sal_Bool IndexTabPage_Impl::HasKeyword() const { @@ -870,7 +870,7 @@ sal_Bool IndexTabPage_Impl::HasKeyword() const return bRet; } -// ----------------------------------------------------------------------- + sal_Bool IndexTabPage_Impl::HasKeywordIgnoreCase() { @@ -894,7 +894,7 @@ sal_Bool IndexTabPage_Impl::HasKeywordIgnoreCase() return bRet; } -// ----------------------------------------------------------------------- + void IndexTabPage_Impl::OpenKeyword() { @@ -922,7 +922,7 @@ bool SearchBox_Impl::PreNotify( NotifyEvent& rNEvt ) return bHandled || ComboBox::PreNotify( rNEvt ); } -// ----------------------------------------------------------------------- + void SearchBox_Impl::Select() { @@ -995,7 +995,7 @@ SearchTabPage_Impl::SearchTabPage_Impl( Window* pParent, SfxHelpIndexWindow_Impl ModifyHdl( &aSearchED ); } -// ----------------------------------------------------------------------- + SearchTabPage_Impl::~SearchTabPage_Impl() { @@ -1022,7 +1022,7 @@ SearchTabPage_Impl::~SearchTabPage_Impl() aViewOpt.SetUserItem( USERITEM_NAME, aUserItem ); } -// ----------------------------------------------------------------------- + void SearchTabPage_Impl::ClearSearchResults() { @@ -1033,7 +1033,7 @@ void SearchTabPage_Impl::ClearSearchResults() aResultsLB.Update(); } -// ----------------------------------------------------------------------- + void SearchTabPage_Impl::RememberSearchText( const OUString& rSearchText ) { @@ -1049,7 +1049,7 @@ void SearchTabPage_Impl::RememberSearchText( const OUString& rSearchText ) aSearchED.InsertEntry( rSearchText, 0 ); } -// ----------------------------------------------------------------------- + IMPL_LINK_NOARG(SearchTabPage_Impl, SearchHdl) { @@ -1091,7 +1091,7 @@ IMPL_LINK_NOARG(SearchTabPage_Impl, SearchHdl) return 0; } -// ----------------------------------------------------------------------- + IMPL_LINK_NOARG(SearchTabPage_Impl, OpenHdl) { @@ -1099,7 +1099,7 @@ IMPL_LINK_NOARG(SearchTabPage_Impl, OpenHdl) return 0; } -// ----------------------------------------------------------------------- + IMPL_LINK_NOARG(SearchTabPage_Impl, ModifyHdl) { @@ -1108,7 +1108,7 @@ IMPL_LINK_NOARG(SearchTabPage_Impl, ModifyHdl) return 0; } -// ----------------------------------------------------------------------- + void SearchTabPage_Impl::Resize() { @@ -1151,7 +1151,7 @@ void SearchTabPage_Impl::Resize() } } -// ----------------------------------------------------------------------- + void SearchTabPage_Impl::ActivatePage() { @@ -1159,21 +1159,21 @@ void SearchTabPage_Impl::ActivatePage() aSearchED.GrabFocus(); } -// ----------------------------------------------------------------------- + Control* SearchTabPage_Impl::GetLastFocusControl() { return &aOpenBtn; } -// ----------------------------------------------------------------------- + void SearchTabPage_Impl::SetDoubleClickHdl( const Link& rLink ) { aResultsLB.SetDoubleClickHdl( rLink ); } -// ----------------------------------------------------------------------- + OUString SearchTabPage_Impl::GetSelectEntry() const { @@ -1184,7 +1184,7 @@ OUString SearchTabPage_Impl::GetSelectEntry() const return aRet; } -// ----------------------------------------------------------------------- + void SearchTabPage_Impl::ClearPage() { @@ -1192,7 +1192,7 @@ void SearchTabPage_Impl::ClearPage() aSearchED.SetText( OUString() ); } -// ----------------------------------------------------------------------- + sal_Bool SearchTabPage_Impl::OpenKeyword( const OUString& rKeyword ) { @@ -1229,7 +1229,7 @@ void GetBookmarkEntry_Impl } } -// ----------------------------------------------------------------------- + BookmarksBox_Impl::BookmarksBox_Impl( Window* pParent, const ResId& rResId ) : @@ -1238,7 +1238,7 @@ BookmarksBox_Impl::BookmarksBox_Impl( Window* pParent, const ResId& rResId ) : { } -// ----------------------------------------------------------------------- + BookmarksBox_Impl::~BookmarksBox_Impl() { @@ -1256,7 +1256,7 @@ BookmarksBox_Impl::~BookmarksBox_Impl() } } -// ----------------------------------------------------------------------- + void BookmarksBox_Impl::DoAction( sal_uInt16 nAction ) { @@ -1307,7 +1307,7 @@ void BookmarksBox_Impl::DoAction( sal_uInt16 nAction ) } } -// ----------------------------------------------------------------------- + bool BookmarksBox_Impl::Notify( NotifyEvent& rNEvt ) { @@ -1375,7 +1375,7 @@ BookmarksTabPage_Impl::BookmarksTabPage_Impl( Window* pParent, SfxHelpIndexWindo } } -// ----------------------------------------------------------------------- + IMPL_LINK_NOARG(BookmarksTabPage_Impl, OpenHdl) { @@ -1383,7 +1383,7 @@ IMPL_LINK_NOARG(BookmarksTabPage_Impl, OpenHdl) return 0; } -// ----------------------------------------------------------------------- + void BookmarksTabPage_Impl::Resize() { @@ -1413,7 +1413,7 @@ void BookmarksTabPage_Impl::Resize() aBookmarksPB.SetPosPixel( aPnt ); } -// ----------------------------------------------------------------------- + void BookmarksTabPage_Impl::ActivatePage() { @@ -1421,21 +1421,21 @@ void BookmarksTabPage_Impl::ActivatePage() SetFocusOnBox(); } -// ----------------------------------------------------------------------- + Control* BookmarksTabPage_Impl::GetLastFocusControl() { return &aBookmarksPB; } -// ----------------------------------------------------------------------- + void BookmarksTabPage_Impl::SetDoubleClickHdl( const Link& rLink ) { aBookmarksBox.SetDoubleClickHdl( rLink ); } -// ----------------------------------------------------------------------- + OUString BookmarksTabPage_Impl::GetSelectEntry() const { @@ -1446,7 +1446,7 @@ OUString BookmarksTabPage_Impl::GetSelectEntry() const return aRet; } -// ----------------------------------------------------------------------- + void BookmarksTabPage_Impl::AddBookmarks( const OUString& rTitle, const OUString& rURL ) { @@ -1560,7 +1560,7 @@ SfxHelpIndexWindow_Impl::SfxHelpIndexWindow_Impl( SfxHelpWindow_Impl* _pParent ) aTimer.Start(); } -// ----------------------------------------------------------------------- + SfxHelpIndexWindow_Impl::~SfxHelpIndexWindow_Impl() { @@ -1578,7 +1578,7 @@ SfxHelpIndexWindow_Impl::~SfxHelpIndexWindow_Impl() aViewOpt.SetPageID( (sal_Int32)aTabCtrl.GetCurPageId() ); } -// ----------------------------------------------------------------------- + void SfxHelpIndexWindow_Impl::Initialize() { @@ -1602,7 +1602,7 @@ void SfxHelpIndexWindow_Impl::Initialize() SetActiveFactory(); } -// ----------------------------------------------------------------------- + void SfxHelpIndexWindow_Impl::SetActiveFactory() { @@ -1629,7 +1629,7 @@ void SfxHelpIndexWindow_Impl::SetActiveFactory() } } -// ----------------------------------------------------------------------- + HelpTabPage_Impl* SfxHelpIndexWindow_Impl::GetCurrentPage( sal_uInt16& rCurId ) { @@ -1667,7 +1667,7 @@ HelpTabPage_Impl* SfxHelpIndexWindow_Impl::GetCurrentPage( sal_uInt16& rCurId ) return pPage; } -// ----------------------------------------------------------------------- + IMPL_LINK( SfxHelpIndexWindow_Impl, ActivatePageHdl, TabControl *, pTabCtrl ) { @@ -1677,7 +1677,7 @@ IMPL_LINK( SfxHelpIndexWindow_Impl, ActivatePageHdl, TabControl *, pTabCtrl ) return 0; } -// ----------------------------------------------------------------------- + IMPL_LINK_NOARG(SfxHelpIndexWindow_Impl, SelectHdl) { @@ -1686,7 +1686,7 @@ IMPL_LINK_NOARG(SfxHelpIndexWindow_Impl, SelectHdl) return 0; } -// ----------------------------------------------------------------------- + IMPL_LINK_NOARG(SfxHelpIndexWindow_Impl, InitHdl) { @@ -1700,7 +1700,7 @@ IMPL_LINK_NOARG(SfxHelpIndexWindow_Impl, InitHdl) return 0; } -// ----------------------------------------------------------------------- + IMPL_LINK_NOARG(SfxHelpIndexWindow_Impl, SelectFactoryHdl) { @@ -1714,7 +1714,7 @@ IMPL_LINK_NOARG(SfxHelpIndexWindow_Impl, SelectFactoryHdl) return 0; } -// ----------------------------------------------------------------------- + IMPL_LINK_NOARG(SfxHelpIndexWindow_Impl, KeywordHdl) { @@ -1740,7 +1740,7 @@ IMPL_LINK_NOARG(SfxHelpIndexWindow_Impl, KeywordHdl) return 0; } -// ----------------------------------------------------------------------- + void SfxHelpIndexWindow_Impl::Resize() { @@ -1763,7 +1763,7 @@ void SfxHelpIndexWindow_Impl::Resize() aTabCtrl.SetSizePixel( aSize ); } -// ----------------------------------------------------------------------- + bool SfxHelpIndexWindow_Impl::PreNotify( NotifyEvent& rNEvt ) { @@ -1813,7 +1813,7 @@ bool SfxHelpIndexWindow_Impl::PreNotify( NotifyEvent& rNEvt ) return nDone || Window::PreNotify( rNEvt ); } -// ----------------------------------------------------------------------- + void SfxHelpIndexWindow_Impl::DataChanged( const DataChangedEvent& rDCEvt ) { @@ -1827,7 +1827,7 @@ void SfxHelpIndexWindow_Impl::DataChanged( const DataChangedEvent& rDCEvt ) } } -// ----------------------------------------------------------------------- + void SfxHelpIndexWindow_Impl::SetDoubleClickHdl( const Link& rLink ) { @@ -1842,7 +1842,7 @@ void SfxHelpIndexWindow_Impl::SetDoubleClickHdl( const Link& rLink ) pBPage->SetDoubleClickHdl( aPageDoubleClickLink ); } -// ----------------------------------------------------------------------- + void SfxHelpIndexWindow_Impl::SetFactory( const OUString& rFactory, sal_Bool bActive ) { @@ -1857,7 +1857,7 @@ void SfxHelpIndexWindow_Impl::SetFactory( const OUString& rFactory, sal_Bool bAc } } -// ----------------------------------------------------------------------- + OUString SfxHelpIndexWindow_Impl::GetSelectEntry() const { @@ -1885,14 +1885,14 @@ OUString SfxHelpIndexWindow_Impl::GetSelectEntry() const return sRet; } -// ----------------------------------------------------------------------- + void SfxHelpIndexWindow_Impl::AddBookmarks( const OUString& rTitle, const OUString& rURL ) { GetBookmarksPage()->AddBookmarks( rTitle, rURL ); } -// ----------------------------------------------------------------------- + bool SfxHelpIndexWindow_Impl::IsValidFactory( const OUString& _rFactory ) { @@ -1909,7 +1909,7 @@ bool SfxHelpIndexWindow_Impl::IsValidFactory( const OUString& _rFactory ) return bValid; } -// ----------------------------------------------------------------------- + void SfxHelpIndexWindow_Impl::ClearSearchPage() { @@ -1917,7 +1917,7 @@ void SfxHelpIndexWindow_Impl::ClearSearchPage() pSPage->ClearPage(); } -// ----------------------------------------------------------------------- + void SfxHelpIndexWindow_Impl::GrabFocusBack() { @@ -1931,7 +1931,7 @@ void SfxHelpIndexWindow_Impl::GrabFocusBack() pBPage->SetFocusOnBox(); } -// ----------------------------------------------------------------------- + sal_Bool SfxHelpIndexWindow_Impl::HasFocusOnEdit() const { @@ -1943,7 +1943,7 @@ sal_Bool SfxHelpIndexWindow_Impl::HasFocusOnEdit() const return bRet; } -// ----------------------------------------------------------------------- + OUString SfxHelpIndexWindow_Impl::GetSearchText() const { @@ -1953,7 +1953,7 @@ OUString SfxHelpIndexWindow_Impl::GetSearchText() const return sRet; } -// ----------------------------------------------------------------------- + sal_Bool SfxHelpIndexWindow_Impl::IsFullWordSearch() const { @@ -1963,7 +1963,7 @@ sal_Bool SfxHelpIndexWindow_Impl::IsFullWordSearch() const return bRet; } -// ----------------------------------------------------------------------- + void SfxHelpIndexWindow_Impl::OpenKeyword( const OUString& rKeyword ) { @@ -1972,7 +1972,7 @@ void SfxHelpIndexWindow_Impl::OpenKeyword( const OUString& rKeyword ) pIPage->SetKeyword( sKeyword ); } -// ----------------------------------------------------------------------- + void SfxHelpIndexWindow_Impl::SelectExecutableEntry() { @@ -1998,7 +1998,7 @@ bool TextWin_Impl::Notify( NotifyEvent& rNEvt ) return DockingWindow::Notify( rNEvt ); } -// ----------------------------------------------------------------------- + // remove docking area acceptor from layoutmanager, so it will not layout anything further .-) static void lcl_disableLayoutOfFrame(const Reference< XFrame2 >& xFrame) { @@ -2072,7 +2072,7 @@ SfxHelpTextWindow_Impl::SfxHelpTextWindow_Impl( SfxHelpWindow_Impl* pParent ) : aOnStartupCB.SetHelpId( HID_HELP_ONSTARTUP_BOX ); } -// ----------------------------------------------------------------------- + SfxHelpTextWindow_Impl::~SfxHelpTextWindow_Impl() { @@ -2083,7 +2083,7 @@ SfxHelpTextWindow_Impl::~SfxHelpTextWindow_Impl() delete pSrchDlg; } -// ----------------------------------------------------------------------- + sal_Bool SfxHelpTextWindow_Impl::HasSelection() const { @@ -2100,7 +2100,7 @@ sal_Bool SfxHelpTextWindow_Impl::HasSelection() const return bRet; } -// ----------------------------------------------------------------------- + void SfxHelpTextWindow_Impl::InitToolBoxImages() { @@ -2144,7 +2144,7 @@ void SfxHelpTextWindow_Impl::InitToolBoxImages() aToolBox.SetOutStyle( aMiscOptions.GetToolboxStyle() ); } -// ----------------------------------------------------------------------- + void SfxHelpTextWindow_Impl::InitOnStartupBox( bool bOnlyText ) { @@ -2238,7 +2238,7 @@ void SfxHelpTextWindow_Impl::InitOnStartupBox( bool bOnlyText ) } } -// ----------------------------------------------------------------------- + void SfxHelpTextWindow_Impl::SetOnStartupBoxPosition() { @@ -2248,7 +2248,7 @@ void SfxHelpTextWindow_Impl::SetOnStartupBoxPosition() aOnStartupCB.SetPosPixel( aPos ); } -// ----------------------------------------------------------------------- + Reference< XBreakIterator > SfxHelpTextWindow_Impl::GetBreakIterator() { @@ -2258,7 +2258,7 @@ Reference< XBreakIterator > SfxHelpTextWindow_Impl::GetBreakIterator() return xBreakIterator; } -// ----------------------------------------------------------------------- + Reference< XTextRange > SfxHelpTextWindow_Impl::getCursor() const { @@ -2290,7 +2290,7 @@ Reference< XTextRange > SfxHelpTextWindow_Impl::getCursor() const return xCursor; } -// ----------------------------------------------------------------------- + bool SfxHelpTextWindow_Impl::isHandledKey( const KeyCode& _rKeyCode ) { @@ -2312,7 +2312,7 @@ bool SfxHelpTextWindow_Impl::isHandledKey( const KeyCode& _rKeyCode ) return bRet; } -// ----------------------------------------------------------------------- + IMPL_LINK_NOARG(SfxHelpTextWindow_Impl, SelectHdl) { @@ -2357,7 +2357,7 @@ IMPL_LINK_NOARG(SfxHelpTextWindow_Impl, SelectHdl) return 1; } -// ----------------------------------------------------------------------- + IMPL_LINK( SfxHelpTextWindow_Impl, NotifyHdl, SvtMiscOptions*, pOptions ) { @@ -2368,7 +2368,7 @@ IMPL_LINK( SfxHelpTextWindow_Impl, NotifyHdl, SvtMiscOptions*, pOptions ) return 0; } -// ----------------------------------------------------------------------- + IMPL_LINK( SfxHelpTextWindow_Impl, FindHdl, sfx2::SearchDialog*, pDlg ) { @@ -2452,7 +2452,7 @@ IMPL_LINK( SfxHelpTextWindow_Impl, FindHdl, sfx2::SearchDialog*, pDlg ) return 0; } -// ----------------------------------------------------------------------- + IMPL_LINK( SfxHelpTextWindow_Impl, CloseHdl, sfx2::SearchDialog*, pDlg ) { @@ -2462,7 +2462,7 @@ IMPL_LINK( SfxHelpTextWindow_Impl, CloseHdl, sfx2::SearchDialog*, pDlg ) return 0; } -// ----------------------------------------------------------------------- + IMPL_LINK( SfxHelpTextWindow_Impl, CheckHdl, CheckBox*, pBox ) { @@ -2486,7 +2486,7 @@ IMPL_LINK( SfxHelpTextWindow_Impl, CheckHdl, CheckBox*, pBox ) return 0; } -// ----------------------------------------------------------------------- + void SfxHelpTextWindow_Impl::Resize() { @@ -2497,7 +2497,7 @@ void SfxHelpTextWindow_Impl::Resize() SetOnStartupBoxPosition(); } -// ----------------------------------------------------------------------- + bool SfxHelpTextWindow_Impl::PreNotify( NotifyEvent& rNEvt ) { @@ -2623,7 +2623,7 @@ bool SfxHelpTextWindow_Impl::PreNotify( NotifyEvent& rNEvt ) return nDone || Window::PreNotify( rNEvt ); } -// ----------------------------------------------------------------------- + void SfxHelpTextWindow_Impl::GetFocus() { @@ -2645,7 +2645,7 @@ void SfxHelpTextWindow_Impl::GetFocus() } } -// ----------------------------------------------------------------------- + void SfxHelpTextWindow_Impl::DataChanged( const DataChangedEvent& rDCEvt ) { @@ -2660,7 +2660,7 @@ void SfxHelpTextWindow_Impl::DataChanged( const DataChangedEvent& rDCEvt ) } } -// ----------------------------------------------------------------------- + void SfxHelpTextWindow_Impl::ToggleIndex( sal_Bool bOn ) { @@ -2677,7 +2677,7 @@ void SfxHelpTextWindow_Impl::ToggleIndex( sal_Bool bOn ) } } -// ----------------------------------------------------------------------- + void SfxHelpTextWindow_Impl::SelectSearchText( const OUString& rSearchText, sal_Bool _bIsFullWordSearch ) { @@ -2686,7 +2686,7 @@ void SfxHelpTextWindow_Impl::SelectSearchText( const OUString& rSearchText, sal_ aSelectTimer.Start(); } -// ----------------------------------------------------------------------- + void SfxHelpTextWindow_Impl::SetPageStyleHeaderOff() const { @@ -2748,7 +2748,7 @@ void SfxHelpTextWindow_Impl::SetPageStyleHeaderOff() const #endif } -// ----------------------------------------------------------------------- + void SfxHelpTextWindow_Impl::CloseFrame() { @@ -2764,7 +2764,7 @@ void SfxHelpTextWindow_Impl::CloseFrame() } } -// ----------------------------------------------------------------------- + void SfxHelpTextWindow_Impl::DoSearch() { @@ -2795,7 +2795,7 @@ void SfxHelpWindow_Impl::Resize() InitSizes(); } -// ----------------------------------------------------------------------- + void SfxHelpWindow_Impl::Split() { @@ -2834,14 +2834,14 @@ void SfxHelpWindow_Impl::Split() InitSizes(); } -// ----------------------------------------------------------------------- + void SfxHelpWindow_Impl::GetFocus() { pTextWin->GrabFocus(); } -// ----------------------------------------------------------------------- + void SfxHelpWindow_Impl::MakeLayout() { @@ -2892,7 +2892,7 @@ void SfxHelpWindow_Impl::MakeLayout() } } -// ----------------------------------------------------------------------- + void SfxHelpWindow_Impl::InitSizes() { @@ -2914,7 +2914,7 @@ void SfxHelpWindow_Impl::InitSizes() } } -// ----------------------------------------------------------------------- + void SfxHelpWindow_Impl::LoadConfig() { @@ -2952,7 +2952,7 @@ void SfxHelpWindow_Impl::LoadConfig() } } -// ----------------------------------------------------------------------- + void SfxHelpWindow_Impl::SaveConfig() { @@ -2985,7 +2985,7 @@ void SfxHelpWindow_Impl::SaveConfig() aViewOpt.SetUserItem( USERITEM_NAME, makeAny( OUString( aUserData ) ) ); } -// ----------------------------------------------------------------------- + void SfxHelpWindow_Impl::ShowStartPage() { @@ -2996,7 +2996,7 @@ void SfxHelpWindow_Impl::ShowStartPage() loadHelpContent(sHelpURL); } -// ----------------------------------------------------------------------- + IMPL_LINK( SfxHelpWindow_Impl, SelectHdl, ToolBox* , pToolBox ) { @@ -3009,7 +3009,7 @@ IMPL_LINK( SfxHelpWindow_Impl, SelectHdl, ToolBox* , pToolBox ) return 1; } -//------------------------------------------------------------------------- + IMPL_LINK_NOARG(SfxHelpWindow_Impl, OpenHdl) { @@ -3051,7 +3051,7 @@ IMPL_LINK_NOARG(SfxHelpWindow_Impl, OpenHdl) return 0; } -//------------------------------------------------------------------------- + IMPL_LINK( SfxHelpWindow_Impl, SelectFactoryHdl, SfxHelpIndexWindow_Impl* , pWin ) { @@ -3071,7 +3071,7 @@ IMPL_LINK( SfxHelpWindow_Impl, SelectFactoryHdl, SfxHelpIndexWindow_Impl* , pWin return 0; } -// ----------------------------------------------------------------------- + IMPL_LINK( SfxHelpWindow_Impl, ChangeHdl, HelpListener_Impl*, pListener ) { @@ -3079,7 +3079,7 @@ IMPL_LINK( SfxHelpWindow_Impl, ChangeHdl, HelpListener_Impl*, pListener ) return 0; } -// ----------------------------------------------------------------------- + void SfxHelpWindow_Impl::openDone(const OUString& sURL , sal_Bool bSuccess) @@ -3133,7 +3133,7 @@ void SfxHelpWindow_Impl::openDone(const OUString& sURL , } } -// ----------------------------------------------------------------------- + SfxHelpWindow_Impl::SfxHelpWindow_Impl( const ::com::sun::star::uno::Reference < ::com::sun::star::frame::XFrame2 >& rFrame, @@ -3174,7 +3174,7 @@ SfxHelpWindow_Impl::SfxHelpWindow_Impl( LoadConfig(); } -// ----------------------------------------------------------------------- + SfxHelpWindow_Impl::~SfxHelpWindow_Impl() { @@ -3187,7 +3187,7 @@ SfxHelpWindow_Impl::~SfxHelpWindow_Impl() delete pTextWin; } -// ----------------------------------------------------------------------- + bool SfxHelpWindow_Impl::PreNotify( NotifyEvent& rNEvt ) { @@ -3213,7 +3213,7 @@ bool SfxHelpWindow_Impl::PreNotify( NotifyEvent& rNEvt ) return bHandled || Window::PreNotify( rNEvt ); } -// ----------------------------------------------------------------------- + void SfxHelpWindow_Impl::setContainerWindow( Reference < ::com::sun::star::awt::XWindow > xWin ) { @@ -3221,14 +3221,14 @@ void SfxHelpWindow_Impl::setContainerWindow( Reference < ::com::sun::star::awt:: MakeLayout(); } -// ----------------------------------------------------------------------- + void SfxHelpWindow_Impl::SetFactory( const OUString& rFactory ) { pIndexWin->SetFactory( rFactory, sal_True ); } -// ----------------------------------------------------------------------- + void SfxHelpWindow_Impl::SetHelpURL( const OUString& rURL ) { @@ -3237,7 +3237,7 @@ void SfxHelpWindow_Impl::SetHelpURL( const OUString& rURL ) SetFactory( aObj.GetHost() ); } -// ----------------------------------------------------------------------- + void SfxHelpWindow_Impl::DoAction( sal_uInt16 nActionId ) { @@ -3338,7 +3338,7 @@ void SfxHelpWindow_Impl::DoAction( sal_uInt16 nActionId ) } } -// ----------------------------------------------------------------------- + void SfxHelpWindow_Impl::CloseWindow() { @@ -3365,7 +3365,7 @@ void SfxHelpWindow_Impl::CloseWindow() } } -// ----------------------------------------------------------------------- + void SfxHelpWindow_Impl::UpdateToolbox() { @@ -3373,14 +3373,14 @@ void SfxHelpWindow_Impl::UpdateToolbox() pTextWin->GetToolBox().EnableItem( TBI_FORWARD, pHelpInterceptor->HasHistorySucc() ); } -// ----------------------------------------------------------------------- + sal_Bool SfxHelpWindow_Impl::HasHistoryPredecessor() const { return pHelpInterceptor->HasHistoryPred(); } -// ----------------------------------------------------------------------- + sal_Bool SfxHelpWindow_Impl::HasHistorySuccessor() const { @@ -3397,7 +3397,7 @@ SfxAddHelpBookmarkDialog_Impl::SfxAddHelpBookmarkDialog_Impl(Window* pParent, sa SetText(get<FixedText>("alttitle")->GetText()); } -// ----------------------------------------------------------------------- + void SfxAddHelpBookmarkDialog_Impl::SetTitle( const OUString& rTitle ) { diff --git a/sfx2/source/appl/opengrf.cxx b/sfx2/source/appl/opengrf.cxx index d39383b4af72..d04f1aa636aa 100644 --- a/sfx2/source/appl/opengrf.cxx +++ b/sfx2/source/appl/opengrf.cxx @@ -46,7 +46,7 @@ #include "app.hrc" #include <sfx2/sfxresid.hxx> -//----------------------------------------------------------------------------- + using namespace ::com::sun::star; using namespace ::com::sun::star::lang; @@ -56,7 +56,7 @@ using namespace ::rtl; using namespace ::cppu; -//----------------------------------------------------------------------------- + sal_uInt16 SvxOpenGrfErr2ResId( short err ) { diff --git a/sfx2/source/appl/sfxpicklist.cxx b/sfx2/source/appl/sfxpicklist.cxx index 236e74fc1331..fa751c63f82f 100644 --- a/sfx2/source/appl/sfxpicklist.cxx +++ b/sfx2/source/appl/sfxpicklist.cxx @@ -32,7 +32,7 @@ #include <unotools/localfilehelper.hxx> #include <cppuhelper/implbase1.hxx> -// ---------------------------------------------------------------------------- + #include <sfx2/app.hxx> #include "sfxpicklist.hxx" @@ -52,13 +52,13 @@ #include <algorithm> -// ---------------------------------------------------------------------------- + using namespace ::com::sun::star::uno; using namespace ::com::sun::star::beans; using namespace ::com::sun::star::util; -// ---------------------------------------------------------------------------- + class StringLength : public ::cppu::WeakImplHelper1< XStringWidth > { diff --git a/sfx2/source/appl/shutdownicon.cxx b/sfx2/source/appl/shutdownicon.cxx index 2947fb628281..f72f6a637a4f 100644 --- a/sfx2/source/appl/shutdownicon.cxx +++ b/sfx2/source/appl/shutdownicon.cxx @@ -294,7 +294,7 @@ ShutdownIcon::~ShutdownIcon() new IdleUnloader (&m_pPlugin); } -// --------------------------------------------------------------------------- + void ShutdownIcon::OpenURL( const OUString& aURL, const OUString& rTarget, const Sequence< PropertyValue >& aArgs ) { @@ -327,7 +327,7 @@ void ShutdownIcon::OpenURL( const OUString& aURL, const OUString& rTarget, const } } -// --------------------------------------------------------------------------- + void ShutdownIcon::FileOpen() { @@ -339,7 +339,7 @@ void ShutdownIcon::FileOpen() } } -// --------------------------------------------------------------------------- + void ShutdownIcon::FromTemplate() { @@ -382,7 +382,7 @@ void ShutdownIcon::FromTemplate() } } -// --------------------------------------------------------------------------- + #include <tools/rcid.h> OUString ShutdownIcon::GetResString( int id ) { @@ -398,7 +398,7 @@ OUString ShutdownIcon::GetResString( int id ) return ResId(id, *m_pResMgr).toString(); } -// --------------------------------------------------------------------------- + OUString ShutdownIcon::GetUrlDescription( const OUString& aUrl ) { @@ -407,7 +407,7 @@ OUString ShutdownIcon::GetUrlDescription( const OUString& aUrl ) return OUString( SvFileInformationManager::GetDescription( INetURLObject( aUrl ) ) ); } -// --------------------------------------------------------------------------- + void ShutdownIcon::StartFileDialog() { @@ -430,7 +430,7 @@ void ShutdownIcon::StartFileDialog() m_pFileDlg->StartExecuteModal( STATIC_LINK( this, ShutdownIcon, DialogClosedHdl_Impl ) ); } -// --------------------------------------------------------------------------- + IMPL_STATIC_LINK( ShutdownIcon, DialogClosedHdl_Impl, FileDialogHelper*, EMPTYARG ) { @@ -574,7 +574,7 @@ IMPL_STATIC_LINK( ShutdownIcon, DialogClosedHdl_Impl, FileDialogHelper*, EMPTYAR return 0; } -// --------------------------------------------------------------------------- + void ShutdownIcon::addTerminateListener() { @@ -593,7 +593,7 @@ void ShutdownIcon::addTerminateListener() pInst->m_bListenForTermination = true; } -// --------------------------------------------------------------------------- + void ShutdownIcon::terminateDesktop() { @@ -618,7 +618,7 @@ void ShutdownIcon::terminateDesktop() ShutdownIcon::pShutdownIcon = 0; } -// --------------------------------------------------------------------------- + ShutdownIcon* ShutdownIcon::getInstance() { @@ -626,7 +626,7 @@ ShutdownIcon* ShutdownIcon::getInstance() return pShutdownIcon; } -// --------------------------------------------------------------------------- + ShutdownIcon* ShutdownIcon::createInstance() { @@ -659,7 +659,7 @@ void ShutdownIcon::init() throw( ::com::sun::star::uno::Exception ) m_xDesktop = xDesktop; } -// --------------------------------------------------------------------------- + void SAL_CALL ShutdownIcon::disposing() { @@ -667,7 +667,7 @@ void SAL_CALL ShutdownIcon::disposing() m_xDesktop.clear(); } -// --------------------------------------------------------------------------- + // XEventListener void SAL_CALL ShutdownIcon::disposing( const ::com::sun::star::lang::EventObject& ) @@ -675,7 +675,7 @@ void SAL_CALL ShutdownIcon::disposing( const ::com::sun::star::lang::EventObject { } -// --------------------------------------------------------------------------- + // XTerminateListener void SAL_CALL ShutdownIcon::queryTermination( const ::com::sun::star::lang::EventObject& ) @@ -689,7 +689,7 @@ throw(::com::sun::star::frame::TerminationVetoException, ::com::sun::star::uno:: } -// --------------------------------------------------------------------------- + void SAL_CALL ShutdownIcon::notifyTermination( const ::com::sun::star::lang::EventObject& ) throw(::com::sun::star::uno::RuntimeException) @@ -697,7 +697,7 @@ throw(::com::sun::star::uno::RuntimeException) } -// --------------------------------------------------------------------------- + void SAL_CALL ShutdownIcon::initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any>& aArguments ) throw( ::com::sun::star::uno::Exception ) @@ -750,14 +750,14 @@ void SAL_CALL ShutdownIcon::initialize( const ::com::sun::star::uno::Sequence< : } -// ------------------------------- + void ShutdownIcon::EnterModalMode() { bModalMode = true; } -// ------------------------------- + void ShutdownIcon::LeaveModalMode() { @@ -781,7 +781,7 @@ bool ShutdownIcon::IsQuickstarterInstalled() } #endif // !WNT -// --------------------------------------------------------------------------- + #if defined (ENABLE_QUICKSTART_APPLET) && defined (UNX) /** diff --git a/sfx2/source/appl/shutdowniconw32.cxx b/sfx2/source/appl/shutdowniconw32.cxx index 8c7a6a1cd42f..584d6b040f55 100644 --- a/sfx2/source/appl/shutdowniconw32.cxx +++ b/sfx2/source/appl/shutdowniconw32.cxx @@ -96,7 +96,7 @@ typedef struct tagMYITEM UINT iconId; } MYITEM; -// ------------------------------- + static void addMenuItem( HMENU hMenu, UINT id, UINT iconId, const OUString& text, int& pos, int bOwnerdraw, const OUString& module ) { @@ -143,7 +143,7 @@ static void addMenuItem( HMENU hMenu, UINT id, UINT iconId, const OUString& text InsertMenuItemW( hMenu, pos++, TRUE, &mi ); } -// ------------------------------- + static HMENU createSystrayMenu( ) { @@ -231,7 +231,7 @@ static HMENU createSystrayMenu( ) return hMenu; } -// ------------------------------- + static void deleteSystrayMenu( HMENU hMenu ) { @@ -257,7 +257,7 @@ static void deleteSystrayMenu( HMENU hMenu ) } } -// ------------------------------- + static void addTaskbarIcon( HWND hWnd ) { @@ -282,7 +282,7 @@ static void addTaskbarIcon( HWND hWnd ) Shell_NotifyIconW(NIM_ADD, &nid); } -// ------------------------------- + LRESULT CALLBACK listenerWndProc( HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam) { @@ -407,7 +407,7 @@ LRESULT CALLBACK listenerWndProc( HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lP return 0; } -// ------------------------------- + LRESULT CALLBACK executerWndProc( HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam) { @@ -467,7 +467,7 @@ LRESULT CALLBACK executerWndProc( HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lP return 0; } -// ------------------------------- + DWORD WINAPI SystrayThread( LPVOID /*lpParam*/ ) @@ -497,7 +497,7 @@ DWORD WINAPI SystrayThread( LPVOID /*lpParam*/ ) return msg.wParam; // Exit code of WM_QUIT } -// ------------------------------- + void win32_init_sys_tray() { @@ -554,7 +554,7 @@ void win32_init_sys_tray() } } -// ------------------------------- + void win32_shutdown_sys_tray() { @@ -574,7 +574,7 @@ void win32_shutdown_sys_tray() -// ------------------------------- + void OnMeasureItem(HWND hwnd, LPMEASUREITEMSTRUCT lpmis) { @@ -695,9 +695,9 @@ void OnDrawItem(HWND /*hwnd*/, LPDRAWITEMSTRUCT lpdis) SetBkColor(lpdis->hDC, clrPrevBkgnd); } -// ------------------------------- + // code from setup2 project -// ------------------------------- + void _SHFree( void *pv ) { @@ -790,7 +790,7 @@ BOOL CreateShortcut( const OUString& rAbsObject, const OUString& rAbsObjectPath, return TRUE; } -// ------------------ + // install/uninstall static bool FileExistsW( LPCWSTR lpPath ) diff --git a/sfx2/source/appl/workwin.cxx b/sfx2/source/appl/workwin.cxx index e141d8456d48..b595b666cedb 100644 --- a/sfx2/source/appl/workwin.cxx +++ b/sfx2/source/appl/workwin.cxx @@ -213,9 +213,9 @@ void LayoutManagerListener::setFrame( const css::uno::Reference< css::frame::XFr } } -//--------------------------------------------------------------------------------------------------------- + // XComponent -//--------------------------------------------------------------------------------------------------------- + void SAL_CALL LayoutManagerListener::addEventListener( const css::uno::Reference< css::lang::XEventListener >& ) throw (::com::sun::star::uno::RuntimeException) @@ -273,9 +273,9 @@ throw( css::uno::RuntimeException ) } } -//--------------------------------------------------------------------------------------------------------- + // XEventListener -//--------------------------------------------------------------------------------------------------------- + void SAL_CALL LayoutManagerListener::disposing( const css::lang::EventObject& ) throw( css::uno::RuntimeException ) @@ -286,9 +286,9 @@ throw( css::uno::RuntimeException ) m_xFrame = css::uno::Reference< css::frame::XFrame >(); } -//--------------------------------------------------------------------------------------------------------- + // XLayoutManagerEventListener -//--------------------------------------------------------------------------------------------------------- + void SAL_CALL LayoutManagerListener::layoutEvent( const css::lang::EventObject&, ::sal_Int16 eLayoutEvent, @@ -664,7 +664,7 @@ void SfxWorkWindow::Lock_Impl( sal_Bool bLock ) ArrangeChildren_Impl(); } -//-------------------------------------------------------------------- + // Helper method to release the child lists. Should the destructor not be // called after this, instead work continues, then space for the object bars // and split windows has to be reserved in the same way as in the constructor @@ -801,7 +801,7 @@ void SfxFrameWorkWin_Impl::ArrangeChildren_Impl( sal_Bool bForce ) ArrangeAutoHideWindows( NULL ); } -//-------------------------------------------------------------------- + SvBorder SfxWorkWindow::Arrange_Impl() @@ -967,7 +967,7 @@ sal_Bool SfxWorkWindow::PrepareClose_Impl() return sal_True; } -//-------------------------------------------------------------------- + SfxChild_Impl* SfxWorkWindow::RegisterChild_Impl( Window& rWindow, SfxChildAlignment eAlign, sal_Bool bCanGetFocus ) @@ -991,7 +991,7 @@ SfxChild_Impl* SfxWorkWindow::RegisterChild_Impl( Window& rWindow, return aChildren.back(); } -//-------------------------------------------------------------------- + void SfxWorkWindow::ReleaseChild_Impl( Window& rWindow ) { @@ -1018,7 +1018,7 @@ void SfxWorkWindow::ReleaseChild_Impl( Window& rWindow ) } } -//-------------------------------------------------------------------- + SfxChild_Impl* SfxWorkWindow::FindChild_Impl( const Window& rWindow ) const { @@ -1036,7 +1036,7 @@ SfxChild_Impl* SfxWorkWindow::FindChild_Impl( const Window& rWindow ) const return 0; } -//-------------------------------------------------------------------- + void SfxWorkWindow::ShowChildren_Impl() { @@ -1108,7 +1108,7 @@ void SfxWorkWindow::ShowChildren_Impl() } } -//-------------------------------------------------------------------- + void SfxWorkWindow::HideChildren_Impl() { @@ -1130,7 +1130,7 @@ void SfxWorkWindow::HideChildren_Impl() } } -//------------------------------------------------------------------------ + void SfxWorkWindow::ResetObjectBars_Impl() { @@ -1142,7 +1142,7 @@ void SfxWorkWindow::ResetObjectBars_Impl() aChildWins[n]->nId = 0; } -//------------------------------------------------------------------------ + void SfxWorkWindow::SetObjectBar_Impl( sal_uInt16 nPos, sal_uInt32 nResId, SfxInterface* pIFace, const OUString *pName) @@ -1179,7 +1179,7 @@ void SfxWorkWindow::SetObjectBar_Impl( sal_uInt16 nPos, sal_uInt32 nResId, aObjBarList.push_back( aObjBar ); } -//------------------------------------------------------------------------ + bool SfxWorkWindow::KnowsObjectBar_Impl( sal_uInt16 nPos ) const @@ -1203,7 +1203,7 @@ bool SfxWorkWindow::KnowsObjectBar_Impl( sal_uInt16 nPos ) const return false; } -//------------------------------------------------------------------------ + sal_Bool SfxWorkWindow::IsVisible_Impl( sal_uInt16 nMode ) const { @@ -1287,7 +1287,7 @@ Reference< ::com::sun::star::task::XStatusIndicator > SfxWorkWindow::GetStatusIn return xStatusIndicator; } -//------------------------------------------------------------------------ + sal_Bool SfxWorkWindow::IsPluginMode( SfxObjectShell* pObjShell ) { @@ -1301,7 +1301,7 @@ sal_Bool SfxWorkWindow::IsPluginMode( SfxObjectShell* pObjShell ) return sal_False; } -//------------------------------------------------------------------------ + ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > SfxWorkWindow::GetFrameInterface() { @@ -1318,7 +1318,7 @@ sal_Bool SfxWorkWindow::IsPluginMode( SfxObjectShell* pObjShell ) return xFrame; } -//------------------------------------------------------------------------ + void SfxWorkWindow::UpdateObjectBars_Impl() { @@ -1623,7 +1623,7 @@ void SfxWorkWindow::ResetStatusBar_Impl() aStatBar.nId = 0; } -//-------------------------------------------------------------------- + void SfxWorkWindow::SetStatusBar_Impl( sal_uInt32 nResId, SfxShell*, SfxBindings& ) { if ( nResId && bShowStatusBar && IsVisible_Impl() ) @@ -1673,7 +1673,7 @@ sal_Bool SfxWorkWindow::IsVisible_Impl() return nOrigMode != SFX_VISIBILITY_UNVISIBLE; } -//------------------------------------------------------------------------ + void SfxWorkWindow::HidePopups_Impl(sal_Bool bHide, sal_Bool bParent, sal_uInt16 nId ) { for ( sal_uInt16 n = 0; n < aChildWins.size(); ++n ) @@ -1701,7 +1701,7 @@ void SfxWorkWindow::HidePopups_Impl(sal_Bool bHide, sal_Bool bParent, sal_uInt16 pParent->HidePopups_Impl( bHide, bParent, nId ); } -//------------------------------------------------------------------------ + void SfxWorkWindow::ConfigChild_Impl(SfxChildIdentifier eChild, SfxDockingConfig eConfig, sal_uInt16 nId) @@ -1961,7 +1961,7 @@ void SfxWorkWindow::ConfigChild_Impl(SfxChildIdentifier eChild, } } -//-------------------------------------------------------------------- + void SfxWorkWindow::SetChildWindowVisible_Impl( sal_uInt32 lId, sal_Bool bEnabled, sal_uInt16 nMode ) { @@ -2021,7 +2021,7 @@ void SfxWorkWindow::SetChildWindowVisible_Impl( sal_uInt32 lId, sal_Bool bEnable pCW->nVisibility = nMode; } -//-------------------------------------------------------------------- + // The on/off status of a ChildWindow is switched void SfxWorkWindow::ToggleChildWindow_Impl(sal_uInt16 nId, sal_Bool bSetFocus) @@ -2133,7 +2133,7 @@ void SfxWorkWindow::ToggleChildWindow_Impl(sal_uInt16 nId, sal_Bool bSetFocus) #endif } -//-------------------------------------------------------------------- + sal_Bool SfxWorkWindow::HasChildWindow_Impl(sal_uInt16 nId) { @@ -2212,7 +2212,7 @@ sal_Bool SfxWorkWindow::IsFloating( sal_uInt16 nId ) return sal_True; } -//-------------------------------------------------------------------- + sal_Bool SfxWorkWindow::KnowsChildWindow_Impl(sal_uInt16 nId) { @@ -2238,7 +2238,7 @@ sal_Bool SfxWorkWindow::KnowsChildWindow_Impl(sal_uInt16 nId) return sal_False; } -//-------------------------------------------------------------------- + void SfxWorkWindow::SetChildWindow_Impl(sal_uInt16 nId, sal_Bool bOn, sal_Bool bSetFocus) { @@ -2290,7 +2290,7 @@ void SfxWorkWindow::SetChildWindow_Impl(sal_uInt16 nId, sal_Bool bOn, sal_Bool b pWork->ToggleChildWindow_Impl(nId,bSetFocus); } -//-------------------------------------------------------------------- + void SfxWorkWindow::ShowChildWindow_Impl(sal_uInt16 nId, sal_Bool bVisible, sal_Bool bSetFocus) { @@ -2378,7 +2378,7 @@ void SfxWorkWindow::ShowChildWindow_Impl(sal_uInt16 nId, sal_Bool bVisible, sal_ #endif } -//-------------------------------------------------------------------- + SfxChildWindow* SfxWorkWindow::GetChildWindow_Impl(sal_uInt16 nId) { @@ -2395,7 +2395,7 @@ SfxChildWindow* SfxWorkWindow::GetChildWindow_Impl(sal_uInt16 nId) return 0; } -//------------------------------------------------------------------------ + void SfxWorkWindow::ResetChildWindows_Impl() { @@ -2406,7 +2406,7 @@ void SfxWorkWindow::ResetChildWindows_Impl() } } -//------------------------------------------------------------------------ + // Virtual method that returns the size of the area (client area) of the // parent windows, in which the ChildWindow can be fitted. @@ -2415,7 +2415,7 @@ Rectangle SfxWorkWindow::GetTopRect_Impl() return Rectangle (Point(), pWorkWin->GetOutputSizePixel() ); } -//------------------------------------------------------------------------ + // Virtual method that returns the size of the area (client area) of the // parent windows, in which the ChildWindow can be fitted. @@ -2424,7 +2424,7 @@ Rectangle SfxFrameWorkWin_Impl::GetTopRect_Impl() return pMasterFrame->GetTopOuterRectPixel_Impl(); } -//------------------------------------------------------------------------ + // Virtual method to find out if there is room for a ChildWindow in the // client area of the parent. diff --git a/sfx2/source/appl/xpackcreator.cxx b/sfx2/source/appl/xpackcreator.cxx index 8b3c83118ce2..e86479517237 100644 --- a/sfx2/source/appl/xpackcreator.cxx +++ b/sfx2/source/appl/xpackcreator.cxx @@ -53,7 +53,7 @@ public: virtual uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (uno::RuntimeException); }; -//------------------------------------------------------------------------- + void SAL_CALL OPackageStructureCreator::convertToPackage( const OUString& aFolderUrl, const uno::Reference< io::XOutputStream >& xTargetStream ) throw ( io::IOException, |