diff options
Diffstat (limited to 'sfx2')
111 files changed, 2012 insertions, 2012 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, diff --git a/sfx2/source/bastyp/bitset.cxx b/sfx2/source/bastyp/bitset.cxx index ca778484ebad..fc336bc9d2a8 100644 --- a/sfx2/source/bastyp/bitset.cxx +++ b/sfx2/source/bastyp/bitset.cxx @@ -74,7 +74,7 @@ BitSet BitSet::operator<<( sal_uInt16 nOffset ) const return aSet; } -//-------------------------------------------------------------------- + // substracts nOffset from each bit-value in the set @@ -83,7 +83,7 @@ BitSet BitSet::operator>>( sal_uInt16 ) const return BitSet(); } -//-------------------------------------------------------------------- + // internal code for operator= and copy-ctor @@ -100,7 +100,7 @@ void BitSet::CopyFrom( const BitSet& rSet ) pBitmap = 0; } -//-------------------------------------------------------------------- + // creates an empty bitset @@ -111,7 +111,7 @@ BitSet::BitSet() pBitmap = 0; } -//-------------------------------------------------------------------- + // creates a copy of bitset rOrig @@ -120,7 +120,7 @@ BitSet::BitSet( const BitSet& rOrig ) CopyFrom(rOrig); } -//-------------------------------------------------------------------- + // frees the storage @@ -129,7 +129,7 @@ BitSet::~BitSet() delete [] pBitmap; } -//-------------------------------------------------------------------- + // assignment from another bitset @@ -143,7 +143,7 @@ BitSet& BitSet::operator=( const BitSet& rOrig ) return *this; } -//-------------------------------------------------------------------- + // assignment from a single bit @@ -163,7 +163,7 @@ BitSet& BitSet::operator=( sal_uInt16 nBit ) return *this; } -//-------------------------------------------------------------------- + // creates the asymetric difference with another bitset @@ -184,7 +184,7 @@ BitSet& BitSet::operator-=(sal_uInt16 nBit) return *this; } -//-------------------------------------------------------------------- + // unites with the bits of rSet @@ -220,7 +220,7 @@ BitSet& BitSet::operator|=( const BitSet& rSet ) return *this; } -//-------------------------------------------------------------------- + // unites with a single bit @@ -252,7 +252,7 @@ BitSet& BitSet::operator|=( sal_uInt16 nBit ) return *this; } -//-------------------------------------------------------------------- + // determines if the bit is set (may be the only one) @@ -266,7 +266,7 @@ sal_Bool BitSet::Contains( sal_uInt16 nBit ) const return ( nBitVal & *(pBitmap+nBlock) ) == nBitVal; } -//-------------------------------------------------------------------- + // determines if the bitsets are equal @@ -283,7 +283,7 @@ sal_Bool BitSet::operator==( const BitSet& rSet ) const return sal_True; } -//-------------------------------------------------------------------- + // counts the number of 1-bits in the parameter @@ -299,7 +299,7 @@ sal_uInt16 BitSet::CountBits( sal_uIntPtr nBits ) return nCount; } -//-------------------------------------------------------------------- + sal_uInt16 IndexBitSet::GetFreeIndex() { diff --git a/sfx2/source/bastyp/fltfnc.cxx b/sfx2/source/bastyp/fltfnc.cxx index 7fb213ae6c02..5e1093699441 100644 --- a/sfx2/source/bastyp/fltfnc.cxx +++ b/sfx2/source/bastyp/fltfnc.cxx @@ -124,13 +124,13 @@ static void CreateFilterArr() theSfxFilterListener::get(); } -//---------------------------------------------------------------- + inline OUString ToUpper_Impl( const OUString &rStr ) { return SvtSysLocale().GetCharClass().uppercase( rStr ); } -//---------------------------------------------------------------- + class SfxFilterContainer_Impl { public: @@ -161,21 +161,21 @@ const SfxFilter* SfxFilterContainer::GetAnyFilter( SfxFilterFlags nMust, SfxFilt return aMatch.GetAnyFilter( nMust, nDont ); } -//---------------------------------------------------------------- + SfxFilterContainer::SfxFilterContainer( const OUString& rName ) { pImpl = new SfxFilterContainer_Impl( rName ); } -//---------------------------------------------------------------- + SfxFilterContainer::~SfxFilterContainer() { delete pImpl; } -//---------------------------------------------------------------- + const OUString SfxFilterContainer::GetName() const { @@ -236,7 +236,7 @@ const SfxFilter* SfxFilterContainer::GetDefaultFilter_Impl( const OUString& rNam } -//---------------------------------------------------------------- + // Impl-Data is shared between all FilterMatchers of the same factory class SfxFilterMatcher_Impl @@ -375,7 +375,7 @@ const SfxFilter* SfxFilterMatcher::GetAnyFilter( SfxFilterFlags nMust, SfxFilter return NULL; } -//---------------------------------------------------------------- + sal_uInt32 SfxFilterMatcher::GuessFilterIgnoringContent( SfxMedium& rMedium, @@ -406,14 +406,14 @@ sal_uInt32 SfxFilterMatcher::GuessFilterIgnoringContent( return *ppFilter ? ERRCODE_NONE : ERRCODE_ABORT; } -//---------------------------------------------------------------- + sal_uInt32 SfxFilterMatcher::GuessFilter( SfxMedium& rMedium, const SfxFilter**ppFilter, SfxFilterFlags nMust, SfxFilterFlags nDont ) const { return GuessFilterControlDefaultUI( rMedium, ppFilter, nMust, nDont, sal_True ); } -//---------------------------------------------------------------- + sal_uInt32 SfxFilterMatcher::GuessFilterControlDefaultUI( SfxMedium& rMedium, const SfxFilter** ppFilter, SfxFilterFlags nMust, SfxFilterFlags nDont, sal_Bool /*bDefUI*/ ) const { @@ -508,7 +508,7 @@ sal_uInt32 SfxFilterMatcher::GuessFilterControlDefaultUI( SfxMedium& rMedium, c return ERRCODE_ABORT; } -//---------------------------------------------------------------- + sal_Bool SfxFilterMatcher::IsFilterInstalled_Impl( const SfxFilter* pFilter ) { if ( pFilter->GetFilterFlags() & SFX_FILTER_MUSTINSTALL ) @@ -857,7 +857,7 @@ IMPL_STATIC_LINK( SfxFilterMatcher, MaybeFileHdl_Impl, OUString*, pString ) return sal_False; } -//---------------------------------------------------------------- + SfxFilterMatcherIter::SfxFilterMatcherIter( const SfxFilterMatcher& rMatcher, @@ -870,7 +870,7 @@ SfxFilterMatcherIter::SfxFilterMatcherIter( m_rMatch.InitForIterating(); } -//---------------------------------------------------------------- + const SfxFilter* SfxFilterMatcherIter::Find_Impl() { @@ -893,7 +893,7 @@ const SfxFilter* SfxFilterMatcherIter::First() return Find_Impl(); } -//---------------------------------------------------------------- + const SfxFilter* SfxFilterMatcherIter::Next() { diff --git a/sfx2/source/bastyp/frmhtmlw.cxx b/sfx2/source/bastyp/frmhtmlw.cxx index 7b2b73f99a34..a0d20f8d1f7c 100644 --- a/sfx2/source/bastyp/frmhtmlw.cxx +++ b/sfx2/source/bastyp/frmhtmlw.cxx @@ -46,7 +46,7 @@ #include <rtl/strbuf.hxx> -// ----------------------------------------------------------------------- + using namespace ::com::sun::star; diff --git a/sfx2/source/bastyp/helper.cxx b/sfx2/source/bastyp/helper.cxx index e6637142e637..00f98dac008e 100644 --- a/sfx2/source/bastyp/helper.cxx +++ b/sfx2/source/bastyp/helper.cxx @@ -122,7 +122,7 @@ std::vector<OUString> SfxContentHelper::GetResultSet( const OUString& rURL ) return aList; } -// ----------------------------------------------------------------------- + std::vector< OUString > SfxContentHelper::GetHelpTreeViewContents( const OUString& rURL ) { @@ -188,7 +188,7 @@ std::vector< OUString > SfxContentHelper::GetHelpTreeViewContents( const OUStrin return aProperties; } -// ----------------------------------------------------------------------- + OUString SfxContentHelper::GetActiveHelpString( const OUString& rURL ) { @@ -220,7 +220,7 @@ OUString SfxContentHelper::GetActiveHelpString( const OUString& rURL ) return aRet.makeStringAndClear(); } -// ----------------------------------------------------------------------- + bool SfxContentHelper::IsHelpErrorDocument( const OUString& rURL ) { @@ -242,7 +242,7 @@ bool SfxContentHelper::IsHelpErrorDocument( const OUString& rURL ) return bRet; } -// ----------------------------------------------------------------------- + sal_Int64 SfxContentHelper::GetSize( const OUString& rContent ) { diff --git a/sfx2/source/bastyp/progress.cxx b/sfx2/source/bastyp/progress.cxx index ebe147067906..4cac16ace272 100644 --- a/sfx2/source/bastyp/progress.cxx +++ b/sfx2/source/bastyp/progress.cxx @@ -77,7 +77,7 @@ struct SfxProgress_Impl //======================================================================== extern sal_uInt32 Get10ThSec(); -// ----------------------------------------------------------------------- + void SfxProgress_Impl::Enable_Impl( sal_Bool bEnable ) { @@ -100,7 +100,7 @@ void SfxProgress_Impl::Enable_Impl( sal_Bool bEnable ) SFX_APP()->GetAppDispatcher_Impl()->Lock( !bEnable ); } -// ----------------------------------------------------------------------- + SfxProgress_Impl::SfxProgress_Impl( const OUString &/*rTitle*/ ) : nMax(0) @@ -117,7 +117,7 @@ SfxProgress_Impl::SfxProgress_Impl( const OUString &/*rTitle*/ ) { } -// ----------------------------------------------------------------------- + SfxProgress::SfxProgress ( @@ -172,7 +172,7 @@ SfxProgress::SfxProgress Resume(); } -// ----------------------------------------------------------------------- + SfxProgress::~SfxProgress() @@ -189,7 +189,7 @@ SfxProgress::~SfxProgress() delete pImp; } -// ----------------------------------------------------------------------- + void SfxProgress::Stop() @@ -220,7 +220,7 @@ void SfxProgress::Stop() pImp->Enable_Impl(sal_True); } -// ----------------------------------------------------------------------- + void SfxProgress::SetText( const OUString& /* new Text */) @@ -238,7 +238,7 @@ void SfxProgress::SetText( const OUString& /* new Text */) } } -// ----------------------------------------------------------------------- + // Required in App data static sal_uIntPtr nLastTime = 0; @@ -255,7 +255,7 @@ long TimeOut_Impl( void*, void* pArgV ) return 0; } -// ----------------------------------------------------------------------- + sal_Bool SfxProgress::SetStateText ( @@ -269,7 +269,7 @@ sal_Bool SfxProgress::SetStateText return SetState( nNewVal, nNewRange ); } -// ----------------------------------------------------------------------- + sal_Bool SfxProgress::SetState ( @@ -354,7 +354,7 @@ sal_Bool SfxProgress::SetState return sal_True; } -// ----------------------------------------------------------------------- + void SfxProgress::Resume() @@ -400,7 +400,7 @@ void SfxProgress::Resume() } } -// ----------------------------------------------------------------------- + void SfxProgress::Suspend() @@ -442,7 +442,7 @@ void SfxProgress::Suspend() } } -// ----------------------------------------------------------------------- + void SfxProgress::UnLock() { @@ -455,7 +455,7 @@ void SfxProgress::UnLock() pImp->Enable_Impl(sal_True); } -// ----------------------------------------------------------------------- + void SfxProgress::Reschedule() @@ -478,7 +478,7 @@ void SfxProgress::Reschedule() } } -// ----------------------------------------------------------------------- + SfxProgress* SfxProgress::GetActiveProgress ( @@ -527,14 +527,14 @@ SfxProgress* SfxProgress::GetActiveProgress return pProgress; } -// ----------------------------------------------------------------------- + void SfxProgress::EnterLock() { SFX_APP()->Get_Impl()->nRescheduleLocks++; } -// ----------------------------------------------------------------------- + void SfxProgress::LeaveLock() { diff --git a/sfx2/source/bastyp/sfxresid.cxx b/sfx2/source/bastyp/sfxresid.cxx index e83b4246aa04..32487df00e17 100644 --- a/sfx2/source/bastyp/sfxresid.cxx +++ b/sfx2/source/bastyp/sfxresid.cxx @@ -22,7 +22,7 @@ #include <sfx2/app.hxx> #include "tools/resmgr.hxx" -// ----------------------------------------------------------------------- + static ResMgr* pMgr=NULL; diff --git a/sfx2/source/config/evntconf.cxx b/sfx2/source/config/evntconf.cxx index c70d94caf9e9..ad368c99cf74 100644 --- a/sfx2/source/config/evntconf.cxx +++ b/sfx2/source/config/evntconf.cxx @@ -48,7 +48,7 @@ #include <com/sun/star/uno/Sequence.hxx> #include <com/sun/star/uno/Reference.hxx> -// ----------------------------------------------------------------------- + TYPEINIT1(SfxEventHint, SfxHint); TYPEINIT1(SfxEventNamesItem, SfxPoolItem); TYPEINIT1(SfxViewEventHint, SfxEventHint); @@ -139,7 +139,7 @@ void SfxEventNamesItem::AddEvent( const OUString& rName, const OUString& rUIName //========================================================================== -//-------------------------------------------------------------------------- + uno::Any CreateEventData_Impl( const SvxMacro *pMacro ) { /* @@ -221,7 +221,7 @@ uno::Any CreateEventData_Impl( const SvxMacro *pMacro ) return aEventData; } -//-------------------------------------------------------------------------- + void PropagateEvent_Impl( SfxObjectShell *pDoc, OUString aEventName, const SvxMacro* pMacro ) { uno::Reference < document::XEventsSupplier > xSupplier; @@ -262,7 +262,7 @@ void PropagateEvent_Impl( SfxObjectShell *pDoc, OUString aEventName, const SvxMa } } -//-------------------------------------------------------------------------------------------------------- + void SfxEventConfiguration::ConfigureEvent( OUString aName, const SvxMacro& rMacro, SfxObjectShell *pDoc ) { boost::scoped_ptr<SvxMacro> pMacro; @@ -271,7 +271,7 @@ void SfxEventConfiguration::ConfigureEvent( OUString aName, const SvxMacro& rMac PropagateEvent_Impl( pDoc ? pDoc : 0, aName, pMacro.get() ); } -// ------------------------------------------------------------------------------------------------------- + SvxMacro* SfxEventConfiguration::ConvertToMacro( const com::sun::star::uno::Any& rElement, SfxObjectShell* pDoc, sal_Bool bBlowUp ) { return SfxEvents_Impl::ConvertToMacro( rElement, pDoc, bBlowUp ); diff --git a/sfx2/source/control/bindings.cxx b/sfx2/source/control/bindings.cxx index 233fe94d9a86..3f7091c84bdb 100644 --- a/sfx2/source/control/bindings.cxx +++ b/sfx2/source/control/bindings.cxx @@ -158,7 +158,7 @@ public: InvalidateSlotMap m_aInvalidateSlots; // store slots which are invalidated while in update }; -//-------------------------------------------------------------------- + struct SfxFoundCache_Impl { @@ -195,7 +195,7 @@ struct SfxFoundCache_Impl { return nWhichId== r.nWhichId; } }; -//-------------------------------------------------------------------------- + class SfxFoundCacheArr_Impl : public std::vector<SfxFoundCache_Impl*> { @@ -273,7 +273,7 @@ SfxBindings::~SfxBindings() delete pImp; } -//-------------------------------------------------------------------- + void SfxBindings::DeleteControllers_Impl() { @@ -339,7 +339,7 @@ void SfxBindings::DeleteControllers_Impl() } } -//-------------------------------------------------------------------- + void SfxBindings::HidePopups( bool bHide ) { @@ -376,7 +376,7 @@ void SfxBindings::HidePopupCtrls_Impl( bool bHide ) pImp->ePopupAction = SFX_POPUP_DELETE; } -//-------------------------------------------------------------------- + void SfxBindings::Update_Impl ( @@ -439,7 +439,7 @@ void SfxBindings::Update_Impl DBG_PROFSTOP(SfxBindingsUpdate_Impl); } -//-------------------------------------------------------------------- + void SfxBindings::InvalidateSlotsInMap_Impl() { @@ -452,14 +452,14 @@ void SfxBindings::InvalidateSlotsInMap_Impl() pImp->m_aInvalidateSlots.clear(); } -//-------------------------------------------------------------------- + void SfxBindings::AddSlotToInvalidateSlotsMap_Impl( sal_uInt16 nId ) { pImp->m_aInvalidateSlots[nId] = true; } -//-------------------------------------------------------------------- + void SfxBindings::Update ( @@ -524,7 +524,7 @@ void SfxBindings::Update } } -//-------------------------------------------------------------------- + void SfxBindings::Update() { @@ -548,7 +548,7 @@ void SfxBindings::Update() } } -//-------------------------------------------------------------------- + void SfxBindings::SetState ( @@ -592,7 +592,7 @@ void SfxBindings::SetState } } -//-------------------------------------------------------------------- + void SfxBindings::SetState ( @@ -626,7 +626,7 @@ void SfxBindings::SetState } -//-------------------------------------------------------------------- + SfxStateCache* SfxBindings::GetAnyStateCache_Impl( sal_uInt16 nId ) { @@ -668,7 +668,7 @@ SfxStateCache* SfxBindings::GetStateCache return 0; } -//-------------------------------------------------------------------- + void SfxBindings::InvalidateAll ( @@ -709,7 +709,7 @@ void SfxBindings::InvalidateAll DBG_PROFSTOP(SfxBindingsInvalidateAll); } -//-------------------------------------------------------------------- + void SfxBindings::Invalidate ( @@ -765,7 +765,7 @@ void SfxBindings::Invalidate DBG_PROFSTOP(SfxBindingsInvalidateAll); } -//-------------------------------------------------------------------- + void SfxBindings::InvalidateShell ( @@ -828,7 +828,7 @@ void SfxBindings::InvalidateShell DBG_PROFSTOP(SfxBindingsInvalidateAll); } -//-------------------------------------------------------------------- + void SfxBindings::Invalidate ( @@ -863,7 +863,7 @@ void SfxBindings::Invalidate } } -//-------------------------------------------------------------------- + void SfxBindings::Invalidate ( @@ -900,7 +900,7 @@ void SfxBindings::Invalidate } } -//-------------------------------------------------------------------- + sal_Bool SfxBindings::IsBound( sal_uInt16 nSlotId, sal_uInt16 nStartSearchAt ) { @@ -908,7 +908,7 @@ sal_Bool SfxBindings::IsBound( sal_uInt16 nSlotId, sal_uInt16 nStartSearchAt ) return GetStateCache(nSlotId, &nStartSearchAt ) != 0; } -//-------------------------------------------------------------------- + sal_uInt16 SfxBindings::GetSlotPos( sal_uInt16 nId, sal_uInt16 nStartSearchAt ) { @@ -980,7 +980,7 @@ sal_uInt16 SfxBindings::GetSlotPos( sal_uInt16 nId, sal_uInt16 nStartSearchAt ) DBG_PROFSTOP(SfxBindingsMsgPos); return nPos; } -//-------------------------------------------------------------------- + void SfxBindings::RegisterInternal_Impl( SfxControllerItem& rItem ) { Register_Impl( rItem, sal_True ); @@ -1026,7 +1026,7 @@ void SfxBindings::Register_Impl( SfxControllerItem& rItem, sal_Bool bInternal ) } } -//-------------------------------------------------------------------- + void SfxBindings::Release( SfxControllerItem& rItem ) { @@ -1072,7 +1072,7 @@ void SfxBindings::Release( SfxControllerItem& rItem ) LEAVEREGISTRATIONS(); } -//-------------------------------------------------------------------- + const SfxPoolItem* SfxBindings::ExecuteSynchron( sal_uInt16 nId, const SfxPoolItem** ppItems, sal_uInt16 nModi, const SfxPoolItem **ppInternalArgs ) { @@ -1293,7 +1293,7 @@ void SfxBindings::Execute_Impl( SfxRequest& aReq, const SfxSlot* pSlot, SfxShell pDispatcher->_Execute( *pShell, *pSlot, aReq, aReq.GetCallMode() | SFX_CALLMODE_RECORD ); } -//-------------------------------------------------------------------- + void SfxBindings::UpdateSlotServer_Impl() { @@ -1328,7 +1328,7 @@ void SfxBindings::UpdateSlotServer_Impl() DBG_PROFSTOP(SfxBindingsUpdateServers); } -//-------------------------------------------------------------------- + SfxItemSet* SfxBindings::CreateSet_Impl ( @@ -1470,7 +1470,7 @@ SfxItemSet* SfxBindings::CreateSet_Impl return pSet; } -//-------------------------------------------------------------------- + void SfxBindings::UpdateControllers_Impl ( @@ -1581,7 +1581,7 @@ void SfxBindings::UpdateControllers_Impl } -//-------------------------------------------------------------------- + IMPL_LINK( SfxBindings, NextJob_Impl, Timer *, pTimer ) { @@ -1716,7 +1716,7 @@ IMPL_LINK( SfxBindings, NextJob_Impl, Timer *, pTimer ) #endif } -//-------------------------------------------------------------------- + sal_uInt16 SfxBindings::EnterRegistrations(const char *pFile, int nLine) { @@ -1757,7 +1757,7 @@ sal_uInt16 SfxBindings::EnterRegistrations(const char *pFile, int nLine) return nRegLevel; } -//-------------------------------------------------------------------- + void SfxBindings::LeaveRegistrations( sal_uInt16 nLevel, const char *pFile, int nLine ) { @@ -1827,7 +1827,7 @@ void SfxBindings::LeaveRegistrations( sal_uInt16 nLevel, const char *pFile, int ? SAL_STREAM("File: " << pFile << " Line: " << nLine) : "")); } -//-------------------------------------------------------------------- + const SfxSlot* SfxBindings::GetSlot(sal_uInt16 nSlotId) { @@ -1844,7 +1844,7 @@ const SfxSlot* SfxBindings::GetSlot(sal_uInt16 nSlotId) pCache->GetSlotServer(*pDispatcher, pImp->xProv)->GetSlot(): 0; } -//-------------------------------------------------------------------- + void SfxBindings::SetDispatcher( SfxDispatcher *pDisp ) { @@ -1911,7 +1911,7 @@ void SfxBindings::SetDispatcher( SfxDispatcher *pDisp ) } } -//-------------------------------------------------------------------- + void SfxBindings::ClearCache_Impl( sal_uInt16 nSlotId ) { @@ -1921,7 +1921,7 @@ void SfxBindings::ClearCache_Impl( sal_uInt16 nSlotId ) pCache->ClearCache(); } -//-------------------------------------------------------------------- + void SfxBindings::StartUpdate_Impl( sal_Bool bComplete ) { if ( pImp->pSubBindings ) @@ -1935,7 +1935,7 @@ void SfxBindings::StartUpdate_Impl( sal_Bool bComplete ) NextJob_Impl(0); } -//------------------------------------------------------------------------- + SfxItemState SfxBindings::QueryState( sal_uInt16 nSlot, SfxPoolItem* &rpState ) { diff --git a/sfx2/source/control/ctrlitem.cxx b/sfx2/source/control/ctrlitem.cxx index 7a0d16dbbfc0..4851580fc24e 100644 --- a/sfx2/source/control/ctrlitem.cxx +++ b/sfx2/source/control/ctrlitem.cxx @@ -30,7 +30,7 @@ DBG_NAME(SfxControllerItem); -//-------------------------------------------------------------------- + #ifdef DBG_UTIL void SfxControllerItem::CheckConfigure_Impl( sal_uIntPtr nType ) @@ -52,7 +52,7 @@ void SfxControllerItem::CheckConfigure_Impl( sal_uIntPtr nType ) #endif -//-------------------------------------------------------------------- + // returns the next registered SfxControllerItem with the same id SfxControllerItem* SfxControllerItem::GetItemLink() @@ -61,7 +61,7 @@ SfxControllerItem* SfxControllerItem::GetItemLink() return pNext == this ? 0 : pNext; } -//-------------------------------------------------------------------- + // returns sal_True if this binding is really bound to a function sal_Bool SfxControllerItem::IsBound() const @@ -159,7 +159,7 @@ DBG_CHKTHIS(SfxControllerItem, 0); pBindings->Register(*this); } -//-------------------------------------------------------------------- + void SfxControllerItem::ClearCache() @@ -190,7 +190,7 @@ void SfxControllerItem::ClearCache() pBindings->ClearCache_Impl( GetId() ); } -//-------------------------------------------------------------------- + // replaces the successor in the list of bindings of the same id SfxControllerItem* SfxControllerItem::ChangeItemLink( SfxControllerItem* pNewLink ) @@ -201,7 +201,7 @@ SfxControllerItem* SfxControllerItem::ChangeItemLink( SfxControllerItem* pNewLin return pOldLink == this ? 0 : pOldLink; } -//-------------------------------------------------------------------- + // changes the id of unbound functions (e.g. for sub-menu-ids) void SfxControllerItem::SetId( sal_uInt16 nItemId ) @@ -211,7 +211,7 @@ void SfxControllerItem::SetId( sal_uInt16 nItemId ) nId = nItemId; } -//-------------------------------------------------------------------- + // creates a atomic item for a controller without registration. @@ -223,7 +223,7 @@ SfxControllerItem::SfxControllerItem(): DBG_CTOR(SfxControllerItem, 0); } -//-------------------------------------------------------------------- + // creates a representation of the function nId and registeres it SfxControllerItem::SfxControllerItem( sal_uInt16 nID, SfxBindings &rBindings ): @@ -235,7 +235,7 @@ SfxControllerItem::SfxControllerItem( sal_uInt16 nID, SfxBindings &rBindings ): Bind(nId, &rBindings); } -//-------------------------------------------------------------------- + // unregisteres the item in the bindings SfxControllerItem::~SfxControllerItem() @@ -245,7 +245,7 @@ SfxControllerItem::~SfxControllerItem() DBG_DTOR(SfxControllerItem, 0); } -//-------------------------------------------------------------------- + void SfxControllerItem::StateChanged ( @@ -278,14 +278,14 @@ void SfxControllerItem::StateChanged DBG_CHKTHIS(SfxControllerItem, 0); } -//-------------------------------------------------------------------- + void SfxControllerItem::DeleteFloatingWindow() { DBG_CHKTHIS(SfxControllerItem, 0); } -//-------------------------------------------------------------------- + void SfxStatusForwarder::StateChanged ( @@ -298,7 +298,7 @@ void SfxStatusForwarder::StateChanged pMaster->StateChanged( nSID, eState, pState ); } -//-------------------------------------------------------------------- + SfxStatusForwarder::SfxStatusForwarder( sal_uInt16 nSlotId, @@ -308,7 +308,7 @@ SfxStatusForwarder::SfxStatusForwarder( { } -//-------------------------------------------------------------------- + SfxItemState SfxControllerItem::GetItemState ( @@ -353,7 +353,7 @@ SfxItemState SfxControllerItem::GetItemState : SFX_ITEM_AVAILABLE; } -//-------------------------------------------------------------------- + SfxMapUnit SfxControllerItem::GetCoreMetric() const diff --git a/sfx2/source/control/dispatch.cxx b/sfx2/source/control/dispatch.cxx index 61f8ebf89802..4a55580811e3 100644 --- a/sfx2/source/control/dispatch.cxx +++ b/sfx2/source/control/dispatch.cxx @@ -108,7 +108,7 @@ struct SfxObjectBars_Impl SfxObjectBars_Impl() : nResId(0), nMode(0), pIFace(NULL) {} }; -//------------------------------------------------------------------ + struct SfxDispatcher_Impl { @@ -155,11 +155,11 @@ struct SfxDispatcher_Impl std::deque< std::deque<SfxToDo_Impl> > aToDoCopyStack; }; -//------------------------------------------------------------------ + #define SFX_FLUSH_TIMEOUT 50 -//-------------------------------------------------------------------- + /** This method checks if the stack of the SfxDispatchers is flushed, or if push- or pop- commands are pending. @@ -238,7 +238,7 @@ sal_Bool SfxDispatcher::IsLocked( sal_uInt16 ) const return pImp->bLocked; } -//-------------------------------------------------------------------- + sal_Bool SfxDispatcher::IsAppDispatcher() const /* [Description] @@ -256,7 +256,7 @@ sal_Bool SfxDispatcher::IsAppDispatcher() const return !pImp->pFrame; } -//-------------------------------------------------------------------- + int SfxDispatcher::Call_Impl( SfxShell& rShell, const SfxSlot &rSlot, SfxRequest &rReq, sal_Bool bRecord ) /* [Description] @@ -560,7 +560,7 @@ void SfxDispatcher::Pop } } -//-------------------------------------------------------------------- + IMPL_LINK_INLINE_START( SfxDispatcher, EventHdl_Impl, void *, pvoid ) @@ -585,7 +585,7 @@ IMPL_LINK_INLINE_START( SfxDispatcher, EventHdl_Impl, void *, pvoid ) } IMPL_LINK_INLINE_END( SfxDispatcher, EventHdl_Impl, void *, pvoid ) -//-------------------------------------------------------------------- + sal_Bool SfxDispatcher::CheckVirtualStack( const SfxShell& rShell, sal_Bool bDeep ) /* [Description] @@ -628,7 +628,7 @@ sal_Bool SfxDispatcher::CheckVirtualStack( const SfxShell& rShell, sal_Bool bDee return bReturn; } -//-------------------------------------------------------------------- + sal_uInt16 SfxDispatcher::GetShellLevel( const SfxShell& rShell ) /* [Description] @@ -664,7 +664,7 @@ sal_uInt16 SfxDispatcher::GetShellLevel( const SfxShell& rShell ) return USHRT_MAX; } -//-------------------------------------------------------------------- + SfxShell *SfxDispatcher::GetShell(sal_uInt16 nIdx) const /* [Description] @@ -686,7 +686,7 @@ SfxShell *SfxDispatcher::GetShell(sal_uInt16 nIdx) const return 0; } -//-------------------------------------------------------------------- + SfxBindings* SfxDispatcher::GetBindings() const /* [Description] @@ -707,7 +707,7 @@ SfxBindings* SfxDispatcher::GetBindings() const return NULL; } -//-------------------------------------------------------------------- + SfxViewFrame* SfxDispatcher::GetFrame() const /* [Description] @@ -721,7 +721,7 @@ SfxViewFrame* SfxDispatcher::GetFrame() const return pImp->pFrame; } -//-------------------------------------------------------------------- + void SfxDispatcher::DoActivate_Impl( sal_Bool bMDI, SfxViewFrame* /* pOld */ ) /* [Description] @@ -799,7 +799,7 @@ void SfxDispatcher::DoParentActivate_Impl() (*(pImp->aStack.rbegin() + i ))->ParentActivate(); } -//-------------------------------------------------------------------- + void SfxDispatcher::DoDeactivate_Impl( sal_Bool bMDI, SfxViewFrame* pNew ) /* [Description] @@ -887,7 +887,7 @@ void SfxDispatcher::DoParentDeactivate_Impl() (*(pImp->aStack.rbegin() + i))->ParentDeactivate(); } -//-------------------------------------------------------------------- + int SfxDispatcher::GetShellAndSlot_Impl ( sal_uInt16 nSlot, // the searchable Slot-Id @@ -938,7 +938,7 @@ int SfxDispatcher::GetShellAndSlot_Impl return sal_False; } -//-------------------------------------------------------------------- + void SfxDispatcher::_Execute ( SfxShell& rShell, // to the calling <SfxShell> @@ -987,7 +987,7 @@ void SfxDispatcher::_Execute Call_Impl( rShell, rSlot, rReq, SFX_CALLMODE_RECORD==(eCallMode&SFX_CALLMODE_RECORD) ); } -//-------------------------------------------------------------------- + void MappedPut_Impl( SfxAllItemSet &rSet, const SfxPoolItem &rItem ) /* [Description] @@ -1005,7 +1005,7 @@ void MappedPut_Impl( SfxAllItemSet &rSet, const SfxPoolItem &rItem ) rSet.Put( rItem, nWhich ); } -//-------------------------------------------------------------------- + const SfxSlot* SfxDispatcher::GetSlot( const OUString& rCommand ) { @@ -1036,7 +1036,7 @@ const SfxSlot* SfxDispatcher::GetSlot( const OUString& rCommand ) return 0; } -//-------------------------------------------------------------------- + const SfxPoolItem* SfxDispatcher::Execute( sal_uInt16 nSlot, SfxCallMode nCall, @@ -1072,7 +1072,7 @@ const SfxPoolItem* SfxDispatcher::Execute( return 0; } -//-------------------------------------------------------------------- + const SfxPoolItem* SfxDispatcher::Execute ( sal_uInt16 nSlot, // the Id of the executing function @@ -1131,7 +1131,7 @@ const SfxPoolItem* SfxDispatcher::Execute return 0; } -//-------------------------------------------------------------------- + const SfxPoolItem* SfxDispatcher::Execute ( sal_uInt16 nSlot, // the Id of the executing function @@ -1157,7 +1157,7 @@ const SfxPoolItem* SfxDispatcher::Execute return Execute( nSlot, eCall, 0, rArgs ); } -//-------------------------------------------------------------------- + const SfxPoolItem* SfxDispatcher::Execute ( sal_uInt16 nSlot, @@ -1188,7 +1188,7 @@ const SfxPoolItem* SfxDispatcher::Execute return 0; } -//-------------------------------------------------------------------- + const SfxPoolItem* SfxDispatcher::Execute ( sal_uInt16 nSlot, // the Id of the executing function @@ -1251,7 +1251,7 @@ const SfxPoolItem* SfxDispatcher::Execute return 0; } -//-------------------------------------------------------------------- + IMPL_LINK( SfxDispatcher, PostMsgHandler, SfxRequest*, pReq ) @@ -1298,7 +1298,7 @@ IMPL_LINK( SfxDispatcher, PostMsgHandler, SfxRequest*, pReq ) delete pReq; return 0; } -//-------------------------------------------------------------------- + void SfxDispatcher::SetMenu_Impl() { #if HAVE_FEATURE_DESKTOP @@ -1329,7 +1329,7 @@ void SfxDispatcher::SetMenu_Impl() #endif } -//-------------------------------------------------------------------- + void SfxDispatcher::Update_Impl( sal_Bool bForce ) { SFX_STACK(SfxDispatcher::Update_Impl); @@ -1606,7 +1606,7 @@ void SfxDispatcher::_Update_Impl( sal_Bool bUIActive, sal_Bool bIsMDIApp, sal_Bo } } -//-------------------------------------------------------------------- + void SfxDispatcher::FlushImpl() /* [Description] @@ -1756,7 +1756,7 @@ void SfxDispatcher::FlushImpl() SAL_INFO("sfx.control", "SfxDispatcher(" << this << ")::Flush() done"); } -//-------------------------------------------------------------------- + void SfxDispatcher::SetSlotFilter ( // HACK(hier muss mal ein enum rein) ??? @@ -1817,7 +1817,7 @@ void SfxDispatcher::SetSlotFilter GetBindings()->InvalidateAll(sal_True); } -//-------------------------------------------------------------------- + extern "C" #ifdef WNT int _cdecl @@ -1830,7 +1830,7 @@ SfxCompareSIDs_Impl( const void* pSmaller, const void* pBigger ) return ( (long) *((sal_uInt16*)pSmaller) ) - ( (long) *((sal_uInt16*)pBigger) ); } -//-------------------------------------------------------------------- + sal_Bool SfxDispatcher::IsSlotEnabledByFilter_Impl( sal_uInt16 nSID ) const /* [Description] @@ -1862,7 +1862,7 @@ sal_Bool SfxDispatcher::IsSlotEnabledByFilter_Impl( sal_uInt16 nSID ) const return pImp->bFilterEnabling ? bFound : !bFound; } -//-------------------------------------------------------------------- + sal_Bool SfxDispatcher::_TryIntercept_Impl ( sal_uInt16 nSlot, // Slot-Id to search for @@ -2062,7 +2062,7 @@ sal_Bool SfxDispatcher::_FindServer return sal_False; } -//-------------------------------------------------------------------- + sal_Bool SfxDispatcher::_FillState ( const SfxSlotServer& rSvr, // <Slot-Server> to query @@ -2171,7 +2171,7 @@ SfxPopupMenuManager* SfxDispatcher::Popup( sal_uInt16 nConfigId,Window *pWin, co } -//---------------------------------------------------------------------- + void SfxDispatcher::ExecutePopup( sal_uInt16 nConfigId, Window *pWin, const Point *pPos ) { SfxDispatcher &rDisp = *SFX_APP()->GetDispatcher_Impl(); @@ -2196,14 +2196,14 @@ void SfxDispatcher::ExecutePopup( sal_uInt16 nConfigId, Window *pWin, const Poin } } -//---------------------------------------------------------------------- + void SfxDispatcher::ExecutePopup( const ResId &rId, Window *pWin, const Point *pPos ) { Window *pWindow = pWin ? pWin : pImp->pFrame->GetFrame().GetWorkWindow_Impl()->GetWindow(); SfxPopupMenuManager::ExecutePopup( rId, GetFrame(), pPos ? *pPos : pWindow->GetPointerPosPixel(), pWindow ); } -//-------------------------------------------------------------------- + void SfxDispatcher::Lock( sal_Bool bLock ) /* [Description] @@ -2237,7 +2237,7 @@ sal_uInt32 SfxDispatcher::GetObjectBarId( sal_uInt16 nPos ) const return pImp->aObjBars[nPos].nResId; } -//------------------------------------------------------------------------- + void SfxDispatcher::HideUI( sal_Bool bHide ) { sal_Bool bWasHidden = pImp->bNoUI; @@ -2277,7 +2277,7 @@ sal_Bool SfxDispatcher::GetReadOnly_Impl() const return pImp->bReadOnly; } -//------------------------------------------------------------------------- + void SfxDispatcher::SetQuietMode_Impl( sal_Bool bOn ) /* [Description] diff --git a/sfx2/source/control/minfitem.cxx b/sfx2/source/control/minfitem.cxx index 02e782fb381c..be60afb26602 100644 --- a/sfx2/source/control/minfitem.cxx +++ b/sfx2/source/control/minfitem.cxx @@ -23,7 +23,7 @@ TYPEINIT1(SfxMacroInfoItem, SfxPoolItem); -// ----------------------------------------------------------------------- + SfxMacroInfoItem::SfxMacroInfoItem( sal_uInt16 nWhichId, // Slot-ID @@ -41,7 +41,7 @@ SfxMacroInfoItem::SfxMacroInfoItem( { } -// ----------------------------------------------------------------------- + // copy constructor @@ -55,7 +55,7 @@ SfxMacroInfoItem::SfxMacroInfoItem(const SfxMacroInfoItem& rCopy): { } -// ----------------------------------------------------------------------- + // op == @@ -69,14 +69,14 @@ bool SfxMacroInfoItem::operator==( const SfxPoolItem& rCmp) const aCommentText == ((const SfxMacroInfoItem&)rCmp).aCommentText; } -// ----------------------------------------------------------------------- + SfxPoolItem *SfxMacroInfoItem::Clone( SfxItemPool *) const { return new SfxMacroInfoItem(*this); } -// ----------------------------------------------------------------------- + OUString SfxMacroInfoItem::GetQualifiedName() const { diff --git a/sfx2/source/control/msg.cxx b/sfx2/source/control/msg.cxx index 855d4f1942e3..a053010fcb10 100644 --- a/sfx2/source/control/msg.cxx +++ b/sfx2/source/control/msg.cxx @@ -41,7 +41,7 @@ SfxSlotKind SfxSlot::GetKind() const return (SfxSlotKind) SFX_KIND_ATTR; } -//-------------------------------------------------------------------- + sal_uInt16 SfxSlot::GetWhich( const SfxItemPool &rPool ) const { diff --git a/sfx2/source/control/msgpool.cxx b/sfx2/source/control/msgpool.cxx index ed62cb6c79d7..f99e8978fa8c 100644 --- a/sfx2/source/control/msgpool.cxx +++ b/sfx2/source/control/msgpool.cxx @@ -141,7 +141,7 @@ const SfxSlot* SfxSlotPool::GetSlot( sal_uInt16 nId ) return _pParentPool ? _pParentPool->GetSlot( nId ) : 0; } -//-------------------------------------------------------------------- + // skips to the next group @@ -186,7 +186,7 @@ OUString SfxSlotPool::SeekGroup( sal_uInt16 nNo ) } -//-------------------------------------------------------------------- + sal_uInt16 SfxSlotPool::GetGroupCount() { @@ -194,7 +194,7 @@ sal_uInt16 SfxSlotPool::GetGroupCount() } -//-------------------------------------------------------------------- + // internal search loop @@ -240,7 +240,7 @@ const SfxSlot* SfxSlotPool::SeekSlot( sal_uInt16 nStartInterface ) return 0; } -//-------------------------------------------------------------------- + // skips to the next func in the current group const SfxSlot* SfxSlotPool::NextSlot() @@ -285,9 +285,9 @@ const SfxSlot* SfxSlotPool::NextSlot() } -//-------------------------------------------------------------------- + // Query SlotName with help text -//-------------------------------------------------------------------- + SfxInterface* SfxSlotPool::FirstInterface() { @@ -298,7 +298,7 @@ SfxInterface* SfxSlotPool::FirstInterface() } -//-------------------------------------------------------------------- + const SfxSlot* SfxSlotPool::GetUnoSlot( const OUString& rName ) { diff --git a/sfx2/source/control/objface.cxx b/sfx2/source/control/objface.cxx index 9715bdb8ed18..dd42fcf68db8 100644 --- a/sfx2/source/control/objface.cxx +++ b/sfx2/source/control/objface.cxx @@ -286,7 +286,7 @@ void SfxInterface::SetSlotMap( SfxSlot& rSlotMap, sal_uInt16 nSlotCount ) #endif } -//-------------------------------------------------------------------- + SfxInterface::~SfxInterface() { @@ -303,7 +303,7 @@ SfxInterface::~SfxInterface() } } -//-------------------------------------------------------------------- + // searches for the specified func @@ -341,7 +341,7 @@ const SfxSlot* SfxInterface::GetSlot( const OUString& rCommand ) const return pGenoType ? pGenoType->GetSlot( aCommand ) : NULL; } -//-------------------------------------------------------------------- + const SfxSlot* SfxInterface::GetRealSlot( const SfxSlot *pSlot ) const { @@ -361,7 +361,7 @@ const SfxSlot* SfxInterface::GetRealSlot( const SfxSlot *pSlot ) const return pSlot->pLinkedSlot; } -//-------------------------------------------------------------------- + const SfxSlot* SfxInterface::GetRealSlot( sal_uInt16 nSlotId ) const { @@ -382,7 +382,7 @@ const SfxSlot* SfxInterface::GetRealSlot( sal_uInt16 nSlotId ) const return pSlot->pLinkedSlot; } -//-------------------------------------------------------------------- + void SfxInterface::RegisterPopupMenu( const ResId& rResId ) { @@ -391,7 +391,7 @@ void SfxInterface::RegisterPopupMenu( const ResId& rResId ) pImpData->aPopupRes = rResId; } -//-------------------------------------------------------------------- + void SfxInterface::RegisterObjectBar( sal_uInt16 nPos, const ResId& rResId, const OUString *pStr ) @@ -451,7 +451,7 @@ const ResId& SfxInterface::GetObjectBarResId( sal_uInt16 nNo ) const return pImpData->aObjectBars[nNo]->aResId; } -//-------------------------------------------------------------------- + sal_uInt16 SfxInterface::GetObjectBarPos( sal_uInt16 nNo ) const @@ -473,7 +473,7 @@ sal_uInt16 SfxInterface::GetObjectBarPos( sal_uInt16 nNo ) const return pImpData->aObjectBars[nNo]->nPos; } -//-------------------------------------------------------------------- + sal_uInt16 SfxInterface::GetObjectBarCount() const @@ -484,7 +484,7 @@ sal_uInt16 SfxInterface::GetObjectBarCount() const return pImpData->aObjectBars.size(); } -//-------------------------------------------------------------------- + void SfxInterface::RegisterChildWindow(sal_uInt16 nId, sal_Bool bContext, const OUString* pChildWinName) { RegisterChildWindow( nId, bContext, 0UL, pChildWinName ); @@ -542,7 +542,7 @@ sal_uInt32 SfxInterface::GetChildWindowFeature (sal_uInt16 nNo) const return pImpData->aChildWindows[nNo]->nFeature; } -//-------------------------------------------------------------------- + sal_uInt16 SfxInterface::GetChildWindowCount() const diff --git a/sfx2/source/control/request.cxx b/sfx2/source/control/request.cxx index 6b453952cf20..3d364d23dc8e 100644 --- a/sfx2/source/control/request.cxx +++ b/sfx2/source/control/request.cxx @@ -131,7 +131,7 @@ SfxRequest::~SfxRequest() DeleteItemOnIdle(pImp->pRetVal); delete pImp; } -//-------------------------------------------------------------------- + SfxRequest::SfxRequest @@ -162,7 +162,7 @@ SfxRequest::SfxRequest else pImp->SetPool( rOrig.pImp->pPool ); } -//-------------------------------------------------------------------- + SfxRequest::SfxRequest @@ -210,7 +210,7 @@ SfxRequest::SfxRequest #endif } -//-------------------------------------------------------------------- + SfxRequest::SfxRequest @@ -258,7 +258,7 @@ SfxRequest::SfxRequest TransformParameters( nSlot, rArgs, *pArgs, pSlot ); } -//----------------------------------------------------------------------- + SfxRequest::SfxRequest ( @@ -282,21 +282,21 @@ SfxRequest::SfxRequest pImp->nCallMode = nMode; pImp->bUseTarget = sal_False; } -//-------------------------------------------------------------------- + sal_uInt16 SfxRequest::GetCallMode() const { return pImp->nCallMode; } -//-------------------------------------------------------------------- + sal_Bool SfxRequest::IsSynchronCall() const { return SFX_CALLMODE_SYNCHRON == ( SFX_CALLMODE_SYNCHRON & pImp->nCallMode ); } -//-------------------------------------------------------------------- + void SfxRequest::SetSynchronCall( sal_Bool bSynchron ) { @@ -317,7 +317,7 @@ const SfxItemSet* SfxRequest::GetInternalArgs_Impl() const return pImp->pInternalArgs; } -//-------------------------------------------------------------------- + void SfxRequest_Impl::Record @@ -375,7 +375,7 @@ void SfxRequest_Impl::Record } } -//-------------------------------------------------------------------- + void SfxRequest::Record_Impl ( @@ -400,7 +400,7 @@ void SfxRequest::Record_Impl pImp->pViewFrame = pViewFrame; } -//-------------------------------------------------------------------- + void SfxRequest::SetArgs( const SfxAllItemSet& rArgs ) { @@ -409,7 +409,7 @@ void SfxRequest::SetArgs( const SfxAllItemSet& rArgs ) pImp->SetPool( pArgs->GetPool() ); } -//-------------------------------------------------------------------- + void SfxRequest::AppendItem(const SfxPoolItem &rItem) { @@ -418,7 +418,7 @@ void SfxRequest::AppendItem(const SfxPoolItem &rItem) pArgs->Put(rItem, rItem.Which()); } -//-------------------------------------------------------------------- + void SfxRequest::RemoveItem( sal_uInt16 nID ) { @@ -430,7 +430,7 @@ void SfxRequest::RemoveItem( sal_uInt16 nID ) } } -//-------------------------------------------------------------------- + const SfxPoolItem* SfxRequest::GetArg ( @@ -443,7 +443,7 @@ const SfxPoolItem* SfxRequest::GetArg } -//-------------------------------------------------------------------- + const SfxPoolItem* SfxRequest::GetItem ( const SfxItemSet* pArgs, @@ -509,7 +509,7 @@ const SfxPoolItem* SfxRequest::GetItem return 0; } -//-------------------------------------------------------------------- + void SfxRequest::SetReturnValue(const SfxPoolItem &rItem) { @@ -519,14 +519,14 @@ void SfxRequest::SetReturnValue(const SfxPoolItem &rItem) pImp->pRetVal = rItem.Clone(); } -//-------------------------------------------------------------------- + const SfxPoolItem* SfxRequest::GetReturnValue() const { return pImp->pRetVal; } -//-------------------------------------------------------------------- + void SfxRequest::Done ( @@ -587,7 +587,7 @@ void SfxRequest::Done } } -//-------------------------------------------------------------------- + void SfxRequest::Done( sal_Bool bRelease ) @@ -598,7 +598,7 @@ void SfxRequest::Done( sal_Bool bRelease ) DELETEZ( pArgs ); } -//-------------------------------------------------------------------- + void SfxRequest::ForgetAllArgs() { @@ -606,14 +606,14 @@ void SfxRequest::ForgetAllArgs() DELETEZ( pImp->pInternalArgs ); } -//-------------------------------------------------------------------- + sal_Bool SfxRequest::IsCancelled() const { return pImp->bCancelled; } -//-------------------------------------------------------------------- + void SfxRequest::Cancel() @@ -629,7 +629,7 @@ void SfxRequest::Cancel() DELETEZ( pArgs ); } -//-------------------------------------------------------------------- + void SfxRequest::Ignore() @@ -651,7 +651,7 @@ void SfxRequest::Ignore() pImp->bIgnored = sal_True; } -//-------------------------------------------------------------------- + void SfxRequest::Done_Impl ( @@ -766,7 +766,7 @@ void SfxRequest::Done_Impl } } -//-------------------------------------------------------------------- + sal_Bool SfxRequest::IsDone() const @@ -789,7 +789,7 @@ sal_Bool SfxRequest::IsDone() const return pImp->bDone; } -//-------------------------------------------------------------------- + com::sun::star::uno::Reference< com::sun::star::frame::XDispatchRecorder > SfxRequest::GetMacroRecorder( SfxViewFrame* pView ) @@ -827,7 +827,7 @@ sal_Bool SfxRequest::HasMacroRecorder( SfxViewFrame* pView ) } -//-------------------------------------------------------------------- + sal_Bool SfxRequest::IsAPI() const @@ -841,19 +841,19 @@ sal_Bool SfxRequest::IsAPI() const return SFX_CALLMODE_API == ( SFX_CALLMODE_API & pImp->nCallMode ); } -//-------------------------------------------------------------------- + void SfxRequest::SetModifier( sal_uInt16 nModi ) { pImp->nModifier = nModi; } -//-------------------------------------------------------------------- + sal_uInt16 SfxRequest::GetModifier() const { return pImp->nModifier; } -//-------------------------------------------------------------------- + void SfxRequest::AllowRecording( sal_Bool bSet ) { diff --git a/sfx2/source/control/shell.cxx b/sfx2/source/control/shell.cxx index 84d0160ca358..44d73a8a157b 100644 --- a/sfx2/source/control/shell.cxx +++ b/sfx2/source/control/shell.cxx @@ -141,7 +141,7 @@ SfxShell::SfxShell() pImp->nDisableFlags = 0; } -//------------------------------------------------------------------------- + SfxShell::SfxShell( SfxViewShell *pViewSh ) @@ -166,7 +166,7 @@ SfxShell::SfxShell( SfxViewShell *pViewSh ) pImp->bActive = sal_False; } -//-------------------------------------------------------------------- + SfxShell::~SfxShell() @@ -184,7 +184,7 @@ SfxShell::~SfxShell() delete pImp; } -//-------------------------------------------------------------------- + void SfxShell::SetName( const OUString &rName ) @@ -198,7 +198,7 @@ void SfxShell::SetName( const OUString &rName ) pImp->aObjectName = rName; } -//-------------------------------------------------------------------- + const OUString& SfxShell::GetName() const @@ -212,7 +212,7 @@ const OUString& SfxShell::GetName() const return pImp->aObjectName; } -//-------------------------------------------------------------------- + SfxDispatcher* SfxShell::GetDispatcher() const @@ -229,7 +229,7 @@ SfxDispatcher* SfxShell::GetDispatcher() const return pImp->pFrame ? pImp->pFrame->GetDispatcher() : 0; } -//-------------------------------------------------------------------- + SfxViewShell* SfxShell::GetViewShell() const @@ -244,7 +244,7 @@ SfxViewShell* SfxShell::GetViewShell() const return pImp->pViewSh; } -//-------------------------------------------------------------------- + SfxViewFrame* SfxShell::GetFrame() const @@ -277,7 +277,7 @@ SfxViewFrame* SfxShell::GetFrame() const return 0; } -//-------------------------------------------------------------------- + const SfxPoolItem* SfxShell::GetItem ( @@ -306,7 +306,7 @@ const SfxPoolItem* SfxShell::GetItem return 0; } -//-------------------------------------------------------------------- + void SfxShell::PutItem ( @@ -370,7 +370,7 @@ void SfxShell::PutItem } } -//-------------------------------------------------------------------- + SfxInterface* SfxShell::GetInterface() const @@ -388,7 +388,7 @@ SfxInterface* SfxShell::GetInterface() const return GetStaticInterface(); } -//-------------------------------------------------------------------- + ::svl::IUndoManager* SfxShell::GetUndoManager() @@ -405,7 +405,7 @@ SfxInterface* SfxShell::GetInterface() const return pUndoMgr; } -//-------------------------------------------------------------------- + void SfxShell::SetUndoManager( ::svl::IUndoManager *pNewUndoMgr ) @@ -435,7 +435,7 @@ void SfxShell::SetUndoManager( ::svl::IUndoManager *pNewUndoMgr ) officecfg::Office::Common::Undo::Steps::get()); } -//-------------------------------------------------------------------- + SfxRepeatTarget* SfxShell::GetRepeatTarget() const @@ -456,7 +456,7 @@ SfxRepeatTarget* SfxShell::GetRepeatTarget() const return pImp->pRepeatTarget; } -//-------------------------------------------------------------------- + void SfxShell::SetRepeatTarget( SfxRepeatTarget *pTarget ) @@ -478,7 +478,7 @@ void SfxShell::SetRepeatTarget( SfxRepeatTarget *pTarget ) pImp->pRepeatTarget = pTarget; } -//-------------------------------------------------------------------- + void SfxShell::Invalidate ( @@ -548,7 +548,7 @@ void SfxShell::Invalidate_Impl( SfxBindings& rBindings, sal_uInt16 nId ) } } -//-------------------------------------------------------------------- + void SfxShell::DoActivate_Impl( SfxViewFrame *pFrame, sal_Bool bMDI ) @@ -585,7 +585,7 @@ void SfxShell::DoActivate_Impl( SfxViewFrame *pFrame, sal_Bool bMDI ) Activate(bMDI); } -//-------------------------------------------------------------------- + void SfxShell::DoDeactivate_Impl( SfxViewFrame *pFrame, sal_Bool bMDI ) @@ -623,14 +623,14 @@ void SfxShell::DoDeactivate_Impl( SfxViewFrame *pFrame, sal_Bool bMDI ) Deactivate(bMDI); } -//-------------------------------------------------------------------- + sal_Bool SfxShell::IsActive() const { return pImp->bActive; } -//-------------------------------------------------------------------- + void SfxShell::Activate ( @@ -661,7 +661,7 @@ void SfxShell::Activate BroadcastContextForActivation(true); } -//-------------------------------------------------------------------- + void SfxShell::Deactivate ( @@ -712,7 +712,7 @@ void SfxShell::ParentActivate { } -//-------------------------------------------------------------------- + void SfxShell::ParentDeactivate ( @@ -732,7 +732,7 @@ void SfxShell::ParentDeactivate { } -//-------------------------------------------------------------------- + ResMgr* SfxShell::GetResMgr() const @@ -747,7 +747,7 @@ ResMgr* SfxShell::GetResMgr() const return GetInterface()->GetResMgr(); } -//-------------------------------------------------------------------- + bool SfxShell::CanExecuteSlot_Impl( const SfxSlot &rSlot ) @@ -766,7 +766,7 @@ bool SfxShell::CanExecuteSlot_Impl( const SfxSlot &rSlot ) return aSet.GetItemState(nId) != SFX_ITEM_DISABLED; } -//-------------------------------------------------------------------- + long ShellCall_Impl( void* pObj, void* pArg ) { @@ -779,7 +779,7 @@ long ShellCall_Impl( void* pObj, void* pArg ) Asynchronous ExecuteSlot for the RELOAD */ -//-------------------------------------------------------------------- + const SfxPoolItem* SfxShell::ExecuteSlot( SfxRequest& rReq, sal_Bool bAsync ) { if( !bAsync ) @@ -851,7 +851,7 @@ const SfxPoolItem* SfxShell::ExecuteSlot return rReq.GetReturnValue(); } -//-------------------------------------------------------------------- + const SfxPoolItem* SfxShell::GetSlotState ( @@ -960,7 +960,7 @@ const SfxPoolItem* SfxShell::GetSlotState return pRetItem; } -//-------------------------------------------------------------------- + SFX_EXEC_STUB(SfxShell, VerbExec) SFX_STATE_STUB(SfxShell, VerbState) @@ -1036,14 +1036,14 @@ void SfxShell::SetVerbs(const com::sun::star::uno::Sequence < com::sun::star::em } } -//-------------------------------------------------------------------- + const com::sun::star::uno::Sequence < com::sun::star::embed::VerbDescriptor >& SfxShell::GetVerbs() const { return pImp->aVerbList; } -//-------------------------------------------------------------------- + void SfxShell::VerbExec(SfxRequest& rReq) { @@ -1073,13 +1073,13 @@ void SfxShell::VerbExec(SfxRequest& rReq) } } -//-------------------------------------------------------------------- + void SfxShell::VerbState(SfxItemSet& ) { } -//-------------------------------------------------------------------- + const SfxSlot* SfxShell::GetVerbSlot_Impl(sal_uInt16 nId) const { @@ -1095,21 +1095,21 @@ const SfxSlot* SfxShell::GetVerbSlot_Impl(sal_uInt16 nId) const return 0; } -//-------------------------------------------------------------------- + void SfxShell::SetHelpId(sal_uIntPtr nId) { pImp->nHelpId = nId; } -//-------------------------------------------------------------------- + sal_uIntPtr SfxShell::GetHelpId() const { return pImp->nHelpId; } -//-------------------------------------------------------------------- + SfxObjectShell* SfxShell::GetObjectShell() { @@ -1119,7 +1119,7 @@ SfxObjectShell* SfxShell::GetObjectShell() return NULL; } -//-------------------------------------------------------------------- + sal_Bool SfxShell::HasUIFeature( sal_uInt32 ) { diff --git a/sfx2/source/control/sorgitm.cxx b/sfx2/source/control/sorgitm.cxx index 2114ffaf1551..e48175ac7840 100644 --- a/sfx2/source/control/sorgitm.cxx +++ b/sfx2/source/control/sorgitm.cxx @@ -24,7 +24,7 @@ TYPEINIT1_AUTOFACTORY(SfxScriptOrganizerItem, SfxStringItem); -//------------------------------------------------------------------------ + SfxScriptOrganizerItem::SfxScriptOrganizerItem() : @@ -33,7 +33,7 @@ SfxScriptOrganizerItem::SfxScriptOrganizerItem() : { } -//------------------------------------------------------------------------ + SfxScriptOrganizerItem::SfxScriptOrganizerItem( const SfxScriptOrganizerItem& rItem ) : @@ -44,20 +44,20 @@ SfxScriptOrganizerItem::SfxScriptOrganizerItem( const SfxScriptOrganizerItem& rI { } -//------------------------------------------------------------------------ + SfxScriptOrganizerItem::~SfxScriptOrganizerItem() { } -//------------------------------------------------------------------------ + SfxPoolItem* SfxScriptOrganizerItem::Clone( SfxItemPool * ) const { return new SfxScriptOrganizerItem( *this ); } -//------------------------------------------------------------------------ + bool SfxScriptOrganizerItem::operator==( const SfxPoolItem& rItem) const { diff --git a/sfx2/source/control/statcach.cxx b/sfx2/source/control/statcach.cxx index 1c3644205abb..bd78e889c158 100644 --- a/sfx2/source/control/statcach.cxx +++ b/sfx2/source/control/statcach.cxx @@ -58,7 +58,7 @@ using namespace ::com::sun::star::util; DBG_NAME(SfxStateCache) DBG_NAME(SfxStateCacheSetState) -//----------------------------------------------------------------------------- + BindDispatch_Impl::BindDispatch_Impl( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > & rDisp, const ::com::sun::star::util::URL& rURL, SfxStateCache *pStateCache, const SfxSlot* pS ) : xDisp( rDisp ) , aURL( rURL ) @@ -184,7 +184,7 @@ void BindDispatch_Impl::Dispatch( uno::Sequence < beans::PropertyValue > aProps, } } -//-------------------------------------------------------------------- + // This constructor for an invalid cache that is updated in the first request. SfxStateCache::SfxStateCache( sal_uInt16 nFuncId ): @@ -202,7 +202,7 @@ SfxStateCache::SfxStateCache( sal_uInt16 nFuncId ): bItemDirty = sal_True; } -//-------------------------------------------------------------------- + // The Destructor checks by assertion, even if controllers are registered. SfxStateCache::~SfxStateCache() @@ -218,7 +218,7 @@ SfxStateCache::~SfxStateCache() } } -//-------------------------------------------------------------------- + // invalidates the cache (next request will force update) void SfxStateCache::Invalidate( sal_Bool bWithMsg ) { @@ -235,7 +235,7 @@ void SfxStateCache::Invalidate( sal_Bool bWithMsg ) } } -//-------------------------------------------------------------------- + // gets the corresponding function from the dispatcher or the cache const SfxSlotServer* SfxStateCache::GetSlotServer( SfxDispatcher &rDispat , const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProvider > & xProv ) @@ -329,7 +329,7 @@ const SfxSlotServer* SfxStateCache::GetSlotServer( SfxDispatcher &rDispat , cons } -//-------------------------------------------------------------------- + // Set Status in all Controllers @@ -351,7 +351,7 @@ void SfxStateCache::SetState SetState_Impl( eState, pState, bMaybeDirty ); } -//-------------------------------------------------------------------- + void SfxStateCache::SetVisibleState( sal_Bool bShow ) { @@ -397,7 +397,7 @@ void SfxStateCache::SetVisibleState( sal_Bool bShow ) } } -//-------------------------------------------------------------------- + void SfxStateCache::SetState_Impl ( @@ -462,7 +462,7 @@ void SfxStateCache::SetState_Impl } -//-------------------------------------------------------------------- + // Set old status again in all the controllers void SfxStateCache::SetCachedState( sal_Bool bAlways ) @@ -496,7 +496,7 @@ void SfxStateCache::SetCachedState( sal_Bool bAlways ) } -//-------------------------------------------------------------------- + // Destroy FloatingWindows in all Controls with this Id void SfxStateCache::DeleteFloatingWindows() diff --git a/sfx2/source/control/unoctitm.cxx b/sfx2/source/control/unoctitm.cxx index a9004590e754..da8115692b92 100644 --- a/sfx2/source/control/unoctitm.cxx +++ b/sfx2/source/control/unoctitm.cxx @@ -299,7 +299,7 @@ void SAL_CALL SfxStatusDispatcher::removeStatusListener( const ::com::sun::star: aListeners.removeInterface( aURL.Complete, aListener ); } -//------------------------------------------------------------------------- + // XUnoTunnel sal_Int64 SAL_CALL SfxOfficeDispatch::getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& aIdentifier ) throw(::com::sun::star::uno::RuntimeException) { diff --git a/sfx2/source/dialog/backingcomp.cxx b/sfx2/source/dialog/backingcomp.cxx index e515b1483bfb..573fc5e25ef5 100644 --- a/sfx2/source/dialog/backingcomp.cxx +++ b/sfx2/source/dialog/backingcomp.cxx @@ -153,13 +153,13 @@ BackingComp::BackingComp( const css::uno::Reference< css::uno::XComponentContext { } -//_______________________________________________ + BackingComp::~BackingComp() { } -//_______________________________________________ + /** return information about supported interfaces. @@ -213,7 +213,7 @@ css::uno::Any SAL_CALL BackingComp::queryInterface( /*IN*/ const css::uno::Type& return aResult; } -//_______________________________________________ + /** increase ref count of this instance. */ @@ -224,7 +224,7 @@ void SAL_CALL BackingComp::acquire() OWeakObject::acquire(); } -//_______________________________________________ + /** decrease ref count of this instance. */ @@ -235,7 +235,7 @@ void SAL_CALL BackingComp::release() OWeakObject::release(); } -//_______________________________________________ + /** return collection about all supported interfaces. @@ -285,7 +285,7 @@ css::uno::Sequence< css::uno::Type > SAL_CALL BackingComp::getTypes() return pTypeCollection->getTypes(); } -//_______________________________________________ + /** create one unique Id for all instances of this class. @@ -336,7 +336,7 @@ css::uno::Sequence< OUString > SAL_CALL BackingComp::getSupportedServiceNames() return lNames; } -//_______________________________________________ + /** attach this component to a target frame. @@ -465,7 +465,7 @@ void SAL_CALL BackingComp::attachFrame( /*IN*/ const css::uno::Reference< css::f /* } SAFE */ } -//_______________________________________________ + /** not supported. @@ -481,7 +481,7 @@ sal_Bool SAL_CALL BackingComp::attachModel( /*IN*/ const css::uno::Reference< cs return sal_False; } -//_______________________________________________ + /** not supported. @@ -497,7 +497,7 @@ css::uno::Reference< css::frame::XModel > SAL_CALL BackingComp::getModel() return css::uno::Reference< css::frame::XModel >(); } -//_______________________________________________ + /** not supported. @@ -510,7 +510,7 @@ css::uno::Any SAL_CALL BackingComp::getViewData() return css::uno::Any(); } -//_______________________________________________ + /** not supported. @@ -523,7 +523,7 @@ void SAL_CALL BackingComp::restoreViewData( /*IN*/ const css::uno::Any& ) { } -//_______________________________________________ + /** returns the attached frame for this component. @@ -542,7 +542,7 @@ css::uno::Reference< css::frame::XFrame > SAL_CALL BackingComp::getFrame() /* } SAFE */ } -//_______________________________________________ + /** ask controller for it's current working state. @@ -564,7 +564,7 @@ sal_Bool SAL_CALL BackingComp::suspend( /*IN*/ sal_Bool ) return sal_True; } -//_______________________________________________ + /** callback from our window member. @@ -600,7 +600,7 @@ void SAL_CALL BackingComp::disposing( /*IN*/ const css::lang::EventObject& aEven /* } SAFE */ } -//_______________________________________________ + /** kill this instance. @@ -652,7 +652,7 @@ void SAL_CALL BackingComp::dispose() /* } SAFE */ } -//_______________________________________________ + /** not supported. @@ -672,7 +672,7 @@ void SAL_CALL BackingComp::addEventListener( /*IN*/ const css::uno::Reference< c static_cast< ::cppu::OWeakObject* >(this)); } -//_______________________________________________ + /** not supported. @@ -687,7 +687,7 @@ void SAL_CALL BackingComp::removeEventListener( /*IN*/ const css::uno::Reference { } -//_______________________________________________ + /** force initialiation for this component. @@ -751,7 +751,7 @@ void SAL_CALL BackingComp::initialize( /*IN*/ const css::uno::Sequence< css::uno /* } SAFE */ } -//_______________________________________________ + /** */ @@ -761,7 +761,7 @@ void SAL_CALL BackingComp::keyPressed( /*IN*/ const css::awt::KeyEvent& ) { } -//_______________________________________________ + /** */ diff --git a/sfx2/source/dialog/basedlgs.cxx b/sfx2/source/dialog/basedlgs.cxx index 1e3f6d12f692..0fbd80feeb61 100644 --- a/sfx2/source/dialog/basedlgs.cxx +++ b/sfx2/source/dialog/basedlgs.cxx @@ -93,7 +93,7 @@ void SfxFloatingWindow_Impl::Notify( SfxBroadcaster&, const SfxHint& rHint ) } } -// ----------------------------------------------------------------------- + void SfxModalDialog::SetDialogData_Impl() { @@ -105,7 +105,7 @@ void SfxModalDialog::SetDialogData_Impl() aDlgOpt.SetUserItem( USERITEM_NAME, makeAny( aExtraData ) ); } -// ----------------------------------------------------------------------- + void SfxModalDialog::GetDialogData_Impl() @@ -128,14 +128,14 @@ void SfxModalDialog::GetDialogData_Impl() } } -// ----------------------------------------------------------------------- + void SfxModalDialog::init() { GetDialogData_Impl(); } -// ----------------------------------------------------------------------- + SfxModalDialog::SfxModalDialog(Window* pParent, const ResId &rResId ) @@ -162,7 +162,7 @@ SfxModalDialog::SfxModalDialog(Window *pParent, const OString& rID, const OUStri init(); } -// ----------------------------------------------------------------------- + SfxModalDialog::~SfxModalDialog() @@ -183,7 +183,7 @@ void SfxModalDialog::CreateOutputItemSet( SfxItemPool& rPool ) pOutputSet = new SfxAllItemSet( rPool ); } -// ----------------------------------------------------------------------- + void SfxModalDialog::CreateOutputItemSet( const SfxItemSet& rSet ) { @@ -195,7 +195,7 @@ void SfxModalDialog::CreateOutputItemSet( const SfxItemSet& rSet ) } } -//------------------------------------------------------------------------- + void SfxModelessDialog::StateChanged( StateChangedType nStateChange ) { if ( nStateChange == STATE_CHANGE_INITSHOW ) @@ -332,7 +332,7 @@ void SfxModelessDialog::Init(SfxBindings *pBindinx, SfxChildWindow *pCW) pImp->aMoveTimer.SetTimeoutHdl(LINK(this,SfxModelessDialog,TimerHdl)); } -// ----------------------------------------------------------------------- + bool SfxModelessDialog::Notify( NotifyEvent& rEvt ) @@ -365,7 +365,7 @@ bool SfxModelessDialog::Notify( NotifyEvent& rEvt ) return ModelessDialog::Notify( rEvt ); } -// ----------------------------------------------------------------------- + SfxModelessDialog::~SfxModelessDialog() @@ -380,7 +380,7 @@ SfxModelessDialog::~SfxModelessDialog() delete pImp; } -//------------------------------------------------------------------------- + bool SfxModelessDialog::Close() @@ -401,7 +401,7 @@ bool SfxModelessDialog::Close() return true; } -//------------------------------------------------------------------------- + void SfxModelessDialog::FillInfo(SfxChildWinInfo& rInfo) const @@ -420,7 +420,7 @@ void SfxModelessDialog::FillInfo(SfxChildWinInfo& rInfo) const rInfo.nFlags |= SFX_CHILDWIN_ZOOMIN; } -// ----------------------------------------------------------------------- + bool SfxFloatingWindow::Notify( NotifyEvent& rEvt ) @@ -456,7 +456,7 @@ bool SfxFloatingWindow::Notify( NotifyEvent& rEvt ) return FloatingWindow::Notify( rEvt ); } -// ----------------------------------------------------------------------- + SfxFloatingWindow::SfxFloatingWindow( SfxBindings *pBindinx, SfxChildWindow *pCW, @@ -475,7 +475,7 @@ SfxFloatingWindow::SfxFloatingWindow( SfxBindings *pBindinx, pImp->aMoveTimer.SetTimeoutHdl(LINK(this,SfxFloatingWindow,TimerHdl)); } -// ----------------------------------------------------------------------- + SfxFloatingWindow::SfxFloatingWindow( SfxBindings *pBindinx, SfxChildWindow *pCW, @@ -495,7 +495,7 @@ SfxFloatingWindow::SfxFloatingWindow( SfxBindings *pBindinx, pImp->aMoveTimer.SetTimeoutHdl(LINK(this,SfxFloatingWindow,TimerHdl)); } -//------------------------------------------------------------------------- + bool SfxFloatingWindow::Close() @@ -516,7 +516,7 @@ bool SfxFloatingWindow::Close() return true; } -// ----------------------------------------------------------------------- + SfxFloatingWindow::~SfxFloatingWindow() @@ -531,7 +531,7 @@ SfxFloatingWindow::~SfxFloatingWindow() delete pImp; } -//------------------------------------------------------------------------- + void SfxFloatingWindow::Resize() @@ -581,7 +581,7 @@ IMPL_LINK_NOARG(SfxFloatingWindow, TimerHdl) return 0; } -//------------------------------------------------------------------------- + void SfxFloatingWindow::StateChanged( StateChangedType nStateChange ) { if ( nStateChange == STATE_CHANGE_INITSHOW ) @@ -609,7 +609,7 @@ void SfxFloatingWindow::Initialize(SfxChildWinInfo *pInfo) pImp->aWinState = pInfo->aWinState; } -//------------------------------------------------------------------------- + void SfxFloatingWindow::FillInfo(SfxChildWinInfo& rInfo) const @@ -676,7 +676,7 @@ IMPL_LINK_NOARG(SfxSingleTabDialog, OKHdl_Impl) return 0; } -// ----------------------------------------------------------------------- + SfxSingleTabDialog::SfxSingleTabDialog(Window *pParent, const SfxItemSet& rSet, const OString& rID, const OUString& rUIXMLDescription) @@ -702,7 +702,7 @@ SfxSingleTabDialog::SfxSingleTabDialog(Window* pParent, const SfxItemSet* pInSet SetInputSet( pInSet ); } -// ----------------------------------------------------------------------- + SfxSingleTabDialog::~SfxSingleTabDialog() { diff --git a/sfx2/source/dialog/dinfdlg.cxx b/sfx2/source/dialog/dinfdlg.cxx index e27c15fa072c..3288f4d82f11 100644 --- a/sfx2/source/dialog/dinfdlg.cxx +++ b/sfx2/source/dialog/dinfdlg.cxx @@ -116,7 +116,7 @@ const sal_uInt16 HI_ACTION = 4; static const char DOCUMENT_SIGNATURE_MENU_CMD[] = "Signature"; -//------------------------------------------------------------------------ + namespace { OUString CreateSizeText( sal_Int64 nSize ) @@ -193,7 +193,7 @@ OUString ConvertDateTime_Impl( const OUString& rName, } } -//------------------------------------------------------------------------ + SfxDocumentInfoItem::SfxDocumentInfoItem() : SfxStringItem() @@ -220,7 +220,7 @@ SfxDocumentInfoItem::SfxDocumentInfoItem() { } -//------------------------------------------------------------------------ + SfxDocumentInfoItem::SfxDocumentInfoItem( const OUString& rFile, const uno::Reference<document::XDocumentProperties>& i_xDocProps, @@ -280,7 +280,7 @@ SfxDocumentInfoItem::SfxDocumentInfoItem( const OUString& rFile, catch ( Exception& ) {} } -//------------------------------------------------------------------------ + SfxDocumentInfoItem::SfxDocumentInfoItem( const SfxDocumentInfoItem& rItem ) : SfxStringItem( rItem ) @@ -315,19 +315,19 @@ SfxDocumentInfoItem::SfxDocumentInfoItem( const SfxDocumentInfoItem& rItem ) m_aCmisProperties = rItem.m_aCmisProperties; } -//------------------------------------------------------------------------ + SfxDocumentInfoItem::~SfxDocumentInfoItem() { ClearCustomProperties(); } -//------------------------------------------------------------------------ + SfxPoolItem* SfxDocumentInfoItem::Clone( SfxItemPool * ) const { return new SfxDocumentInfoItem( *this ); } -//------------------------------------------------------------------------ + bool SfxDocumentInfoItem::operator==( const SfxPoolItem& rItem) const { if (!(rItem.Type() == Type() && SfxStringItem::operator==(rItem))) @@ -357,7 +357,7 @@ bool SfxDocumentInfoItem::operator==( const SfxPoolItem& rItem) const m_aCmisProperties.getLength() == rInfoItem.m_aCmisProperties.getLength(); } -//------------------------------------------------------------------------ + void SfxDocumentInfoItem::resetUserData(const OUString & i_rAuthor) { setAuthor(i_rAuthor); @@ -373,7 +373,7 @@ void SfxDocumentInfoItem::resetUserData(const OUString & i_rAuthor) setEditingCycles(1); } -//------------------------------------------------------------------------ + void SfxDocumentInfoItem::UpdateDocumentInfo( const uno::Reference<document::XDocumentProperties>& i_xDocProps, bool i_bDoNotUpdateUserDefined) const @@ -445,7 +445,7 @@ void SfxDocumentInfoItem::UpdateDocumentInfo( } } -//------------------------------------------------------------------------ + sal_Bool SfxDocumentInfoItem::IsDeleteUserData() const { return m_bDeleteUserData; @@ -631,7 +631,7 @@ bool SfxDocumentInfoItem::PutValue( const Any& rVal, sal_uInt8 nMemberId ) return bRet; } -//------------------------------------------------------------------------ + SfxDocumentDescPage::SfxDocumentDescPage( Window * pParent, const SfxItemSet& rItemSet ) : SfxTabPage(pParent, "DescriptionInfoPage", "sfx/ui/descriptioninfopage.ui", rItemSet) , m_pInfoItem ( NULL ) @@ -643,13 +643,13 @@ SfxDocumentDescPage::SfxDocumentDescPage( Window * pParent, const SfxItemSet& rI get(m_pCommentEd, "comments"); } -//------------------------------------------------------------------------ + SfxTabPage *SfxDocumentDescPage::Create(Window *pParent, const SfxItemSet &rItemSet) { return new SfxDocumentDescPage(pParent, rItemSet); } -//------------------------------------------------------------------------ + sal_Bool SfxDocumentDescPage::FillItemSet(SfxItemSet &rSet) { // Test whether a change is present @@ -707,7 +707,7 @@ sal_Bool SfxDocumentDescPage::FillItemSet(SfxItemSet &rSet) return sal_True; } -//------------------------------------------------------------------------ + void SfxDocumentDescPage::Reset(const SfxItemSet &rSet) { m_pInfoItem = &(SfxDocumentInfoItem &)rSet.Get(SID_DOCINFO); @@ -727,7 +727,7 @@ void SfxDocumentDescPage::Reset(const SfxItemSet &rSet) } } -//------------------------------------------------------------------------ + namespace { OUString GetDateTimeString( sal_Int32 _nDate, sal_Int32 _nTime ) @@ -809,7 +809,7 @@ SfxDocumentPage::SfxDocumentPage(Window* pParent, const SfxItemSet& rItemSet) m_pSignatureBtn->Disable(); } -//------------------------------------------------------------------------ + IMPL_LINK_NOARG(SfxDocumentPage, DeleteHdl) { @@ -923,14 +923,14 @@ void SfxDocumentPage::ImplCheckPasswordState() m_pChangePassBtn->Disable(); } -//------------------------------------------------------------------------ + SfxTabPage* SfxDocumentPage::Create( Window* pParent, const SfxItemSet& rItemSet ) { return new SfxDocumentPage( pParent, rItemSet ); } -//------------------------------------------------------------------------ + void SfxDocumentPage::EnableUseUserData() { @@ -939,7 +939,7 @@ void SfxDocumentPage::EnableUseUserData() m_pDeleteBtn->Show(); } -//------------------------------------------------------------------------ + sal_Bool SfxDocumentPage::FillItemSet( SfxItemSet& rSet ) { @@ -998,7 +998,7 @@ sal_Bool SfxDocumentPage::FillItemSet( SfxItemSet& rSet ) return bRet; } -//------------------------------------------------------------------------ + void SfxDocumentPage::Reset( const SfxItemSet& rSet ) { @@ -1127,7 +1127,7 @@ void SfxDocumentPage::Reset( const SfxItemSet& rSet ) m_pDeleteBtn->Enable( bEnableUseUserData ); } -//------------------------------------------------------------------------ + SfxDocumentInfoDialog::SfxDocumentInfoDialog( Window* pParent, const SfxItemSet& rItemSet ) : SfxTabDialog(0, pParent, "DocumentPropertiesDialog", @@ -1181,7 +1181,7 @@ SfxDocumentInfoDialog::SfxDocumentInfoDialog( Window* pParent, AddTabPage("security", SfxSecurityPage::Create, 0); } -// ----------------------------------------------------------------------- + void SfxDocumentInfoDialog::PageCreated( sal_uInt16 nId, SfxTabPage &rPage ) { @@ -1323,7 +1323,7 @@ IMPL_LINK_NOARG(CustomPropertiesEditButton, ClickHdl) delete pDurationDlg; return 1; } -//-------------------------------------------------------------------------- + void CustomPropertiesYesNoButton::Resize() { const long nWidth = GetSizePixel().Width(); diff --git a/sfx2/source/dialog/dockwin.cxx b/sfx2/source/dialog/dockwin.cxx index be4ff1b51937..8d75488c9b1d 100644 --- a/sfx2/source/dialog/dockwin.cxx +++ b/sfx2/source/dialog/dockwin.cxx @@ -433,7 +433,7 @@ friend class SfxDockingWindow; { eDockAlignment = eAlign; } }; -//------------------------------------------------------------------------- + void SfxDockingWindow::Resize() @@ -483,7 +483,7 @@ void SfxDockingWindow::Resize() } } -//------------------------------------------------------------------------- + bool SfxDockingWindow::PrepareToggleFloatingMode() @@ -536,7 +536,7 @@ bool SfxDockingWindow::PrepareToggleFloatingMode() return true; } -//------------------------------------------------------------------------- + void SfxDockingWindow::ToggleFloatingMode() @@ -623,7 +623,7 @@ void SfxDockingWindow::ToggleFloatingMode() pWorkWin->ConfigChild_Impl( eIdent, SFX_TOGGLEFLOATMODE, pMgr->GetType() ); } -//------------------------------------------------------------------------- + void SfxDockingWindow::StartDocking() @@ -654,7 +654,7 @@ void SfxDockingWindow::StartDocking() } } -//------------------------------------------------------------------------- + bool SfxDockingWindow::Docking( const Point& rPos, Rectangle& rRect ) @@ -757,7 +757,7 @@ bool SfxDockingWindow::Docking( const Point& rPos, Rectangle& rRect ) return bFloatMode; } -//------------------------------------------------------------------------- + void SfxDockingWindow::EndDocking( const Rectangle& rRect, sal_Bool bFloatMode ) @@ -830,7 +830,7 @@ void SfxDockingWindow::EndDocking( const Rectangle& rRect, sal_Bool bFloatMode ) SetAlignment( IsFloatingMode() ? SFX_ALIGN_NOALIGNMENT : pImp->GetDockAlignment() ); } -//------------------------------------------------------------------------- + void SfxDockingWindow::Resizing( Size& /*rSize*/ ) @@ -846,7 +846,7 @@ void SfxDockingWindow::Resizing( Size& /*rSize*/ ) } -//------------------------------------------------------------------------- + SfxDockingWindow::SfxDockingWindow( SfxBindings *pBindinx, SfxChildWindow *pCW, Window* pParent, WinBits nWinBits) : @@ -897,7 +897,7 @@ SfxDockingWindow::SfxDockingWindow( SfxBindings *pBindinx, SfxChildWindow *pCW, pImp->aMoveTimer.SetTimeoutHdl(LINK(this,SfxDockingWindow,TimerHdl)); } -//------------------------------------------------------------------------- + SfxDockingWindow::SfxDockingWindow( SfxBindings *pBindinx, SfxChildWindow *pCW, Window* pParent, const ResId& rResId) : @@ -948,7 +948,7 @@ SfxDockingWindow::SfxDockingWindow( SfxBindings *pBindinx, SfxChildWindow *pCW, pImp->aMoveTimer.SetTimeoutHdl(LINK(this,SfxDockingWindow,TimerHdl)); } -//------------------------------------------------------------------------- + void SfxDockingWindow::Initialize(SfxChildWinInfo *pInfo) /* [Description] @@ -1177,7 +1177,7 @@ void SfxDockingWindow::Initialize_Impl() pImp->bConstructed = sal_True; } -//------------------------------------------------------------------------- + void SfxDockingWindow::FillInfo(SfxChildWinInfo& rInfo) const @@ -1222,7 +1222,7 @@ void SfxDockingWindow::FillInfo(SfxChildWinInfo& rInfo) const rInfo.aExtraString += ")"; } -//------------------------------------------------------------------------- + SfxDockingWindow::~SfxDockingWindow() { @@ -1241,7 +1241,7 @@ void SfxDockingWindow::ReleaseChildWindow_Impl() pMgr=NULL; } -//------------------------------------------------------------------------- + SfxChildAlignment SfxDockingWindow::CalcAlignment(const Point& rPos, Rectangle& rRect) @@ -1600,7 +1600,7 @@ SfxChildAlignment SfxDockingWindow::CalcAlignment(const Point& rPos, Rectangle& return eDockAlign; } -//------------------------------------------------------------------------- + Size SfxDockingWindow::CalcDockingSize(SfxChildAlignment eAlign) @@ -1649,7 +1649,7 @@ Size SfxDockingWindow::CalcDockingSize(SfxChildAlignment eAlign) return aSize; } -//------------------------------------------------------------------------- + SfxChildAlignment SfxDockingWindow::CheckAlignment(SfxChildAlignment, SfxChildAlignment eAlign) @@ -1665,7 +1665,7 @@ SfxChildAlignment SfxDockingWindow::CheckAlignment(SfxChildAlignment, return eAlign; } -//------------------------------------------------------------------------- + bool SfxDockingWindow::Close() @@ -1687,7 +1687,7 @@ bool SfxDockingWindow::Close() return true; } -//------------------------------------------------------------------------- + void SfxDockingWindow::Paint(const Rectangle& /*rRect*/) @@ -1740,7 +1740,7 @@ void SfxDockingWindow::Paint(const Rectangle& /*rRect*/) aView.DrawFrame( aRect, FRAME_DRAW_OUT ); } -//------------------------------------------------------------------------- + void SfxDockingWindow::SetMinOutputSizePixel( const Size& rSize ) @@ -1755,7 +1755,7 @@ void SfxDockingWindow::SetMinOutputSizePixel( const Size& rSize ) DockingWindow::SetMinOutputSizePixel( rSize ); } -//------------------------------------------------------------------------- + Size SfxDockingWindow::GetMinOutputSizePixel() const @@ -1768,7 +1768,7 @@ Size SfxDockingWindow::GetMinOutputSizePixel() const return pImp->aMinSize; } -//------------------------------------------------------------------------- + bool SfxDockingWindow::Notify( NotifyEvent& rEvt ) { @@ -1813,7 +1813,7 @@ sal_uInt16 SfxDockingWindow::GetWinBits_Impl() const return nBits; } -//------------------------------------------------------------------------- + void SfxDockingWindow::SetItemSize_Impl( const Size& rSize ) { diff --git a/sfx2/source/dialog/filtergrouping.cxx b/sfx2/source/dialog/filtergrouping.cxx index 385f11e043d7..74dc1fc8b4e5 100644 --- a/sfx2/source/dialog/filtergrouping.cxx +++ b/sfx2/source/dialog/filtergrouping.cxx @@ -148,7 +148,7 @@ namespace sfx2 // = reading of configuration data // ======================================================================= - //-------------------------------------------------------------------- + void lcl_ReadFilterClass( const OConfigurationNode& _rClassesNode, const OUString& _rLogicalClassName, FilterClass& /* [out] */ _rClass ) { @@ -163,7 +163,7 @@ namespace sfx2 aClassDesc.getNodeValue( sSubFiltersNodeName ) >>= _rClass.aSubFilters; } - //-------------------------------------------------------------------- + struct CreateEmptyClassRememberPos : public ::std::unary_function< FilterName, void > { protected: @@ -190,7 +190,7 @@ namespace sfx2 } }; - //-------------------------------------------------------------------- + struct ReadGlobalFilter : public ::std::unary_function< FilterName, void > { protected: @@ -223,7 +223,7 @@ namespace sfx2 } }; - //-------------------------------------------------------------------- + void lcl_ReadGlobalFilters( const OConfigurationNode& _rFilterClassification, FilterClassList& _rGlobalClasses, StringArray& _rGlobalClassNames ) { _rGlobalClasses.clear(); @@ -267,7 +267,7 @@ namespace sfx2 ); } - //-------------------------------------------------------------------- + struct ReadLocalFilter : public ::std::unary_function< FilterName, void > { protected: @@ -293,7 +293,7 @@ namespace sfx2 } }; - //-------------------------------------------------------------------- + void lcl_ReadLocalFilters( const OConfigurationNode& _rFilterClassification, FilterClassList& _rLocalClasses ) { _rLocalClasses.clear(); @@ -310,7 +310,7 @@ namespace sfx2 ); } - //-------------------------------------------------------------------- + void lcl_ReadClassification( FilterClassList& _rGlobalClasses, StringArray& _rGlobalClassNames, FilterClassList& _rLocalClasses ) { //================================================================ @@ -336,7 +336,7 @@ namespace sfx2 // = grouping and classifying // ======================================================================= - //-------------------------------------------------------------------- + // a struct which adds helps remembering a reference to a class entry struct ReferToFilterEntry : public ::std::unary_function< FilterName, void > { @@ -362,7 +362,7 @@ namespace sfx2 } }; - //-------------------------------------------------------------------- + struct FillClassGroup : public ::std::unary_function< FilterClass, void > { protected: @@ -400,7 +400,7 @@ namespace sfx2 } }; - //-------------------------------------------------------------------- + static const sal_Unicode s_cWildcardSeparator( ';' ); //==================================================================== @@ -504,7 +504,7 @@ namespace sfx2 aWildCards.push_back( OUString( pTokenStart, pTokenLoop - pTokenStart ) ); } - //-------------------------------------------------------------------- + void lcl_InitGlobalClasses( GroupedFilterList& _rAllFilters, const FilterClassList& _rGlobalClasses, FilterGroupEntryReferrer& _rGlobalClassesRef ) { // we need an extra group in our "all filters" container @@ -527,7 +527,7 @@ namespace sfx2 // and modify the descriptor for this class accordingly } - //-------------------------------------------------------------------- + typedef ::std::vector< ::std::pair< FilterGroupEntryReferrer::mapped_type, FilterGroup::iterator > > MapGroupEntry2GroupEntry; // this is not really a map - it's just called this way because it is used as a map @@ -554,7 +554,7 @@ namespace sfx2 } }; - //-------------------------------------------------------------------- + struct CopyNonEmptyFilter : public ::std::unary_function< FilterDescriptor, void > { FilterGroup& rTarget; @@ -567,7 +567,7 @@ namespace sfx2 } }; - //-------------------------------------------------------------------- + void lcl_GroupAndClassify( TSortedFilterList& _rFilterMatcher, GroupedFilterList& _rAllFilters ) { _rAllFilters.clear(); @@ -728,7 +728,7 @@ namespace sfx2 rGlobalFilters.swap( aNonEmptyGlobalFilters ); } - //-------------------------------------------------------------------- + struct AppendFilter : public ::std::unary_function< FilterDescriptor, void > { protected: @@ -763,7 +763,7 @@ namespace sfx2 // = handling for the "all files" entry // ======================================================================= - //-------------------------------------------------------------------- + sal_Bool lcl_hasAllFilesFilter( TSortedFilterList& _rFilterMatcher, OUString& /* [out] */ _rAllFilterName ) { sal_Bool bHasAll = sal_False; @@ -779,7 +779,7 @@ namespace sfx2 return bHasAll; } - //-------------------------------------------------------------------- + void lcl_EnsureAllFilesEntry( TSortedFilterList& _rFilterMatcher, GroupedFilterList& _rFilters ) { // =============================================================== @@ -800,7 +800,7 @@ namespace sfx2 // = filling an XFilterManager // ======================================================================= - //-------------------------------------------------------------------- + struct AppendFilterGroup : public ::std::unary_function< FilterGroup, void > { protected: @@ -864,7 +864,7 @@ namespace sfx2 } }; - //-------------------------------------------------------------------- + TSortedFilterList::TSortedFilterList(const ::com::sun::star::uno::Reference< ::com::sun::star::container::XEnumeration >& xFilterList) : m_nIterator(0) { @@ -883,21 +883,21 @@ namespace sfx2 } } - //-------------------------------------------------------------------- + const SfxFilter* TSortedFilterList::First() { m_nIterator = 0; return impl_getFilter(m_nIterator); } - //-------------------------------------------------------------------- + const SfxFilter* TSortedFilterList::Next() { ++m_nIterator; return impl_getFilter(m_nIterator); } - //-------------------------------------------------------------------- + const SfxFilter* TSortedFilterList::impl_getFilter(sal_Int32 nIndex) { if (nIndex<0 || nIndex>=(sal_Int32)m_lFilters.size()) @@ -908,7 +908,7 @@ namespace sfx2 return SfxFilter::GetFilterByName(sFilterName); } - //-------------------------------------------------------------------- + void appendFiltersForSave( TSortedFilterList& _rFilterMatcher, const Reference< XFilterManager >& _rxFilterManager, OUString& _rFirstNonEmpty, FileDialogHelper_Impl& _rFileDlgImpl, @@ -971,7 +971,7 @@ namespace sfx2 OUString aWildcard; }; - //-------------------------------------------------------------------- + void appendExportFilters( TSortedFilterList& _rFilterMatcher, const Reference< XFilterManager >& _rxFilterManager, OUString& _rFirstNonEmpty, FileDialogHelper_Impl& _rFileDlgImpl ) @@ -1130,7 +1130,7 @@ namespace sfx2 } } - //-------------------------------------------------------------------- + void appendFiltersForOpen( TSortedFilterList& _rFilterMatcher, const Reference< XFilterManager >& _rxFilterManager, OUString& _rFirstNonEmpty, FileDialogHelper_Impl& _rFileDlgImpl ) diff --git a/sfx2/source/dialog/itemconnect.cxx b/sfx2/source/dialog/itemconnect.cxx index 444245b5f12c..aae7b16c2771 100644 --- a/sfx2/source/dialog/itemconnect.cxx +++ b/sfx2/source/dialog/itemconnect.cxx @@ -40,7 +40,7 @@ TriState lclConvertToTriState( bool bKnown, bool bIsKnownFlag, bool bIsUnknownFl } // namespace -// ---------------------------------------------------------------------------- + sal_uInt16 ItemWrapperHelper::GetWhichId( const SfxItemSet& rItemSet, sal_uInt16 nSlot ) { @@ -105,7 +105,7 @@ void DummyWindowWrapper::SetControlValue( void* ) { } -// ---------------------------------------------------------------------------- + CheckBoxWrapper::CheckBoxWrapper( CheckBox& rCheckBox ) : SingleControlWrapperType( rCheckBox ) @@ -133,7 +133,7 @@ void CheckBoxWrapper::SetControlValue( sal_Bool bValue ) GetControl().Check( bValue ); } -// ---------------------------------------------------------------------------- + ColorListBoxWrapper::ColorListBoxWrapper(ColorListBox & rListBox): SingleControlWrapper< ColorListBox, Color >(rListBox) @@ -327,7 +327,7 @@ bool ItemConnectionArrayImpl::FillItemSet( SfxItemSet& rDestSet, const SfxItemSe return bChanged; } -// ---------------------------------------------------------------------------- + ItemConnectionArray::ItemConnectionArray() : mxImpl( new ItemConnectionArrayImpl ) diff --git a/sfx2/source/dialog/mailmodel.cxx b/sfx2/source/dialog/mailmodel.cxx index 1b51bd5f2a41..587d9a8f0903 100644 --- a/sfx2/source/dialog/mailmodel.cxx +++ b/sfx2/source/dialog/mailmodel.cxx @@ -74,7 +74,7 @@ #include <vcl/svapp.hxx> #include <cppuhelper/implbase1.hxx> -// -------------------------------------------------------------- + using namespace ::com::sun::star; using namespace ::com::sun::star::beans; using namespace ::com::sun::star::frame; diff --git a/sfx2/source/dialog/mgetempl.cxx b/sfx2/source/dialog/mgetempl.cxx index 63abb278453e..f33ce5000f3e 100644 --- a/sfx2/source/dialog/mgetempl.cxx +++ b/sfx2/source/dialog/mgetempl.cxx @@ -230,7 +230,7 @@ SfxManageStyleSheetPage::SfxManageStyleSheetPage(Window* pParent, const SfxItemS m_pAutoCB->Show(); } -//------------------------------------------------------------------------- + SfxManageStyleSheetPage::~SfxManageStyleSheetPage() @@ -248,7 +248,7 @@ SfxManageStyleSheetPage::~SfxManageStyleSheetPage() } -//------------------------------------------------------------------------- + void SfxManageStyleSheetPage::UpdateName_Impl( ListBox* pBox, const OUString& rNew ) @@ -276,7 +276,7 @@ void SfxManageStyleSheetPage::UpdateName_Impl( ListBox* pBox, } } -//------------------------------------------------------------------------- + void SfxManageStyleSheetPage::SetDescriptionText_Impl() @@ -314,7 +314,7 @@ void SfxManageStyleSheetPage::SetDescriptionText_Impl() m_pDescFt->SetText( pStyle->GetDescription( eUnit ) ); } -//------------------------------------------------------------------------- + IMPL_LINK_INLINE_START( SfxManageStyleSheetPage, GetFocusHdl, Edit *, pEdit ) @@ -329,7 +329,7 @@ IMPL_LINK_INLINE_START( SfxManageStyleSheetPage, GetFocusHdl, Edit *, pEdit ) } IMPL_LINK_INLINE_END( SfxManageStyleSheetPage, GetFocusHdl, Edit *, pEdit ) -//------------------------------------------------------------------------- + IMPL_LINK_INLINE_START( SfxManageStyleSheetPage, LoseFocusHdl, Edit *, pEdit ) @@ -350,7 +350,7 @@ IMPL_LINK_INLINE_START( SfxManageStyleSheetPage, LoseFocusHdl, Edit *, pEdit ) } IMPL_LINK_INLINE_END( SfxManageStyleSheetPage, LoseFocusHdl, Edit *, pEdit ) -//------------------------------------------------------------------------- + sal_Bool SfxManageStyleSheetPage::FillItemSet( SfxItemSet& rSet ) @@ -397,7 +397,7 @@ sal_Bool SfxManageStyleSheetPage::FillItemSet( SfxItemSet& rSet ) return bModified; } -//------------------------------------------------------------------------- + void SfxManageStyleSheetPage::Reset( const SfxItemSet& /*rAttrSet*/ ) @@ -466,7 +466,7 @@ void SfxManageStyleSheetPage::Reset( const SfxItemSet& /*rAttrSet*/ ) } } -//------------------------------------------------------------------------- + SfxTabPage* SfxManageStyleSheetPage::Create( Window* pParent, const SfxItemSet &rAttrSet ) @@ -484,7 +484,7 @@ SfxTabPage* SfxManageStyleSheetPage::Create( Window* pParent, return new SfxManageStyleSheetPage( pParent, rAttrSet ); } -//------------------------------------------------------------------------- + void SfxManageStyleSheetPage::ActivatePage( const SfxItemSet& rSet) @@ -515,7 +515,7 @@ void SfxManageStyleSheetPage::ActivatePage( const SfxItemSet& rSet) m_pAutoCB->SaveValue(); } -//------------------------------------------------------------------------- + int SfxManageStyleSheetPage::DeactivatePage( SfxItemSet* pItemSet ) diff --git a/sfx2/source/dialog/newstyle.cxx b/sfx2/source/dialog/newstyle.cxx index 062b86f44df8..c8fd34ab0d5c 100644 --- a/sfx2/source/dialog/newstyle.cxx +++ b/sfx2/source/dialog/newstyle.cxx @@ -49,7 +49,7 @@ IMPL_LINK( SfxNewStyleDlg, OKHdl, Control *, pControl ) return 0; } -// ----------------------------------------------------------------------- + IMPL_LINK_INLINE_START( SfxNewStyleDlg, ModifyHdl, ComboBox *, pBox ) { @@ -86,7 +86,7 @@ SfxNewStyleDlg::SfxNewStyleDlg( Window* pParent, SfxStyleSheetBasePool& rInPool } } -// ----------------------------------------------------------------------- + SfxNewStyleDlg::~SfxNewStyleDlg() { diff --git a/sfx2/source/dialog/passwd.cxx b/sfx2/source/dialog/passwd.cxx index 14b4221e6cd6..c1d47d5d1e8c 100644 --- a/sfx2/source/dialog/passwd.cxx +++ b/sfx2/source/dialog/passwd.cxx @@ -27,7 +27,7 @@ #include "dialog.hrc" -// ----------------------------------------------------------------------- + IMPL_LINK_INLINE_START( SfxPasswordDialog, EditModifyHdl, Edit *, pEdit ) { @@ -61,7 +61,7 @@ IMPL_LINK_INLINE_START( SfxPasswordDialog, EditModifyHdl, Edit *, pEdit ) } IMPL_LINK_INLINE_END(SfxPasswordDialog, EditModifyHdl, Edit *, pEdit) -// ----------------------------------------------------------------------- + IMPL_LINK_NOARG(SfxPasswordDialog, OKHdl) { @@ -124,7 +124,7 @@ SfxPasswordDialog::SfxPasswordDialog(Window* pParent, const OUString* pGroupText SetPasswdText(); } -// ----------------------------------------------------------------------- + void SfxPasswordDialog::SetPasswdText( ) { @@ -139,7 +139,7 @@ void SfxPasswordDialog::SetPasswdText( ) } } -// ----------------------------------------------------------------------- + void SfxPasswordDialog::SetMinLen( sal_uInt16 nLen ) { @@ -153,7 +153,7 @@ void SfxPasswordDialog::ShowMinLengthText(bool bShow) mpMinLengthFT->Show(bShow); } -// ----------------------------------------------------------------------- + short SfxPasswordDialog::Execute() { diff --git a/sfx2/source/dialog/splitwin.cxx b/sfx2/source/dialog/splitwin.cxx index 2b9847da4f63..7f975fe3436e 100644 --- a/sfx2/source/dialog/splitwin.cxx +++ b/sfx2/source/dialog/splitwin.cxx @@ -190,7 +190,7 @@ void SfxEmptySplitWin_Impl::FadeIn() pOwner->SaveConfig_Impl(); } -//------------------------------------------------------------------------- + void SfxSplitWindow::MouseButtonDown( const MouseEvent& rMEvt ) { @@ -203,7 +203,7 @@ void SfxEmptySplitWin_Impl::MouseMove( const MouseEvent& rMEvt ) SplitWindow::MouseMove( rMEvt ); } -//------------------------------------------------------------------------- + SfxSplitWindow::SfxSplitWindow( Window* pParent, SfxChildAlignment eAl, SfxWorkWindow *pW, sal_Bool bWithButtons, WinBits nBits ) @@ -317,7 +317,7 @@ SfxSplitWindow::SfxSplitWindow( Window* pParent, SfxChildAlignment eAl, pEmptyWin->SetAutoHideState( !bPinned ); } -//------------------------------------------------------------------------- + SfxSplitWindow::~SfxSplitWindow() { @@ -373,7 +373,7 @@ void SfxSplitWindow::SaveConfig_Impl() aWinOpt.SetUserItem( USERITEM_NAME, makeAny( aWinData.makeStringAndClear() ) ); } -//------------------------------------------------------------------------- + void SfxSplitWindow::StartSplit() { @@ -402,7 +402,7 @@ void SfxSplitWindow::StartSplit() SetMaxSizePixel( nSize ); } -//------------------------------------------------------------------------- + void SfxSplitWindow::SplitResize() { @@ -415,7 +415,7 @@ void SfxSplitWindow::SplitResize() pWorkWin->ArrangeAutoHideWindows( this ); } -//------------------------------------------------------------------------- + void SfxSplitWindow::Split() { @@ -467,7 +467,7 @@ void SfxSplitWindow::Split() SaveConfig_Impl(); } -//------------------------------------------------------------------------- + void SfxSplitWindow::InsertWindow( SfxDockingWindow* pDockWin, const Size& rSize) @@ -559,7 +559,7 @@ void SfxSplitWindow::InsertWindow( SfxDockingWindow* pDockWin, const Size& rSize SaveConfig_Impl(); } -//------------------------------------------------------------------------- + void SfxSplitWindow::ReleaseWindow_Impl(SfxDockingWindow *pDockWin, sal_Bool bSave) { @@ -589,7 +589,7 @@ void SfxSplitWindow::ReleaseWindow_Impl(SfxDockingWindow *pDockWin, sal_Bool bSa SaveConfig_Impl(); } -//------------------------------------------------------------------------- + void SfxSplitWindow::MoveWindow( SfxDockingWindow* pDockWin, const Size& rSize, sal_uInt16 nLine, sal_uInt16 nPos, sal_Bool bNewLine) @@ -613,7 +613,7 @@ void SfxSplitWindow::MoveWindow( SfxDockingWindow* pDockWin, const Size& rSize, InsertWindow( pDockWin, rSize, nLine, nPos, bNewLine ); } -//------------------------------------------------------------------------- + void SfxSplitWindow::InsertWindow( SfxDockingWindow* pDockWin, const Size& rSize, sal_uInt16 nLine, sal_uInt16 nPos, sal_Bool bNewLine) @@ -683,7 +683,7 @@ void SfxSplitWindow::InsertWindow( SfxDockingWindow* pDockWin, const Size& rSize SaveConfig_Impl(); } -//------------------------------------------------------------------------- + void SfxSplitWindow::InsertWindow_Impl( SfxDock_Impl* pDock, const Size& rSize, @@ -815,7 +815,7 @@ void SfxSplitWindow::InsertWindow_Impl( SfxDock_Impl* pDock, } } -//------------------------------------------------------------------------- + void SfxSplitWindow::RemoveWindow( SfxDockingWindow* pDockWin, sal_Bool bHide ) @@ -879,7 +879,7 @@ void SfxSplitWindow::RemoveWindow( SfxDockingWindow* pDockWin, sal_Bool bHide ) bLocked = sal_False; }; -//------------------------------------------------------------------------- + sal_Bool SfxSplitWindow::GetWindowPos( const SfxDockingWindow* pWindow, sal_uInt16& rLine, sal_uInt16& rPos ) const @@ -899,7 +899,7 @@ sal_Bool SfxSplitWindow::GetWindowPos( const SfxDockingWindow* pWindow, return sal_True; } -//------------------------------------------------------------------------- + sal_Bool SfxSplitWindow::GetWindowPos( const Point& rTestPos, sal_uInt16& rLine, sal_uInt16& rPos ) const @@ -920,7 +920,7 @@ sal_Bool SfxSplitWindow::GetWindowPos( const Point& rTestPos, return sal_True; } -//------------------------------------------------------------------------- + sal_uInt16 SfxSplitWindow::GetLineCount() const @@ -932,7 +932,7 @@ sal_uInt16 SfxSplitWindow::GetLineCount() const return GetItemCount( 0 ); } -//------------------------------------------------------------------------- + long SfxSplitWindow::GetLineSize( sal_uInt16 nLine ) const @@ -945,7 +945,7 @@ long SfxSplitWindow::GetLineSize( sal_uInt16 nLine ) const return GetItemSize( nId ); } -//------------------------------------------------------------------------- + sal_uInt16 SfxSplitWindow::GetWindowCount( sal_uInt16 nLine ) const @@ -958,7 +958,7 @@ sal_uInt16 SfxSplitWindow::GetWindowCount( sal_uInt16 nLine ) const return GetItemCount( nId ); } -//------------------------------------------------------------------------- + sal_uInt16 SfxSplitWindow::GetWindowCount() const @@ -970,14 +970,14 @@ sal_uInt16 SfxSplitWindow::GetWindowCount() const return GetItemCount( 0 ); } -//------------------------------------------------------------------------- + void SfxSplitWindow::Command( const CommandEvent& rCEvt ) { SplitWindow::Command( rCEvt ); } -//------------------------------------------------------------------------- + IMPL_LINK( SfxSplitWindow, TimerHdl, Timer*, pTimer) { @@ -1050,7 +1050,7 @@ IMPL_LINK( SfxSplitWindow, TimerHdl, Timer*, pTimer) return 0L; } -//------------------------------------------------------------------------- + sal_Bool SfxSplitWindow::CursorIsOverRect( sal_Bool bForceAdding ) const { @@ -1091,7 +1091,7 @@ sal_Bool SfxSplitWindow::CursorIsOverRect( sal_Bool bForceAdding ) const return sal_False; } -//------------------------------------------------------------------------- + SplitWindow* SfxSplitWindow::GetSplitWindow() { @@ -1100,7 +1100,7 @@ SplitWindow* SfxSplitWindow::GetSplitWindow() return this; } -//------------------------------------------------------------------------- + sal_Bool SfxSplitWindow::IsFadeIn() const { return pEmptyWin->bFadeIn; @@ -1111,7 +1111,7 @@ sal_Bool SfxSplitWindow::IsAutoHide( sal_Bool bSelf ) const return bSelf ? pEmptyWin->bAutoHide && !pEmptyWin->bEndAutoHide : pEmptyWin->bAutoHide; } -//------------------------------------------------------------------------- + void SfxSplitWindow::SetPinned_Impl( sal_Bool bOn ) { @@ -1166,7 +1166,7 @@ void SfxSplitWindow::SetPinned_Impl( sal_Bool bOn ) pEmptyWin->SetAutoHideState( !bPinned ); } -//------------------------------------------------------------------------- + void SfxSplitWindow::SetFadeIn_Impl( sal_Bool bOn ) { diff --git a/sfx2/source/dialog/styfitem.cxx b/sfx2/source/dialog/styfitem.cxx index 88213917984d..9da42533ac16 100644 --- a/sfx2/source/dialog/styfitem.cxx +++ b/sfx2/source/dialog/styfitem.cxx @@ -21,7 +21,7 @@ #include <svtools/localresaccess.hxx> #include <tools/debug.hxx> -// ----------------------------------------------------------------------- + class SfxStyleFamilyItem_Impl { @@ -29,7 +29,7 @@ class SfxStyleFamilyItem_Impl Image aImage; }; -// ----------------------------------------------------------------------- + // Implementierung des Resource-Konstruktors @@ -80,7 +80,7 @@ SfxStyleFamilyItem::SfxStyleFamilyItem( const ResId &rResId ) : aImage = Image(aBitmap); } -// ----------------------------------------------------------------------- + // Destructor; releases the internal data @@ -91,7 +91,7 @@ SfxStyleFamilyItem::~SfxStyleFamilyItem() aFilterList.clear(); } -// ----------------------------------------------------------------------- + // Implementation of the resource constructor @@ -112,7 +112,7 @@ SfxStyleFamilies::SfxStyleFamilies( const ResId& rResId ) : updateImages( rResId ); } -// ----------------------------------------------------------------------- + // Destructor; releases the internal data @@ -124,7 +124,7 @@ SfxStyleFamilies::~SfxStyleFamilies() } -// ----------------------------------------------------------------------- + sal_Bool SfxStyleFamilies::updateImages( const ResId& _rId ) { diff --git a/sfx2/source/dialog/styledlg.cxx b/sfx2/source/dialog/styledlg.cxx index 1cc80b135d5d..09c84ee20520 100644 --- a/sfx2/source/dialog/styledlg.cxx +++ b/sfx2/source/dialog/styledlg.cxx @@ -68,7 +68,7 @@ SfxStyleDialog::SfxStyleDialog GetCancelButton().SetClickHdl( LINK(this, SfxStyleDialog, CancelHdl) ); } -// ----------------------------------------------------------------------- + SfxStyleDialog::~SfxStyleDialog() @@ -84,7 +84,7 @@ SfxStyleDialog::~SfxStyleDialog() delete GetInputSetImpl(); } -// ----------------------------------------------------------------------- + const SfxItemSet* SfxStyleDialog::GetRefreshedSet() @@ -98,7 +98,7 @@ const SfxItemSet* SfxStyleDialog::GetRefreshedSet() return GetInputSetImpl(); } -// ----------------------------------------------------------------------- + short SfxStyleDialog::Ok() @@ -112,7 +112,7 @@ short SfxStyleDialog::Ok() return RET_OK; } -// ----------------------------------------------------------------------- + IMPL_LINK( SfxStyleDialog, CancelHdl, Button *, pButton ) diff --git a/sfx2/source/dialog/tabdlg.cxx b/sfx2/source/dialog/tabdlg.cxx index 22d5f8585021..844fcb226db0 100644 --- a/sfx2/source/dialog/tabdlg.cxx +++ b/sfx2/source/dialog/tabdlg.cxx @@ -239,7 +239,7 @@ SfxTabPage::SfxTabPage(Window *pParent, const OString& rID, const OUString& rUIX { } -// ----------------------------------------------------------------------- + SfxTabPage::~SfxTabPage() @@ -252,14 +252,14 @@ SfxTabPage::~SfxTabPage() delete pImpl; } -// ----------------------------------------------------------------------- + sal_Bool SfxTabPage::FillItemSet( SfxItemSet& rSet ) { return pImpl->maItemConn.DoFillItemSet( rSet, GetItemSet() ); } -// ----------------------------------------------------------------------- + void SfxTabPage::Reset( const SfxItemSet& rSet ) { @@ -267,7 +267,7 @@ void SfxTabPage::Reset( const SfxItemSet& rSet ) pImpl->maItemConn.DoReset( rSet ); } -// ----------------------------------------------------------------------- + void SfxTabPage::ActivatePage( const SfxItemSet& ) @@ -281,7 +281,7 @@ void SfxTabPage::ActivatePage( const SfxItemSet& ) { } -// ----------------------------------------------------------------------- + int SfxTabPage::DeactivatePage( SfxItemSet* ) @@ -304,7 +304,7 @@ int SfxTabPage::DeactivatePage( SfxItemSet* ) return LEAVE_PAGE; } -// ----------------------------------------------------------------------- + void SfxTabPage::FillUserData() @@ -318,14 +318,14 @@ void SfxTabPage::FillUserData() { } -// ----------------------------------------------------------------------- + sal_Bool SfxTabPage::IsReadOnly() const { return sal_False; } -// ----------------------------------------------------------------------- + const SfxPoolItem* SfxTabPage::GetItem( const SfxItemSet& rSet, sal_uInt16 nSlot, sal_Bool bDeep ) @@ -346,7 +346,7 @@ const SfxPoolItem* SfxTabPage::GetItem( const SfxItemSet& rSet, sal_uInt16 nSlot return pItem; } -// ----------------------------------------------------------------------- + const SfxPoolItem* SfxTabPage::GetOldItem( const SfxItemSet& rSet, sal_uInt16 nSlot, sal_Bool bDeep ) @@ -376,7 +376,7 @@ void SfxTabPage::PageCreated( SfxAllItemSet /*aSet*/ ) DBG_ASSERT(false, "SfxTabPage::PageCreated should not be called"); } -// ----------------------------------------------------------------------- + void SfxTabPage::AddItemConnection( sfx::ItemConnectionBase* pConnection ) { @@ -388,7 +388,7 @@ SfxTabDialog* SfxTabPage::GetTabDialog() const return dynamic_cast<SfxTabDialog*>(GetParentDialog()); } -// ----------------------------------------------------------------------- + SfxTabDialog::SfxTabDialog ( @@ -414,7 +414,7 @@ SfxTabDialog::SfxTabDialog Init_Impl( bFmt, NULL, NULL ); } -// ----------------------------------------------------------------------- + SfxTabDialog::SfxTabDialog @@ -446,7 +446,7 @@ SfxTabDialog::SfxTabDialog DBG_WARNING( "Please use the Construtor with the ViewFrame" ); } -// ----------------------------------------------------------------------- + SfxTabDialog::~SfxTabDialog() { @@ -502,7 +502,7 @@ SfxTabDialog::~SfxTabDialog() delete m_pBox; } -// ----------------------------------------------------------------------- + void SfxTabDialog::Init_Impl( sal_Bool bFmtFlag, const OUString* pUserButtonText, const ResId *pResId ) @@ -626,7 +626,7 @@ void SfxTabDialog::Init_Impl( sal_Bool bFmtFlag, const OUString* pUserButtonText } } -// ----------------------------------------------------------------------- + void SfxTabDialog::RemoveResetButton() { @@ -634,7 +634,7 @@ void SfxTabDialog::RemoveResetButton() pImpl->bHideResetBtn = sal_True; } -// ----------------------------------------------------------------------- + short SfxTabDialog::Execute() { @@ -644,7 +644,7 @@ short SfxTabDialog::Execute() return TabDialog::Execute(); } -// ----------------------------------------------------------------------- + void SfxTabDialog::StartExecuteModal( const Link& rEndDialogHdl ) { @@ -654,7 +654,7 @@ void SfxTabDialog::StartExecuteModal( const Link& rEndDialogHdl ) TabDialog::StartExecuteModal( rEndDialogHdl ); } -// ----------------------------------------------------------------------- + void SfxTabDialog::Start( sal_Bool bShow ) { @@ -668,7 +668,7 @@ void SfxTabDialog::Start( sal_Bool bShow ) GrabFocusToFirstControl(); } -// ----------------------------------------------------------------------- + void SfxTabDialog::SetApplyHandler(const Link& _rHdl) { @@ -677,7 +677,7 @@ void SfxTabDialog::SetApplyHandler(const Link& _rHdl) m_pApplyBtn->SetClickHdl( _rHdl ); } -// ----------------------------------------------------------------------- + void SfxTabDialog::Start_Impl() { @@ -757,7 +757,7 @@ sal_uInt16 SfxTabDialog::AddTabPage return nPageId; } -// ----------------------------------------------------------------------- + void SfxTabDialog::AddTabPage @@ -783,7 +783,7 @@ void SfxTabDialog::AddTabPage new Data_Impl( nId, pCreateFunc, pRangesFunc, bItemsOnDemand ) ); } -// ----------------------------------------------------------------------- + void SfxTabDialog::RemoveTabPage( sal_uInt16 nId ) @@ -829,7 +829,7 @@ void SfxTabDialog::RemoveTabPage(const OString &rName) RemoveTabPage(m_pTabCtrl->GetPageId(rName)); } -// ----------------------------------------------------------------------- + void SfxTabDialog::PageCreated @@ -847,7 +847,7 @@ void SfxTabDialog::PageCreated { } -// ----------------------------------------------------------------------- + SfxItemSet* SfxTabDialog::GetInputSetImpl() @@ -861,7 +861,7 @@ SfxItemSet* SfxTabDialog::GetInputSetImpl() return (SfxItemSet*)pSet; } -// ----------------------------------------------------------------------- + SfxTabPage* SfxTabDialog::GetTabPage( sal_uInt16 nPageId ) const @@ -887,7 +887,7 @@ void SfxTabDialog::SavePosAndId() aDlgOpt.SetPageID( m_pTabCtrl->GetCurPageId() ); } -// ----------------------------------------------------------------------- + short SfxTabDialog::Ok() @@ -956,7 +956,7 @@ short SfxTabDialog::Ok() return bModified ? RET_OK : RET_CANCEL; } -// ----------------------------------------------------------------------- + IMPL_LINK_NOARG(SfxTabDialog, CancelHdl) { @@ -964,7 +964,7 @@ IMPL_LINK_NOARG(SfxTabDialog, CancelHdl) return 0; } -// ----------------------------------------------------------------------- + SfxItemSet* SfxTabDialog::CreateInputItemSet( sal_uInt16 ) @@ -979,7 +979,7 @@ SfxItemSet* SfxTabDialog::CreateInputItemSet( sal_uInt16 ) return new SfxAllItemSet( SFX_APP()->GetPool() ); } -// ----------------------------------------------------------------------- + const SfxItemSet* SfxTabDialog::GetRefreshedSet() @@ -995,7 +995,7 @@ const SfxItemSet* SfxTabDialog::GetRefreshedSet() return 0; } -// ----------------------------------------------------------------------- + IMPL_LINK_NOARG(SfxTabDialog, OkHdl) @@ -1029,7 +1029,7 @@ bool SfxTabDialog::Apply() return bApplied; } -// ----------------------------------------------------------------------- + bool SfxTabDialog::PrepareLeaveCurrentPage() { @@ -1065,7 +1065,7 @@ bool SfxTabDialog::PrepareLeaveCurrentPage() } -// ----------------------------------------------------------------------- + IMPL_LINK_NOARG(SfxTabDialog, UserHdl) @@ -1091,7 +1091,7 @@ IMPL_LINK_NOARG(SfxTabDialog, UserHdl) return 0; } -// ----------------------------------------------------------------------- + IMPL_LINK_NOARG(SfxTabDialog, ResetHdl) @@ -1118,7 +1118,7 @@ IMPL_LINK_NOARG(SfxTabDialog, ResetHdl) return 0; } -// ----------------------------------------------------------------------- + IMPL_LINK_NOARG(SfxTabDialog, BaseFmtHdl) @@ -1195,7 +1195,7 @@ IMPL_LINK_NOARG(SfxTabDialog, BaseFmtHdl) return 1; } -// ----------------------------------------------------------------------- + IMPL_LINK( SfxTabDialog, ActivatePageHdl, TabControl *, pTabCtrl ) @@ -1277,7 +1277,7 @@ IMPL_LINK( SfxTabDialog, ActivatePageHdl, TabControl *, pTabCtrl ) return 0; } -// ----------------------------------------------------------------------- + IMPL_LINK( SfxTabDialog, DeactivatePageHdl, TabControl *, pTabCtrl ) @@ -1362,7 +1362,7 @@ IMPL_LINK( SfxTabDialog, DeactivatePageHdl, TabControl *, pTabCtrl ) return sal_False; } -// ----------------------------------------------------------------------- + void SfxTabDialog::ShowPage( sal_uInt16 nId ) @@ -1376,7 +1376,7 @@ void SfxTabDialog::ShowPage( sal_uInt16 nId ) ActivatePageHdl( m_pTabCtrl ); } -// ----------------------------------------------------------------------- + const sal_uInt16* SfxTabDialog::GetInputRanges( const SfxItemPool& rPool ) @@ -1444,7 +1444,7 @@ const sal_uInt16* SfxTabDialog::GetInputRanges( const SfxItemPool& rPool ) return pRanges; } -// ----------------------------------------------------------------------- + void SfxTabDialog::SetInputSet( const SfxItemSet* pInSet ) diff --git a/sfx2/source/dialog/taskpane.cxx b/sfx2/source/dialog/taskpane.cxx index 48db4d06e10b..63ddd9598f33 100644 --- a/sfx2/source/dialog/taskpane.cxx +++ b/sfx2/source/dialog/taskpane.cxx @@ -94,7 +94,7 @@ namespace sfx2 //================================================================================================================== namespace { - //-------------------------------------------------------------------------------------------------------------- + ::utl::OConfigurationTreeRoot lcl_getModuleUIElementStatesConfig( const OUString& i_rModuleIdentifier, const OUString& i_rResourceURL = OUString() ) { @@ -122,7 +122,7 @@ namespace sfx2 return ::utl::OConfigurationTreeRoot( xContext, aPathComposer.makeStringAndClear(), false ); } - //-------------------------------------------------------------------------------------------------------------- + OUString lcl_identifyModule( const Reference< XFrame >& i_rDocumentFrame ) { OUString sModuleName; @@ -139,7 +139,7 @@ namespace sfx2 return sModuleName; } - //-------------------------------------------------------------------------------------------------------------- + Reference< XFrame > lcl_getFrame( const SfxBindings* i_pBindings ) { const SfxViewFrame* pViewFrame = i_pBindings->GetDispatcher()->GetFrame(); @@ -148,14 +148,14 @@ namespace sfx2 return xFrame; } - //-------------------------------------------------------------------------------------------------------------- + OUString lcl_getPanelHelpURL( const ::utl::OConfigurationNode& i_rPanelConfigNode ) { const OUString sHelpURL( ::comphelper::getString( i_rPanelConfigNode.getNodeValue( "HelpURL" ) ) ); return sHelpURL; } - //-------------------------------------------------------------------------------------------------------------- + Image lcl_getPanelImage( const Reference< XFrame >& i_rDocFrame, const ::utl::OConfigurationNode& i_rPanelConfigNode ) { const OUString sImageURL( ::comphelper::getString( i_rPanelConfigNode.getNodeValue( "ImageURL" ) ) ); @@ -199,7 +199,7 @@ namespace sfx2 //================================================================================================================== //= TaskPaneDockingWindow //================================================================================================================== - //------------------------------------------------------------------------------------------------------------------ + TaskPaneDockingWindow::TaskPaneDockingWindow( SfxBindings* i_pBindings, TaskPaneWrapper& i_rWrapper, Window* i_pParent, WinBits i_nBits ) :TitledDockingWindow( i_pBindings, &i_rWrapper, i_pParent, i_nBits ) ,m_aTaskPane( GetContentWindow(), lcl_getFrame( i_pBindings ) ) @@ -209,20 +209,20 @@ namespace sfx2 SetText( SfxResId( SID_TASKPANE ).toString() ); } - //------------------------------------------------------------------------------------------------------------------ + void TaskPaneDockingWindow::ActivateToolPanel( const OUString& i_rPanelURL ) { m_aPaneController.ActivateToolPanel( i_rPanelURL ); } - //------------------------------------------------------------------------------------------------------------------ + void TaskPaneDockingWindow::GetFocus() { TitledDockingWindow::GetFocus(); m_aTaskPane.GrabFocus(); } - //------------------------------------------------------------------------------------------------------------------ + void TaskPaneDockingWindow::onLayoutDone() { m_aTaskPane.SetPosSizePixel( Point(), GetContentWindow().GetOutputSizePixel() ); @@ -231,10 +231,10 @@ namespace sfx2 //================================================================================================================== //= TaskPaneWrapper //================================================================================================================== - //------------------------------------------------------------------------------------------------------------------ + SFX_IMPL_DOCKINGWINDOW( TaskPaneWrapper, SID_TASKPANE ); - //------------------------------------------------------------------------------------------------------------------ + TaskPaneWrapper::TaskPaneWrapper( Window* i_pParent, sal_uInt16 i_nId, SfxBindings* i_pBindings, SfxChildWinInfo* i_pInfo ) :SfxChildWindow( i_pParent, i_nId ) { @@ -251,7 +251,7 @@ namespace sfx2 pWindow->Show(); } - //------------------------------------------------------------------------------------------------------------------ + void TaskPaneWrapper::ActivateToolPanel( const OUString& i_rPanelURL ) { TaskPaneDockingWindow* pDockingWindow = dynamic_cast< TaskPaneDockingWindow* >( GetWindow() ); @@ -331,7 +331,7 @@ namespace sfx2 bool m_bAttemptedCreation; }; - //------------------------------------------------------------------------------------------------------------------ + CustomToolPanel::CustomToolPanel( const ::utl::OConfigurationNode& i_rPanelWindowState, const Reference< XFrame >& i_rFrame ) :m_sUIName( ::comphelper::getString( i_rPanelWindowState.getNodeValue( "UIName" ) ) ) ,m_aPanelImage( lcl_getPanelImage( i_rFrame, i_rPanelWindowState ) ) @@ -344,12 +344,12 @@ namespace sfx2 { } - //------------------------------------------------------------------------------------------------------------------ + CustomToolPanel::~CustomToolPanel() { } - //------------------------------------------------------------------------------------------------------------------ + bool CustomToolPanel::impl_ensureToolPanelWindow( Window& i_rPanelParentWindow ) { if ( m_bAttemptedCreation ) @@ -377,7 +377,7 @@ namespace sfx2 return m_aCustomPanel.is(); } - //------------------------------------------------------------------------------------------------------------------ + void CustomToolPanel::impl_updatePanelConfig( const bool i_bVisible ) const { ::utl::OConfigurationTreeRoot aConfig( ::comphelper::getProcessComponentContext(), m_sPanelConfigPath, true ); @@ -386,13 +386,13 @@ namespace sfx2 aConfig.commit(); } - //------------------------------------------------------------------------------------------------------------------ + OUString CustomToolPanel::GetDisplayName() const { return m_sUIName; } - //------------------------------------------------------------------------------------------------------------------ + Image CustomToolPanel::GetImage() const { return m_aPanelImage; @@ -407,13 +407,13 @@ namespace sfx2 return OUStringToOString( _rHelpURL, RTL_TEXTENCODING_UTF8 ); } - //------------------------------------------------------------------------------------------------------------------ + OString CustomToolPanel::GetHelpID() const { return lcl_getHelpId( m_aPanelHelpURL ); } - //------------------------------------------------------------------------------------------------------------------ + void CustomToolPanel::Activate( Window& i_rParentWindow ) { ENSURE_OR_RETURN_VOID( impl_ensureToolPanelWindow( i_rParentWindow ), "no panel to activate!" ); @@ -426,7 +426,7 @@ namespace sfx2 impl_updatePanelConfig( true ); } - //------------------------------------------------------------------------------------------------------------------ + void CustomToolPanel::Deactivate() { ENSURE_OR_RETURN_VOID( m_aCustomPanel.is(), "no panel to deactivate!" ); @@ -437,7 +437,7 @@ namespace sfx2 impl_updatePanelConfig( false ); } - //------------------------------------------------------------------------------------------------------------------ + void CustomToolPanel::SetSizePixel( const Size& i_rPanelWindowSize ) { ENSURE_OR_RETURN_VOID( m_aCustomPanel.is(), "no panel/window to position!" ); @@ -453,7 +453,7 @@ namespace sfx2 } } - //------------------------------------------------------------------------------------------------------------------ + void CustomToolPanel::GrabFocus() { ENSURE_OR_RETURN_VOID( m_aCustomPanel.is(), "no panel/window to focus!" ); @@ -461,7 +461,7 @@ namespace sfx2 m_aCustomPanel.getPanelWindow()->setFocus(); } - //------------------------------------------------------------------------------------------------------------------ + void CustomToolPanel::Dispose() { if ( !m_bAttemptedCreation ) @@ -480,7 +480,7 @@ namespace sfx2 } } - //------------------------------------------------------------------------------------------------------------------ + Reference< XAccessible > CustomToolPanel::CreatePanelAccessible( const Reference< XAccessible >& i_rParentAccessible ) { ENSURE_OR_RETURN( m_aCustomPanel.is(), "no panel to ask!", NULL ); @@ -550,32 +550,32 @@ namespace sfx2 ::svt::ToolPanelDeck m_aPanelDeck; }; - //------------------------------------------------------------------------------------------------------------------ + void ModuleTaskPane_Impl::OnResize() { m_aPanelDeck.SetPosSizePixel( Point(), m_rAntiImpl.GetOutputSizePixel() ); } - //------------------------------------------------------------------------------------------------------------------ + void ModuleTaskPane_Impl::OnGetFocus() { m_aPanelDeck.GrabFocus(); } - //------------------------------------------------------------------------------------------------------------------ + IMPL_LINK( ModuleTaskPane_Impl, OnActivatePanel, void*, i_pArg ) { m_aPanelDeck.ActivatePanel( reinterpret_cast< size_t >( i_pArg ) ); return 1L; } - //------------------------------------------------------------------------------------------------------------------ + bool ModuleTaskPane_Impl::impl_isToolPanelResource( const OUString& i_rResourceURL ) { return i_rResourceURL.startsWith( "private:resource/toolpanel/" ); } - //------------------------------------------------------------------------------------------------------------------ + void ModuleTaskPane_Impl::impl_initFromConfiguration( const IToolPanelCompare* i_pPanelCompare ) { const ::utl::OConfigurationTreeRoot aWindowStateConfig( lcl_getModuleUIElementStatesConfig( m_sModuleIdentifier ) ); @@ -634,7 +634,7 @@ namespace sfx2 } } - //------------------------------------------------------------------------------------------------------------------ + bool ModuleTaskPane_Impl::ModuleHasToolPanels( const OUString& i_rModuleIdentifier ) { const ::utl::OConfigurationTreeRoot aWindowStateConfig( lcl_getModuleUIElementStatesConfig( i_rModuleIdentifier ) ); @@ -653,7 +653,7 @@ namespace sfx2 return false; } - //------------------------------------------------------------------------------------------------------------------ + ::boost::optional< size_t > ModuleTaskPane_Impl::GetPanelPos( const OUString& i_rResourceURL ) { ::boost::optional< size_t > aPanelPos; @@ -676,7 +676,7 @@ namespace sfx2 return aPanelPos; } - //------------------------------------------------------------------------------------------------------------------ + OUString ModuleTaskPane_Impl::GetPanelResourceURL( const size_t i_nPanelPos ) const { ENSURE_OR_RETURN( i_nPanelPos < m_aPanelDeck.GetPanelCount(), "ModuleTaskPane_Impl::GetPanelResourceURL: illegal panel position!", OUString() ); @@ -686,7 +686,7 @@ namespace sfx2 return pCustomPanel->GetResourceURL(); } - //------------------------------------------------------------------------------------------------------------------ + void ModuleTaskPane_Impl::SetDrawersLayout() { const ::svt::PDeckLayouter pLayouter( m_aPanelDeck.GetLayouter() ); @@ -697,7 +697,7 @@ namespace sfx2 m_aPanelDeck.SetLayouter( new ::svt::DrawerDeckLayouter( m_aPanelDeck, m_aPanelDeck ) ); } - //------------------------------------------------------------------------------------------------------------------ + void ModuleTaskPane_Impl::SetTabsLayout( const ::svt::TabAlignment i_eTabAlignment, const ::svt::TabItemContent i_eTabContent ) { ::svt::PDeckLayouter pLayouter( m_aPanelDeck.GetLayouter() ); @@ -722,63 +722,63 @@ namespace sfx2 //================================================================================================================== //= ModuleTaskPane //================================================================================================================== - //------------------------------------------------------------------------------------------------------------------ + ModuleTaskPane::ModuleTaskPane( Window& i_rParentWindow, const Reference< XFrame >& i_rDocumentFrame ) :Window( &i_rParentWindow, WB_DIALOGCONTROL ) ,m_pImpl( new ModuleTaskPane_Impl( *this, i_rDocumentFrame, NULL ) ) { } - //------------------------------------------------------------------------------------------------------------------ + ModuleTaskPane::~ModuleTaskPane() { } - //------------------------------------------------------------------------------------------------------------------ + bool ModuleTaskPane::ModuleHasToolPanels( const Reference< XFrame >& i_rDocumentFrame ) { return ModuleTaskPane_Impl::ModuleHasToolPanels( lcl_identifyModule( i_rDocumentFrame ) ); } - //------------------------------------------------------------------------------------------------------------------ + void ModuleTaskPane::Resize() { Window::Resize(); m_pImpl->OnResize(); } - //------------------------------------------------------------------------------------------------------------------ + void ModuleTaskPane::GetFocus() { Window::GetFocus(); m_pImpl->OnGetFocus(); } - //------------------------------------------------------------------------------------------------------------------ + ::svt::ToolPanelDeck& ModuleTaskPane::GetPanelDeck() { return m_pImpl->GetPanelDeck(); } - //------------------------------------------------------------------------------------------------------------------ + const ::svt::ToolPanelDeck& ModuleTaskPane::GetPanelDeck() const { return m_pImpl->GetPanelDeck(); } - //------------------------------------------------------------------------------------------------------------------ + ::boost::optional< size_t > ModuleTaskPane::GetPanelPos( const OUString& i_rResourceURL ) { return m_pImpl->GetPanelPos( i_rResourceURL ); } - //------------------------------------------------------------------------------------------------------------------ + void ModuleTaskPane::SetDrawersLayout() { m_pImpl->SetDrawersLayout(); } - //------------------------------------------------------------------------------------------------------------------ + void ModuleTaskPane::SetTabsLayout( const ::svt::TabAlignment i_eTabAlignment, const ::svt::TabItemContent i_eTabContent ) { m_pImpl->SetTabsLayout( i_eTabAlignment, i_eTabContent ); @@ -906,7 +906,7 @@ namespace sfx2 OUString m_sDefaultTitle; }; - //------------------------------------------------------------------------------------------------------------------ + TaskPaneController_Impl::TaskPaneController_Impl( ModuleTaskPane& i_rTaskPane, TitledDockingWindow& i_rDockingWindow ) :m_rTaskPane( i_rTaskPane ) ,m_rDockingWindow( i_rDockingWindow ) @@ -937,7 +937,7 @@ namespace sfx2 SetDefaultTitle( SfxResId( STR_SFX_TASKS ).toString() ); } - //------------------------------------------------------------------------------------------------------------------ + TaskPaneController_Impl::~TaskPaneController_Impl() { m_rTaskPane.GetPanelDeck().RemoveListener( *this ); @@ -955,14 +955,14 @@ namespace sfx2 m_aPanelRepository.clear(); } - // ----------------------------------------------------------------------------------------------------------------- + void TaskPaneController_Impl::SetDefaultTitle( const OUString& i_rTitle ) { m_sDefaultTitle = i_rTitle; impl_updateDockingWindowTitle(); } - //------------------------------------------------------------------------------------------------------------------ + void TaskPaneController_Impl::ActivateToolPanel( const OUString& i_rPanelURL ) { ::boost::optional< size_t > aPanelPos( m_rTaskPane.GetPanelPos( i_rPanelURL ) ); @@ -979,7 +979,7 @@ namespace sfx2 } } - // ----------------------------------------------------------------------------------------------------------------- + IMPL_LINK( TaskPaneController_Impl, DockingChanged, TitledDockingWindow*, i_pDockingWindow ) { ENSURE_OR_RETURN( i_pDockingWindow && &m_rDockingWindow, "TaskPaneController_Impl::DockingChanged: where does this come from?", 0L ); @@ -991,7 +991,7 @@ namespace sfx2 return 1L; } - // ----------------------------------------------------------------------------------------------------------------- + IMPL_LINK( TaskPaneController_Impl, OnToolboxClicked, ToolBox*, i_pToolBox ) { if ( i_pToolBox->GetCurItemId() == m_nViewMenuID ) @@ -1012,7 +1012,7 @@ namespace sfx2 return 0; } - // --------------------------------------------------------------------------------------------------------------------- + IMPL_LINK( TaskPaneController_Impl, OnMenuItemSelected, Menu*, i_pMenu ) { ENSURE_OR_RETURN( i_pMenu, "TaskPaneController_Impl::OnMenuItemSelected: illegal menu!", 0L ); @@ -1047,7 +1047,7 @@ namespace sfx2 return 1L; } - // --------------------------------------------------------------------------------------------------------------------- + size_t TaskPaneController_Impl::impl_getLogicalPanelIndex( const size_t i_nVisibleIndex ) { size_t nLogicalIndex = 0; @@ -1065,7 +1065,7 @@ namespace sfx2 return nLogicalIndex; } - // --------------------------------------------------------------------------------------------------------------------- + void TaskPaneController_Impl::PanelInserted( const ::svt::PToolPanel& i_pPanel, const size_t i_nPosition ) { if ( m_bTogglingPanelVisibility ) @@ -1075,7 +1075,7 @@ namespace sfx2 m_aPanelRepository.insert( m_aPanelRepository.begin() + nLogicalIndex, PanelDescriptor( i_pPanel ) ); } - // --------------------------------------------------------------------------------------------------------------------- + void TaskPaneController_Impl::PanelRemoved( const size_t i_nPosition ) { if ( m_bTogglingPanelVisibility ) @@ -1085,7 +1085,7 @@ namespace sfx2 m_aPanelRepository.erase( m_aPanelRepository.begin() + nLogicalIndex ); } - // --------------------------------------------------------------------------------------------------------------------- + void TaskPaneController_Impl::ActivePanelChanged( const ::boost::optional< size_t >& i_rOldActive, const ::boost::optional< size_t >& i_rNewActive ) { if ( impl_getLayout() == LAYOUT_DRAWERS ) @@ -1097,14 +1097,14 @@ namespace sfx2 (void)i_rNewActive; } - // --------------------------------------------------------------------------------------------------------------------- + void TaskPaneController_Impl::LayouterChanged( const ::svt::PDeckLayouter& i_rNewLayouter ) { // not interested in (void)i_rNewLayouter; } - // --------------------------------------------------------------------------------------------------------------------- + void TaskPaneController_Impl::Dying() { OSL_FAIL( "TaskPaneController_Impl::Dying: unexpected call!" ); @@ -1112,7 +1112,7 @@ namespace sfx2 // as listener from the panel deck, this method here should never be called. } - // --------------------------------------------------------------------------------------------------------------------- + void TaskPaneController_Impl::impl_togglePanelVisibility( const size_t i_nLogicalPanelIndex ) { ENSURE_OR_RETURN_VOID( i_nLogicalPanelIndex < m_aPanelRepository.size(), "illegal index" ); @@ -1147,7 +1147,7 @@ namespace sfx2 m_rTaskPane.GetPanelDeck().ActivatePanel( *aActivatePanel ); } - // --------------------------------------------------------------------------------------------------------------------- + void TaskPaneController_Impl::impl_setLayout( const PanelSelectorLayout i_eLayout, const bool i_bForce ) { if ( !i_bForce && ( m_eCurrentLayout == i_eLayout ) ) @@ -1176,7 +1176,7 @@ namespace sfx2 impl_updateDockingWindowTitle(); } - // --------------------------------------------------------------------------------------------------------------------- + void TaskPaneController_Impl::impl_updateDockingWindowTitle() { ::boost::optional< size_t > aActivePanel( m_rTaskPane.GetPanelDeck().GetActivePanel() ); @@ -1200,7 +1200,7 @@ namespace sfx2 } } - // --------------------------------------------------------------------------------------------------------------------- + SAL_WNODEPRECATED_DECLARATIONS_PUSH ::std::auto_ptr< PopupMenu > TaskPaneController_Impl::impl_createPopupMenu() const { @@ -1255,18 +1255,18 @@ namespace sfx2 //================================================================================================================== //= TaskPaneController //================================================================================================================== - //------------------------------------------------------------------------------------------------------------------ + TaskPaneController::TaskPaneController( ModuleTaskPane& i_rTaskPane, TitledDockingWindow& i_rDockingWindow ) :m_pImpl( new TaskPaneController_Impl( i_rTaskPane, i_rDockingWindow ) ) { } - //------------------------------------------------------------------------------------------------------------------ + TaskPaneController::~TaskPaneController() { } - //------------------------------------------------------------------------------------------------------------------ + void TaskPaneController::ActivateToolPanel( const OUString& i_rPanelURL ) { m_pImpl->ActivateToolPanel( i_rPanelURL ); diff --git a/sfx2/source/dialog/templdlg.cxx b/sfx2/source/dialog/templdlg.cxx index fbb51f8844b5..c5feb4f0e755 100644 --- a/sfx2/source/dialog/templdlg.cxx +++ b/sfx2/source/dialog/templdlg.cxx @@ -92,7 +92,7 @@ TYPEINIT1(SfxTemplateDialog_Impl,SfxCommonTemplateDialog_Impl); SFX_IMPL_DOCKINGWINDOW_WITHID(SfxTemplateDialogWrapper, SID_STYLE_DESIGNER) -//------------------------------------------------------------------------- + class SfxCommonTemplateDialog_Impl::DeletionWatcher : private boost::noncopyable { @@ -147,7 +147,7 @@ SfxTemplateDialog::SfxTemplateDialog pImpl->updateNonFamilyImages(); } -//------------------------------------------------------------------------- + SfxTemplateDialog::~SfxTemplateDialog() { @@ -167,7 +167,7 @@ void SfxTemplateDialog::SetParagraphFamily() pImpl->SetAutomaticFilter(); } -// ------------------------------------------------------------------------ + void SfxTemplateDialog::DataChanged( const DataChangedEvent& _rDCEvt ) { @@ -181,14 +181,14 @@ void SfxTemplateDialog::DataChanged( const DataChangedEvent& _rDCEvt ) SfxDockingWindow::DataChanged( _rDCEvt ); } -//------------------------------------------------------------------------- + void SfxTemplateDialog::Update() { pImpl->Update(); } -//------------------------------------------------------------------------- + void SfxTemplateDialog::Resize() { @@ -198,7 +198,7 @@ void SfxTemplateDialog::Resize() } -//------------------------------------------------------------------------- + SfxChildAlignment SfxTemplateDialog::CheckAlignment(SfxChildAlignment eActAlign,SfxChildAlignment eAlign) { @@ -225,7 +225,7 @@ SfxChildAlignment SfxTemplateDialog::CheckAlignment(SfxChildAlignment eActAlign, } } -//------------------------------------------------------------------------- + void DropListBox_Impl::MouseButtonDown( const MouseEvent& rMEvt ) { @@ -259,7 +259,7 @@ sal_Int8 DropListBox_Impl::AcceptDrop( const AcceptDropEvent& rEvt ) return SvTreeListBox::AcceptDrop( rEvt ); } -//------------------------------------------------------------------------- + sal_Int8 DropListBox_Impl::ExecuteDrop( const ExecuteDropEvent& rEvt ) { @@ -329,7 +329,7 @@ bool DropListBox_Impl::Notify( NotifyEvent& rNEvt ) } -//------------------------------------------------------------------------- + SfxActionListBox::SfxActionListBox @@ -350,7 +350,7 @@ SfxActionListBox::SfxActionListBox EnableContextMenuHandling(); } -//------------------------------------------------------------------------- + PopupMenu* SfxActionListBox::CreateContextMenu( void ) { @@ -363,7 +363,7 @@ PopupMenu* SfxActionListBox::CreateContextMenu( void ) return pDialog->CreateContextMenu(); } -//------------------------------------------------------------------------- + SfxTemplateDialogWrapper::SfxTemplateDialogWrapper(Window *pParentWnd, sal_uInt16 nId, SfxBindings *p, SfxChildWinInfo *pInfo) : @@ -505,7 +505,7 @@ void SfxTemplatePanelControl::StateChanged( StateChangedType nStateChange ) DockingWindow::StateChanged( nStateChange ); } -//------------------------------------------------------------------------- + void StyleTreeListBox_Impl::MakeExpanded_Impl(ExpandedEntries_t& rEntries) const { @@ -536,7 +536,7 @@ sal_Bool StyleTreeListBox_Impl::DoubleClickHdl() return sal_False; } -//------------------------------------------------------------------------- + void StyleTreeListBox_Impl::Command( const CommandEvent& rCEvt ) @@ -549,7 +549,7 @@ void StyleTreeListBox_Impl::Command( const CommandEvent& rCEvt ) SvTreeListBox::Command(rCEvt); } -//------------------------------------------------------------------------- + bool StyleTreeListBox_Impl::Notify( NotifyEvent& rNEvt ) { @@ -572,7 +572,7 @@ bool StyleTreeListBox_Impl::Notify( NotifyEvent& rNEvt ) return nRet; } -//------------------------------------------------------------------------- + sal_Bool StyleTreeListBox_Impl::NotifyMoving(SvTreeListEntry* pTarget, SvTreeListEntry* pEntry, @@ -601,7 +601,7 @@ sal_Bool StyleTreeListBox_Impl::NotifyMoving(SvTreeListEntry* pTarget, return bRet? (sal_Bool)2: sal_False; } -//------------------------------------------------------------------------- + bool StyleTreeListBox_Impl::ExpandingHdl() @@ -618,7 +618,7 @@ bool StyleTreeListBox_Impl::ExpandingHdl() return true; } -//------------------------------------------------------------------------- + void StyleTreeListBox_Impl::ExpandedHdl() @@ -638,7 +638,7 @@ void StyleTreeListBox_Impl::ExpandedHdl() pCurEntry = 0; } -//------------------------------------------------------------------------- + StyleTreeListBox_Impl::StyleTreeListBox_Impl( SfxCommonTemplateDialog_Impl* pParent, WinBits nWinStyle) : @@ -653,7 +653,7 @@ StyleTreeListBox_Impl::StyleTreeListBox_Impl( EnableContextMenuHandling(); } -//------------------------------------------------------------------------- + class StyleTreeArr_Impl; @@ -693,14 +693,14 @@ sal_uIntPtr StyleTree_Impl::Count() return pChildren ? pChildren->size() : 0L; } -//------------------------------------------------------------------------- + StyleTree_Impl::~StyleTree_Impl() { delete pChildren; } -//------------------------------------------------------------------------- + void StyleTree_Impl::Put(StyleTree_Impl* pIns, sal_uIntPtr lPos) { @@ -713,7 +713,7 @@ void StyleTree_Impl::Put(StyleTree_Impl* pIns, sal_uIntPtr lPos) pChildren->insert( pChildren->begin() + (sal_uInt16)lPos, pIns ); } -//------------------------------------------------------------------------- + StyleTreeArr_Impl &MakeTree_Impl(StyleTreeArr_Impl &rArr) { @@ -757,7 +757,7 @@ StyleTreeArr_Impl &MakeTree_Impl(StyleTreeArr_Impl &rArr) return rArr; } -//------------------------------------------------------------------------- + inline sal_Bool IsExpanded_Impl( const ExpandedEntries_t& rEntries, @@ -785,7 +785,7 @@ SvTreeListEntry* FillBox_Impl(SvTreeListBox *pBox, return pNewEntry; } -//------------------------------------------------------------------------- + // Constructor SfxCommonTemplateDialog_Impl::SfxCommonTemplateDialog_Impl( SfxBindings* pB, Window* pW, bool ) : @@ -836,7 +836,7 @@ SfxCommonTemplateDialog_Impl::SfxCommonTemplateDialog_Impl( SfxBindings* pB, Win aFmtLb.SetFont( aFont ); } -//------------------------------------------------------------------------- + sal_uInt16 SfxCommonTemplateDialog_Impl::StyleNrToInfoOffset(sal_uInt16 nId) { @@ -844,7 +844,7 @@ sal_uInt16 SfxCommonTemplateDialog_Impl::StyleNrToInfoOffset(sal_uInt16 nId) return SfxFamilyIdToNId(pItem->GetFamily())-1; } -//------------------------------------------------------------------------- + void SfxTemplateDialog_Impl::EnableEdit(sal_Bool bEnable) { @@ -853,7 +853,7 @@ void SfxTemplateDialog_Impl::EnableEdit(sal_Bool bEnable) EnableItem( SID_STYLE_UPDATE_BY_EXAMPLE, bEnable); } -//------------------------------------------------------------------------- + void SfxCommonTemplateDialog_Impl::ReadResource() { @@ -953,7 +953,7 @@ void SfxCommonTemplateDialog_Impl::ReadResource() pModule = pCurObjShell ? pCurObjShell->GetModule() : NULL; } -//------------------------------------------------------------------------- + void SfxCommonTemplateDialog_Impl::ClearResource() { @@ -979,7 +979,7 @@ void SfxCommonTemplateDialog_Impl::impl_setDeletionWatcher(DeletionWatcher* pNew m_pDeletionWatcher = pNewWatcher; } -//------------------------------------------------------------------------- + void SfxCommonTemplateDialog_Impl::Initialize() { @@ -1001,7 +1001,7 @@ void SfxCommonTemplateDialog_Impl::Initialize() aFmtLb.Show(); } -//------------------------------------------------------------------------- + SfxCommonTemplateDialog_Impl::~SfxCommonTemplateDialog_Impl() { @@ -1027,7 +1027,7 @@ SfxCommonTemplateDialog_Impl::~SfxCommonTemplateDialog_Impl() m_pDeletionWatcher->signal(); } -//------------------------------------------------------------------------- + sal_uInt16 SfxCommonTemplateDialog_Impl::SfxFamilyIdToNId( SfxStyleFamily nFamily ) { @@ -1059,7 +1059,7 @@ void SfxCommonTemplateDialog_Impl::SetAutomaticFilter() } } -//------------------------------------------------------------------------- + // Helper function: Access to the current family item const SfxStyleFamilyItem *SfxCommonTemplateDialog_Impl::GetFamilyItem_Impl() const { @@ -1083,7 +1083,7 @@ SfxStyleSheetBase *SfxCommonTemplateDialog_Impl::GetSelectedStyle() const return pStyleSheetPool->Find( aTemplName, pItem->GetFamily(), SFXSTYLEBIT_ALL ); } -//------------------------------------------------------------------------- + void SfxCommonTemplateDialog_Impl::SelectStyle(const OUString &rStr) { @@ -1158,7 +1158,7 @@ void SfxCommonTemplateDialog_Impl::SelectStyle(const OUString &rStr) } } -//------------------------------------------------------------------------- + OUString SfxCommonTemplateDialog_Impl::GetSelectedEntry() const { @@ -1178,7 +1178,7 @@ OUString SfxCommonTemplateDialog_Impl::GetSelectedEntry() const return aRet; } -//------------------------------------------------------------------------- + void SfxCommonTemplateDialog_Impl::EnableTreeDrag( sal_Bool bEnable ) { @@ -1196,7 +1196,7 @@ void SfxCommonTemplateDialog_Impl::EnableTreeDrag( sal_Bool bEnable ) bTreeDrag = bEnable; } -//------------------------------------------------------------------------- + void SfxCommonTemplateDialog_Impl::FillTreeBox() { @@ -1250,7 +1250,7 @@ void SfxCommonTemplateDialog_Impl::FillTreeBox() } } -//------------------------------------------------------------------------- + sal_Bool SfxCommonTemplateDialog_Impl::HasSelectedStyle() const { return pTreeBox? pTreeBox->FirstSelected() != 0: @@ -1258,7 +1258,7 @@ sal_Bool SfxCommonTemplateDialog_Impl::HasSelectedStyle() const } -//------------------------------------------------------------------------- + // internal: Refresh the display // nFlags: what we should update. @@ -1403,7 +1403,7 @@ void SfxCommonTemplateDialog_Impl::UpdateStyles_Impl(sal_uInt16 nFlags) } } -//------------------------------------------------------------------------- + // Updated display: Watering the house void SfxCommonTemplateDialog_Impl::SetWaterCanState(const SfxBoolItem *pItem) @@ -1444,7 +1444,7 @@ void SfxCommonTemplateDialog_Impl::SetWaterCanState(const SfxBoolItem *pItem) pBindings->LeaveRegistrations(); } -//------------------------------------------------------------------------- + // Item with the status of a Family is copied and noted // (is updated when all states have also been updated.) @@ -1462,7 +1462,7 @@ void SfxCommonTemplateDialog_Impl::SetFamilyState( sal_uInt16 nSlotId, const Sfx bUpdateFamily = sal_True; } -//------------------------------------------------------------------------- + // Notice from SfxBindings that the update is completed. Pushes out the update // of the display. @@ -1564,7 +1564,7 @@ void SfxCommonTemplateDialog_Impl::Update_Impl() EnableNew( bCanNew ); } -//------------------------------------------------------------------------- + IMPL_LINK( SfxCommonTemplateDialog_Impl, TimeOut, Timer *, pTim ) { @@ -1594,7 +1594,7 @@ IMPL_LINK( SfxCommonTemplateDialog_Impl, TimeOut, Timer *, pTim ) } -//------------------------------------------------------------------------- + void SfxCommonTemplateDialog_Impl::Notify(SfxBroadcaster& /*rBC*/, const SfxHint& rHint) { // tap update @@ -1689,7 +1689,7 @@ void SfxCommonTemplateDialog_Impl::Notify(SfxBroadcaster& /*rBC*/, const SfxHint } -//------------------------------------------------------------------------- + // Other filters; can be switched by the users or as a result of new or // editing, if the current document has been assigned a different filter. void SfxCommonTemplateDialog_Impl::FilterSelect( @@ -1715,7 +1715,7 @@ void SfxCommonTemplateDialog_Impl::FilterSelect( } } -//------------------------------------------------------------------------- + // Internal: Perform functions through the Dispatcher sal_Bool SfxCommonTemplateDialog_Impl::Execute_Impl( @@ -1781,7 +1781,7 @@ sal_Bool SfxCommonTemplateDialog_Impl::Execute_Impl( return sal_True; } -//------------------------------------------------------------------------- + // Handler der Listbox der Filter void SfxCommonTemplateDialog_Impl::EnableHierarchical(bool const bEnable) @@ -1843,7 +1843,7 @@ IMPL_LINK( SfxCommonTemplateDialog_Impl, FilterSelectHdl, ListBox *, pBox ) return 0; } -//------------------------------------------------------------------------- + // Select-Handler for the Toolbox void SfxCommonTemplateDialog_Impl::FamilySelect(sal_uInt16 nEntry) @@ -1861,7 +1861,7 @@ void SfxCommonTemplateDialog_Impl::FamilySelect(sal_uInt16 nEntry) } } -//------------------------------------------------------------------------- + void SfxCommonTemplateDialog_Impl::ActionSelect(sal_uInt16 nEntry) { @@ -1940,7 +1940,7 @@ void SfxCommonTemplateDialog_Impl::ActionSelect(sal_uInt16 nEntry) } } -//------------------------------------------------------------------------- + static OUString getModuleIdentifier( const Reference< XModuleManager2 >& i_xModMgr, SfxObjectShell* i_pObjSh ) { @@ -1965,7 +1965,7 @@ static OUString getModuleIdentifier( const Reference< XModuleManager2 >& i_xModM return sIdentifier; } -//------------------------------------------------------------------------- + sal_Int32 SfxCommonTemplateDialog_Impl::LoadFactoryStyleFilter( SfxObjectShell* i_pObjSh ) { @@ -1984,7 +1984,7 @@ sal_Int32 SfxCommonTemplateDialog_Impl::LoadFactoryStyleFilter( SfxObjectShell* return nFilter; } -//------------------------------------------------------------------------- + void SfxCommonTemplateDialog_Impl::SaveFactoryStyleFilter( SfxObjectShell* i_pObjSh, sal_Int32 i_nFilter ) { @@ -2008,7 +2008,7 @@ SfxObjectShell* SfxCommonTemplateDialog_Impl::SaveSelection() return pDocShell; } -//------------------------------------------------------------------------- + IMPL_LINK( SfxCommonTemplateDialog_Impl, DropHdl, StyleTreeListBox_Impl *, pBox ) { @@ -2020,7 +2020,7 @@ IMPL_LINK( SfxCommonTemplateDialog_Impl, DropHdl, StyleTreeListBox_Impl *, pBox return ret; } -//------------------------------------------------------------------------- + // Handler for the New-Buttons void SfxCommonTemplateDialog_Impl::NewHdl(void *) @@ -2058,7 +2058,7 @@ void SfxCommonTemplateDialog_Impl::NewHdl(void *) } } -//------------------------------------------------------------------------- + // Handler for the edit-Buttons void SfxCommonTemplateDialog_Impl::EditHdl(void *) @@ -2083,7 +2083,7 @@ void SfxCommonTemplateDialog_Impl::EditHdl(void *) } } -//------------------------------------------------------------------------- + // Handler for the Delete-Buttons void SfxCommonTemplateDialog_Impl::DeleteHdl(void *) @@ -2193,7 +2193,7 @@ void SfxCommonTemplateDialog_Impl::ShowHdl(void *) } } -//------------------------------------------------------------------------- + void SfxCommonTemplateDialog_Impl::EnableDelete() { @@ -2227,7 +2227,7 @@ void SfxCommonTemplateDialog_Impl::EnableDelete() } } -//------------------------------------------------------------------------- + // After selecting a focused item if possible again on the app window void SfxCommonTemplateDialog_Impl::ResetFocus() { @@ -2241,7 +2241,7 @@ void SfxCommonTemplateDialog_Impl::ResetFocus() } } -//------------------------------------------------------------------------- + // Doppelclick on a style sheet in the ListBox is applied. IMPL_LINK( SfxCommonTemplateDialog_Impl, ApplyHdl, Control *, pControl ) @@ -2261,7 +2261,7 @@ IMPL_LINK( SfxCommonTemplateDialog_Impl, ApplyHdl, Control *, pControl ) return 0; } -//------------------------------------------------------------------------- + // Selection of a template during the Watercan-Status IMPL_LINK( SfxCommonTemplateDialog_Impl, FmtSelectHdl, SvTreeListBox *, pListBox ) @@ -2310,7 +2310,7 @@ IMPL_LINK( SfxCommonTemplateDialog_Impl, FmtSelectHdl, SvTreeListBox *, pListBox return 0; } -//------------------------------------------------------------------------- + IMPL_LINK( SfxCommonTemplateDialog_Impl, MenuSelectHdl, Menu *, pMenu ) { @@ -2333,7 +2333,7 @@ IMPL_LINK( SfxCommonTemplateDialog_Impl, MenuSelectHdl, Menu *, pMenu ) return sal_True; } -// ----------------------------------------------------------------------- + void SfxCommonTemplateDialog_Impl::ExecuteContextMenu_Impl( const Point& rPos, Window* pWin ) { @@ -2345,7 +2345,7 @@ void SfxCommonTemplateDialog_Impl::ExecuteContextMenu_Impl( const Point& rPos, W delete pMenu; } -// ----------------------------------------------------------------------- + SfxStyleFamily SfxCommonTemplateDialog_Impl::GetActualFamily() const { @@ -2356,7 +2356,7 @@ SfxStyleFamily SfxCommonTemplateDialog_Impl::GetActualFamily() const return pFamilyItem->GetFamily(); } -// ----------------------------------------------------------------------- + void SfxCommonTemplateDialog_Impl::EnableExample_Impl(sal_uInt16 nId, sal_Bool bEnable) { @@ -2374,7 +2374,7 @@ void SfxCommonTemplateDialog_Impl::PrepareDeleteAction() { } -// ----------------------------------------------------------------------- + PopupMenu* SfxCommonTemplateDialog_Impl::CreateContextMenu( void ) { @@ -2395,7 +2395,7 @@ PopupMenu* SfxCommonTemplateDialog_Impl::CreateContextMenu( void ) return pMenu; } -// ------------------------------------------------------------------------ + SfxTemplateDialog_Impl::SfxTemplateDialog_Impl( @@ -2440,14 +2440,14 @@ void SfxTemplateDialog_Impl::Initialize (void) m_aActionTbL.SetHelpId( HID_TEMPLDLG_TOOLBOX_LEFT ); } -// ------------------------------------------------------------------------ + void SfxTemplateDialog_Impl::EnableFamilyItem( sal_uInt16 nId, sal_Bool bEnable ) { m_aActionTbL.EnableItem( nId, bEnable ); } -//------------------------------------------------------------------------- + // Insert element into dropdown filter "Frame Styles", "List Styles", etc. void SfxTemplateDialog_Impl::InsertFamilyItem(sal_uInt16 nId,const SfxStyleFamilyItem *pItem) @@ -2466,7 +2466,7 @@ void SfxTemplateDialog_Impl::InsertFamilyItem(sal_uInt16 nId,const SfxStyleFamil m_aActionTbL.SetHelpId( nId, sHelpId ); } -// ------------------------------------------------------------------------ + void SfxTemplateDialog_Impl::ReplaceUpdateButtonByMenu() { @@ -2475,7 +2475,7 @@ void SfxTemplateDialog_Impl::ReplaceUpdateButtonByMenu() TIB_DROPDOWNONLY|m_aActionTbR.GetItemBits( SID_STYLE_NEW_BY_EXAMPLE )); } -// ------------------------------------------------------------------------ + void SfxTemplateDialog_Impl::updateFamilyImages() { if ( !m_pStyleFamiliesId ) @@ -2495,20 +2495,20 @@ void SfxTemplateDialog_Impl::updateFamilyImages() } } -// ------------------------------------------------------------------------ + void SfxTemplateDialog_Impl::updateNonFamilyImages() { m_aActionTbR.SetImageList( ImageList( SfxResId( DLG_STYLE_DESIGNER ) ) ); } -// ------------------------------------------------------------------------ + void SfxTemplateDialog_Impl::ClearFamilyList() { m_aActionTbL.Clear(); } -//------------------------------------------------------------------------- + void SfxCommonTemplateDialog_Impl::InvalidateBindings() { @@ -2524,13 +2524,13 @@ void SfxCommonTemplateDialog_Impl::InvalidateBindings() pBindings->Update( SID_STYLE_DRAGHIERARCHIE ); } -//------------------------------------------------------------------------- + SfxTemplateDialog_Impl::~SfxTemplateDialog_Impl() { } -//------------------------------------------------------------------------- + void SfxTemplateDialog_Impl::LoadedFamilies() { @@ -2538,7 +2538,7 @@ void SfxTemplateDialog_Impl::LoadedFamilies() Resize(); } -//------------------------------------------------------------------------- + // Overloaded Resize-Handler ( StarView ) // The size of the Listboxen is adjusted @@ -2611,7 +2611,7 @@ void SfxTemplateDialog_Impl::Resize() pTreeBox->SetSizePixel(aFmtSize); } -// ----------------------------------------------------------------------- + Size SfxTemplateDialog_Impl::GetMinOutputSizePixel() @@ -2630,7 +2630,7 @@ Size SfxTemplateDialog_Impl::GetMinOutputSizePixel() return Size(0,0); } -//------------------------------------------------------------------------- + void SfxTemplateDialog_Impl::Command( const CommandEvent& rCEvt ) { @@ -2643,7 +2643,7 @@ void SfxTemplateDialog_Impl::Command( const CommandEvent& rCEvt ) } } -//------------------------------------------------------------------------- + void SfxTemplateDialog_Impl::EnableItem(sal_uInt16 nMesId, sal_Bool bCheck) { @@ -2660,7 +2660,7 @@ void SfxTemplateDialog_Impl::EnableItem(sal_uInt16 nMesId, sal_Bool bCheck) } } -//------------------------------------------------------------------------- + void SfxTemplateDialog_Impl::CheckItem(sal_uInt16 nMesId, sal_Bool bCheck) { @@ -2675,7 +2675,7 @@ void SfxTemplateDialog_Impl::CheckItem(sal_uInt16 nMesId, sal_Bool bCheck) } } -//------------------------------------------------------------------------- + sal_Bool SfxTemplateDialog_Impl::IsCheckedItem(sal_uInt16 nMesId) { @@ -2688,7 +2688,7 @@ sal_Bool SfxTemplateDialog_Impl::IsCheckedItem(sal_uInt16 nMesId) } } -//------------------------------------------------------------------------- + IMPL_LINK_INLINE_START( SfxTemplateDialog_Impl, ToolBoxLSelect, ToolBox *, pBox ) { @@ -2698,7 +2698,7 @@ IMPL_LINK_INLINE_START( SfxTemplateDialog_Impl, ToolBoxLSelect, ToolBox *, pBox } IMPL_LINK_INLINE_END( SfxTemplateDialog_Impl, ToolBoxLSelect, ToolBox *, pBox ) -//------------------------------------------------------------------------- + static OUString lcl_GetLabel(uno::Any& rAny) { OUString sRet; @@ -2716,7 +2716,7 @@ static OUString lcl_GetLabel(uno::Any& rAny) } return sRet; } -//------------------------------------------------------------------------- + IMPL_LINK( SfxTemplateDialog_Impl, ToolBoxRSelect, ToolBox *, pBox ) { @@ -2726,7 +2726,7 @@ IMPL_LINK( SfxTemplateDialog_Impl, ToolBoxRSelect, ToolBox *, pBox ) ActionSelect(nEntry); return 0; } -//------------------------------------------------------------------------- + IMPL_LINK( SfxTemplateDialog_Impl, ToolBoxRClick, ToolBox *, pBox ) { const sal_uInt16 nEntry = pBox->GetCurItemId(); @@ -2778,14 +2778,14 @@ IMPL_LINK( SfxTemplateDialog_Impl, ToolBoxRClick, ToolBox *, pBox ) } return 0; } -//------------------------------------------------------------------------- + IMPL_LINK( SfxTemplateDialog_Impl, MenuSelectHdl, Menu*, pMenu) { sal_uInt16 nMenuId = pMenu->GetCurItemId(); ActionSelect(nMenuId); return 0; } -//------------------------------------------------------------------------- + void SfxCommonTemplateDialog_Impl::SetFamily( sal_uInt16 nId ) diff --git a/sfx2/source/dialog/titledockwin.cxx b/sfx2/source/dialog/titledockwin.cxx index dacebcabddb5..1499ca0a28eb 100644 --- a/sfx2/source/dialog/titledockwin.cxx +++ b/sfx2/source/dialog/titledockwin.cxx @@ -35,7 +35,7 @@ namespace sfx2 //================================================================================================================== //= TitledDockingWindow //================================================================================================================== - //------------------------------------------------------------------------------------------------------------------ + TitledDockingWindow::TitledDockingWindow( SfxBindings* i_pBindings, SfxChildWindow* i_pChildWindow, Window* i_pParent, WinBits i_nStyle ) :SfxDockingWindow( i_pBindings, i_pChildWindow, i_pParent, i_nStyle ) @@ -49,7 +49,7 @@ namespace sfx2 impl_construct(); } - //------------------------------------------------------------------------------------------------------------------ + TitledDockingWindow::TitledDockingWindow( SfxBindings* i_pBindings, SfxChildWindow* i_pChildWindow, Window* i_pParent, const ResId& i_rResId ) :SfxDockingWindow( i_pBindings, i_pChildWindow, i_pParent, i_rResId ) @@ -62,7 +62,7 @@ namespace sfx2 impl_construct(); } - //------------------------------------------------------------------------------------------------------------------ + void TitledDockingWindow::impl_construct() { SetBackground( Wallpaper() ); @@ -76,19 +76,19 @@ namespace sfx2 m_aContentWindow.Show(); } - //------------------------------------------------------------------------------------------------------------------ + TitledDockingWindow::~TitledDockingWindow() { } - //------------------------------------------------------------------------------------------------------------------ + void TitledDockingWindow::SetTitle( const OUString& i_rTitle ) { m_sTitle = i_rTitle; Invalidate(); } - //------------------------------------------------------------------------------------------------------------------ + void TitledDockingWindow::SetText( const OUString& i_rText ) { SfxDockingWindow::SetText( i_rText ); @@ -97,26 +97,26 @@ namespace sfx2 Invalidate(); } - //------------------------------------------------------------------------------------------------------------------ + void TitledDockingWindow::Resize() { SfxDockingWindow::Resize(); impl_scheduleLayout(); } - //------------------------------------------------------------------------------------------------------------------ + void TitledDockingWindow::onLayoutDone() { // not interested in } - //------------------------------------------------------------------------------------------------------------------ + void TitledDockingWindow::impl_scheduleLayout() { m_bLayoutPending = true; } - //------------------------------------------------------------------------------------------------------------------ + void TitledDockingWindow::impl_layout() { m_bLayoutPending = false; @@ -153,7 +153,7 @@ namespace sfx2 onLayoutDone(); } - //------------------------------------------------------------------------------------------------------------------ + void TitledDockingWindow::Paint( const Rectangle& i_rArea ) { if ( m_bLayoutPending ) @@ -220,13 +220,13 @@ namespace sfx2 Pop(); } - //------------------------------------------------------------------------------------------------------------------ + OUString TitledDockingWindow::impl_getTitle() const { return !m_sTitle.isEmpty() ? m_sTitle : GetText(); } - //------------------------------------------------------------------------------------------------------------------ + void TitledDockingWindow::impl_resetToolBox() { m_aToolbox.Clear(); @@ -237,7 +237,7 @@ namespace sfx2 m_aToolbox.ShowItem( 1 ); } - //------------------------------------------------------------------------------------------------------------------ + sal_uInt16 TitledDockingWindow::impl_addDropDownToolBoxItem( const OUString& i_rItemText, const OString& i_nHelpId, const Link& i_rCallback ) { // Add the menu before the closer button. @@ -256,7 +256,7 @@ namespace sfx2 return nItemId; } - //------------------------------------------------------------------------------------------------------------------ + IMPL_LINK( TitledDockingWindow, OnToolboxItemSelected, ToolBox*, pToolBox ) { const sal_uInt16 nId = pToolBox->GetCurItemId(); @@ -278,7 +278,7 @@ namespace sfx2 return 0; } - //------------------------------------------------------------------------------------------------------------------ + void TitledDockingWindow::StateChanged( StateChangedType i_nType ) { switch ( i_nType ) @@ -290,7 +290,7 @@ namespace sfx2 SfxDockingWindow::StateChanged( i_nType ); } - //------------------------------------------------------------------------------------------------------------------ + void TitledDockingWindow::EndDocking( const Rectangle& i_rRect, sal_Bool i_bFloatMode ) { SfxDockingWindow::EndDocking( i_rRect, i_bFloatMode ); @@ -299,7 +299,7 @@ namespace sfx2 m_aEndDockingHdl.Call( this ); } - //------------------------------------------------------------------------------------------------------------------ + void TitledDockingWindow::DataChanged( const DataChangedEvent& i_rDataChangedEvent ) { SfxDockingWindow::DataChanged( i_rDataChangedEvent ); diff --git a/sfx2/source/dialog/tplcitem.cxx b/sfx2/source/dialog/tplcitem.cxx index 38d77b15eb9d..de100e37bc23 100644 --- a/sfx2/source/dialog/tplcitem.cxx +++ b/sfx2/source/dialog/tplcitem.cxx @@ -44,14 +44,14 @@ SfxTemplateControllerItem::SfxTemplateControllerItem( nUserEventId(0) { } -// ----------------------------------------------------------------------- + SfxTemplateControllerItem::~SfxTemplateControllerItem() { if(nUserEventId) Application::RemoveUserEvent(nUserEventId); } -// ----------------------------------------------------------------------- + // Notice about change of status, is propagated through the Controller // passed on by the constructor diff --git a/sfx2/source/dialog/tplpitem.cxx b/sfx2/source/dialog/tplpitem.cxx index f34844c1ef18..58b7ce855a55 100644 --- a/sfx2/source/dialog/tplpitem.cxx +++ b/sfx2/source/dialog/tplpitem.cxx @@ -42,7 +42,7 @@ SfxTemplateItem::SfxTemplateItem { } -//------------------------------------------------------------------------- + // copy constuctor SfxTemplateItem::SfxTemplateItem( const SfxTemplateItem& rCopy ) : @@ -53,7 +53,7 @@ SfxTemplateItem::SfxTemplateItem( const SfxTemplateItem& rCopy ) : { } -//------------------------------------------------------------------------- + // op == @@ -63,14 +63,14 @@ bool SfxTemplateItem::operator==( const SfxPoolItem& rCmp ) const aStyle == ( (const SfxTemplateItem&)rCmp ).aStyle ); } -//------------------------------------------------------------------------- + SfxPoolItem* SfxTemplateItem::Clone( SfxItemPool *) const { return new SfxTemplateItem(*this); } -//------------------------------------------------------------------------- + bool SfxTemplateItem::QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/ ) const { ::com::sun::star::frame::status::Template aTemplate; @@ -82,7 +82,7 @@ bool SfxTemplateItem::QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 /*nM return true; } -//------------------------------------------------------------------------- + bool SfxTemplateItem::PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/ ) { ::com::sun::star::frame::status::Template aTemplate; @@ -97,7 +97,7 @@ bool SfxTemplateItem::PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 return false; } -//------------------------------------------------------------------------- + sal_uInt8 SfxTemplateItem::GetFlagCount() const { diff --git a/sfx2/source/dialog/versdlg.cxx b/sfx2/source/dialog/versdlg.cxx index 44164b417533..04f1f0a1aef5 100644 --- a/sfx2/source/dialog/versdlg.cxx +++ b/sfx2/source/dialog/versdlg.cxx @@ -151,7 +151,7 @@ SfxVersionTableDtor& SfxVersionTableDtor::operator=( const SfxVersionTableDtor& return *this; } -//---------------------------------------------------------------- + SfxVersionInfo::SfxVersionInfo() : aCreationDate( DateTime::EMPTY ) { diff --git a/sfx2/source/doc/Metadatable.cxx b/sfx2/source/doc/Metadatable.cxx index 425289d8833f..2cf506594ddf 100644 --- a/sfx2/source/doc/Metadatable.cxx +++ b/sfx2/source/doc/Metadatable.cxx @@ -480,7 +480,7 @@ struct XmlIdRegistryDocument::XmlIdRegistry_Impl XmlIdReverseMap_t m_XmlIdReverseMap; }; -// ------------------------------------------------------------------- + static void rmIter(XmlIdMap_t & i_rXmlIdMap, XmlIdMap_t::iterator const& i_rIter, @@ -498,7 +498,7 @@ rmIter(XmlIdMap_t & i_rXmlIdMap, XmlIdMap_t::iterator const& i_rIter, } } -// ------------------------------------------------------------------- + const XmlIdList_t * XmlIdRegistryDocument::XmlIdRegistry_Impl::LookupElementList( @@ -806,7 +806,7 @@ void XmlIdRegistryDocument::RemoveXmlIdForElement(const Metadatable& i_rObject) } } -// ------------------------------------------------------------------- + void XmlIdRegistryDocument::RegisterCopy(Metadatable const& i_rSource, Metadatable & i_rCopy, const bool i_bCopyPrecedesSource) @@ -965,7 +965,7 @@ struct XmlIdRegistryClipboard::XmlIdRegistry_Impl ClipboardXmlIdReverseMap_t m_XmlIdReverseMap; }; -// ------------------------------------------------------------------- + static void rmIter(ClipboardXmlIdMap_t & i_rXmlIdMap, @@ -987,7 +987,7 @@ rmIter(ClipboardXmlIdMap_t & i_rXmlIdMap, } } -// ------------------------------------------------------------------- + Metadatable* const* XmlIdRegistryClipboard::XmlIdRegistry_Impl::LookupEntry( @@ -1232,7 +1232,7 @@ void XmlIdRegistryClipboard::RemoveXmlIdForElement(const Metadatable& i_rObject) } } -// ------------------------------------------------------------------- + ::boost::shared_ptr<MetadatableClipboard> XmlIdRegistryClipboard::CreateClipboard(const bool i_isInContent) diff --git a/sfx2/source/doc/docfac.cxx b/sfx2/source/doc/docfac.cxx index faf99f882b29..0a04920f25c1 100644 --- a/sfx2/source/doc/docfac.cxx +++ b/sfx2/source/doc/docfac.cxx @@ -93,7 +93,7 @@ SfxFilterContainer* SfxObjectFactory::GetFilterContainer( sal_Bool /*bForceLoad* return pImpl->pFilterContainer; } -//-------------------------------------------------------------------- + SfxObjectFactory::SfxObjectFactory ( @@ -126,7 +126,7 @@ SfxObjectFactory::SfxObjectFactory pImpl->pNameResId = new SfxResId( STR_DOCTYPENAME_MESSAGE ); } -//-------------------------------------------------------------------- + SfxObjectFactory::~SfxObjectFactory() { @@ -137,7 +137,7 @@ SfxObjectFactory::~SfxObjectFactory() delete pImpl; } -//-------------------------------------------------------------------- + void SfxObjectFactory::RegisterViewFactory ( @@ -167,21 +167,21 @@ void SfxObjectFactory::RegisterViewFactory pImpl->aViewFactoryArr.insert(it, &rFactory); } -//-------------------------------------------------------------------- + sal_uInt16 SfxObjectFactory::GetViewFactoryCount() const { return pImpl->aViewFactoryArr.size(); } -//-------------------------------------------------------------------- + SfxViewFactory& SfxObjectFactory::GetViewFactory(sal_uInt16 i) const { return *pImpl->aViewFactoryArr[i]; } -//-------------------------------------------------------------------- + SfxModule* SfxObjectFactory::GetModule() const { diff --git a/sfx2/source/doc/docfile.cxx b/sfx2/source/doc/docfile.cxx index 6f158a7fa65e..141cd90559ac 100644 --- a/sfx2/source/doc/docfile.cxx +++ b/sfx2/source/doc/docfile.cxx @@ -146,7 +146,7 @@ bool IsSystemFileLockingUsed() #endif } -//---------------------------------------------------------------- + bool IsOOoLockFileUsed() { #if HAVE_FEATURE_MACOSX_SANDBOX @@ -167,7 +167,7 @@ bool IsLockingUsed() //========================================================== -//---------------------------------------------------------------- + class SfxMediumHandler_Impl : public ::cppu::WeakImplHelper1< com::sun::star::task::XInteractionHandler > { com::sun::star::uno::Reference< com::sun::star::task::XInteractionHandler > m_xInter; @@ -183,12 +183,12 @@ public: ~SfxMediumHandler_Impl(); }; -//---------------------------------------------------------------- + SfxMediumHandler_Impl::~SfxMediumHandler_Impl() { } -//---------------------------------------------------------------- + void SAL_CALL SfxMediumHandler_Impl::handle( const com::sun::star::uno::Reference< com::sun::star::task::XInteractionRequest >& xRequest ) throw( com::sun::star::uno::RuntimeException ) { @@ -286,7 +286,7 @@ public: { return m_pFilter == 0 ? OUString() : m_pFilter->GetMimeType(); } }; -//------------------------------------------------------------------ + SfxMedium_Impl::SfxMedium_Impl( SfxMedium* pAntiImplP ) : m_nStorOpenMode(SFX_STREAM_READWRITE), m_eError(SVSTREAM_OK), @@ -323,7 +323,7 @@ SfxMedium_Impl::SfxMedium_Impl( SfxMedium* pAntiImplP ) : aDoneLink.CreateMutex(); } -//------------------------------------------------------------------ + SfxMedium_Impl::~SfxMedium_Impl() { aDoneLink.ClearPendingCall(); @@ -342,13 +342,13 @@ void SfxMedium::ResetError() pImp->m_pOutStream->ResetError(); } -//------------------------------------------------------------------ + sal_uInt32 SfxMedium::GetLastStorageCreationState() { return pImp->nLastStorageError; } -//------------------------------------------------------------------ + void SfxMedium::AddLog( const OUString& aMessage ) { if ( !pImp->m_xLogRing.is() ) @@ -366,7 +366,7 @@ void SfxMedium::AddLog( const OUString& aMessage ) pImp->m_xLogRing->logString( aMessage ); } -//------------------------------------------------------------------ + void SfxMedium::SetError( sal_uInt32 nError, const OUString& aLogMessage ) { pImp->m_eError = nError; @@ -374,7 +374,7 @@ void SfxMedium::SetError( sal_uInt32 nError, const OUString& aLogMessage ) AddLog( aLogMessage ); } -//------------------------------------------------------------------ + sal_uInt32 SfxMedium::GetErrorCode() const { sal_uInt32 lError = pImp->m_eError; @@ -385,7 +385,7 @@ sal_uInt32 SfxMedium::GetErrorCode() const return lError; } -//------------------------------------------------------------------ + void SfxMedium::CheckFileDate( const util::DateTime& aInitDate ) { GetInitFileDate( true ); @@ -423,13 +423,13 @@ void SfxMedium::CheckFileDate( const util::DateTime& aInitDate ) } } -//------------------------------------------------------------------ + sal_Bool SfxMedium::DocNeedsFileDateCheck() { return ( !IsReadOnly() && ::utl::LocalFileHelper::IsLocalFile( GetURLObject().GetMainURL( INetURLObject::NO_DECODE ) ) ); } -//------------------------------------------------------------------ + util::DateTime SfxMedium::GetInitFileDate( sal_Bool bIgnoreOldValue ) { if ( ( bIgnoreOldValue || !pImp->m_bGotDateTime ) && !pImp->m_aLogicName.isEmpty() ) @@ -450,7 +450,7 @@ util::DateTime SfxMedium::GetInitFileDate( sal_Bool bIgnoreOldValue ) return pImp->m_aDateTime; } -//------------------------------------------------------------------ + Reference < XContent > SfxMedium::GetContent() const { if ( !pImp->aContent.get().is() ) @@ -488,7 +488,7 @@ Reference < XContent > SfxMedium::GetContent() const return pImp->aContent.get(); } -//------------------------------------------------------------------ + OUString SfxMedium::GetBaseURL( bool bForSaving ) { OUString aBaseURL; @@ -521,7 +521,7 @@ OUString SfxMedium::GetBaseURL( bool bForSaving ) return aBaseURL; } -//------------------------------------------------------------------ + SvStream* SfxMedium::GetInStream() { if ( pImp->m_pInStream ) @@ -552,7 +552,7 @@ SvStream* SfxMedium::GetInStream() return pImp->m_pInStream; } -//------------------------------------------------------------------ + void SfxMedium::CloseInStream() { CloseInStream_Impl(); @@ -592,7 +592,7 @@ void SfxMedium::CloseInStream_Impl() } } -//------------------------------------------------------------------ + SvStream* SfxMedium::GetOutStream() { if ( !pImp->m_pOutStream ) @@ -630,7 +630,7 @@ SvStream* SfxMedium::GetOutStream() return pImp->m_pOutStream; } -//------------------------------------------------------------------ + sal_Bool SfxMedium::CloseOutStream() { CloseOutStream_Impl(); @@ -667,7 +667,7 @@ sal_Bool SfxMedium::CloseOutStream_Impl() return true; } -//------------------------------------------------------------------ + const OUString& SfxMedium::GetPhysicalName() const { if ( pImp->m_aName.isEmpty() && !pImp->m_aLogicName.isEmpty() ) @@ -677,7 +677,7 @@ const OUString& SfxMedium::GetPhysicalName() const return pImp->m_aName; } -//------------------------------------------------------------------ + void SfxMedium::CreateFileStream() { ForceSynchronStream_Impl( true ); @@ -690,7 +690,7 @@ void SfxMedium::CreateFileStream() } } -//------------------------------------------------------------------ + sal_Bool SfxMedium::Commit() { if( pImp->xStorage.is() ) @@ -716,7 +716,7 @@ sal_Bool SfxMedium::Commit() return bResult; } -//------------------------------------------------------------------ + sal_Bool SfxMedium::IsStorage() { if ( pImp->xStorage.is() ) @@ -746,7 +746,7 @@ sal_Bool SfxMedium::IsStorage() return pImp->bIsStorage; } -//------------------------------------------------------------------ + sal_Bool SfxMedium::IsPreview_Impl() { bool bPreview = false; @@ -768,7 +768,7 @@ sal_Bool SfxMedium::IsPreview_Impl() return bPreview; } -//------------------------------------------------------------------ + void SfxMedium::StorageBackup_Impl() { ::ucbhelper::Content aOriginalContent; @@ -788,7 +788,7 @@ void SfxMedium::StorageBackup_Impl() } } -//------------------------------------------------------------------ + OUString SfxMedium::GetBackup_Impl() { if ( pImp->m_aBackupURL.isEmpty() ) @@ -797,7 +797,7 @@ OUString SfxMedium::GetBackup_Impl() return pImp->m_aBackupURL; } -//------------------------------------------------------------------ + uno::Reference < embed::XStorage > SfxMedium::GetOutputStorage() { if ( GetError() ) @@ -822,7 +822,7 @@ uno::Reference < embed::XStorage > SfxMedium::GetOutputStorage() return GetStorage(); } -//------------------------------------------------------------------ + void SfxMedium::SetEncryptionDataToStorage_Impl() { // in case media-descriptor contains password it should be used on opening @@ -866,7 +866,7 @@ void SfxMedium::SetEncryptionDataToStorage_Impl() // that. Clearly the knowledge whether lock files should be used or // not for some URL scheme belongs in UCB, not here. -//------------------------------------------------------------------ + sal_Int8 SfxMedium::ShowLockedDocumentDialog( const uno::Sequence< OUString >& aData, sal_Bool bIsLoading, sal_Bool bOwnLock ) { sal_Int8 nResult = LOCK_UI_NOLOCK; @@ -1236,7 +1236,7 @@ void SfxMedium::LockOrigFileOnDemand( sal_Bool bLoading, sal_Bool bNoUI ) #endif } -//------------------------------------------------------------------ + uno::Reference < embed::XStorage > SfxMedium::GetStorage( sal_Bool bCreateTempIfNo ) { if ( pImp->xStorage.is() || pImp->m_bTriedStorage ) @@ -1403,7 +1403,7 @@ uno::Reference < embed::XStorage > SfxMedium::GetStorage( sal_Bool bCreateTempIf return pImp->xStorage; } -//------------------------------------------------------------------ + uno::Reference< embed::XStorage > SfxMedium::GetZipStorageToSign_Impl( sal_Bool bReadOnly ) { if ( !GetError() && !pImp->m_xZipStorage.is() ) @@ -1435,7 +1435,7 @@ uno::Reference< embed::XStorage > SfxMedium::GetZipStorageToSign_Impl( sal_Bool return pImp->m_xZipStorage; } -//------------------------------------------------------------------ + void SfxMedium::CloseZipStorage_Impl() { if ( pImp->m_xZipStorage.is() ) @@ -1505,7 +1505,7 @@ void SfxMedium::SetOpenMode( StreamMode nStorOpen, } } -//------------------------------------------------------------------ + sal_Bool SfxMedium::UseBackupToRestore_Impl( ::ucbhelper::Content& aOriginalContent, const Reference< ::com::sun::star::ucb::XCommandEnvironment >& xComEnv ) { @@ -1529,7 +1529,7 @@ sal_Bool SfxMedium::UseBackupToRestore_Impl( ::ucbhelper::Content& aOriginalCont return false; } -//------------------------------------------------------------------ + sal_Bool SfxMedium::StorageCommit_Impl() { bool bResult = false; @@ -1588,7 +1588,7 @@ sal_Bool SfxMedium::StorageCommit_Impl() return bResult; } -//------------------------------------------------------------------ + sal_Bool SfxMedium::TransactedTransferForFS_Impl( const INetURLObject& aSource, const INetURLObject& aDest, const Reference< ::com::sun::star::ucb::XCommandEnvironment >& xComEnv ) @@ -1714,7 +1714,7 @@ sal_Bool SfxMedium::TransactedTransferForFS_Impl( const INetURLObject& aSource, return bResult; } -//------------------------------------------------------------------ + sal_Bool SfxMedium::TryDirectTransfer( const OUString& aURL, SfxItemSet& aTargetSet ) { if ( GetError() ) @@ -1782,7 +1782,7 @@ sal_Bool SfxMedium::TryDirectTransfer( const OUString& aURL, SfxItemSet& aTarget return false; } -//------------------------------------------------------------------ + void SfxMedium::Transfer_Impl() { // The transfer is required only in two cases: either if there is a temporary file or if there is a salvage item @@ -2078,7 +2078,7 @@ void SfxMedium::Transfer_Impl() } } -//------------------------------------------------------------------ + void SfxMedium::DoInternalBackup_Impl( const ::ucbhelper::Content& aOriginalContent, const OUString& aPrefix, const OUString& aExtension, @@ -2120,7 +2120,7 @@ void SfxMedium::DoInternalBackup_Impl( const ::ucbhelper::Content& aOriginalCont aTransactTemp.EnableKillingFile( true ); } -//------------------------------------------------------------------ + void SfxMedium::DoInternalBackup_Impl( const ::ucbhelper::Content& aOriginalContent ) { if ( !pImp->m_aBackupURL.isEmpty() ) @@ -2157,7 +2157,7 @@ void SfxMedium::DoInternalBackup_Impl( const ::ucbhelper::Content& aOriginalCont } -//------------------------------------------------------------------ + void SfxMedium::DoBackup_Impl() { SAL_INFO( "sfx.doc", "SfxMedium::DoBackup_Impl" ); @@ -2218,7 +2218,7 @@ void SfxMedium::DoBackup_Impl() } } -//------------------------------------------------------------------ + void SfxMedium::ClearBackup_Impl() { if( pImp->m_bRemoveBackup ) @@ -2243,7 +2243,7 @@ void SfxMedium::ClearBackup_Impl() pImp->m_aBackupURL = ""; } -//---------------------------------------------------------------- + void SfxMedium::GetLockingStream_Impl() { if ( ::utl::LocalFileHelper::IsLocalFile( GetURLObject().GetMainURL( INetURLObject::NO_DECODE ) ) @@ -2282,7 +2282,7 @@ void SfxMedium::GetLockingStream_Impl() } } -//---------------------------------------------------------------- + void SfxMedium::GetMedium_Impl() { if ( !pImp->m_pInStream ) @@ -2409,19 +2409,19 @@ void SfxMedium::GetMedium_Impl() } } -//---------------------------------------------------------------- + sal_Bool SfxMedium::IsRemote() { return pImp->m_bRemote; } -//------------------------------------------------------------------ + void SfxMedium::SetUpdatePickList(sal_Bool bVal) { pImp->bUpdatePickList = bVal; } -//------------------------------------------------------------------ + sal_Bool SfxMedium::IsUpdatePickList() const { @@ -2454,7 +2454,7 @@ void SfxMedium::DownLoad( const Link& aLink ) } } -//------------------------------------------------------------------ + void SfxMedium::Init_Impl() /* [Description] Includes a valid:: sun:: com:: star:: util:: URL (If a file name was @@ -2536,20 +2536,20 @@ void SfxMedium::Init_Impl() SetIsRemote_Impl(); } -//------------------------------------------------------------------ + SfxMedium::SfxMedium() : pImp(new SfxMedium_Impl(this)) { Init_Impl(); } -//------------------------------------------------------------------ + void SfxMedium::UseInteractionHandler( sal_Bool bUse ) { pImp->bAllowDefaultIntHdl = bUse; } -//------------------------------------------------------------------ + ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionHandler > SfxMedium::GetInteractionHandler() @@ -2582,7 +2582,7 @@ SfxMedium::GetInteractionHandler() return pImp->xInteraction; } -//---------------------------------------------------------------- + void SfxMedium::SetFilter( const SfxFilter* pFilterP, sal_Bool /*bResetOrig*/ ) { @@ -2594,14 +2594,14 @@ const SfxFilter* SfxMedium::GetFilter() const return pImp->m_pFilter; } -//---------------------------------------------------------------- + const SfxFilter* SfxMedium::GetOrigFilter( sal_Bool bNotCurrent ) const { return ( pImp->pOrigFilter || bNotCurrent ) ? pImp->pOrigFilter : pImp->m_pFilter; } -//---------------------------------------------------------------- + sal_uInt32 SfxMedium::CreatePasswordToModifyHash( const OUString& aPasswd, sal_Bool bWriter ) { @@ -2623,7 +2623,7 @@ sal_uInt32 SfxMedium::CreatePasswordToModifyHash( const OUString& aPasswd, sal_B return nHash; } -//------------------------------------------------------------------ + void SfxMedium::Close() { @@ -2723,7 +2723,7 @@ void SfxMedium::CloseAndReleaseStreams_Impl() } } -//------------------------------------------------------------------ + void SfxMedium::CloseStreams_Impl() { CloseInStream_Impl(); @@ -2735,7 +2735,7 @@ void SfxMedium::CloseStreams_Impl() pImp->aContent = ::ucbhelper::Content(); } -//------------------------------------------------------------------ + void SfxMedium::SetIsRemote_Impl() { @@ -2776,13 +2776,13 @@ void SfxMedium::SetName( const OUString& aNameP, sal_Bool bSetOrigURL ) Init_Impl(); } -//---------------------------------------------------------------- + const OUString& SfxMedium::GetOrigURL() const { return pImp->aOrigURL.isEmpty() ? pImp->m_aLogicName : pImp->aOrigURL; } -//---------------------------------------------------------------- + void SfxMedium::SetPhysicalName_Impl( const OUString& rNameP ) { @@ -2803,7 +2803,7 @@ void SfxMedium::SetPhysicalName_Impl( const OUString& rNameP ) } } -//------------------------------------------------------------------ + void SfxMedium::ReOpen() { @@ -2813,7 +2813,7 @@ void SfxMedium::ReOpen() pImp->bUseInteractionHandler = bUseInteractionHandler; } -//------------------------------------------------------------------ + void SfxMedium::CompleteReOpen() { @@ -2943,7 +2943,7 @@ SfxMedium::SfxMedium( const uno::Sequence<beans::PropertyValue>& aArgs ) : } -//------------------------------------------------------------------ + SfxMedium::SfxMedium( const uno::Reference < embed::XStorage >& rStor, const OUString& rBaseURL, const SfxItemSet* p ) : pImp(new SfxMedium_Impl(this)) @@ -2962,7 +2962,7 @@ SfxMedium::SfxMedium( const uno::Reference < embed::XStorage >& rStor, const OUS GetItemSet()->Put( *p ); } -//------------------------------------------------------------------ + SfxMedium::SfxMedium( const uno::Reference < embed::XStorage >& rStor, const OUString& rBaseURL, const OUString &rTypeName, const SfxItemSet* p ) : pImp(new SfxMedium_Impl(this)) @@ -2980,7 +2980,7 @@ SfxMedium::SfxMedium( const uno::Reference < embed::XStorage >& rStor, const OUS GetItemSet()->Put( *p ); } -//------------------------------------------------------------------ + SfxMedium::~SfxMedium() { @@ -3026,13 +3026,13 @@ void SfxMedium::SetExpired_Impl( const DateTime& rDateTime ) { pImp->aExpireTime = rDateTime; } -//---------------------------------------------------------------- + sal_Bool SfxMedium::IsExpired() const { return pImp->aExpireTime.IsValidAndGregorian() && pImp->aExpireTime < DateTime( DateTime::SYSTEM ); } -//---------------------------------------------------------------- + void SfxMedium::ForceSynchronStream_Impl( sal_Bool bForce ) { @@ -3044,7 +3044,7 @@ void SfxMedium::ForceSynchronStream_Impl( sal_Bool bForce ) } } -//---------------------------------------------------------------- + SfxFrame* SfxMedium::GetLoadTargetFrame() const { return pImp->wLoadTargetFrame; @@ -3060,13 +3060,13 @@ void SfxMedium::SetLoadTargetFrame(SfxFrame* pFrame ) { pImp->wLoadTargetFrame = pFrame; } -//---------------------------------------------------------------- + void SfxMedium::SetStorage_Impl( const uno::Reference < embed::XStorage >& rStor ) { pImp->xStorage = rStor; } -//---------------------------------------------------------------- + SfxItemSet* SfxMedium::GetItemSet() const { @@ -3075,7 +3075,7 @@ SfxItemSet* SfxMedium::GetItemSet() const pImp->m_pSet = new SfxAllItemSet( SFX_APP()->GetPool() ); return pImp->m_pSet; } -//---------------------------------------------------------------- + SvKeyValueIterator* SfxMedium::GetHeaderAttributes_Impl() { @@ -3233,7 +3233,7 @@ sal_Bool SfxMedium::SaveVersionList_Impl( sal_Bool /*bUseXML*/ ) return false; } -//---------------------------------------------------------------- + sal_Bool SfxMedium::IsReadOnly() { // a) ReadOnly filter cant produce read/write contents! @@ -3262,7 +3262,7 @@ bool SfxMedium::IsOriginallyReadOnly() const return pImp->m_bOriginallyReadOnly; } -//---------------------------------------------------------------- + sal_Bool SfxMedium::SetWritableForUserOnly( const OUString& aURL ) { // UCB does not allow to allow write access only for the user, @@ -3292,7 +3292,7 @@ sal_Bool SfxMedium::SetWritableForUserOnly( const OUString& aURL ) return bResult; } -//---------------------------------------------------------------- + void SfxMedium::CreateTempFile( sal_Bool bReplace ) { if ( pImp->pTempFile ) @@ -3396,7 +3396,7 @@ void SfxMedium::CreateTempFile( sal_Bool bReplace ) CloseStorage(); } -//---------------------------------------------------------------- + void SfxMedium::CreateTempFileNoCopy() { // this call always replaces the existing temporary file @@ -3525,13 +3525,13 @@ sal_Bool SfxMedium::SignContents_Impl( sal_Bool bScriptingContent, const OUStrin return bChanges; } -//---------------------------------------------------------------- + sal_uInt16 SfxMedium::GetCachedSignatureState_Impl() { return pImp->m_nSignatureState; } -//---------------------------------------------------------------- + void SfxMedium::SetCachedSignatureState_Impl( sal_uInt16 nState ) { pImp->m_nSignatureState = nState; diff --git a/sfx2/source/doc/docmacromode.cxx b/sfx2/source/doc/docmacromode.cxx index 7082bc44ec4d..e7e8a701ffbc 100644 --- a/sfx2/source/doc/docmacromode.cxx +++ b/sfx2/source/doc/docmacromode.cxx @@ -131,32 +131,32 @@ namespace sfx2 //==================================================================== //= DocumentMacroMode //==================================================================== - //-------------------------------------------------------------------- + DocumentMacroMode::DocumentMacroMode( IMacroDocumentAccess& rDocumentAccess ) :m_pData( new DocumentMacroMode_Data( rDocumentAccess ) ) { } - //-------------------------------------------------------------------- + DocumentMacroMode::~DocumentMacroMode() { } - //-------------------------------------------------------------------- + sal_Bool DocumentMacroMode::allowMacroExecution() { m_pData->m_rDocumentAccess.setCurrentMacroExecMode( MacroExecMode::ALWAYS_EXECUTE_NO_WARN ); return sal_True; } - //-------------------------------------------------------------------- + sal_Bool DocumentMacroMode::disallowMacroExecution() { m_pData->m_rDocumentAccess.setCurrentMacroExecMode( MacroExecMode::NEVER_EXECUTE ); return sal_False; } - //-------------------------------------------------------------------- + sal_Bool DocumentMacroMode::adjustMacroMode( const Reference< XInteractionHandler >& rxInteraction ) { sal_uInt16 nMacroExecutionMode = m_pData->m_rDocumentAccess.getCurrentMacroExecMode(); @@ -308,13 +308,13 @@ namespace sfx2 return ( bSecure ? allowMacroExecution() : disallowMacroExecution() ); } - //-------------------------------------------------------------------- + sal_Bool DocumentMacroMode::isMacroExecutionDisallowed() const { return m_pData->m_rDocumentAccess.getCurrentMacroExecMode() == MacroExecMode::NEVER_EXECUTE; } - //-------------------------------------------------------------------- + sal_Bool DocumentMacroMode::containerHasBasicMacros( const Reference< XLibraryContainer >& xContainer ) { sal_Bool bHasMacroLib = sal_False; @@ -361,7 +361,7 @@ namespace sfx2 return bHasMacroLib; } - //-------------------------------------------------------------------- + sal_Bool DocumentMacroMode::hasMacroLibrary() const { sal_Bool bHasMacroLib = sal_False; @@ -383,7 +383,7 @@ namespace sfx2 return bHasMacroLib; } - //-------------------------------------------------------------------- + sal_Bool DocumentMacroMode::storageHasMacros( const Reference< XStorage >& rxStorage ) { sal_Bool bHasMacros = sal_False; @@ -410,7 +410,7 @@ namespace sfx2 return bHasMacros; } - //-------------------------------------------------------------------- + sal_Bool DocumentMacroMode::checkMacrosOnLoading( const Reference< XInteractionHandler >& rxInteraction ) { sal_Bool bAllow = sal_False; diff --git a/sfx2/source/doc/docstoragemodifylistener.cxx b/sfx2/source/doc/docstoragemodifylistener.cxx index 671c67de68ae..5bb66ba48ea4 100644 --- a/sfx2/source/doc/docstoragemodifylistener.cxx +++ b/sfx2/source/doc/docstoragemodifylistener.cxx @@ -39,26 +39,26 @@ namespace sfx2 //==================================================================== //= //==================================================================== - //-------------------------------------------------------------------- + DocumentStorageModifyListener::DocumentStorageModifyListener( IModifiableDocument& _rDocument, comphelper::SolarMutex& _rMutex ) :m_pDocument( &_rDocument ) ,m_rMutex( _rMutex ) { } - //-------------------------------------------------------------------- + DocumentStorageModifyListener::~DocumentStorageModifyListener() { } - //-------------------------------------------------------------------- + void DocumentStorageModifyListener::dispose() { ::osl::Guard< comphelper::SolarMutex > aGuard( m_rMutex ); m_pDocument = NULL; } - //-------------------------------------------------------------------- + void SAL_CALL DocumentStorageModifyListener::modified( const EventObject& /*aEvent*/ ) throw (RuntimeException) { ::osl::Guard< comphelper::SolarMutex > aGuard( m_rMutex ); @@ -67,7 +67,7 @@ namespace sfx2 m_pDocument->storageIsModified(); } - //-------------------------------------------------------------------- + void SAL_CALL DocumentStorageModifyListener::disposing( const EventObject& /*Source*/ ) throw (RuntimeException) { // not interested in. In particular, we do *not* dispose ourself when a storage we're diff --git a/sfx2/source/doc/doctempl.cxx b/sfx2/source/doc/doctempl.cxx index 97d66c4e3c82..c8fb07e37b11 100644 --- a/sfx2/source/doc/doctempl.cxx +++ b/sfx2/source/doc/doctempl.cxx @@ -146,7 +146,7 @@ public: using namespace ::DocTempl; -// ------------------------------------------------------------------------ + class RegionData_Impl { @@ -191,7 +191,7 @@ public: typedef vector< RegionData_Impl* > RegionList_Impl; -// ------------------------------------------------------------------------ + class SfxDocTemplate_Impl : public SvRefBase { @@ -242,7 +242,7 @@ public: uno::Reference< XDocumentTemplates > getDocTemplates() { return mxTemplates; } }; -// ------------------------------------------------------------------------ + class DocTemplLocker_Impl { @@ -260,7 +260,7 @@ public: } }; -// ------------------------------------------------------------------------ + #ifndef SFX_DECL_DOCTEMPLATES_DEFINED #define SFX_DECL_DOCTEMPLATES_DEFINED @@ -269,11 +269,11 @@ SV_DECL_REF(SfxDocTemplate_Impl) SV_IMPL_REF(SfxDocTemplate_Impl) -// ------------------------------------------------------------------------ + SfxDocTemplate_Impl *gpTemplateData = 0; -// ----------------------------------------------------------------------- + static sal_Bool getTextProperty_Impl( Content& rContent, const OUString& rPropName, @@ -315,7 +315,7 @@ OUString SfxDocumentTemplates::GetFullRegionName return aName; } -//------------------------------------------------------------------------ + const OUString& SfxDocumentTemplates::GetRegionName ( @@ -351,7 +351,7 @@ const OUString& SfxDocumentTemplates::GetRegionName return maTmpString; } -//------------------------------------------------------------------------ + sal_uInt16 SfxDocumentTemplates::GetRegionCount() const @@ -374,7 +374,7 @@ sal_uInt16 SfxDocumentTemplates::GetRegionCount() const return (sal_uInt16) nCount; } -//------------------------------------------------------------------------ + sal_uInt16 SfxDocumentTemplates::GetCount ( @@ -405,7 +405,7 @@ sal_uInt16 SfxDocumentTemplates::GetCount return (sal_uInt16) nCount; } -//------------------------------------------------------------------------ + const OUString& SfxDocumentTemplates::GetName ( @@ -446,7 +446,7 @@ const OUString& SfxDocumentTemplates::GetName return maTmpString; } -//------------------------------------------------------------------------ + OUString SfxDocumentTemplates::GetPath ( @@ -480,7 +480,7 @@ OUString SfxDocumentTemplates::GetPath return OUString(); } -//------------------------------------------------------------------------ + OUString SfxDocumentTemplates::GetTemplateTargetURLFromComponent( const OUString& aGroupName, const OUString& aTitle ) @@ -511,7 +511,7 @@ OUString SfxDocumentTemplates::GetTemplateTargetURLFromComponent( const OUString return aResult; } -//------------------------------------------------------------------------ + /** Convert a resource string - a template name - to its localised pair if it exists. @param nSourceResIds @@ -536,7 +536,7 @@ OUString SfxDocumentTemplates::ConvertResourceString ( return rString; } -//------------------------------------------------------------------------ + sal_Bool SfxDocumentTemplates::CopyOrMove ( @@ -642,7 +642,7 @@ sal_Bool SfxDocumentTemplates::CopyOrMove return sal_False; } -//------------------------------------------------------------------------ + sal_Bool SfxDocumentTemplates::Move ( @@ -672,7 +672,7 @@ sal_Bool SfxDocumentTemplates::Move nSourceRegion, nSourceIdx, sal_True ); } -//------------------------------------------------------------------------ + sal_Bool SfxDocumentTemplates::Copy ( @@ -703,7 +703,7 @@ sal_Bool SfxDocumentTemplates::Copy nSourceRegion, nSourceIdx, sal_False ); } -//------------------------------------------------------------------------ + sal_Bool SfxDocumentTemplates::CopyTo ( @@ -775,7 +775,7 @@ sal_Bool SfxDocumentTemplates::CopyTo return sal_True; } -//------------------------------------------------------------------------ + sal_Bool SfxDocumentTemplates::CopyFrom ( @@ -920,7 +920,7 @@ sal_Bool SfxDocumentTemplates::CopyFrom return sal_False; } -//------------------------------------------------------------------------ + sal_Bool SfxDocumentTemplates::Delete ( @@ -984,7 +984,7 @@ sal_Bool SfxDocumentTemplates::Delete return bRet; } -//------------------------------------------------------------------------ + sal_Bool SfxDocumentTemplates::InsertDir ( @@ -1105,7 +1105,7 @@ sal_Bool SfxDocumentTemplates::SetName( const OUString& rName, sal_uInt16 nRegio return sal_False; } -//------------------------------------------------------------------------ + sal_Bool SfxDocumentTemplates::GetFull ( @@ -1161,7 +1161,7 @@ sal_Bool SfxDocumentTemplates::GetFull return ( pEntry != NULL ); } -//------------------------------------------------------------------------ + sal_Bool SfxDocumentTemplates::GetLogicNames ( @@ -1229,7 +1229,7 @@ sal_Bool SfxDocumentTemplates::GetLogicNames return bFound; } -//------------------------------------------------------------------------ + SfxDocumentTemplates::SfxDocumentTemplates() @@ -1244,7 +1244,7 @@ SfxDocumentTemplates::SfxDocumentTemplates() pImp = gpTemplateData; } -//------------------------------------------------------------------------- + void SfxDocumentTemplates::Construct() @@ -1253,7 +1253,7 @@ void SfxDocumentTemplates::Construct() { } -//------------------------------------------------------------------------ + SfxDocumentTemplates::~SfxDocumentTemplates() @@ -1283,7 +1283,7 @@ void SfxDocumentTemplates::ReInitFromComponent() pImp->ReInitFromComponent(); } -// ----------------------------------------------------------------------- + DocTempl_EntryData_Impl::DocTempl_EntryData_Impl( RegionData_Impl* pParent, const OUString& rTitle ) { @@ -1294,13 +1294,13 @@ DocTempl_EntryData_Impl::DocTempl_EntryData_Impl( RegionData_Impl* pParent, mbDidConvert= sal_False; } -// ----------------------------------------------------------------------- + int DocTempl_EntryData_Impl::Compare( const OUString& rTitle ) const { return maTitle.compareTo( rTitle ); } -// ----------------------------------------------------------------------- + const OUString& DocTempl_EntryData_Impl::GetHierarchyURL() { if ( maOwnURL.isEmpty() ) @@ -1318,7 +1318,7 @@ const OUString& DocTempl_EntryData_Impl::GetHierarchyURL() return maOwnURL; } -// ----------------------------------------------------------------------- + const OUString& DocTempl_EntryData_Impl::GetTargetURL() { if ( maTargetURL.isEmpty() ) @@ -1341,7 +1341,7 @@ const OUString& DocTempl_EntryData_Impl::GetTargetURL() return maTargetURL; } -// ----------------------------------------------------------------------- + RegionData_Impl::RegionData_Impl( const SfxDocTemplate_Impl* pParent, const OUString& rTitle ) { @@ -1349,7 +1349,7 @@ RegionData_Impl::RegionData_Impl( const SfxDocTemplate_Impl* pParent, mpParent = pParent; } -// ----------------------------------------------------------------------- + RegionData_Impl::~RegionData_Impl() { for ( size_t i = 0, n = maEntries.size(); i < n; ++i ) @@ -1357,7 +1357,7 @@ RegionData_Impl::~RegionData_Impl() maEntries.clear(); } -// ----------------------------------------------------------------------- + size_t RegionData_Impl::GetEntryPos( const OUString& rTitle, sal_Bool& rFound ) const { #if 1 // Don't use binary search today @@ -1418,7 +1418,7 @@ size_t RegionData_Impl::GetEntryPos( const OUString& rTitle, sal_Bool& rFound ) #endif } -// ----------------------------------------------------------------------- + void RegionData_Impl::AddEntry( const OUString& rTitle, const OUString& rTargetURL, size_t *pPos ) @@ -1455,13 +1455,13 @@ void RegionData_Impl::AddEntry( const OUString& rTitle, } } -// ----------------------------------------------------------------------- + size_t RegionData_Impl::GetCount() const { return maEntries.size(); } -// ----------------------------------------------------------------------- + const OUString& RegionData_Impl::GetHierarchyURL() { if ( maOwnURL.isEmpty() ) @@ -1479,7 +1479,7 @@ const OUString& RegionData_Impl::GetHierarchyURL() return maOwnURL; } -// ----------------------------------------------------------------------- + DocTempl_EntryData_Impl* RegionData_Impl::GetEntry( const OUString& rName ) const { sal_Bool bFound = sal_False; @@ -1491,7 +1491,7 @@ DocTempl_EntryData_Impl* RegionData_Impl::GetEntry( const OUString& rName ) cons return NULL; } -// ----------------------------------------------------------------------- + DocTempl_EntryData_Impl* RegionData_Impl::GetEntry( size_t nIndex ) const { if ( nIndex < maEntries.size() ) @@ -1499,7 +1499,7 @@ DocTempl_EntryData_Impl* RegionData_Impl::GetEntry( size_t nIndex ) const return NULL; } -// ----------------------------------------------------------------------- + void RegionData_Impl::DeleteEntry( size_t nIndex ) { if ( nIndex < maEntries.size() ) @@ -1511,7 +1511,7 @@ void RegionData_Impl::DeleteEntry( size_t nIndex ) } } -// ----------------------------------------------------------------------- + int RegionData_Impl::Compare( RegionData_Impl* pCompare ) const { int nCompare = maTitle.compareTo( pCompare->maTitle ); @@ -1519,7 +1519,7 @@ int RegionData_Impl::Compare( RegionData_Impl* pCompare ) const return nCompare; } -// ----------------------------------------------------------------------- + SfxDocTemplate_Impl::SfxDocTemplate_Impl() : mbConstructed( sal_False ) @@ -1527,7 +1527,7 @@ SfxDocTemplate_Impl::SfxDocTemplate_Impl() { } -// ----------------------------------------------------------------------- + SfxDocTemplate_Impl::~SfxDocTemplate_Impl() { Clear(); @@ -1535,14 +1535,14 @@ SfxDocTemplate_Impl::~SfxDocTemplate_Impl() gpTemplateData = NULL; } -// ----------------------------------------------------------------------- + void SfxDocTemplate_Impl::IncrementLock() { ::osl::MutexGuard aGuard( maMutex ); mnLockCounter++; } -// ----------------------------------------------------------------------- + void SfxDocTemplate_Impl::DecrementLock() { ::osl::MutexGuard aGuard( maMutex ); @@ -1550,7 +1550,7 @@ void SfxDocTemplate_Impl::DecrementLock() mnLockCounter--; } -// ----------------------------------------------------------------------- + RegionData_Impl* SfxDocTemplate_Impl::GetRegion( size_t nIndex ) const { if ( nIndex < maRegions.size() ) @@ -1558,7 +1558,7 @@ RegionData_Impl* SfxDocTemplate_Impl::GetRegion( size_t nIndex ) const return NULL; } -// ----------------------------------------------------------------------- + RegionData_Impl* SfxDocTemplate_Impl::GetRegion( const OUString& rName ) const { @@ -1571,7 +1571,7 @@ RegionData_Impl* SfxDocTemplate_Impl::GetRegion( const OUString& rName ) return NULL; } -// ----------------------------------------------------------------------- + void SfxDocTemplate_Impl::DeleteRegion( size_t nIndex ) { if ( nIndex < maRegions.size() ) @@ -1583,7 +1583,7 @@ void SfxDocTemplate_Impl::DeleteRegion( size_t nIndex ) } } -// ----------------------------------------------------------------------- + /* AddRegion adds a Region to the RegionList */ void SfxDocTemplate_Impl::AddRegion( const OUString& rTitle, @@ -1633,7 +1633,7 @@ void SfxDocTemplate_Impl::AddRegion( const OUString& rTitle, } } -// ----------------------------------------------------------------------- + void SfxDocTemplate_Impl::CreateFromHierarchy( Content &rTemplRoot ) { uno::Reference< XResultSet > xResultSet; @@ -1672,7 +1672,7 @@ void SfxDocTemplate_Impl::CreateFromHierarchy( Content &rTemplRoot ) } } -// ------------------------------------------------------------------------ + sal_Bool SfxDocTemplate_Impl::Construct( ) { ::osl::MutexGuard aGuard( maMutex ); @@ -1711,7 +1711,7 @@ sal_Bool SfxDocTemplate_Impl::Construct( ) return sal_True; } -// ----------------------------------------------------------------------- + void SfxDocTemplate_Impl::ReInitFromComponent() { uno::Reference< XDocumentTemplates > xTemplates = getDocTemplates(); @@ -1725,7 +1725,7 @@ void SfxDocTemplate_Impl::ReInitFromComponent() } } -// ----------------------------------------------------------------------- + sal_Bool SfxDocTemplate_Impl::InsertRegion( RegionData_Impl *pNew, size_t nPos ) { ::osl::MutexGuard aGuard( maMutex ); @@ -1751,7 +1751,7 @@ sal_Bool SfxDocTemplate_Impl::InsertRegion( RegionData_Impl *pNew, size_t nPos ) return sal_True; } -// ----------------------------------------------------------------------- + void SfxDocTemplate_Impl::Rescan() { Clear(); @@ -1777,7 +1777,7 @@ void SfxDocTemplate_Impl::Rescan() } } -// ----------------------------------------------------------------------- + sal_Bool SfxDocTemplate_Impl::GetTitleFromURL( const OUString& rURL, OUString& aTitle ) { @@ -1821,7 +1821,7 @@ sal_Bool SfxDocTemplate_Impl::GetTitleFromURL( const OUString& rURL, } -// ----------------------------------------------------------------------- + void SfxDocTemplate_Impl::Clear() { ::osl::MutexGuard aGuard( maMutex ); @@ -1833,7 +1833,7 @@ void SfxDocTemplate_Impl::Clear() maRegions.clear(); } -// ----------------------------------------------------------------------- + sal_Bool getTextProperty_Impl( Content& rContent, const OUString& rPropName, OUString& rPropValue ) diff --git a/sfx2/source/doc/doctemplates.cxx b/sfx2/source/doc/doctemplates.cxx index e61eeac6d896..574232a28e46 100644 --- a/sfx2/source/doc/doctemplates.cxx +++ b/sfx2/source/doc/doctemplates.cxx @@ -390,9 +390,9 @@ public: DocTemplates_EntryData_Impl* getEntry( size_t nPos ) { return maEntries[ nPos ]; } }; -//----------------------------------------------------------------------------- + // private SfxDocTplService_Impl -//----------------------------------------------------------------------------- + void SfxDocTplService_Impl::init_Impl() { uno::Reference< uno::XComponentContext > xContext = ::comphelper::getProcessComponentContext(); @@ -485,7 +485,7 @@ void SfxDocTplService_Impl::init_Impl() mbIsInitialized = bIsInitialized; } -//----------------------------------------------------------------------------- + void SfxDocTplService_Impl::getDefaultLocale() { if ( !mbLocaleSet ) @@ -499,7 +499,7 @@ void SfxDocTplService_Impl::getDefaultLocale() } } -// ----------------------------------------------------------------------- + void SfxDocTplService_Impl::readFolderList() { SolarMutexGuard aGuard; @@ -521,7 +521,7 @@ void SfxDocTplService_Impl::readFolderList() } } -// ----------------------------------------------------------------------- + OUString SfxDocTplService_Impl::getLongName( const OUString& rShortName ) { OUString aRet; @@ -542,7 +542,7 @@ OUString SfxDocTplService_Impl::getLongName( const OUString& rShortName ) return aRet; } -//----------------------------------------------------------------------------- + void SfxDocTplService_Impl::getDirList() { OUString aPropName( PROPERTY_DIRLIST ); @@ -582,7 +582,7 @@ void SfxDocTplService_Impl::getDirList() setProperty( maRootContent, aPropName, aValue ); } -//----------------------------------------------------------------------------- + sal_Bool SfxDocTplService_Impl::needsUpdate() { OUString aPropName( PROPERTY_NEEDSUPDATE ); @@ -607,7 +607,7 @@ sal_Bool SfxDocTplService_Impl::needsUpdate() return bNeedsUpdate; } -// ----------------------------------------------------------------------- + sal_Bool SfxDocTplService_Impl::setTitleForURL( const OUString& rURL, const OUString& aTitle ) { if (m_xDocProps.is()) @@ -636,7 +636,7 @@ sal_Bool SfxDocTplService_Impl::setTitleForURL( const OUString& rURL, const OUSt return false; } -// ----------------------------------------------------------------------- + sal_Bool SfxDocTplService_Impl::getTitleFromURL( const OUString& rURL, OUString& aTitle, OUString& aType, sal_Bool& bDocHasTitle ) { bDocHasTitle = sal_False; @@ -682,7 +682,7 @@ sal_Bool SfxDocTplService_Impl::getTitleFromURL( const OUString& rURL, OUString& return sal_True; } -// ----------------------------------------------------------------------- + sal_Bool SfxDocTplService_Impl::addEntry( Content& rParentFolder, const OUString& rTitle, const OUString& rTargetURL, @@ -725,7 +725,7 @@ sal_Bool SfxDocTplService_Impl::addEntry( Content& rParentFolder, return bAddedEntry; } -// ----------------------------------------------------------------------- + sal_Bool SfxDocTplService_Impl::createFolder( const OUString& rNewFolderURL, sal_Bool bCreateParent, sal_Bool bFsysFolder, @@ -794,7 +794,7 @@ sal_Bool SfxDocTplService_Impl::createFolder( const OUString& rNewFolderURL, return bCreatedFolder; } -// ----------------------------------------------------------------------- + sal_Bool SfxDocTplService_Impl::CreateNewUniqueFolderWithPrefix( const OUString& aPath, const OUString& aPrefix, OUString& aNewFolderName, @@ -856,7 +856,7 @@ sal_Bool SfxDocTplService_Impl::CreateNewUniqueFolderWithPrefix( const OUString& return bCreated; } -// ----------------------------------------------------------------------- + OUString SfxDocTplService_Impl::CreateNewUniqueFileWithPrefix( const OUString& aPath, const OUString& aPrefix, const OUString& aExt ) @@ -921,7 +921,7 @@ OUString SfxDocTplService_Impl::CreateNewUniqueFileWithPrefix( const OUString& a return aNewFileURL; } -// ----------------------------------------------------------------------- + sal_Bool SfxDocTplService_Impl::removeContent( Content& rContent ) { sal_Bool bRemoved = sal_False; @@ -939,7 +939,7 @@ sal_Bool SfxDocTplService_Impl::removeContent( Content& rContent ) return bRemoved; } -// ----------------------------------------------------------------------- + sal_Bool SfxDocTplService_Impl::removeContent( const OUString& rContentURL ) { Content aContent; @@ -950,7 +950,7 @@ sal_Bool SfxDocTplService_Impl::removeContent( const OUString& rContentURL ) return sal_False; } -// ----------------------------------------------------------------------- + sal_Bool SfxDocTplService_Impl::setProperty( Content& rContent, const OUString& rPropName, const Any& rPropValue ) @@ -1022,7 +1022,7 @@ sal_Bool SfxDocTplService_Impl::setProperty( Content& rContent, return bPropertySet; } -// ----------------------------------------------------------------------- + sal_Bool SfxDocTplService_Impl::getProperty( Content& rContent, const OUString& rPropName, Any& rPropValue ) @@ -1089,7 +1089,7 @@ SfxDocTplService_Impl::SfxDocTplService_Impl( const uno::Reference< XComponentCo mbLocaleSet = sal_False; } -//----------------------------------------------------------------------------- + SfxDocTplService_Impl::~SfxDocTplService_Impl() { ::osl::MutexGuard aGuard( maMutex ); @@ -1106,7 +1106,7 @@ SfxDocTplService_Impl::~SfxDocTplService_Impl() maNames.clear(); } -//----------------------------------------------------------------------------- + Locale SfxDocTplService_Impl::getLocale() { ::osl::MutexGuard aGuard( maMutex ); @@ -1117,7 +1117,7 @@ Locale SfxDocTplService_Impl::getLocale() return maLocale; } -//----------------------------------------------------------------------------- + void SfxDocTplService_Impl::setLocale( const Locale &rLocale ) { ::osl::MutexGuard aGuard( maMutex ); @@ -1132,7 +1132,7 @@ void SfxDocTplService_Impl::setLocale( const Locale &rLocale ) mbLocaleSet = sal_True; } -//----------------------------------------------------------------------------- + void SfxDocTplService_Impl::update( sal_Bool bUpdateNow ) { ::osl::MutexGuard aGuard( maMutex ); @@ -1146,7 +1146,7 @@ void SfxDocTplService_Impl::update( sal_Bool bUpdateNow ) } } -//----------------------------------------------------------------------------- + void SfxDocTplService_Impl::doUpdate() { ::osl::MutexGuard aGuard( maMutex ); @@ -1232,7 +1232,7 @@ void SfxDocTplService_Impl::doUpdate() setProperty( maRootContent, aPropName, aValue ); } -//----------------------------------------------------------------------------- + uno::Sequence< beans::StringPair > SfxDocTplService_Impl::ReadUINamesForTemplateDir_Impl( const OUString& aUserPath ) { INetURLObject aLocObj( aUserPath ); @@ -1258,7 +1258,7 @@ uno::Sequence< beans::StringPair > SfxDocTplService_Impl::ReadUINamesForTemplate return aUINames; } -//----------------------------------------------------------------------------- + sal_Bool SfxDocTplService_Impl::UpdateUINamesForTemplateDir_Impl( const OUString& aUserPath, const OUString& aGroupName, const OUString& aNewFolderName ) @@ -1278,7 +1278,7 @@ sal_Bool SfxDocTplService_Impl::UpdateUINamesForTemplateDir_Impl( const OUString return WriteUINamesForTemplateDir_Impl( aUserPath, aUINames ); } -//----------------------------------------------------------------------------- + sal_Bool SfxDocTplService_Impl::ReplaceUINamesForTemplateDir_Impl( const OUString& aUserPath, const OUString& aDefaultFsysGroupName, const OUString& aOldGroupName, @@ -1304,7 +1304,7 @@ sal_Bool SfxDocTplService_Impl::ReplaceUINamesForTemplateDir_Impl( const OUStrin return WriteUINamesForTemplateDir_Impl( aUserPath, aUINames ); } -//----------------------------------------------------------------------------- + sal_Bool SfxDocTplService_Impl::RemoveUINamesForTemplateDir_Impl( const OUString& aUserPath, const OUString& aGroupName ) { @@ -1330,7 +1330,7 @@ sal_Bool SfxDocTplService_Impl::RemoveUINamesForTemplateDir_Impl( const OUString } -//----------------------------------------------------------------------------- + sal_Bool SfxDocTplService_Impl::WriteUINamesForTemplateDir_Impl( const OUString& aUserPath, const uno::Sequence< beans::StringPair >& aUINames ) { @@ -1372,7 +1372,7 @@ sal_Bool SfxDocTplService_Impl::WriteUINamesForTemplateDir_Impl( const OUString& return bResult; } -//----------------------------------------------------------------------------- + OUString SfxDocTplService_Impl::CreateNewGroupFsys( const OUString& rGroupName, Content& aGroup ) { OUString aResultURL; @@ -1421,7 +1421,7 @@ OUString SfxDocTplService_Impl::CreateNewGroupFsys( const OUString& rGroupName, return aResultURL; } -//----------------------------------------------------------------------------- + sal_Bool SfxDocTplService_Impl::addGroup( const OUString& rGroupName ) { ::osl::MutexGuard aGuard( maMutex ); @@ -1504,7 +1504,7 @@ sal_Bool SfxDocTplService_Impl::addGroup( const OUString& rGroupName ) return sal_True; } -//----------------------------------------------------------------------------- + sal_Bool SfxDocTplService_Impl::removeGroup( const OUString& rGroupName ) { // remove all the elements that have the prefix aTargetURL @@ -1610,7 +1610,7 @@ sal_Bool SfxDocTplService_Impl::removeGroup( const OUString& rGroupName ) return bResult; } -//----------------------------------------------------------------------------- + sal_Bool SfxDocTplService_Impl::renameGroup( const OUString& rOldName, const OUString& rNewName ) { @@ -1713,7 +1713,7 @@ sal_Bool SfxDocTplService_Impl::renameGroup( const OUString& rOldName, return sal_False; } -//----------------------------------------------------------------------------- + sal_Bool SfxDocTplService_Impl::storeTemplate( const OUString& rGroupName, const OUString& rTemplateName, const uno::Reference< frame::XStorable >& rStorable ) @@ -1899,7 +1899,7 @@ sal_Bool SfxDocTplService_Impl::storeTemplate( const OUString& rGroupName, } } -//----------------------------------------------------------------------------- + sal_Bool SfxDocTplService_Impl::addTemplate( const OUString& rGroupName, const OUString& rTemplateName, const OUString& rSourceURL ) @@ -2050,7 +2050,7 @@ sal_Bool SfxDocTplService_Impl::addTemplate( const OUString& rGroupName, return sal_False; } -//----------------------------------------------------------------------------- + sal_Bool SfxDocTplService_Impl::removeTemplate( const OUString& rGroupName, const OUString& rTemplateName ) { @@ -2102,7 +2102,7 @@ sal_Bool SfxDocTplService_Impl::removeTemplate( const OUString& rGroupName, return removeContent( aTemplate ); } -//----------------------------------------------------------------------------- + sal_Bool SfxDocTplService_Impl::renameTemplate( const OUString& rGroupName, const OUString& rOldName, const OUString& rNewName ) @@ -2162,7 +2162,7 @@ sal_Bool SfxDocTplService_Impl::renameTemplate( const OUString& rGroupName, return setProperty( aTemplate, aTitleProp, aTitleValue ); } -//----------------------------------------------------------------------------- + class SfxDocTplService: public ::cppu::WeakImplHelper3< css::lang::XLocalizable, css::frame::XDocumentTemplates, css::lang::XServiceInfo > { SfxDocTplService_Impl *pImp; @@ -2216,22 +2216,22 @@ public: void SAL_CALL update() throw( css::uno::RuntimeException ); }; -//----------------------------------------------------------------------------- + SfxDocTplService::SfxDocTplService( const uno::Reference< XComponentContext >& xContext ) { pImp = new SfxDocTplService_Impl(xContext); } -//----------------------------------------------------------------------------- + SfxDocTplService::~SfxDocTplService() { delete pImp; } -//----------------------------------------------------------------------------- + //--- XLocalizable --- -//----------------------------------------------------------------------------- + Locale SAL_CALL SfxDocTplService::getLocale() throw( uno::RuntimeException ) @@ -2239,7 +2239,7 @@ Locale SAL_CALL SfxDocTplService::getLocale() return pImp->getLocale(); } -//----------------------------------------------------------------------------- + void SAL_CALL SfxDocTplService::setLocale( const Locale & rLocale ) throw( uno::RuntimeException ) @@ -2247,9 +2247,9 @@ void SAL_CALL SfxDocTplService::setLocale( const Locale & rLocale ) pImp->setLocale( rLocale ); } -//----------------------------------------------------------------------------- + //--- XDocumentTemplates --- -//----------------------------------------------------------------------------- + uno::Reference< ucb::XContent > SAL_CALL SfxDocTplService::getContent() throw( uno::RuntimeException ) { @@ -2259,7 +2259,7 @@ uno::Reference< ucb::XContent > SAL_CALL SfxDocTplService::getContent() return NULL; } -//----------------------------------------------------------------------------- + sal_Bool SAL_CALL SfxDocTplService::storeTemplate( const OUString& GroupName, const OUString& TemplateName, const uno::Reference< frame::XStorable >& Storable ) @@ -2271,7 +2271,7 @@ sal_Bool SAL_CALL SfxDocTplService::storeTemplate( const OUString& GroupName, return sal_False; } -//----------------------------------------------------------------------------- + sal_Bool SAL_CALL SfxDocTplService::addTemplate( const OUString& rGroupName, const OUString& rTemplateName, const OUString& rSourceURL ) @@ -2283,7 +2283,7 @@ sal_Bool SAL_CALL SfxDocTplService::addTemplate( const OUString& rGroupName, return sal_False; } -//----------------------------------------------------------------------------- + sal_Bool SAL_CALL SfxDocTplService::removeTemplate( const OUString& rGroupName, const OUString& rTemplateName ) throw( uno::RuntimeException ) @@ -2294,7 +2294,7 @@ sal_Bool SAL_CALL SfxDocTplService::removeTemplate( const OUString& rGroupName, return sal_False; } -//----------------------------------------------------------------------------- + sal_Bool SAL_CALL SfxDocTplService::renameTemplate( const OUString& rGroupName, const OUString& rOldName, const OUString& rNewName ) @@ -2309,7 +2309,7 @@ sal_Bool SAL_CALL SfxDocTplService::renameTemplate( const OUString& rGroupName, return sal_False; } -//----------------------------------------------------------------------------- + sal_Bool SAL_CALL SfxDocTplService::addGroup( const OUString& rGroupName ) throw( uno::RuntimeException ) { @@ -2319,7 +2319,7 @@ sal_Bool SAL_CALL SfxDocTplService::addGroup( const OUString& rGroupName ) return sal_False; } -//----------------------------------------------------------------------------- + sal_Bool SAL_CALL SfxDocTplService::removeGroup( const OUString& rGroupName ) throw( uno::RuntimeException ) { @@ -2329,7 +2329,7 @@ sal_Bool SAL_CALL SfxDocTplService::removeGroup( const OUString& rGroupName ) return sal_False; } -//----------------------------------------------------------------------------- + sal_Bool SAL_CALL SfxDocTplService::renameGroup( const OUString& rOldName, const OUString& rNewName ) throw( uno::RuntimeException ) @@ -2343,7 +2343,7 @@ sal_Bool SAL_CALL SfxDocTplService::renameGroup( const OUString& rOldName, return sal_False; } -//----------------------------------------------------------------------------- + void SAL_CALL SfxDocTplService::update() throw( uno::RuntimeException ) { @@ -2351,32 +2351,32 @@ void SAL_CALL SfxDocTplService::update() pImp->update( sal_True ); } -//------------------------------------------------------------------------ + Updater_Impl::Updater_Impl( SfxDocTplService_Impl* pTemplates ) { mpDocTemplates = pTemplates; } -//------------------------------------------------------------------------ + Updater_Impl::~Updater_Impl() { } -//------------------------------------------------------------------------ + void SAL_CALL Updater_Impl::run() { mpDocTemplates->doUpdate(); } -//------------------------------------------------------------------------ + void SAL_CALL Updater_Impl::onTerminated() { mpDocTemplates->finished(); delete this; } -//----------------------------------------------------------------------------- + WaitWindow_Impl::WaitWindow_Impl() : WorkWindow( NULL, WB_BORDER | WB_3DLOOK ) { @@ -2394,19 +2394,19 @@ WaitWindow_Impl::WaitWindow_Impl() Flush(); } -//----------------------------------------------------------------------------- + WaitWindow_Impl::~WaitWindow_Impl() { Hide(); } -//----------------------------------------------------------------------------- + void WaitWindow_Impl::Paint( const Rectangle& /*rRect*/ ) { DrawText( _aRect, _aText, _nTextStyle ); } -//----------------------------------------------------------------------------- + void SfxDocTplService_Impl::addHierGroup( GroupList_Impl& rList, const OUString& rTitle, const OUString& rOwnURL ) @@ -2477,7 +2477,7 @@ void SfxDocTplService_Impl::addHierGroup( GroupList_Impl& rList, } } -//----------------------------------------------------------------------------- + void SfxDocTplService_Impl::addFsysGroup( GroupList_Impl& rList, const OUString& rTitle, const OUString& rUITitle, @@ -2568,7 +2568,7 @@ void SfxDocTplService_Impl::addFsysGroup( GroupList_Impl& rList, } } -// ----------------------------------------------------------------------- + void SfxDocTplService_Impl::createFromContent( GroupList_Impl& rList, Content &rContent, sal_Bool bHierarchy, @@ -2635,7 +2635,7 @@ void SfxDocTplService_Impl::createFromContent( GroupList_Impl& rList, } } -//----------------------------------------------------------------------------- + void SfxDocTplService_Impl::removeFromHierarchy( DocTemplates_EntryData_Impl *pData ) { Content aTemplate; @@ -2646,7 +2646,7 @@ void SfxDocTplService_Impl::removeFromHierarchy( DocTemplates_EntryData_Impl *pD } } -//----------------------------------------------------------------------------- + void SfxDocTplService_Impl::addToHierarchy( GroupData_Impl *pGroup, DocTemplates_EntryData_Impl *pData ) { @@ -2673,7 +2673,7 @@ void SfxDocTplService_Impl::addToHierarchy( GroupData_Impl *pGroup, pData->getType() ); } -//----------------------------------------------------------------------------- + void SfxDocTplService_Impl::updateData( DocTemplates_EntryData_Impl *pData ) { Content aTemplate; @@ -2696,7 +2696,7 @@ void SfxDocTplService_Impl::updateData( DocTemplates_EntryData_Impl *pData ) } } -//----------------------------------------------------------------------------- + void SfxDocTplService_Impl::addGroupToHierarchy( GroupData_Impl *pGroup ) { OUString aAdditionalProp( TARGET_DIR_URL ); @@ -2723,7 +2723,7 @@ void SfxDocTplService_Impl::addGroupToHierarchy( GroupData_Impl *pGroup ) } } -//----------------------------------------------------------------------------- + void SfxDocTplService_Impl::removeFromHierarchy( GroupData_Impl *pGroup ) { Content aGroup; @@ -2734,7 +2734,7 @@ void SfxDocTplService_Impl::removeFromHierarchy( GroupData_Impl *pGroup ) } } -// ----------------------------------------------------------------------- + GroupData_Impl::GroupData_Impl( const OUString& rTitle ) { maTitle = rTitle; @@ -2742,7 +2742,7 @@ GroupData_Impl::GroupData_Impl( const OUString& rTitle ) mbInHierarchy = sal_False; } -// ----------------------------------------------------------------------- + GroupData_Impl::~GroupData_Impl() { for ( size_t i = 0, n = maEntries.size(); i < n; ++i ) @@ -2750,7 +2750,7 @@ GroupData_Impl::~GroupData_Impl() maEntries.clear(); } -// ----------------------------------------------------------------------- + DocTemplates_EntryData_Impl* GroupData_Impl::addEntry( const OUString& rTitle, const OUString& rTargetURL, const OUString& rType, @@ -2802,7 +2802,7 @@ DocTemplates_EntryData_Impl* GroupData_Impl::addEntry( const OUString& rTitle, return pData; } -// ----------------------------------------------------------------------- + DocTemplates_EntryData_Impl::DocTemplates_EntryData_Impl( const OUString& rTitle ) { maTitle = rTitle; @@ -2825,18 +2825,18 @@ bool SfxURLRelocator_Impl::propertyCanContainOfficeDir( return ( rPropName == TARGET_DIR_URL || rPropName == PROPERTY_DIRLIST ); } -// ----------------------------------------------------------------------- + SfxURLRelocator_Impl::SfxURLRelocator_Impl( const uno::Reference< XComponentContext > & xContext ) : mxContext( xContext ) { } -// ----------------------------------------------------------------------- + SfxURLRelocator_Impl::~SfxURLRelocator_Impl() { } -// ----------------------------------------------------------------------- + void SfxURLRelocator_Impl::initOfficeInstDirs() { if ( !mxOfficeInstDirs.is() ) @@ -2851,7 +2851,7 @@ void SfxURLRelocator_Impl::initOfficeInstDirs() } } -// ----------------------------------------------------------------------- + void SfxURLRelocator_Impl::implExpandURL( OUString& io_url ) { const INetURLObject aParser( io_url ); @@ -2873,7 +2873,7 @@ void SfxURLRelocator_Impl::implExpandURL( OUString& io_url ) } } -// ----------------------------------------------------------------------- + void SfxURLRelocator_Impl::makeRelocatableURL( OUString & rURL ) { if ( !rURL.isEmpty() ) @@ -2884,7 +2884,7 @@ void SfxURLRelocator_Impl::makeRelocatableURL( OUString & rURL ) } } -// ----------------------------------------------------------------------- + void SfxURLRelocator_Impl::makeAbsoluteURL( OUString & rURL ) { if ( !rURL.isEmpty() ) diff --git a/sfx2/source/doc/doctemplateslocal.cxx b/sfx2/source/doc/doctemplateslocal.cxx index d895492cb972..e250d9f0bca6 100644 --- a/sfx2/source/doc/doctemplateslocal.cxx +++ b/sfx2/source/doc/doctemplateslocal.cxx @@ -32,7 +32,7 @@ using namespace ::com::sun::star; -// ----------------------------------- + uno::Sequence< beans::StringPair > DocTemplLocaleHelper::ReadGroupLocalizationSequence( const uno::Reference< io::XInputStream >& xInStream, const uno::Reference< uno::XComponentContext > xContext ) throw( uno::Exception ) { @@ -40,7 +40,7 @@ uno::Sequence< beans::StringPair > DocTemplLocaleHelper::ReadGroupLocalizationSe return ReadLocalizationSequence_Impl( xInStream, aStringID, xContext ); } -// ----------------------------------- + void SAL_CALL DocTemplLocaleHelper::WriteGroupLocalizationSequence( const uno::Reference< io::XOutputStream >& xOutStream, const uno::Sequence< beans::StringPair >& aSequence, const uno::Reference< uno::XComponentContext > xContext ) throw( uno::Exception ) { @@ -89,7 +89,7 @@ void SAL_CALL DocTemplLocaleHelper::WriteGroupLocalizationSequence( const uno::R // ================================================================================== -// ----------------------------------- + uno::Sequence< beans::StringPair > SAL_CALL DocTemplLocaleHelper::ReadLocalizationSequence_Impl( const uno::Reference< io::XInputStream >& xInStream, const OUString& aStringID, const uno::Reference< uno::XComponentContext > xContext ) throw( uno::Exception ) { @@ -110,7 +110,7 @@ uno::Sequence< beans::StringPair > SAL_CALL DocTemplLocaleHelper::ReadLocalizati return pHelper->GetParsingResult(); } -// ----------------------------------- + DocTemplLocaleHelper::DocTemplLocaleHelper() : m_aGroupListElement( "groupuinames:template-group-list" ) , m_aGroupElement( "groupuinames:template-group" ) @@ -119,12 +119,12 @@ DocTemplLocaleHelper::DocTemplLocaleHelper() { } -// ----------------------------------- + DocTemplLocaleHelper::~DocTemplLocaleHelper() { } -// ----------------------------------- + uno::Sequence< beans::StringPair > DocTemplLocaleHelper::GetParsingResult() { if ( m_aElementsSeq.getLength() ) @@ -133,19 +133,19 @@ uno::Sequence< beans::StringPair > DocTemplLocaleHelper::GetParsingResult() return m_aResultSeq; } -// ----------------------------------- + void SAL_CALL DocTemplLocaleHelper::startDocument() throw(xml::sax::SAXException, uno::RuntimeException) { } -// ----------------------------------- + void SAL_CALL DocTemplLocaleHelper::endDocument() throw(xml::sax::SAXException, uno::RuntimeException) { } -// ----------------------------------- + void SAL_CALL DocTemplLocaleHelper::startElement( const OUString& aName, const uno::Reference< xml::sax::XAttributeList >& xAttribs ) throw( xml::sax::SAXException, uno::RuntimeException ) { @@ -197,7 +197,7 @@ void SAL_CALL DocTemplLocaleHelper::startElement( const OUString& aName, const u } } -// ----------------------------------- + void SAL_CALL DocTemplLocaleHelper::endElement( const OUString& aName ) throw( xml::sax::SAXException, uno::RuntimeException ) { @@ -211,25 +211,25 @@ void SAL_CALL DocTemplLocaleHelper::endElement( const OUString& aName ) m_aElementsSeq.realloc( nLength - 1 ); } -// ----------------------------------- + void SAL_CALL DocTemplLocaleHelper::characters( const OUString& /*aChars*/ ) throw(xml::sax::SAXException, uno::RuntimeException) { } -// ----------------------------------- + void SAL_CALL DocTemplLocaleHelper::ignorableWhitespace( const OUString& /*aWhitespaces*/ ) throw(xml::sax::SAXException, uno::RuntimeException) { } -// ----------------------------------- + void SAL_CALL DocTemplLocaleHelper::processingInstruction( const OUString& /*aTarget*/, const OUString& /*aData*/ ) throw(xml::sax::SAXException, uno::RuntimeException) { } -// ----------------------------------- + void SAL_CALL DocTemplLocaleHelper::setDocumentLocator( const uno::Reference< xml::sax::XLocator >& /*xLocator*/ ) throw(xml::sax::SAXException, uno::RuntimeException) { diff --git a/sfx2/source/doc/docundomanager.cxx b/sfx2/source/doc/docundomanager.cxx index f33f89e92a25..5401b8d7b047 100644 --- a/sfx2/source/doc/docundomanager.cxx +++ b/sfx2/source/doc/docundomanager.cxx @@ -122,7 +122,7 @@ namespace sfx2 } }; - //------------------------------------------------------------------------------------------------------------------ + ::svl::IUndoManager& DocumentUndoManager_Impl::getImplUndoManager() { ENSURE_OR_THROW( pUndoManager != NULL, "DocumentUndoManager_Impl::getImplUndoManager: no access to the doc's UndoManager implementation!" ); @@ -138,13 +138,13 @@ namespace sfx2 return *pUndoManager; } - //------------------------------------------------------------------------------------------------------------------ + Reference< XUndoManager > DocumentUndoManager_Impl::getThis() { return static_cast< XUndoManager* >( &rAntiImpl ); } - //------------------------------------------------------------------------------------------------------------------ + void DocumentUndoManager_Impl::invalidateXDo_nolck() { SfxModelGuard aGuard( rAntiImpl ); @@ -227,44 +227,44 @@ namespace sfx2 //================================================================================================================== //= DocumentUndoManager //================================================================================================================== - //------------------------------------------------------------------------------------------------------------------ + DocumentUndoManager::DocumentUndoManager( SfxBaseModel& i_document ) :SfxModelSubComponent( i_document ) ,m_pImpl( new DocumentUndoManager_Impl( *this ) ) { } - //------------------------------------------------------------------------------------------------------------------ + DocumentUndoManager::~DocumentUndoManager() { } - //------------------------------------------------------------------------------------------------------------------ + void DocumentUndoManager::disposing() { m_pImpl->disposing(); } - //------------------------------------------------------------------------------------------------------------------ + bool DocumentUndoManager::isInContext() const { // No mutex locking within this method, no disposal check - this is the responsibility of the owner. return m_pImpl->getImplUndoManager().IsInListAction(); } - //------------------------------------------------------------------------------------------------------------------ + void SAL_CALL DocumentUndoManager::acquire( ) throw () { SfxModelSubComponent::acquire(); } - //------------------------------------------------------------------------------------------------------------------ + void SAL_CALL DocumentUndoManager::release( ) throw () { SfxModelSubComponent::release(); } - //------------------------------------------------------------------------------------------------------------------ + void SAL_CALL DocumentUndoManager::enterUndoContext( const OUString& i_title ) throw (RuntimeException) { // SYNCHRONIZED ---> @@ -274,7 +274,7 @@ namespace sfx2 m_pImpl->invalidateXDo_nolck(); } - //------------------------------------------------------------------------------------------------------------------ + void SAL_CALL DocumentUndoManager::enterHiddenUndoContext( ) throw (EmptyUndoStackException, RuntimeException) { // SYNCHRONIZED ---> @@ -284,7 +284,7 @@ namespace sfx2 m_pImpl->invalidateXDo_nolck(); } - //------------------------------------------------------------------------------------------------------------------ + void SAL_CALL DocumentUndoManager::leaveUndoContext( ) throw (InvalidStateException, RuntimeException) { // SYNCHRONIZED ---> @@ -294,7 +294,7 @@ namespace sfx2 m_pImpl->invalidateXDo_nolck(); } - //------------------------------------------------------------------------------------------------------------------ + void SAL_CALL DocumentUndoManager::addUndoAction( const Reference< XUndoAction >& i_action ) throw (RuntimeException, IllegalArgumentException) { // SYNCHRONIZED ---> @@ -304,7 +304,7 @@ namespace sfx2 m_pImpl->invalidateXDo_nolck(); } - //------------------------------------------------------------------------------------------------------------------ + void SAL_CALL DocumentUndoManager::undo( ) throw (EmptyUndoStackException, UndoContextNotClosedException, UndoFailedException, RuntimeException) { // SYNCHRONIZED ---> @@ -314,7 +314,7 @@ namespace sfx2 m_pImpl->invalidateXDo_nolck(); } - //------------------------------------------------------------------------------------------------------------------ + void SAL_CALL DocumentUndoManager::redo( ) throw (EmptyUndoStackException, UndoContextNotClosedException, UndoFailedException, RuntimeException) { // SYNCHRONIZED ---> @@ -324,49 +324,49 @@ namespace sfx2 m_pImpl->invalidateXDo_nolck(); } - //------------------------------------------------------------------------------------------------------------------ + ::sal_Bool SAL_CALL DocumentUndoManager::isUndoPossible( ) throw (RuntimeException) { UndoManagerGuard aGuard( *this ); return m_pImpl->aUndoHelper.isUndoPossible(); } - //------------------------------------------------------------------------------------------------------------------ + ::sal_Bool SAL_CALL DocumentUndoManager::isRedoPossible( ) throw (RuntimeException) { UndoManagerGuard aGuard( *this ); return m_pImpl->aUndoHelper.isRedoPossible(); } - //------------------------------------------------------------------------------------------------------------------ + OUString SAL_CALL DocumentUndoManager::getCurrentUndoActionTitle( ) throw (EmptyUndoStackException, RuntimeException) { UndoManagerGuard aGuard( *this ); return m_pImpl->aUndoHelper.getCurrentUndoActionTitle(); } - //------------------------------------------------------------------------------------------------------------------ + OUString SAL_CALL DocumentUndoManager::getCurrentRedoActionTitle( ) throw (EmptyUndoStackException, RuntimeException) { UndoManagerGuard aGuard( *this ); return m_pImpl->aUndoHelper.getCurrentRedoActionTitle(); } - //------------------------------------------------------------------------------------------------------------------ + Sequence< OUString > SAL_CALL DocumentUndoManager::getAllUndoActionTitles( ) throw (RuntimeException) { UndoManagerGuard aGuard( *this ); return m_pImpl->aUndoHelper.getAllUndoActionTitles(); } - //------------------------------------------------------------------------------------------------------------------ + Sequence< OUString > SAL_CALL DocumentUndoManager::getAllRedoActionTitles( ) throw (RuntimeException) { UndoManagerGuard aGuard( *this ); return m_pImpl->aUndoHelper.getAllRedoActionTitles(); } - //------------------------------------------------------------------------------------------------------------------ + void SAL_CALL DocumentUndoManager::clear( ) throw (UndoContextNotClosedException, RuntimeException) { // SYNCHRONIZED ---> @@ -376,7 +376,7 @@ namespace sfx2 m_pImpl->invalidateXDo_nolck(); } - //------------------------------------------------------------------------------------------------------------------ + void SAL_CALL DocumentUndoManager::clearRedo( ) throw (UndoContextNotClosedException, RuntimeException) { // SYNCHRONIZED ---> @@ -386,7 +386,7 @@ namespace sfx2 m_pImpl->invalidateXDo_nolck(); } - //------------------------------------------------------------------------------------------------------------------ + void SAL_CALL DocumentUndoManager::reset() throw (RuntimeException) { // SYNCHRONIZED ---> @@ -396,49 +396,49 @@ namespace sfx2 m_pImpl->invalidateXDo_nolck(); } - //------------------------------------------------------------------------------------------------------------------ + void SAL_CALL DocumentUndoManager::lock( ) throw (RuntimeException) { UndoManagerGuard aGuard( *this ); m_pImpl->aUndoHelper.lock(); } - //------------------------------------------------------------------------------------------------------------------ + void SAL_CALL DocumentUndoManager::unlock( ) throw (RuntimeException, NotLockedException) { UndoManagerGuard aGuard( *this ); m_pImpl->aUndoHelper.unlock(); } - //------------------------------------------------------------------------------------------------------------------ + ::sal_Bool SAL_CALL DocumentUndoManager::isLocked( ) throw (RuntimeException) { UndoManagerGuard aGuard( *this ); return m_pImpl->aUndoHelper.isLocked(); } - //------------------------------------------------------------------------------------------------------------------ + void SAL_CALL DocumentUndoManager::addUndoManagerListener( const Reference< XUndoManagerListener >& i_listener ) throw (RuntimeException) { UndoManagerGuard aGuard( *this ); return m_pImpl->aUndoHelper.addUndoManagerListener( i_listener ); } - //------------------------------------------------------------------------------------------------------------------ + void SAL_CALL DocumentUndoManager::removeUndoManagerListener( const Reference< XUndoManagerListener >& i_listener ) throw (RuntimeException) { UndoManagerGuard aGuard( *this ); return m_pImpl->aUndoHelper.removeUndoManagerListener( i_listener ); } - //------------------------------------------------------------------------------------------------------------------ + Reference< XInterface > SAL_CALL DocumentUndoManager::getParent( ) throw (RuntimeException) { UndoManagerGuard aGuard( *this ); return static_cast< XModel* >( &getBaseModel() ); } - //------------------------------------------------------------------------------------------------------------------ + void SAL_CALL DocumentUndoManager::setParent( const Reference< XInterface >& i_parent ) throw (NoSupportException, RuntimeException) { (void)i_parent; diff --git a/sfx2/source/doc/frmdescr.cxx b/sfx2/source/doc/frmdescr.cxx index 8ca270242f65..f03a54c14a4e 100644 --- a/sfx2/source/doc/frmdescr.cxx +++ b/sfx2/source/doc/frmdescr.cxx @@ -193,14 +193,14 @@ bool SfxFrameDescriptorItem::operator==( const SfxPoolItem& rAttr ) const return aProperties == ((SfxFrameDescriptorItem&)rAttr).aProperties; } -// ----------------------------------------------------------------------- + SfxPoolItem* SfxFrameDescriptorItem::Clone( SfxItemPool* ) const { return new SfxFrameDescriptorItem( *this ); } -//------------------------------------------------------------------------ + SfxItemPresentation SfxFrameDescriptorItem::GetPresentation ( diff --git a/sfx2/source/doc/graphhelp.cxx b/sfx2/source/doc/graphhelp.cxx index 12482c236885..6a6597d9197d 100644 --- a/sfx2/source/doc/graphhelp.cxx +++ b/sfx2/source/doc/graphhelp.cxx @@ -84,7 +84,7 @@ SvMemoryStream* GraphicHelper::getFormatStrFromGDI_Impl( const GDIMetaFile* pGDI return pResult; } -//--------------------------------------------------------------- + // static void* GraphicHelper::getEnhMetaFileFromGDI_Impl( const GDIMetaFile* pGDIMeta ) { @@ -121,7 +121,7 @@ void* GraphicHelper::getEnhMetaFileFromGDI_Impl( const GDIMetaFile* pGDIMeta ) return pResult; } -//--------------------------------------------------------------- + // static void* GraphicHelper::getWinMetaFileFromGDI_Impl( const GDIMetaFile* pGDIMeta, const Size& aMetaSize ) { @@ -193,7 +193,7 @@ void* GraphicHelper::getWinMetaFileFromGDI_Impl( const GDIMetaFile* pGDIMeta, co return pResult; } -//--------------------------------------------------------------- + // static sal_Bool GraphicHelper::supportsMetaFileHandle_Impl() { @@ -204,7 +204,7 @@ sal_Bool GraphicHelper::supportsMetaFileHandle_Impl() #endif } -//--------------------------------------------------------------- + // static sal_Bool GraphicHelper::mergeBitmaps_Impl( const BitmapEx& rBmpEx, const BitmapEx& rOverlay, const Rectangle& rOverlayRect, BitmapEx& rReturn ) @@ -325,7 +325,7 @@ sal_Bool GraphicHelper::getThumbnailReplacement_Impl( sal_Int32 nResID, const un return bResult; } -//--------------------------------------------------------------- + // static sal_uInt16 GraphicHelper::getThumbnailReplacementIDByFactoryName_Impl( const OUString& aFactoryShortName, sal_Bool /*bIsTemplate*/ ) { diff --git a/sfx2/source/doc/guisaveas.cxx b/sfx2/source/doc/guisaveas.cxx index 32d1c5773371..be619af4a12d 100644 --- a/sfx2/source/doc/guisaveas.cxx +++ b/sfx2/source/doc/guisaveas.cxx @@ -121,7 +121,7 @@ using namespace ::com::sun::star; using namespace css::system; namespace { -//------------------------------------------------------------------------- + static sal_uInt16 getSlotIDFromMode( sal_Int8 nStoreMode ) { // This is a temporary hardcoded solution must be removed when @@ -143,7 +143,7 @@ static sal_uInt16 getSlotIDFromMode( sal_Int8 nStoreMode ) return nResult; } -//------------------------------------------------------------------------- + static sal_uInt8 getStoreModeFromSlotName( const OUString& aSlotName ) { sal_uInt8 nResult = 0; @@ -166,14 +166,14 @@ static sal_uInt8 getStoreModeFromSlotName( const OUString& aSlotName ) return nResult; } -//------------------------------------------------------------------------- + static sal_Int32 getMustFlags( sal_Int8 nStoreMode ) { return ( SFX_FILTER_EXPORT | ( ( ( nStoreMode & EXPORT_REQUESTED ) && !( nStoreMode & WIDEEXPORT_REQUESTED ) ) ? 0 : SFX_FILTER_IMPORT ) ); } -//------------------------------------------------------------------------- + static sal_Int32 getDontFlags( sal_Int8 nStoreMode ) { return ( SFX_FILTER_INTERNAL @@ -323,7 +323,7 @@ public: }; -//------------------------------------------------------------------------- + ModelData_Impl::ModelData_Impl( SfxStoringHelper& aOwner, const uno::Reference< frame::XModel >& xModel, const uno::Sequence< beans::PropertyValue >& aMediaDescr ) @@ -360,7 +360,7 @@ ModelData_Impl::ModelData_Impl( SfxStoringHelper& aOwner, } } -//------------------------------------------------------------------------- + ModelData_Impl::~ModelData_Impl() { FreeDocumentProps(); @@ -371,7 +371,7 @@ ModelData_Impl::~ModelData_Impl() delete m_pModulePropsHM; } -//------------------------------------------------------------------------- + void ModelData_Impl::FreeDocumentProps() { if ( m_pDocumentPropsHM ) @@ -381,7 +381,7 @@ void ModelData_Impl::FreeDocumentProps() } } -//------------------------------------------------------------------------- + uno::Reference< frame::XModel > ModelData_Impl::GetModel() { if ( !m_xModel.is() ) @@ -390,7 +390,7 @@ uno::Reference< frame::XModel > ModelData_Impl::GetModel() return m_xModel; } -//------------------------------------------------------------------------- + uno::Reference< frame::XStorable > ModelData_Impl::GetStorable() { if ( !m_xStorable.is() ) @@ -403,7 +403,7 @@ uno::Reference< frame::XStorable > ModelData_Impl::GetStorable() return m_xStorable; } -//------------------------------------------------------------------------- + uno::Reference< frame::XStorable2 > ModelData_Impl::GetStorable2() { if ( !m_xStorable2.is() ) @@ -416,7 +416,7 @@ uno::Reference< frame::XStorable2 > ModelData_Impl::GetStorable2() return m_xStorable2; } -//------------------------------------------------------------------------- + uno::Reference< util::XModifiable > ModelData_Impl::GetModifiable() { if ( !m_xModifiable.is() ) @@ -429,7 +429,7 @@ uno::Reference< util::XModifiable > ModelData_Impl::GetModifiable() return m_xModifiable; } -//------------------------------------------------------------------------- + const ::comphelper::SequenceAsHashMap& ModelData_Impl::GetDocProps() { if ( !m_pDocumentPropsHM ) @@ -438,7 +438,7 @@ const ::comphelper::SequenceAsHashMap& ModelData_Impl::GetDocProps() return *m_pDocumentPropsHM; } -//------------------------------------------------------------------------- + OUString ModelData_Impl::GetModuleName() { if ( m_aModuleName.isEmpty() ) @@ -451,7 +451,7 @@ OUString ModelData_Impl::GetModuleName() return m_aModuleName; } -//------------------------------------------------------------------------- + const ::comphelper::SequenceAsHashMap& ModelData_Impl::GetModuleProps() { if ( !m_pModulePropsHM ) @@ -466,13 +466,13 @@ const ::comphelper::SequenceAsHashMap& ModelData_Impl::GetModuleProps() return *m_pModulePropsHM; } -//------------------------------------------------------------------------- + OUString ModelData_Impl::GetDocServiceName() { return GetModuleProps().getUnpackedValueOrDefault("ooSetupFactoryDocumentService", OUString()); } -//------------------------------------------------------------------------- + void ModelData_Impl::CheckInteractionHandler() { ::comphelper::SequenceAsHashMap::const_iterator aInteractIter = @@ -495,7 +495,7 @@ void ModelData_Impl::CheckInteractionHandler() } } -//------------------------------------------------------------------------- + uno::Sequence< beans::PropertyValue > ModelData_Impl::GetDocServiceDefaultFilter() { uno::Sequence< beans::PropertyValue > aProps; @@ -509,7 +509,7 @@ uno::Sequence< beans::PropertyValue > ModelData_Impl::GetDocServiceDefaultFilter return aProps; } -//------------------------------------------------------------------------- + uno::Sequence< beans::PropertyValue > ModelData_Impl::GetDocServiceDefaultFilterCheckFlags( sal_Int32 nMust, sal_Int32 nDont ) { @@ -528,7 +528,7 @@ uno::Sequence< beans::PropertyValue > ModelData_Impl::GetDocServiceDefaultFilter } -//------------------------------------------------------------------------- + uno::Sequence< beans::PropertyValue > ModelData_Impl::GetDocServiceAnyFilter( sal_Int32 nMust, sal_Int32 nDont ) { uno::Sequence< beans::NamedValue > aSearchRequest( 1 ); @@ -538,7 +538,7 @@ uno::Sequence< beans::PropertyValue > ModelData_Impl::GetDocServiceAnyFilter( sa return ::comphelper::MimeConfigurationHelper::SearchForFilter( m_pOwner->GetFilterQuery(), aSearchRequest, nMust, nDont ); } -//------------------------------------------------------------------------- + uno::Sequence< beans::PropertyValue > ModelData_Impl::GetPreselectedFilter_Impl( sal_Int8 nStoreMode ) { uno::Sequence< beans::PropertyValue > aFilterProps; @@ -571,7 +571,7 @@ uno::Sequence< beans::PropertyValue > ModelData_Impl::GetPreselectedFilter_Impl( return aFilterProps; } -//------------------------------------------------------------------------- + sal_Bool ModelData_Impl::ExecuteFilterDialog_Impl( const OUString& aFilterName ) { sal_Bool bDialogUsed = sal_False; @@ -650,7 +650,7 @@ sal_Bool ModelData_Impl::ExecuteFilterDialog_Impl( const OUString& aFilterName ) return bDialogUsed; } -//------------------------------------------------------------------------- + sal_Int8 ModelData_Impl::CheckSaveAcceptable( sal_Int8 nCurStatus ) { sal_Int8 nResult = nCurStatus; @@ -677,7 +677,7 @@ sal_Int8 ModelData_Impl::CheckSaveAcceptable( sal_Int8 nCurStatus ) return nResult; } -//------------------------------------------------------------------------- + sal_Int8 ModelData_Impl::CheckStateForSave() { // if the document is readonly or a new one a SaveAs operation must be used @@ -835,7 +835,7 @@ sal_Int8 ModelData_Impl::CheckFilter( const OUString& aFilterName ) return STATUS_SAVE; } -//------------------------------------------------------------------------- + sal_Bool ModelData_Impl::CheckFilterOptionsDialogExistence() { uno::Sequence< beans::NamedValue > aSearchRequest( 1 ); @@ -862,7 +862,7 @@ sal_Bool ModelData_Impl::CheckFilterOptionsDialogExistence() return sal_False; } -//------------------------------------------------------------------------- + sal_Bool ModelData_Impl::OutputFileDialog( sal_Int8 nStoreMode, const ::comphelper::SequenceAsHashMap& aPreselectedFilterPropsHM, sal_Bool bSetStandardName, @@ -1173,7 +1173,7 @@ sal_Bool ModelData_Impl::OutputFileDialog( sal_Int8 nStoreMode, return bUseFilterOptions; } -//------------------------------------------------------------------------- + sal_Bool ModelData_Impl::ShowDocumentInfoDialog() { sal_Bool bDialogUsed = sal_False; @@ -1211,7 +1211,7 @@ sal_Bool ModelData_Impl::ShowDocumentInfoDialog() return bDialogUsed; } -//------------------------------------------------------------------------- + OUString ModelData_Impl::GetRecommendedDir( const OUString& aSuggestedDir ) { OUString aRecommendedDir; @@ -1249,7 +1249,7 @@ OUString ModelData_Impl::GetRecommendedDir( const OUString& aSuggestedDir ) return aRecommendedDir; } -//------------------------------------------------------------------------- + OUString ModelData_Impl::GetRecommendedName( const OUString& aSuggestedName, const OUString& aTypeName ) { // the last used name might be provided by aSuggestedName from the old selection, or from the MediaDescriptor @@ -1301,12 +1301,12 @@ OUString ModelData_Impl::GetRecommendedName( const OUString& aSuggestedName, con //========================================================================= // class SfxStoringHelper //========================================================================= -//------------------------------------------------------------------------- + SfxStoringHelper::SfxStoringHelper() { } -//------------------------------------------------------------------------- + uno::Reference< container::XNameAccess > SfxStoringHelper::GetFilterConfiguration() { if ( !m_xFilterCFG.is() ) @@ -1322,7 +1322,7 @@ uno::Reference< container::XNameAccess > SfxStoringHelper::GetFilterConfiguratio return m_xFilterCFG; } -//------------------------------------------------------------------------- + uno::Reference< container::XContainerQuery > SfxStoringHelper::GetFilterQuery() { if ( !m_xFilterQuery.is() ) @@ -1335,7 +1335,7 @@ uno::Reference< container::XContainerQuery > SfxStoringHelper::GetFilterQuery() return m_xFilterQuery; } -//------------------------------------------------------------------------- + uno::Reference< ::com::sun::star::frame::XModuleManager2 > SfxStoringHelper::GetModuleManager() { if ( !m_xModuleManager.is() ) @@ -1347,7 +1347,7 @@ uno::Reference< ::com::sun::star::frame::XModuleManager2 > SfxStoringHelper::Get return m_xModuleManager; } -//------------------------------------------------------------------------- + sal_Bool SfxStoringHelper::GUIStoreModel( uno::Reference< frame::XModel > xModel, const OUString& aSlotName, uno::Sequence< beans::PropertyValue >& aArgsSequence, @@ -1724,7 +1724,7 @@ sal_Bool SfxStoringHelper::GUIStoreModel( uno::Reference< frame::XModel > xModel return bDialogUsed; } -//------------------------------------------------------------------------- + // static sal_Bool SfxStoringHelper::CheckFilterOptionsAppearence( const uno::Reference< container::XNameAccess >& xFilterCFG, @@ -1756,7 +1756,7 @@ sal_Bool SfxStoringHelper::CheckFilterOptionsAppearence( return bUseFilterOptions; } -//------------------------------------------------------------------------- + // static void SfxStoringHelper::SetDocInfoState( const uno::Reference< frame::XModel >& xModel, @@ -1836,7 +1836,7 @@ void SfxStoringHelper::SetDocInfoState( xModifiable->setModified( bIsModified ); } -//------------------------------------------------------------------------- + // static sal_Bool SfxStoringHelper::WarnUnacceptableFormat( const uno::Reference< frame::XModel >& xModel, OUString aOldUIName, diff --git a/sfx2/source/doc/new.cxx b/sfx2/source/doc/new.cxx index 13417a5d5265..4fb3137c660b 100644 --- a/sfx2/source/doc/new.cxx +++ b/sfx2/source/doc/new.cxx @@ -187,7 +187,7 @@ public: }; -//------------------------------------------------------------------------- + void SfxNewFileDialog_Impl::ClearInfo() { @@ -198,7 +198,7 @@ void SfxNewFileDialog_Impl::ClearInfo() aDescEd.SetText(aNo); } -//------------------------------------------------------------------------- + IMPL_LINK_NOARG(SfxNewFileDialog_Impl, Update) { @@ -273,7 +273,7 @@ IMPL_LINK_NOARG(SfxNewFileDialog_Impl, Update) return sal_True; } -//------------------------------------------------------------------------- + IMPL_LINK( SfxNewFileDialog_Impl, RegionSelect, ListBox *, pBox ) { @@ -300,7 +300,7 @@ IMPL_LINK( SfxNewFileDialog_Impl, RegionSelect, ListBox *, pBox ) return 0; } -//------------------------------------------------------------------------- + IMPL_LINK_NOARG_INLINE_START(SfxNewFileDialog_Impl, Expand) { @@ -309,7 +309,7 @@ IMPL_LINK_NOARG_INLINE_START(SfxNewFileDialog_Impl, Expand) } IMPL_LINK_NOARG_INLINE_END(SfxNewFileDialog_Impl, Expand) -//------------------------------------------------------------------------- + IMPL_LINK( SfxNewFileDialog_Impl, PreviewClick, CheckBox *, pBox ) { @@ -331,7 +331,7 @@ IMPL_LINK( SfxNewFileDialog_Impl, PreviewClick, CheckBox *, pBox ) return 0; } -//------------------------------------------------------------------------- + IMPL_LINK_NOARG(SfxNewFileDialog_Impl, TemplateSelect) { @@ -347,7 +347,7 @@ IMPL_LINK_NOARG(SfxNewFileDialog_Impl, TemplateSelect) return 0; } -//------------------------------------------------------------------------- + IMPL_LINK_INLINE_START( SfxNewFileDialog_Impl, DoubleClick, ListBox *, pListBox ) { @@ -359,7 +359,7 @@ IMPL_LINK_INLINE_START( SfxNewFileDialog_Impl, DoubleClick, ListBox *, pListBox } IMPL_LINK_INLINE_END( SfxNewFileDialog_Impl, DoubleClick, ListBox *, pListBox ) -//------------------------------------------------------------------------- + IMPL_LINK_NOARG_INLINE_START(SfxNewFileDialog_Impl, LoadFile) { @@ -367,7 +367,7 @@ IMPL_LINK_NOARG_INLINE_START(SfxNewFileDialog_Impl, LoadFile) return 0; } IMPL_LINK_NOARG_INLINE_END(SfxNewFileDialog_Impl, LoadFile) -//------------------------------------------------------------------------- + sal_uInt16 SfxNewFileDialog_Impl::GetSelectedTemplatePos() const { @@ -383,7 +383,7 @@ sal_uInt16 SfxNewFileDialog_Impl::GetSelectedTemplatePos() const return nEntry; } -//------------------------------------------------------------------------- + sal_Bool SfxNewFileDialog_Impl::IsTemplate() const { @@ -391,7 +391,7 @@ sal_Bool SfxNewFileDialog_Impl::IsTemplate() const } -//------------------------------------------------------------------------- + OUString SfxNewFileDialog_Impl::GetTemplateFileName() const { @@ -401,7 +401,7 @@ OUString SfxNewFileDialog_Impl::GetTemplateFileName() const GetSelectedTemplatePos()-1); } -//------------------------------------------------------------------------- + void AdjustPosSize_Impl(Window *pWin, short nMoveOffset, short nSizeOffset) { @@ -411,7 +411,7 @@ void AdjustPosSize_Impl(Window *pWin, short nMoveOffset, short nSizeOffset) aSize.Width() += nSizeOffset; pWin->SetPosSizePixel(aPos, aSize); } -//------------------------------------------------------------------------- + sal_uInt16 SfxNewFileDialog_Impl::GetTemplateFlags()const { sal_uInt16 nRet = aTextStyleCB.IsChecked() ? SFX_LOAD_TEXT_STYLES : 0; @@ -425,7 +425,7 @@ sal_uInt16 SfxNewFileDialog_Impl::GetTemplateFlags()const nRet |= SFX_MERGE_STYLES; return nRet; } -//------------------------------------------------------------------------- + void SfxNewFileDialog_Impl::SetTemplateFlags(sal_uInt16 nSet) { aTextStyleCB.Check( 0 != (nSet&SFX_LOAD_TEXT_STYLES )); @@ -435,7 +435,7 @@ void SfxNewFileDialog_Impl::SetTemplateFlags(sal_uInt16 nSet) aMergeStyleCB.Check( 0 != (nSet&SFX_MERGE_STYLES )); } -//------------------------------------------------------------------------- + SfxNewFileDialog_Impl::SfxNewFileDialog_Impl( SfxNewFileDialog* pAntiImplP, sal_uInt16 nFl) @@ -554,7 +554,7 @@ SfxNewFileDialog_Impl::SfxNewFileDialog_Impl( RegionSelect(&aRegionLb); } -//------------------------------------------------------------------------- + SfxNewFileDialog_Impl::~SfxNewFileDialog_Impl() { @@ -565,34 +565,34 @@ SfxNewFileDialog_Impl::~SfxNewFileDialog_Impl() delete pMoreBt; } -//------------------------------------------------------------------------- + SfxNewFileDialog::SfxNewFileDialog(Window *pParent, sal_uInt16 nFlags) : SfxModalDialog( pParent, SfxResId( DLG_NEW_FILE ) ) { pImpl = new SfxNewFileDialog_Impl( this, nFlags ); } -//------------------------------------------------------------------------- + SfxNewFileDialog::~SfxNewFileDialog() { delete pImpl; } -//------------------------------------------------------------------------- + sal_Bool SfxNewFileDialog::IsTemplate() const { return pImpl->IsTemplate(); } -//------------------------------------------------------------------------- + OUString SfxNewFileDialog::GetTemplateFileName() const { return pImpl->GetTemplateFileName(); } -//------------------------------------------------------------------------- + sal_uInt16 SfxNewFileDialog::GetTemplateFlags()const { return pImpl->GetTemplateFlags(); } -//------------------------------------------------------------------------- + void SfxNewFileDialog::SetTemplateFlags(sal_uInt16 nSet) { pImpl->SetTemplateFlags(nSet); diff --git a/sfx2/source/doc/objcont.cxx b/sfx2/source/doc/objcont.cxx index 31bb6c819372..2f1d53cbd12c 100644 --- a/sfx2/source/doc/objcont.cxx +++ b/sfx2/source/doc/objcont.cxx @@ -214,7 +214,7 @@ void SfxObjectShell::UpdateDocInfoForSave() } } -//-------------------------------------------------------------------- + static void lcl_add(util::Duration & rDur, Time const& rTime) @@ -286,7 +286,7 @@ void SfxObjectShell::UpdateTime_Impl( } } -//-------------------------------------------------------------------- + SfxDocumentInfoDialog* SfxObjectShell::CreateDocumentInfoDialog ( @@ -297,7 +297,7 @@ SfxDocumentInfoDialog* SfxObjectShell::CreateDocumentInfoDialog return new SfxDocumentInfoDialog(pParent, rSet); } -//-------------------------------------------------------------------- + SfxStyleSheetBasePool* SfxObjectShell::GetStyleSheetPool() { @@ -362,7 +362,7 @@ void SfxObjectShell::LoadStyles delete [] pFound; } -//-------------------------------------------------------------------- + void SfxObjectShell::UpdateFromTemplate_Impl( ) diff --git a/sfx2/source/doc/objembed.cxx b/sfx2/source/doc/objembed.cxx index 32cfcaf270e2..875eddcc2474 100644 --- a/sfx2/source/doc/objembed.cxx +++ b/sfx2/source/doc/objembed.cxx @@ -39,7 +39,7 @@ using namespace ::com::sun::star; -// ----------------------------------------------------------------------- + // TODO/LATER: this workaround must be replaced by API in future if possible SfxObjectShell* SfxObjectShell::GetParentShellByModel_Impl() { @@ -66,7 +66,7 @@ SfxObjectShell* SfxObjectShell::GetParentShellByModel_Impl() return pResult; } -// ----------------------------------------------------------------------- + Printer* SfxObjectShell::GetDocumentPrinter() { SfxObjectShell* pParent = GetParentShellByModel_Impl(); @@ -75,7 +75,7 @@ Printer* SfxObjectShell::GetDocumentPrinter() return NULL; } -// ----------------------------------------------------------------------- + OutputDevice* SfxObjectShell::GetDocumentRefDev() { SfxObjectShell* pParent = GetParentShellByModel_Impl(); @@ -84,13 +84,13 @@ OutputDevice* SfxObjectShell::GetDocumentRefDev() return NULL; } -// ----------------------------------------------------------------------- + void SfxObjectShell::OnDocumentPrinterChanged( Printer* /*pNewPrinter*/ ) { // virtual method } -// ----------------------------------------------------------------------- + Rectangle SfxObjectShell::GetVisArea( sal_uInt16 nAspect ) const { if( nAspect == ASPECT_CONTENT ) @@ -105,14 +105,14 @@ Rectangle SfxObjectShell::GetVisArea( sal_uInt16 nAspect ) const return Rectangle(); } -// ----------------------------------------------------------------------- + const Rectangle& SfxObjectShell::GetVisArea() const { pImp->m_aVisArea = GetVisArea( ASPECT_CONTENT ); return pImp->m_aVisArea; } -// ----------------------------------------------------------------------- + void SfxObjectShell::SetVisArea( const Rectangle & rVisArea ) { if( pImp->m_aVisArea != rVisArea ) @@ -128,31 +128,31 @@ void SfxObjectShell::SetVisArea( const Rectangle & rVisArea ) } } -// ----------------------------------------------------------------------- + void SfxObjectShell::SetVisAreaSize( const Size & rVisSize ) { SetVisArea( Rectangle( GetVisArea().TopLeft(), rVisSize ) ); } -// ----------------------------------------------------------------------- + sal_uIntPtr SfxObjectShell::GetMiscStatus() const { return 0; } -// ----------------------------------------------------------------------- + MapUnit SfxObjectShell::GetMapUnit() const { return pImp->m_nMapUnit; } -// ----------------------------------------------------------------------- + void SfxObjectShell::SetMapUnit( MapUnit nMapUnit ) { pImp->m_nMapUnit = nMapUnit; } -// ----------------------------------------------------------------------- + void SfxObjectShell::FillTransferableObjectDescriptor( TransferableObjectDescriptor& rDesc ) const { sal_uInt32 nClipFormat; @@ -167,7 +167,7 @@ void SfxObjectShell::FillTransferableObjectDescriptor( TransferableObjectDescrip rDesc.mbCanLink = sal_False; } -// ----------------------------------------------------------------------- + void SfxObjectShell::DoDraw( OutputDevice* pDev, const Point & rObjPos, const Size & rSize, @@ -187,7 +187,7 @@ void SfxObjectShell::DoDraw( OutputDevice* pDev, } } -// ----------------------------------------------------------------------- + void SfxObjectShell::DoDraw_Impl( OutputDevice* pDev, const Point & rViewPos, const Fraction & rScaleX, diff --git a/sfx2/source/doc/objitem.cxx b/sfx2/source/doc/objitem.cxx index c48fce0663a6..39400c3ba380 100644 --- a/sfx2/source/doc/objitem.cxx +++ b/sfx2/source/doc/objitem.cxx @@ -34,21 +34,21 @@ bool SfxObjectShellItem::operator==( const SfxPoolItem &rItem ) const return PTR_CAST(SfxObjectShellItem, &rItem)->pObjSh == pObjSh; } -//-------------------------------------------------------------------- + OUString SfxObjectShellItem::GetValueText() const { return OUString(); } -//-------------------------------------------------------------------- + SfxPoolItem* SfxObjectShellItem::Clone( SfxItemPool *) const { return new SfxObjectShellItem( Which(), pObjSh ); } -//-------------------------------------------------------------------- + bool SfxObjectShellItem::QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/ ) const { @@ -65,7 +65,7 @@ bool SfxObjectShellItem::QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 / return true; } -//-------------------------------------------------------------------- + bool SfxObjectShellItem::PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/ ) { @@ -105,7 +105,7 @@ SfxObjectItem::SfxObjectItem( sal_uInt16 nWhichId, SfxShell *pSh ) _pSh( pSh ) {} -//-------------------------------------------------------------------- + bool SfxObjectItem::operator==( const SfxPoolItem &rItem ) const { @@ -113,7 +113,7 @@ bool SfxObjectItem::operator==( const SfxPoolItem &rItem ) const return pOther->_pSh == _pSh; } -//-------------------------------------------------------------------- + SfxPoolItem* SfxObjectItem::Clone( SfxItemPool *) const { diff --git a/sfx2/source/doc/objmisc.cxx b/sfx2/source/doc/objmisc.cxx index 6a149c0ac4e8..255260c3c1b0 100644 --- a/sfx2/source/doc/objmisc.cxx +++ b/sfx2/source/doc/objmisc.cxx @@ -172,14 +172,14 @@ void SfxObjectShell::AbortImport() pImp->bIsAbortingImport = sal_True; } -//------------------------------------------------------------------------- + sal_Bool SfxObjectShell::IsAbortingImport() const { return pImp->bIsAbortingImport; } -//------------------------------------------------------------------------- + uno::Reference<document::XDocumentProperties> SfxObjectShell::getDocProperties() @@ -193,13 +193,13 @@ SfxObjectShell::getDocProperties() return xDocProps; } -//------------------------------------------------------------------------- + void SfxObjectShell::DoFlushDocInfo() { } -//------------------------------------------------------------------------- + // Note: the only thing that calls this is the modification event handler // that is installed at the XDocumentProperties @@ -217,7 +217,7 @@ void SfxObjectShell::FlushDocInfo() (delay > 0) || !url.isEmpty() ); } -//------------------------------------------------------------------------- + void SfxObjectShell::SetError( sal_uInt32 lErr, const OUString& aLogMessage ) { @@ -230,14 +230,14 @@ void SfxObjectShell::SetError( sal_uInt32 lErr, const OUString& aLogMessage ) } } -//------------------------------------------------------------------------- + sal_uInt32 SfxObjectShell::GetError() const { return ERRCODE_TOERROR(GetErrorCode()); } -//------------------------------------------------------------------------- + sal_uInt32 SfxObjectShell::GetErrorCode() const { @@ -247,7 +247,7 @@ sal_uInt32 SfxObjectShell::GetErrorCode() const return lError; } -//------------------------------------------------------------------------- + void SfxObjectShell::ResetError() { @@ -260,14 +260,14 @@ void SfxObjectShell::ResetError() pMed->ResetError(); } -//------------------------------------------------------------------------- + sal_Bool SfxObjectShell::IsTemplate() const { return pImp->bIsTemplate; } -//------------------------------------------------------------------------- + void SfxObjectShell::EnableSetModified( sal_Bool bEnable ) { @@ -278,14 +278,14 @@ void SfxObjectShell::EnableSetModified( sal_Bool bEnable ) pImp->m_bEnableSetModified = bEnable; } -//------------------------------------------------------------------------- + sal_Bool SfxObjectShell::IsEnableSetModified() const { return pImp->m_bEnableSetModified && !IsReadOnly(); } -//------------------------------------------------------------------------- + sal_Bool SfxObjectShell::IsModified() { @@ -325,7 +325,7 @@ sal_Bool SfxObjectShell::IsModified() return sal_False; } -//------------------------------------------------------------------------- + void SfxObjectShell::SetModified( sal_Bool bModifiedP ) { @@ -344,7 +344,7 @@ void SfxObjectShell::SetModified( sal_Bool bModifiedP ) } } -//------------------------------------------------------------------------- + void SfxObjectShell::ModifyChanged() { @@ -365,7 +365,7 @@ void SfxObjectShell::ModifyChanged() SFX_APP()->NotifyEvent( SfxEventHint( SFX_EVENT_MODIFYCHANGED, GlobalEventConfig::GetEventName(STR_EVENT_MODIFYCHANGED), this ) ); } -//------------------------------------------------------------------------- + sal_Bool SfxObjectShell::IsReadOnlyUI() const @@ -379,7 +379,7 @@ sal_Bool SfxObjectShell::IsReadOnlyUI() const return pImp->bReadOnlyUI; } -//------------------------------------------------------------------------- + sal_Bool SfxObjectShell::IsReadOnlyMedium() const @@ -399,7 +399,7 @@ bool SfxObjectShell::IsOriginallyReadOnlyMedium() const return pMedium == 0 || pMedium->IsOriginallyReadOnly(); } -//------------------------------------------------------------------------- + void SfxObjectShell::SetReadOnlyUI( sal_Bool bReadOnly ) @@ -417,7 +417,7 @@ void SfxObjectShell::SetReadOnlyUI( sal_Bool bReadOnly ) } } -//------------------------------------------------------------------------- + void SfxObjectShell::SetReadOnly() { @@ -443,14 +443,14 @@ void SfxObjectShell::SetReadOnly() Broadcast( SfxSimpleHint(SFX_HINT_MODECHANGED) ); } } -//------------------------------------------------------------------------- + sal_Bool SfxObjectShell::IsReadOnly() const { return pImp->bReadOnlyUI || pMedium == 0; } -//------------------------------------------------------------------------- + sal_Bool SfxObjectShell::IsInModalMode() const { @@ -462,7 +462,7 @@ sal_Bool SfxObjectShell::AcceptStateUpdate() const return !IsInModalMode(); } -//------------------------------------------------------------------------- + void SfxObjectShell::SetMacroMode_Impl( sal_Bool bModal ) { @@ -473,7 +473,7 @@ void SfxObjectShell::SetMacroMode_Impl( sal_Bool bModal ) } } -//------------------------------------------------------------------------- + void SfxObjectShell::SetModalMode_Impl( sal_Bool bModal ) { @@ -609,7 +609,7 @@ sal_Bool SfxObjectShell::SwitchToShared( sal_Bool bShared, sal_Bool bSave ) return bResult; } -//-------------------------------------------------------------------- + void SfxObjectShell::FreeSharedFile() { @@ -617,7 +617,7 @@ void SfxObjectShell::FreeSharedFile() FreeSharedFile( pMedium->GetURLObject().GetMainURL( INetURLObject::NO_DECODE ) ); } -//-------------------------------------------------------------------- + void SfxObjectShell::FreeSharedFile( const OUString& aTempFileURL ) { SetSharedXMLFlag( sal_False ); @@ -647,32 +647,32 @@ void SfxObjectShell::FreeSharedFile( const OUString& aTempFileURL ) } } -//-------------------------------------------------------------------- + void SfxObjectShell::DoNotCleanShareControlFile() { pImp->m_bAllowShareControlFileClean = sal_False; } -//-------------------------------------------------------------------- + void SfxObjectShell::SetSharedXMLFlag( sal_Bool bFlag ) const { pImp->m_bSharedXMLFlag = bFlag; } -//-------------------------------------------------------------------- + sal_Bool SfxObjectShell::HasSharedXMLFlagSet() const { return pImp->m_bSharedXMLFlag; } -//-------------------------------------------------------------------- + sal_Bool SfxObjectShell::IsDocShared() const { return ( !pImp->m_aSharedFileURL.isEmpty() ); } -//-------------------------------------------------------------------- + OUString SfxObjectShell::GetSharedFileURL() const { @@ -681,7 +681,7 @@ OUString SfxObjectShell::GetSharedFileURL() const #endif -//-------------------------------------------------------------------- + Size SfxObjectShell::GetFirstPageSize() { @@ -689,14 +689,14 @@ Size SfxObjectShell::GetFirstPageSize() } -//-------------------------------------------------------------------- + IndexBitSet& SfxObjectShell::GetNoSet_Impl() { return pImp->aBitSet; } -//-------------------------------------------------------------------- + // changes the title of the document void SfxObjectShell::SetTitle @@ -741,7 +741,7 @@ void SfxObjectShell::SetTitle } } -//-------------------------------------------------------------------- + #if OSL_DEBUG_LEVEL > 1 OUString X(const OUString &rRet) @@ -754,7 +754,7 @@ OUString X(const OUString &rRet) #define X(ret) ret #endif -//-------------------------------------------------------------------- + OUString SfxObjectShell::GetTitle ( sal_uInt16 nMaxLength /* 0 (default) @@ -940,7 +940,7 @@ OUString SfxObjectShell::GetTitle return X(pImp->aTitle); } -//-------------------------------------------------------------------- + void SfxObjectShell::InvalidateName() @@ -957,7 +957,7 @@ void SfxObjectShell::InvalidateName() Broadcast( SfxSimpleHint(SFX_HINT_TITLECHANGED) ); } -//-------------------------------------------------------------------- + void SfxObjectShell::SetNamedVisibility_Impl() { @@ -980,14 +980,14 @@ void SfxObjectShell::SetNoName() GetModel()->attachResource( OUString(), GetModel()->getArgs() ); } -//-------------------------------------------------------------------- + SfxProgress* SfxObjectShell::GetProgress() const { return pImp->pProgress; } -//-------------------------------------------------------------------- + void SfxObjectShell::SetProgress_Impl ( @@ -1008,7 +1008,7 @@ void SfxObjectShell::SetProgress_Impl pImp->pProgress = pProgress; } -//-------------------------------------------------------------------- + void SfxObjectShell::PostActivateEvent_Impl( SfxViewFrame* pFrame ) { @@ -1028,7 +1028,7 @@ void SfxObjectShell::PostActivateEvent_Impl( SfxViewFrame* pFrame ) } } -//-------------------------------------------------------------------- + void SfxObjectShell::SetActivateEvent_Impl(sal_uInt16 nId ) { @@ -1054,13 +1054,13 @@ sal_Bool SfxObjectShell::IsAutoLoadLocked() const return !IsReadOnly() || pImp->nAutoLoadLocks > 0; } -//------------------------------------------------------------------------- + void SfxObjectShell::BreakMacroSign_Impl( sal_Bool bBreakMacroSign ) { pImp->m_bMacroSignBroken = bBreakMacroSign; } -//------------------------------------------------------------------------- + void SfxObjectShell::CheckSecurityOnLoading_Impl() { uno::Reference< task::XInteractionHandler > xInteraction; @@ -1076,7 +1076,7 @@ void SfxObjectShell::CheckSecurityOnLoading_Impl() pImp->aMacroMode.checkMacrosOnLoading( xInteraction ); } -//------------------------------------------------------------------------- + void SfxObjectShell::CheckEncryption_Impl( const uno::Reference< task::XInteractionHandler >& xHandler ) { OUString aVersion; @@ -1115,7 +1115,7 @@ void SfxObjectShell::CheckEncryption_Impl( const uno::Reference< task::XInteract } } -//------------------------------------------------------------------------- + void SfxObjectShell::CheckForBrokenDocSignatures_Impl( const uno::Reference< task::XInteractionHandler >& xHandler ) { sal_Int16 nSignatureState = GetDocumentSignatureState(); @@ -1129,7 +1129,7 @@ void SfxObjectShell::CheckForBrokenDocSignatures_Impl( const uno::Reference< tas pImp->aMacroMode.disallowMacroExecution(); } -//------------------------------------------------------------------------- + void SfxObjectShell::SetAutoLoad( const INetURLObject& rUrl, sal_uInt32 nTime, sal_Bool bReload ) { @@ -1278,7 +1278,7 @@ void SfxObjectShell::FinishedLoading( sal_uInt16 nFlags ) } } -//------------------------------------------------------------------------- + extern void SetTemplate_Impl( const OUString&, const OUString&, SfxObjectShell* ); void SfxObjectShell::TemplateDisconnectionAfterLoad() @@ -1372,7 +1372,7 @@ void SfxObjectShell::TemplateDisconnectionAfterLoad() } } -//------------------------------------------------------------------------- + void SfxObjectShell::PositionView_Impl() { @@ -1388,7 +1388,7 @@ void SfxObjectShell::PositionView_Impl() } } -//------------------------------------------------------------------------- + sal_Bool SfxObjectShell::IsLoading() const /* [Description] @@ -1399,7 +1399,7 @@ sal_Bool SfxObjectShell::IsLoading() const return !( pImp->nLoadedFlags & SFX_LOADED_MAINDOCUMENT ); } -//------------------------------------------------------------------------- + void SfxObjectShell::CancelTransfers() /* [Description] @@ -1416,7 +1416,7 @@ void SfxObjectShell::CancelTransfers() } } -//------------------------------------------------------------------------- + AutoReloadTimer_Impl::AutoReloadTimer_Impl( const OUString& rURL, sal_uInt32 nTime, SfxObjectShell* pSh ) @@ -1425,7 +1425,7 @@ AutoReloadTimer_Impl::AutoReloadTimer_Impl( SetTimeout( nTime ); } -//------------------------------------------------------------------------- + void AutoReloadTimer_Impl::Timeout() { @@ -1588,7 +1588,7 @@ ErrCode SfxObjectShell::CallXScript( const OUString& rScriptURL, return CallXScript( GetModel(), rScriptURL, aParams, aRet, aOutParamIndex, aOutParam, bRaiseError, pCaller ); } -//------------------------------------------------------------------------- + SfxFrame* SfxObjectShell::GetSmartSelf( SfxFrame* pSelf, SfxMedium& /*rMedium*/ ) { return pSelf; diff --git a/sfx2/source/doc/objserv.cxx b/sfx2/source/doc/objserv.cxx index 381454cf55bf..365ee234abb3 100644 --- a/sfx2/source/doc/objserv.cxx +++ b/sfx2/source/doc/objserv.cxx @@ -268,7 +268,7 @@ void SfxObjectShell::PrintExec_Impl(SfxRequest &rReq) } } -//-------------------------------------------------------------------- + void SfxObjectShell::PrintState_Impl(SfxItemSet &rSet) { @@ -282,7 +282,7 @@ void SfxObjectShell::PrintState_Impl(SfxItemSet &rSet) rSet.Put( SfxBoolItem( SID_PRINTOUT, bPrinting ) ); } -//-------------------------------------------------------------------- + sal_Bool SfxObjectShell::APISaveAs_Impl ( @@ -421,7 +421,7 @@ uno::Sequence< document::CmisVersion > SfxObjectShell::GetCmisVersions( ) } return uno::Sequence< document::CmisVersion > ( ); } -//-------------------------------------------------------------------- + void SfxObjectShell::ExecFile_Impl(SfxRequest &rReq) { @@ -926,7 +926,7 @@ void SfxObjectShell::ExecFile_Impl(SfxRequest &rReq) rReq.Done(); } -//------------------------------------------------------------------------- + void SfxObjectShell::GetState_Impl(SfxItemSet &rSet) { @@ -1148,7 +1148,7 @@ void SfxObjectShell::GetState_Impl(SfxItemSet &rSet) } } -//-------------------------------------------------------------------- + void SfxObjectShell::ExecProps_Impl(SfxRequest &rReq) { @@ -1190,7 +1190,7 @@ void SfxObjectShell::ExecProps_Impl(SfxRequest &rReq) } } -//-------------------------------------------------------------------- + void SfxObjectShell::StateProps_Impl(SfxItemSet &rSet) { @@ -1269,7 +1269,7 @@ void SfxObjectShell::StateProps_Impl(SfxItemSet &rSet) } } -//-------------------------------------------------------------------- + void SfxObjectShell::ExecView_Impl(SfxRequest &rReq) { @@ -1306,7 +1306,7 @@ void SfxObjectShell::ExecView_Impl(SfxRequest &rReq) } } -//-------------------------------------------------------------------- + void SfxObjectShell::StateView_Impl(SfxItemSet& /*rSet*/) { diff --git a/sfx2/source/doc/objstor.cxx b/sfx2/source/doc/objstor.cxx index d03542757507..efe57bd7b2ee 100644 --- a/sfx2/source/doc/objstor.cxx +++ b/sfx2/source/doc/objstor.cxx @@ -168,21 +168,21 @@ sal_Bool SfxObjectShell::Save() return SaveChildren(); } -//-------------------------------------------------------------------------- + sal_Bool SfxObjectShell::SaveAs( SfxMedium& rMedium ) { return SaveAsChildren( rMedium ); } -//------------------------------------------------------------------------- + sal_Bool SfxObjectShell::QuerySlotExecutable( sal_uInt16 /*nSlotId*/ ) { return sal_True; } -//------------------------------------------------------------------------- + bool GetEncryptionData_Impl( const SfxItemSet* pSet, uno::Sequence< beans::NamedValue >& o_rEncryptionData ) { @@ -210,7 +210,7 @@ bool GetEncryptionData_Impl( const SfxItemSet* pSet, uno::Sequence< beans::Named return bResult; } -//------------------------------------------------------------------------- + sal_Bool SfxObjectShell::PutURLContentsToVersionStream_Impl( OUString aURL, const uno::Reference< embed::XStorage >& xDocStorage, @@ -267,7 +267,7 @@ sal_Bool SfxObjectShell::PutURLContentsToVersionStream_Impl( return bResult; } -//------------------------------------------------------------------------- + OUString SfxObjectShell::CreateTempCopyOfStorage_Impl( const uno::Reference< embed::XStorage >& xStorage ) { OUString aTempURL = ::utl::TempFile().GetURL(); @@ -300,7 +300,7 @@ OUString SfxObjectShell::CreateTempCopyOfStorage_Impl( const uno::Reference< emb return aTempURL; } -//------------------------------------------------------------------------- + SvGlobalName SfxObjectShell::GetClassName() const { return GetFactory().GetClassId(); @@ -335,7 +335,7 @@ sal_uInt32 GetChartVersion( sal_Int32 nVersion, bool bTemplate ) } -//------------------------------------------------------------------------- + void SfxObjectShell::SetupStorage( const uno::Reference< embed::XStorage >& xStorage, sal_Int32 nVersion, sal_Bool bTemplate, bool bChart ) const { @@ -420,7 +420,7 @@ void SfxObjectShell::SetupStorage( const uno::Reference< embed::XStorage >& xSto } } -//------------------------------------------------------------------------- + void SfxObjectShell::PrepareSecondTryLoad_Impl() { // only for internal use @@ -429,7 +429,7 @@ void SfxObjectShell::PrepareSecondTryLoad_Impl() ResetError(); } -//------------------------------------------------------------------------- + sal_Bool SfxObjectShell::GeneralInit_Impl( const uno::Reference< embed::XStorage >& xStorage, sal_Bool bTypeMustBeSetAlready ) { @@ -468,13 +468,13 @@ sal_Bool SfxObjectShell::GeneralInit_Impl( const uno::Reference< embed::XStorage return sal_True; } -//------------------------------------------------------------------------- + sal_Bool SfxObjectShell::InitNew( const uno::Reference< embed::XStorage >& xStorage ) { return GeneralInit_Impl( xStorage, sal_False ); } -//------------------------------------------------------------------------- + sal_Bool SfxObjectShell::Load( SfxMedium& rMedium ) { return GeneralInit_Impl( rMedium.GetStorage(), sal_True ); @@ -545,7 +545,7 @@ sal_Bool SfxObjectShell::DoInitNew( SfxMedium* pMed ) return sal_False; } -//------------------------------------------------------------------------- + sal_Bool SfxObjectShell::ImportFromGeneratedStream_Impl( const uno::Reference< io::XStream >& xStream, @@ -618,7 +618,7 @@ sal_Bool SfxObjectShell::ImportFromGeneratedStream_Impl( return bResult; } -//------------------------------------------------------------------------- + sal_Bool SfxObjectShell::DoLoad( SfxMedium *pMed ) { @@ -986,7 +986,7 @@ sal_uInt32 SfxObjectShell::HandleFilter( SfxMedium* pMedium, SfxObjectShell* pDo return nError; } -//------------------------------------------------------------------------- + sal_Bool SfxObjectShell::IsOwnStorageFormat_Impl(const SfxMedium &rMedium) const { @@ -996,7 +996,7 @@ sal_Bool SfxObjectShell::IsOwnStorageFormat_Impl(const SfxMedium &rMedium) const rMedium.GetFilter()->GetVersion() >= SOFFICE_FILEFORMAT_60 ); } -//------------------------------------------------------------------------- + sal_Bool SfxObjectShell::IsPackageStorageFormat_Impl(const SfxMedium &rMedium) const { @@ -1005,7 +1005,7 @@ sal_Bool SfxObjectShell::IsPackageStorageFormat_Impl(const SfxMedium &rMedium) c rMedium.GetFilter()->GetVersion() >= SOFFICE_FILEFORMAT_60 ); } -//------------------------------------------------------------------------- + sal_Bool SfxObjectShell::DoSave() // DoSave is only invoked for OLE. Save your own documents in the SFX through @@ -1099,7 +1099,7 @@ void Lock_Impl( SfxObjectShell* pDoc, sal_Bool bLock ) } -//------------------------------------------------------------------------- + sal_Bool SfxObjectShell::SaveTo_Impl ( @@ -1763,7 +1763,7 @@ sal_Bool SfxObjectShell::SaveTo_Impl return bOk; } -//------------------------------------------------------------------------ + sal_Bool SfxObjectShell::DisconnectStorage_Impl( SfxMedium& rSrcMedium, SfxMedium& rTargetMedium ) { SAL_INFO( "sfx.doc", "SfxObjectShell::DisconnectStorage_Impl" ); @@ -1810,7 +1810,7 @@ sal_Bool SfxObjectShell::DisconnectStorage_Impl( SfxMedium& rSrcMedium, SfxMediu return bResult; } -//------------------------------------------------------------------------ + sal_Bool SfxObjectShell::ConnectTmpStorage_Impl( const uno::Reference< embed::XStorage >& xStorage, @@ -1894,7 +1894,7 @@ sal_Bool SfxObjectShell::ConnectTmpStorage_Impl( return bResult; } -//------------------------------------------------------------------------- + sal_Bool SfxObjectShell::DoSaveObjectAs( SfxMedium& rMedium, sal_Bool bCommit ) { @@ -1936,7 +1936,7 @@ sal_Bool SfxObjectShell::DoSaveObjectAs( SfxMedium& rMedium, sal_Bool bCommit ) return bOk; } -//------------------------------------------------------------------------- + // TODO/LATER: may be the call must be removed completelly sal_Bool SfxObjectShell::DoSaveAs( SfxMedium& rMedium ) { @@ -1956,7 +1956,7 @@ sal_Bool SfxObjectShell::DoSaveAs( SfxMedium& rMedium ) return bRet; } -//------------------------------------------------------------------------- + sal_Bool SfxObjectShell::DoSaveCompleted( SfxMedium* pNewMed ) { @@ -2120,7 +2120,7 @@ void SfxObjectShell::AddToRecentlyUsedList() } } -//------------------------------------------------------------------------- + sal_Bool SfxObjectShell::ConvertFrom ( @@ -2414,7 +2414,7 @@ sal_Bool SfxObjectShell::ExportTo( SfxMedium& rMedium ) return sal_False; } -//------------------------------------------------------------------------- + sal_Bool SfxObjectShell::ConvertTo ( @@ -2471,7 +2471,7 @@ sal_Bool SfxObjectShell::ConvertTo return sal_False; } -//------------------------------------------------------------------------- + sal_Bool SfxObjectShell::DoSave_Impl( const SfxItemSet* pArgs ) { @@ -2559,7 +2559,7 @@ sal_Bool SfxObjectShell::DoSave_Impl( const SfxItemSet* pArgs ) return bSaved; } -//------------------------------------------------------------------------- + sal_Bool SfxObjectShell::Save_Impl( const SfxItemSet* pSet ) { @@ -2600,7 +2600,7 @@ sal_Bool SfxObjectShell::Save_Impl( const SfxItemSet* pSet ) return bSaved; } -//------------------------------------------------------------------------- + sal_Bool SfxObjectShell::CommonSaveAs_Impl ( @@ -2746,7 +2746,7 @@ sal_Bool SfxObjectShell::CommonSaveAs_Impl return sal_False; } -//------------------------------------------------------------------------- + sal_Bool SfxObjectShell::PreDoSaveAs_Impl ( @@ -2884,7 +2884,7 @@ sal_Bool SfxObjectShell::PreDoSaveAs_Impl return bOk; } -//------------------------------------------------------------------------ + sal_Bool SfxObjectShell::LoadFrom( SfxMedium& /*rMedium*/ ) { @@ -2892,7 +2892,7 @@ sal_Bool SfxObjectShell::LoadFrom( SfxMedium& /*rMedium*/ ) return sal_True; } -//------------------------------------------------------------------------- + sal_Bool SfxObjectShell::IsInformationLost() { Sequence< PropertyValue > aProps = GetModel()->getArgs(); @@ -2918,7 +2918,7 @@ sal_Bool SfxObjectShell::IsInformationLost() return sal_False; } -//------------------------------------------------------------------------- + sal_Bool SfxObjectShell::CanReload_Impl() /* [Description] @@ -2931,7 +2931,7 @@ sal_Bool SfxObjectShell::CanReload_Impl() return pMedium && HasName() && !IsInModalMode() && !pImp->bForbidReload; } -//------------------------------------------------------------------------- + sal_uInt16 SfxObjectShell::GetHiddenInformationState( sal_uInt16 nStates ) { @@ -3662,7 +3662,7 @@ sal_Bool SfxObjectShell::QuerySaveSizeExceededModules_Impl( const uno::Reference // No interaction handler, default is to continue to save return sal_True; } -// ----------------------------------------------------------------------------- + uno::Reference< task::XInteractionHandler > SfxObjectShell::getInteractionHandler() const { uno::Reference< task::XInteractionHandler > xRet; diff --git a/sfx2/source/doc/objxtor.cxx b/sfx2/source/doc/objxtor.cxx index c34781a2a0f8..15cb8dd03ee3 100644 --- a/sfx2/source/doc/objxtor.cxx +++ b/sfx2/source/doc/objxtor.cxx @@ -207,7 +207,7 @@ void SAL_CALL SfxModelListener_Impl::disposing( const com::sun::star::lang::Even TYPEINIT1(SfxObjectShell, SfxShell); -//-------------------------------------------------------------------- + SfxObjectShell_Impl::SfxObjectShell_Impl( SfxObjectShell& _rDocShell ) :mpObjectContainer(0) ,pBasicManager( new SfxBasicManagerHolder ) @@ -277,14 +277,14 @@ SfxObjectShell_Impl::SfxObjectShell_Impl( SfxObjectShell& _rDocShell ) bInList = sal_True; } -//-------------------------------------------------------------------- + SfxObjectShell_Impl::~SfxObjectShell_Impl() { delete pBasicManager; } -//-------------------------------------------------------------------- + SfxObjectShell::SfxObjectShell( const sal_uInt64 i_nCreationFlags ) : pImp( new SfxObjectShell_Impl( *this ) ) @@ -305,7 +305,7 @@ SfxObjectShell::SfxObjectShell( const sal_uInt64 i_nCreationFlags ) pImp->m_bDocRecoverySupport = sal_False; } -//-------------------------------------------------------------------- + // initializes a document from a file-description @@ -345,7 +345,7 @@ SfxObjectShell::SfxObjectShell DBG_CTOR(SfxObjectShell, 0); } -//-------------------------------------------------------------------- + // virtual destructor of typical base-class SfxObjectShell @@ -410,21 +410,21 @@ SfxObjectShell::~SfxObjectShell() delete pImp; } -//-------------------------------------------------------------------- + void SfxObjectShell::Stamp_SetPrintCancelState(sal_Bool bState) { pImp->bIsPrintJobCancelable = bState; } -//-------------------------------------------------------------------- + sal_Bool SfxObjectShell::Stamp_GetPrintCancelState() const { return pImp->bIsPrintJobCancelable; } -//-------------------------------------------------------------------- + void SfxObjectShell::ViewAssigned() @@ -436,7 +436,7 @@ void SfxObjectShell::ViewAssigned() { } -//-------------------------------------------------------------------- + // closes the Object and all its views bool SfxObjectShell::Close() @@ -479,7 +479,7 @@ bool SfxObjectShell::Close() return true; } -//-------------------------------------------------------------------- + // returns a pointer the first SfxDocument of specified type @@ -505,7 +505,7 @@ SfxObjectShell* SfxObjectShell::GetFirst return 0; } -//-------------------------------------------------------------------- + // returns a pointer to the next SfxDocument of specified type behind *pDoc @@ -538,7 +538,7 @@ SfxObjectShell* SfxObjectShell::GetNext return 0; } -//-------------------------------------------------------------------- + SfxObjectShell* SfxObjectShell::Current() { @@ -546,14 +546,14 @@ SfxObjectShell* SfxObjectShell::Current() return pFrame ? pFrame->GetObjectShell() : 0; } -//------------------------------------------------------------------------- + sal_Bool SfxObjectShell::IsInPrepareClose() const { return pImp->bInPrepareClose; } -//------------------------------------------------------------------------ + struct BoolEnv_Impl { @@ -655,7 +655,7 @@ bool SfxObjectShell::PrepareClose return true; } -//-------------------------------------------------------------------- + #ifndef DISABLE_SCRIPTING namespace { @@ -692,7 +692,7 @@ namespace } #endif -//-------------------------------------------------------------------- + BasicManager* SfxObjectShell::GetBasicManager() const { @@ -706,14 +706,14 @@ BasicManager* SfxObjectShell::GetBasicManager() const #endif } -//-------------------------------------------------------------------- + void SfxObjectShell::SetHasNoBasic() { pImp->m_bNoBasicCapabilities = sal_True; } -//-------------------------------------------------------------------- + sal_Bool SfxObjectShell::HasBasic() const { @@ -730,7 +730,7 @@ sal_Bool SfxObjectShell::HasBasic() const #endif } -//-------------------------------------------------------------------- + #ifndef DISABLE_SCRIPTING namespace { @@ -761,7 +761,7 @@ namespace } } #endif -//-------------------------------------------------------------------- + Reference< XLibraryContainer > SfxObjectShell::GetDialogContainer() { @@ -778,7 +778,7 @@ Reference< XLibraryContainer > SfxObjectShell::GetDialogContainer() return SFX_APP()->GetDialogContainer(); } -//-------------------------------------------------------------------- + Reference< XLibraryContainer > SfxObjectShell::GetBasicContainer() { @@ -795,7 +795,7 @@ Reference< XLibraryContainer > SfxObjectShell::GetBasicContainer() return SFX_APP()->GetBasicContainer(); } -//-------------------------------------------------------------------- + StarBASIC* SfxObjectShell::GetBasic() const { @@ -806,7 +806,7 @@ StarBASIC* SfxObjectShell::GetBasic() const #endif } -//-------------------------------------------------------------------- + void SfxObjectShell::InitBasicManager_Impl() /* [Description] @@ -853,21 +853,21 @@ void SfxObjectShell::InitBasicManager_Impl() #endif } -//-------------------------------------------------------------------- + sal_Bool SfxObjectShell::DoClose() { return Close(); } -//-------------------------------------------------------------------- + SfxObjectShell* SfxObjectShell::GetObjectShell() { return this; } -//-------------------------------------------------------------------- + uno::Sequence< OUString > SfxObjectShell::GetEventNames() { @@ -886,7 +886,7 @@ uno::Sequence< OUString > SfxObjectShell::GetEventNames() return *pEventNameContainer; } -//-------------------------------------------------------------------- + ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > SfxObjectShell::GetModel() const { @@ -903,7 +903,7 @@ void SfxObjectShell::SetBaseModel( SfxBaseModel* pModel ) } } -//-------------------------------------------------------------------- + ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > SfxObjectShell::GetBaseModel() const { diff --git a/sfx2/source/doc/oleprops.cxx b/sfx2/source/doc/oleprops.cxx index 1610923f989c..c6e800c7e402 100644 --- a/sfx2/source/doc/oleprops.cxx +++ b/sfx2/source/doc/oleprops.cxx @@ -283,7 +283,7 @@ void SfxOleTextEncoding::SetCodePage( sal_uInt16 nCodePage ) } } -// ---------------------------------------------------------------------------- + OUString SfxOleStringHelper::LoadString8( SvStream& rStrm ) const { @@ -384,7 +384,7 @@ void SfxOleStringHelper::ImplSaveString16( SvStream& rStrm, const OUString& rVal rStrm.WriteUInt16( sal_uInt16( 0 ) ); } -// ---------------------------------------------------------------------------- + SfxOleObjectBase::~SfxOleObjectBase() { @@ -416,7 +416,7 @@ void SfxOleObjectBase::SaveObject( SvStream& rStrm, SfxOleObjectBase& rObj ) SetError( rObj.Save( rStrm ) ); } -// ---------------------------------------------------------------------------- + SfxOleCodePageProperty::SfxOleCodePageProperty() : SfxOlePropertyBase( PROPID_CODEPAGE, PROPTYPE_INT16 ) @@ -437,7 +437,7 @@ void SfxOleCodePageProperty::ImplSave( SvStream& rStrm ) rStrm.WriteUInt16( GetCodePage() ); } -// ---------------------------------------------------------------------------- + SfxOleInt32Property::SfxOleInt32Property( sal_Int32 nPropId, sal_Int32 nValue ) : SfxOlePropertyBase( nPropId, PROPTYPE_INT32 ), @@ -455,7 +455,7 @@ void SfxOleInt32Property::ImplSave( SvStream& rStrm ) rStrm.WriteInt32( mnValue ); } -// ---------------------------------------------------------------------------- + SfxOleDoubleProperty::SfxOleDoubleProperty( sal_Int32 nPropId, double fValue ) : SfxOlePropertyBase( nPropId, PROPTYPE_DOUBLE ), @@ -473,7 +473,7 @@ void SfxOleDoubleProperty::ImplSave( SvStream& rStrm ) rStrm.WriteDouble( mfValue ); } -// ---------------------------------------------------------------------------- + SfxOleBoolProperty::SfxOleBoolProperty( sal_Int32 nPropId, bool bValue ) : SfxOlePropertyBase( nPropId, PROPTYPE_BOOL ), @@ -493,7 +493,7 @@ void SfxOleBoolProperty::ImplSave( SvStream& rStrm ) rStrm.WriteInt16( static_cast< sal_Int16 >( mbValue ? -1 : 0 ) ); } -// ---------------------------------------------------------------------------- + SfxOleStringPropertyBase::SfxOleStringPropertyBase( sal_Int32 nPropId, sal_Int32 nPropType, const SfxOleTextEncoding& rTextEnc ) : @@ -517,7 +517,7 @@ SfxOleStringPropertyBase::SfxOleStringPropertyBase( { } -// ---------------------------------------------------------------------------- + SfxOleString8Property::SfxOleString8Property( sal_Int32 nPropId, const SfxOleTextEncoding& rTextEnc ) : @@ -541,7 +541,7 @@ void SfxOleString8Property::ImplSave( SvStream& rStrm ) SaveString8( rStrm, GetValue() ); } -// ---------------------------------------------------------------------------- + SfxOleString16Property::SfxOleString16Property( sal_Int32 nPropId ) : SfxOleStringPropertyBase( nPropId, PROPTYPE_STRING16, RTL_TEXTENCODING_UCS2 ) @@ -558,7 +558,7 @@ void SfxOleString16Property::ImplSave( SvStream& rStrm ) SaveString16( rStrm, GetValue() ); } -// ---------------------------------------------------------------------------- + SfxOleFileTimeProperty::SfxOleFileTimeProperty( sal_Int32 nPropId ) : SfxOlePropertyBase( nPropId, PROPTYPE_FILETIME ) @@ -643,7 +643,7 @@ void SfxOleDateProperty::ImplSave( SvStream& rStrm ) rStrm.WriteDouble( fValue ); } -// ---------------------------------------------------------------------------- + SfxOleThumbnailProperty::SfxOleThumbnailProperty( sal_Int32 nPropId, const uno::Sequence<sal_uInt8> & i_rData) : @@ -693,7 +693,7 @@ void SfxOleThumbnailProperty::ImplSave( SvStream& rStrm ) } } -// ---------------------------------------------------------------------------- + SfxOleBlobProperty::SfxOleBlobProperty( sal_Int32 nPropId, const uno::Sequence<sal_uInt8> & i_rData) : @@ -718,7 +718,7 @@ void SfxOleBlobProperty::ImplSave( SvStream& rStrm ) } } -// ---------------------------------------------------------------------------- + SfxOleDictionaryProperty::SfxOleDictionaryProperty( const SfxOleTextEncoding& rTextEnc ) : SfxOlePropertyBase( PROPID_DICTIONARY, 0 ), @@ -765,7 +765,7 @@ void SfxOleDictionaryProperty::ImplSave( SvStream& rStrm ) } } -// ---------------------------------------------------------------------------- + SfxOleSection::SfxOleSection( bool bSupportsDict ) : maDictProp( maCodePageProp ), @@ -1151,7 +1151,7 @@ void SfxOleSection::SaveProperty( SvStream& rStrm, SfxOlePropertyBase& rProp, sa rnPropPosPos = rStrm.Tell(); } -// ---------------------------------------------------------------------------- + ErrCode SfxOlePropertySet::LoadPropertySet( SotStorage* pStrg, const OUString& rStrmName ) { diff --git a/sfx2/source/doc/printhelper.cxx b/sfx2/source/doc/printhelper.cxx index 913452b67807..c5f893c7b8f1 100644 --- a/sfx2/source/doc/printhelper.cxx +++ b/sfx2/source/doc/printhelper.cxx @@ -249,9 +249,9 @@ namespace } } -//________________________________________________________________________________________________________ + // XPrintable -//________________________________________________________________________________________________________ + uno::Sequence< beans::PropertyValue > SAL_CALL SfxPrintHelper::getPrinter() throw(::com::sun::star::uno::RuntimeException) { @@ -308,9 +308,9 @@ uno::Sequence< beans::PropertyValue > SAL_CALL SfxPrintHelper::getPrinter() thro return aPrinter; } -//________________________________________________________________________________________________________ + // XPrintable -//________________________________________________________________________________________________________ + void SfxPrintHelper::impl_setPrinter(const uno::Sequence< beans::PropertyValue >& rPrinter,SfxPrinter*& pPrinter,sal_uInt16& nChangeFlags,SfxViewShell*& pViewSh) @@ -462,9 +462,9 @@ void SAL_CALL SfxPrintHelper::setPrinter(const uno::Sequence< beans::PropertyVal pViewSh->SetPrinter( pPrinter, nChangeFlags, false ); } -//________________________________________________________________________________________________________ + // ImplPrintWatch thread for asynchronous printing with moving temp. file to ucb location -//________________________________________________________________________________________________________ + /* This implements a thread which will be started to wait for asynchronous print jobs to temp. localy files. If they finish we move the temp. files @@ -575,11 +575,11 @@ class ImplUCBPrintWatcher : public ::osl::Thread } }; -//------------------------------------------------ -//________________________________________________________________________________________________________ + + // XPrintable -//________________________________________________________________________________________________________ + void SAL_CALL SfxPrintHelper::print(const uno::Sequence< beans::PropertyValue >& rOptions) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException) { diff --git a/sfx2/source/doc/sfxbasemodel.cxx b/sfx2/source/doc/sfxbasemodel.cxx index 8c6d40d72c11..01f60708e9ad 100644 --- a/sfx2/source/doc/sfxbasemodel.cxx +++ b/sfx2/source/doc/sfxbasemodel.cxx @@ -115,9 +115,9 @@ #include <sfx2/sfxresid.hxx> -//________________________________________________________________________________________________________ + // namespaces -//________________________________________________________________________________________________________ + using namespace ::com::sun::star; using namespace ::com::sun::star::uno; @@ -175,9 +175,9 @@ void SAL_CALL SfxDocInfoListener_Impl::disposing( const lang::EventObject& ) { } -//________________________________________________________________________________________________________ + // impl. declarations -//________________________________________________________________________________________________________ + struct IMPL_SfxBaseModel_DataContainer : public ::sfx2::IModifiableDocument @@ -513,9 +513,9 @@ SfxSaveGuard::~SfxSaveGuard() // ======================================================================================================= -//________________________________________________________________________________________________________ + // constructor -//________________________________________________________________________________________________________ + DBG_NAME(sfx2_SfxBaseModel) SfxBaseModel::SfxBaseModel( SfxObjectShell *pObjectShell ) : BaseMutex() @@ -530,18 +530,18 @@ SfxBaseModel::SfxBaseModel( SfxObjectShell *pObjectShell ) } } -//________________________________________________________________________________________________________ + // destructor -//________________________________________________________________________________________________________ + SfxBaseModel::~SfxBaseModel() { DBG_DTOR(sfx2_SfxBaseModel,NULL); } -//________________________________________________________________________________________________________ + // XInterface -//________________________________________________________________________________________________________ + Any SAL_CALL SfxBaseModel::queryInterface( const uno::Type& rType ) throw( RuntimeException ) { @@ -553,9 +553,9 @@ Any SAL_CALL SfxBaseModel::queryInterface( const uno::Type& rType ) throw( Runti return SfxBaseModel_Base::queryInterface( rType ); } -//________________________________________________________________________________________________________ + // XInterface -//________________________________________________________________________________________________________ + void SAL_CALL SfxBaseModel::acquire() throw( ) { @@ -566,9 +566,9 @@ void SAL_CALL SfxBaseModel::acquire() throw( ) OWeakObject::acquire() ; } -//________________________________________________________________________________________________________ + // XInterface -//________________________________________________________________________________________________________ + void SAL_CALL SfxBaseModel::release() throw( ) { @@ -579,9 +579,9 @@ void SAL_CALL SfxBaseModel::release() throw( ) OWeakObject::release() ; } -//________________________________________________________________________________________________________ + // XTypeProvider -//________________________________________________________________________________________________________ + namespace { @@ -611,9 +611,9 @@ Sequence< uno::Type > SAL_CALL SfxBaseModel::getTypes() throw( RuntimeException return aTypes; } -//________________________________________________________________________________________________________ + // XTypeProvider -//________________________________________________________________________________________________________ + Sequence< sal_Int8 > SAL_CALL SfxBaseModel::getImplementationId() throw( RuntimeException ) { @@ -643,9 +643,9 @@ Sequence< sal_Int8 > SAL_CALL SfxBaseModel::getImplementationId() throw( Runtime return pID->getImplementationId() ; } -//________________________________________________________________________________________________________ + // XStarBasicAccess -//________________________________________________________________________________________________________ + Reference< script::XStarBasicAccess > implGetStarBasicAccess( SfxObjectShell* pObjectShell ) { @@ -755,9 +755,9 @@ void SAL_CALL SfxBaseModel::addDialog( const OUString& LibraryName, const OUStri } -//________________________________________________________________________________________________________ + // XChild -//________________________________________________________________________________________________________ + Reference< XInterface > SAL_CALL SfxBaseModel::getParent() throw( RuntimeException ) { @@ -766,9 +766,9 @@ Reference< XInterface > SAL_CALL SfxBaseModel::getParent() throw( RuntimeExcepti return m_pData->m_xParent; } -//________________________________________________________________________________________________________ + // XChild -//________________________________________________________________________________________________________ + void SAL_CALL SfxBaseModel::setParent(const Reference< XInterface >& Parent) throw(lang::NoSupportException, RuntimeException) { @@ -776,9 +776,9 @@ void SAL_CALL SfxBaseModel::setParent(const Reference< XInterface >& Parent) thr m_pData->m_xParent = Parent; } -//________________________________________________________________________________________________________ + // XChild -//________________________________________________________________________________________________________ + void SAL_CALL SfxBaseModel::dispose() throw(RuntimeException) { @@ -831,9 +831,9 @@ void SAL_CALL SfxBaseModel::dispose() throw(RuntimeException) delete pData; } -//________________________________________________________________________________________________________ + // XChild -//________________________________________________________________________________________________________ + void SAL_CALL SfxBaseModel::addEventListener( const Reference< lang::XEventListener >& aListener ) throw(RuntimeException) @@ -842,9 +842,9 @@ void SAL_CALL SfxBaseModel::addEventListener( const Reference< lang::XEventListe m_pData->m_aInterfaceContainer.addInterface( ::getCppuType((const Reference< lang::XEventListener >*)0), aListener ); } -//________________________________________________________________________________________________________ + // XChild -//________________________________________________________________________________________________________ + void SAL_CALL SfxBaseModel::removeEventListener( const Reference< lang::XEventListener >& aListener ) throw(RuntimeException) @@ -880,9 +880,9 @@ SfxBaseModel::getDocumentProperties() } -//________________________________________________________________________________________________________ + // lang::XEventListener -//________________________________________________________________________________________________________ + void SAL_CALL SfxBaseModel::disposing( const lang::EventObject& aObject ) throw(RuntimeException) @@ -903,9 +903,9 @@ void SAL_CALL SfxBaseModel::disposing( const lang::EventObject& aObject ) m_pData->m_aInterfaceContainer.removeInterface( ::getCppuType((const Reference< document::XEventListener >*)0), xListener ); } -//________________________________________________________________________________________________________ + // frame::XModel -//________________________________________________________________________________________________________ + sal_Bool SAL_CALL SfxBaseModel::attachResource( const OUString& rURL , const Sequence< beans::PropertyValue >& rArgs ) @@ -990,9 +990,9 @@ sal_Bool SAL_CALL SfxBaseModel::attachResource( const OUString& return sal_True ; } -//________________________________________________________________________________________________________ + // frame::XModel -//________________________________________________________________________________________________________ + OUString SAL_CALL SfxBaseModel::getURL() throw(RuntimeException) { @@ -1000,9 +1000,9 @@ OUString SAL_CALL SfxBaseModel::getURL() throw(RuntimeException) return m_pData->m_sURL ; } -//________________________________________________________________________________________________________ + // frame::XModel -//________________________________________________________________________________________________________ + Sequence< beans::PropertyValue > SAL_CALL SfxBaseModel::getArgs() throw(RuntimeException) { @@ -1099,9 +1099,9 @@ Sequence< beans::PropertyValue > SAL_CALL SfxBaseModel::getArgs() throw(RuntimeE return m_pData->m_seqArguments; } -//________________________________________________________________________________________________________ + // frame::XModel -//________________________________________________________________________________________________________ + void SAL_CALL SfxBaseModel::connectController( const Reference< frame::XController >& xController ) throw(RuntimeException) @@ -1129,9 +1129,9 @@ void SAL_CALL SfxBaseModel::connectController( const Reference< frame::XControll } } -//________________________________________________________________________________________________________ + // frame::XModel -//________________________________________________________________________________________________________ + void SAL_CALL SfxBaseModel::disconnectController( const Reference< frame::XController >& xController ) throw(RuntimeException) { @@ -1202,9 +1202,9 @@ namespace } } -//________________________________________________________________________________________________________ + // frame::XModel -//________________________________________________________________________________________________________ + void SAL_CALL SfxBaseModel::lockControllers() throw(RuntimeException) { @@ -1221,9 +1221,9 @@ void SAL_CALL SfxBaseModel::lockControllers() throw(RuntimeException) } } -//________________________________________________________________________________________________________ + // frame::XModel -//________________________________________________________________________________________________________ + void SAL_CALL SfxBaseModel::unlockControllers() throw(RuntimeException) { @@ -1240,9 +1240,9 @@ void SAL_CALL SfxBaseModel::unlockControllers() throw(RuntimeException) } } -//________________________________________________________________________________________________________ + // frame::XModel -//________________________________________________________________________________________________________ + sal_Bool SAL_CALL SfxBaseModel::hasControllersLocked() throw(RuntimeException) { @@ -1250,9 +1250,9 @@ sal_Bool SAL_CALL SfxBaseModel::hasControllersLocked() throw(RuntimeException) return ( m_pData->m_nControllerLockCount != 0 ) ; } -//________________________________________________________________________________________________________ + // frame::XModel -//________________________________________________________________________________________________________ + Reference< frame::XController > SAL_CALL SfxBaseModel::getCurrentController() throw(RuntimeException) { @@ -1266,9 +1266,9 @@ Reference< frame::XController > SAL_CALL SfxBaseModel::getCurrentController() th return m_pData->m_seqControllers.getLength() ? m_pData->m_seqControllers.getConstArray()[0] : m_pData->m_xCurrent; } -//________________________________________________________________________________________________________ + // frame::XModel -//________________________________________________________________________________________________________ + void SAL_CALL SfxBaseModel::setCurrentController( const Reference< frame::XController >& xCurrentController ) throw (container::NoSuchElementException, RuntimeException) @@ -1278,9 +1278,9 @@ void SAL_CALL SfxBaseModel::setCurrentController( const Reference< frame::XContr m_pData->m_xCurrent = xCurrentController; } -//________________________________________________________________________________________________________ + // frame::XModel -//________________________________________________________________________________________________________ + Reference< XInterface > SAL_CALL SfxBaseModel::getCurrentSelection() throw(RuntimeException) { @@ -1302,9 +1302,9 @@ Reference< XInterface > SAL_CALL SfxBaseModel::getCurrentSelection() throw(Runti return xReturn ; } -//________________________________________________________________________________________________________ + // XModifiable2 -//________________________________________________________________________________________________________ + sal_Bool SAL_CALL SfxBaseModel::disableSetModified() throw (RuntimeException) { @@ -1342,9 +1342,9 @@ sal_Bool SAL_CALL SfxBaseModel::isSetModifiedEnabled() throw (RuntimeException) return m_pData->m_pObjectShell->IsEnableSetModified(); } -//________________________________________________________________________________________________________ + // XModifiable -//________________________________________________________________________________________________________ + sal_Bool SAL_CALL SfxBaseModel::isModified() throw(RuntimeException) { @@ -1353,9 +1353,9 @@ sal_Bool SAL_CALL SfxBaseModel::isModified() throw(RuntimeException) return m_pData->m_pObjectShell.Is() ? m_pData->m_pObjectShell->IsModified() : sal_False; } -//________________________________________________________________________________________________________ + // XModifiable -//________________________________________________________________________________________________________ + void SAL_CALL SfxBaseModel::setModified( sal_Bool bModified ) throw (beans::PropertyVetoException, RuntimeException) @@ -1366,9 +1366,9 @@ void SAL_CALL SfxBaseModel::setModified( sal_Bool bModified ) m_pData->m_pObjectShell->SetModified(bModified); } -//________________________________________________________________________________________________________ + // XModifiable -//________________________________________________________________________________________________________ + void SAL_CALL SfxBaseModel::addModifyListener(const Reference< util::XModifyListener >& xListener) throw( RuntimeException ) { @@ -1377,9 +1377,9 @@ void SAL_CALL SfxBaseModel::addModifyListener(const Reference< util::XModifyList m_pData->m_aInterfaceContainer.addInterface( ::getCppuType((const Reference< util::XModifyListener >*)0),xListener ); } -//________________________________________________________________________________________________________ + // XModifiable -//________________________________________________________________________________________________________ + void SAL_CALL SfxBaseModel::removeModifyListener(const Reference< util::XModifyListener >& xListener) throw( RuntimeException ) { @@ -1388,9 +1388,9 @@ void SAL_CALL SfxBaseModel::removeModifyListener(const Reference< util::XModifyL m_pData->m_aInterfaceContainer.removeInterface( ::getCppuType((const Reference< util::XModifyListener >*)0), xListener ); } -//____________________________________________________________________________________________________ + // XCloseable -//____________________________________________________________________________________________________ + void SAL_CALL SfxBaseModel::close( sal_Bool bDeliverOwnership ) throw (util::CloseVetoException, RuntimeException) { @@ -1451,9 +1451,9 @@ void SAL_CALL SfxBaseModel::close( sal_Bool bDeliverOwnership ) throw (util::Clo dispose(); } -//____________________________________________________________________________________________________ + // XCloseBroadcaster -//____________________________________________________________________________________________________ + void SAL_CALL SfxBaseModel::addCloseListener( const Reference< util::XCloseListener >& xListener ) throw (RuntimeException) { @@ -1462,9 +1462,9 @@ void SAL_CALL SfxBaseModel::addCloseListener( const Reference< util::XCloseListe m_pData->m_aInterfaceContainer.addInterface( ::getCppuType((const Reference< util::XCloseListener >*)0), xListener ); } -//____________________________________________________________________________________________________ + // XCloseBroadcaster -//____________________________________________________________________________________________________ + void SAL_CALL SfxBaseModel::removeCloseListener( const Reference< util::XCloseListener >& xListener ) throw (RuntimeException) { @@ -1473,9 +1473,9 @@ void SAL_CALL SfxBaseModel::removeCloseListener( const Reference< util::XCloseLi m_pData->m_aInterfaceContainer.removeInterface( ::getCppuType((const Reference< util::XCloseListener >*)0), xListener ); } -//________________________________________________________________________________________________________ + // XPrintable -//________________________________________________________________________________________________________ + Sequence< beans::PropertyValue > SAL_CALL SfxBaseModel::getPrinter() throw(RuntimeException) { @@ -1505,9 +1505,9 @@ void SAL_CALL SfxBaseModel::print(const Sequence< beans::PropertyValue >& rOptio m_pData->m_xPrintable->print( rOptions ); } -//________________________________________________________________________________________________________ + // XStorable -//________________________________________________________________________________________________________ + sal_Bool SAL_CALL SfxBaseModel::hasLocation() throw(RuntimeException) { @@ -1516,9 +1516,9 @@ sal_Bool SAL_CALL SfxBaseModel::hasLocation() throw(RuntimeException) return m_pData->m_pObjectShell.Is() ? m_pData->m_pObjectShell->HasName() : sal_False; } -//________________________________________________________________________________________________________ + // XStorable -//________________________________________________________________________________________________________ + OUString SAL_CALL SfxBaseModel::getLocation() throw(RuntimeException) { @@ -1536,9 +1536,9 @@ OUString SAL_CALL SfxBaseModel::getLocation() throw(RuntimeException) return m_pData->m_sURL; } -//________________________________________________________________________________________________________ + // XStorable -//________________________________________________________________________________________________________ + sal_Bool SAL_CALL SfxBaseModel::isReadonly() throw(RuntimeException) { @@ -1547,9 +1547,9 @@ sal_Bool SAL_CALL SfxBaseModel::isReadonly() throw(RuntimeException) return m_pData->m_pObjectShell.Is() ? m_pData->m_pObjectShell->IsReadOnly() : sal_True; } -//________________________________________________________________________________________________________ + // XStorable2 -//________________________________________________________________________________________________________ + void SAL_CALL SfxBaseModel::storeSelf( const Sequence< beans::PropertyValue >& aSeqArgs ) throw ( lang::IllegalArgumentException, @@ -1669,18 +1669,18 @@ void SAL_CALL SfxBaseModel::storeSelf( const Sequence< beans::PropertyValue > } -//________________________________________________________________________________________________________ + // XStorable -//________________________________________________________________________________________________________ + void SAL_CALL SfxBaseModel::store() throw (io::IOException, RuntimeException) { storeSelf( Sequence< beans::PropertyValue >() ); } -//________________________________________________________________________________________________________ + // XStorable -//________________________________________________________________________________________________________ + void SAL_CALL SfxBaseModel::storeAsURL( const OUString& rURL , const Sequence< beans::PropertyValue >& rArgs ) @@ -1709,9 +1709,9 @@ void SAL_CALL SfxBaseModel::storeAsURL( const OUString& rURL } } -//________________________________________________________________________________________________________ + // XUndoManagerSupplier -//________________________________________________________________________________________________________ + Reference< XUndoManager > SAL_CALL SfxBaseModel::getUndoManager( ) throw (RuntimeException) { SfxModelGuard aGuard( *this ); @@ -1720,9 +1720,9 @@ Reference< XUndoManager > SAL_CALL SfxBaseModel::getUndoManager( ) throw (Runti return m_pData->m_pDocumentUndoManager.get(); } -//________________________________________________________________________________________________________ + // XStorable -//________________________________________________________________________________________________________ + void SAL_CALL SfxBaseModel::storeToURL( const OUString& rURL , const Sequence< beans::PropertyValue >& rArgs ) @@ -1783,9 +1783,9 @@ void SAL_CALL SfxBaseModel::recoverFromFile( const OUString& i_SourceLocation, c // not want to overwrite it with the "old" elements passed to this method here. } -//________________________________________________________________________________________________________ + // XLoadable -//________________________________________________________________________________________________________ + void SAL_CALL SfxBaseModel::initNew() throw (frame::DoubleInitializationException, @@ -1966,9 +1966,9 @@ void SAL_CALL SfxBaseModel::load( const Sequence< beans::PropertyValue >& seqA #endif } -//________________________________________________________________________________________________________ + // XTransferable -//________________________________________________________________________________________________________ + Any SAL_CALL SfxBaseModel::getTransferData( const datatransfer::DataFlavor& aFlavor ) throw (datatransfer::UnsupportedFlavorException, @@ -2206,9 +2206,9 @@ Any SAL_CALL SfxBaseModel::getTransferData( const datatransfer::DataFlavor& aFla return aAny; } -//________________________________________________________________________________________________________ + // XTransferable -//________________________________________________________________________________________________________ + Sequence< datatransfer::DataFlavor > SAL_CALL SfxBaseModel::getTransferDataFlavors() @@ -2275,9 +2275,9 @@ Sequence< datatransfer::DataFlavor > SAL_CALL SfxBaseModel::getTransferDataFlavo return aFlavorSeq; } -//________________________________________________________________________________________________________ + // XTransferable -//________________________________________________________________________________________________________ + sal_Bool SAL_CALL SfxBaseModel::isDataFlavorSupported( const datatransfer::DataFlavor& aFlavor ) @@ -2336,9 +2336,9 @@ sal_Bool SAL_CALL SfxBaseModel::isDataFlavorSupported( const datatransfer::DataF } -//-------------------------------------------------------------------------------------------------------- + // XEventsSupplier -//-------------------------------------------------------------------------------------------------------- + Reference< container::XNameReplace > SAL_CALL SfxBaseModel::getEvents() throw( RuntimeException ) { @@ -2352,9 +2352,9 @@ Reference< container::XNameReplace > SAL_CALL SfxBaseModel::getEvents() throw( R return m_pData->m_xEvents; } -//-------------------------------------------------------------------------------------------------------- + // XEmbeddedScripts -//-------------------------------------------------------------------------------------------------------- + Reference< script::XStorageBasedLibraryContainer > SAL_CALL SfxBaseModel::getBasicLibraries() throw (RuntimeException) { @@ -2385,9 +2385,9 @@ Reference< script::XStorageBasedLibraryContainer > SAL_CALL SfxBaseModel::getDia return sal_False; } -//-------------------------------------------------------------------------------------------------------- + // XScriptInvocationContext -//-------------------------------------------------------------------------------------------------------- + Reference< document::XEmbeddedScripts > SAL_CALL SfxBaseModel::getScriptContainer() throw (RuntimeException) { @@ -2421,9 +2421,9 @@ Reference< document::XEmbeddedScripts > SAL_CALL SfxBaseModel::getScriptContaine return xDocumentScripts; } -//-------------------------------------------------------------------------------------------------------- + // XEventBroadcaster -//-------------------------------------------------------------------------------------------------------- + void SAL_CALL SfxBaseModel::addEventListener( const Reference< document::XEventListener >& aListener ) throw( RuntimeException ) { @@ -2432,9 +2432,9 @@ void SAL_CALL SfxBaseModel::addEventListener( const Reference< document::XEventL m_pData->m_aInterfaceContainer.addInterface( ::getCppuType((const Reference< document::XEventListener >*)0), aListener ); } -//-------------------------------------------------------------------------------------------------------- + // XEventBroadcaster -//-------------------------------------------------------------------------------------------------------- + void SAL_CALL SfxBaseModel::removeEventListener( const Reference< document::XEventListener >& aListener ) throw( RuntimeException ) { @@ -2443,10 +2443,10 @@ void SAL_CALL SfxBaseModel::removeEventListener( const Reference< document::XEve m_pData->m_aInterfaceContainer.removeInterface( ::getCppuType((const Reference< document::XEventListener >*)0), aListener ); } -//-------------------------------------------------------------------------------------------------------- + // XDocumentEventBroadcaster -//-------------------------------------------------------------------------------------------------------- -// --------------------------------- + + void SAL_CALL SfxBaseModel::addDocumentEventListener( const Reference< document::XDocumentEventListener >& aListener ) throw ( RuntimeException ) { @@ -2454,7 +2454,7 @@ void SAL_CALL SfxBaseModel::addDocumentEventListener( const Reference< document: m_pData->m_aInterfaceContainer.addInterface( ::getCppuType((const Reference< document::XDocumentEventListener >*)0), aListener ); } -// --------------------------------- + void SAL_CALL SfxBaseModel::removeDocumentEventListener( const Reference< document::XDocumentEventListener >& aListener ) throw ( RuntimeException ) { @@ -2462,7 +2462,7 @@ void SAL_CALL SfxBaseModel::removeDocumentEventListener( const Reference< docume m_pData->m_aInterfaceContainer.removeInterface( ::getCppuType((const Reference< document::XDocumentEventListener >*)0), aListener ); } -// --------------------------------- + void SAL_CALL SfxBaseModel::notifyDocumentEvent( const OUString&, const Reference< frame::XController2 >&, const Any& ) throw ( lang::IllegalArgumentException, lang::NoSupportException, RuntimeException ) { @@ -2739,9 +2739,9 @@ void SfxBaseModel::handleLoadError( sal_uInt32 nError, SfxMedium* pMedium ) } } -//________________________________________________________________________________________________________ + // SfxListener -//________________________________________________________________________________________________________ + void addTitle_Impl( Sequence < beans::PropertyValue >& rSeq, const OUString& rTitle ) { @@ -2867,9 +2867,9 @@ void SfxBaseModel::Notify( SfxBroadcaster& rBC , } } -//________________________________________________________________________________________________________ + // public impl. -//________________________________________________________________________________________________________ + void SfxBaseModel::NotifyModifyListeners_Impl() const { @@ -2896,18 +2896,18 @@ void SfxBaseModel::changing() NotifyModifyListeners_Impl(); } -//________________________________________________________________________________________________________ + // public impl. -//________________________________________________________________________________________________________ + SfxObjectShell* SfxBaseModel::GetObjectShell() const { return m_pData ? (SfxObjectShell*) m_pData->m_pObjectShell : 0; } -//________________________________________________________________________________________________________ + // public impl. -//________________________________________________________________________________________________________ + sal_Bool SfxBaseModel::IsInitialized() const { @@ -2933,9 +2933,9 @@ sal_Bool SfxBaseModel::impl_isDisposed() const return ( m_pData == NULL ) ; } -//________________________________________________________________________________________________________ + // private impl. -//________________________________________________________________________________________________________ + OUString SfxBaseModel::GetMediumFilterName_Impl() { @@ -3363,9 +3363,9 @@ sal_Int64 SAL_CALL SfxBaseModel::getSomething( const Sequence< sal_Int8 >& aIden return 0; } -//____________________________________________________________________________________________________ + // XDocumentSubStorageSupplier -//____________________________________________________________________________________________________ + void SfxBaseModel::ListenForStorage_Impl( const Reference< embed::XStorage >& xStorage ) { @@ -3441,9 +3441,9 @@ Sequence< OUString > SAL_CALL SfxBaseModel::getDocumentSubStoragesNames() return aResult; } -//____________________________________________________________________________________________________ + // XScriptProviderSupplier -//____________________________________________________________________________________________________ + Reference< script::provider::XScriptProvider > SAL_CALL SfxBaseModel::getScriptProvider() @@ -3469,9 +3469,9 @@ Reference< script::provider::XScriptProvider > SAL_CALL SfxBaseModel::getScriptP return xScriptProvider; } -//____________________________________________________________________________________________________ + // XUIConfigurationManagerSupplier -//____________________________________________________________________________________________________ + OUString SfxBaseModel::getRuntimeUID() const { @@ -3662,9 +3662,9 @@ Reference< ui::XUIConfigurationManager2 > SfxBaseModel::getUIConfigurationManage return m_pData->m_xUIConfigurationManager; } -//____________________________________________________________________________________________________ + // XVisualObject -//____________________________________________________________________________________________________ + void SAL_CALL SfxBaseModel::setVisualAreaSize( sal_Int64 nAspect, const awt::Size& aSize ) throw ( lang::IllegalArgumentException, @@ -3746,9 +3746,9 @@ embed::VisualRepresentation SAL_CALL SfxBaseModel::getPreferredVisualRepresentat return aVisualRepresentation; } -//____________________________________________________________________________________________________ + // XStorageBasedDocument -//____________________________________________________________________________________________________ + void SAL_CALL SfxBaseModel::loadFromStorage( const Reference< embed::XStorage >& xStorage, const Sequence< beans::PropertyValue >& aMediaDescriptor ) diff --git a/sfx2/source/doc/sfxmodelfactory.cxx b/sfx2/source/doc/sfxmodelfactory.cxx index d96fdfd3e6bb..56b910900bd9 100644 --- a/sfx2/source/doc/sfxmodelfactory.cxx +++ b/sfx2/source/doc/sfxmodelfactory.cxx @@ -100,7 +100,7 @@ namespace sfx2 //==================================================================== //= SfxModelFactory - implementation //==================================================================== - //-------------------------------------------------------------------- + SfxModelFactory::SfxModelFactory( const Reference< XMultiServiceFactory >& _rxServiceFactory, const OUString& _rImplementationName, const SfxModelFactoryFunc _pComponentFactoryFunc, const Sequence< OUString >& _rServiceNames ) @@ -111,24 +111,24 @@ namespace sfx2 { } - //-------------------------------------------------------------------- + SfxModelFactory::~SfxModelFactory() { } - //-------------------------------------------------------------------- + Reference< XInterface > SfxModelFactory::impl_createInstance( const sal_uInt64 _nCreationFlags ) const { return (*m_pComponentFactoryFunc)( m_xServiceFactory, _nCreationFlags ); } - //-------------------------------------------------------------------- + Reference< XInterface > SAL_CALL SfxModelFactory::createInstance( ) throw (Exception, RuntimeException) { return createInstanceWithArguments( Sequence< Any >() ); } - //-------------------------------------------------------------------- + namespace { struct IsSpecialArgument : public ::std::unary_function< Any, bool > @@ -151,7 +151,7 @@ namespace sfx2 }; } - //-------------------------------------------------------------------- + Reference< XInterface > SAL_CALL SfxModelFactory::createInstanceWithArguments( const Sequence< Any >& _rArguments ) throw (Exception, RuntimeException) { ::comphelper::NamedValueCollection aArgs( _rArguments ); diff --git a/sfx2/source/doc/zoomitem.cxx b/sfx2/source/doc/zoomitem.cxx index 445b5c2c5743..1eb14cf42787 100644 --- a/sfx2/source/doc/zoomitem.cxx +++ b/sfx2/source/doc/zoomitem.cxx @@ -24,7 +24,7 @@ #include <com/sun/star/uno/Sequence.hxx> #include <com/sun/star/beans/PropertyValue.hpp> #include <sfx2/sfx.hrc> -// ----------------------------------------------------------------------- + TYPEINIT1_FACTORY(SvxZoomItem,SfxUInt16Item, new SvxZoomItem); @@ -33,7 +33,7 @@ TYPEINIT1_FACTORY(SvxZoomItem,SfxUInt16Item, new SvxZoomItem); #define ZOOM_PARAM_TYPE "Type" #define ZOOM_PARAMS 3 -// ----------------------------------------------------------------------- + SvxZoomItem::SvxZoomItem ( @@ -47,7 +47,7 @@ SvxZoomItem::SvxZoomItem { } -// ----------------------------------------------------------------------- + SvxZoomItem::SvxZoomItem( const SvxZoomItem& rOrig ) : SfxUInt16Item( rOrig.Which(), rOrig.GetValue() ), @@ -56,20 +56,20 @@ SvxZoomItem::SvxZoomItem( const SvxZoomItem& rOrig ) { } -// ----------------------------------------------------------------------- + SvxZoomItem::~SvxZoomItem() { } -// ----------------------------------------------------------------------- + SfxPoolItem* SvxZoomItem::Clone( SfxItemPool * /*pPool*/ ) const { return new SvxZoomItem( *this ); } -// ----------------------------------------------------------------------- + SfxPoolItem* SvxZoomItem::Create( SvStream& rStrm, sal_uInt16 /*nVersion*/ ) const { @@ -82,7 +82,7 @@ SfxPoolItem* SvxZoomItem::Create( SvStream& rStrm, sal_uInt16 /*nVersion*/ ) con return pNew; } -// ----------------------------------------------------------------------- + SvStream& SvxZoomItem::Store( SvStream& rStrm, sal_uInt16 /*nItemVersion*/ ) const { @@ -92,7 +92,7 @@ SvStream& SvxZoomItem::Store( SvStream& rStrm, sal_uInt16 /*nItemVersion*/ ) con return rStrm; } -// ----------------------------------------------------------------------- + bool SvxZoomItem::operator==( const SfxPoolItem& rAttr ) const { diff --git a/sfx2/source/explorer/nochaos.cxx b/sfx2/source/explorer/nochaos.cxx index 76b2e63b9221..58893f87b700 100644 --- a/sfx2/source/explorer/nochaos.cxx +++ b/sfx2/source/explorer/nochaos.cxx @@ -53,7 +53,7 @@ public: const SfxItemInfo* GetItemInfos() const { return m_pItemInfos; } }; -//---------------------------------------------------------------------------- + //========================================================================= @@ -71,9 +71,9 @@ public: static sal_uInt16 Release(); }; -//---------------------------------------------------------------------------- -//---------------------------------------------------------------------------- + + // static SfxItemPool* NoChaos::GetItemPool() { @@ -81,7 +81,7 @@ SfxItemPool* NoChaos::GetItemPool() return CntItemPool::Acquire(); } -//---------------------------------------------------------------------------- + // static sal_uInt16 NoChaos::ReleaseItemPool() { @@ -98,7 +98,7 @@ static CntStaticPoolDefaults_Impl* pPoolDefs_Impl = NULL; // static member! CntItemPool* CntItemPool::_pThePool = NULL; -//------------------------------------------------------------------------- + CntItemPool::CntItemPool() : SfxItemPool( "chaos", WID_CHAOS_START, WID_CHAOS_START, NULL ), _nRefs( 0 ) @@ -117,7 +117,7 @@ CntItemPool::CntItemPool() SetDefaults( pPoolDefs_Impl->GetDefaults() ); } -//------------------------------------------------------------------------- + //virtual CntItemPool::~CntItemPool() { @@ -125,7 +125,7 @@ CntItemPool::~CntItemPool() ReleaseDefaults( false ); } -//------------------------------------------------------------------------- + // static CntItemPool* CntItemPool::Acquire() { @@ -137,7 +137,7 @@ CntItemPool* CntItemPool::Acquire() return _pThePool; } -//------------------------------------------------------------------------- + // static sal_uInt16 CntItemPool::Release() { @@ -174,7 +174,7 @@ inline void CntStaticPoolDefaults_Impl::Insert( m_pItemInfos[ nPos ]._nFlags = nFlags; } -//------------------------------------------------------------------------- + CntStaticPoolDefaults_Impl::~CntStaticPoolDefaults_Impl() { for ( sal_uInt32 n = 0; n < m_nItems; ++n ) @@ -184,7 +184,7 @@ CntStaticPoolDefaults_Impl::~CntStaticPoolDefaults_Impl() delete [] m_pItemInfos; } -//------------------------------------------------------------------------- + CntStaticPoolDefaults_Impl::CntStaticPoolDefaults_Impl( CntItemPool* /*pPool*/ ) : m_nItems( 1 ), m_ppDefaults( new SfxPoolItem* [ m_nItems ] ), diff --git a/sfx2/source/inet/inettbc.cxx b/sfx2/source/inet/inettbc.cxx index af7afe18f9b7..869a3c9f447a 100644 --- a/sfx2/source/inet/inettbc.cxx +++ b/sfx2/source/inet/inettbc.cxx @@ -132,7 +132,7 @@ void SfxURLToolBoxControl_Impl::OpenURL( const OUString& rName, sal_Bool /*bNew* } } -//-------------------------------------------------------------------- + IMPL_STATIC_LINK_NOINSTANCE( SfxURLToolBoxControl_Impl, ExecuteHdl_Impl, ExecuteInfo*, pExecuteInfo ) { diff --git a/sfx2/source/menu/mnuitem.cxx b/sfx2/source/menu/mnuitem.cxx index dfae122b03ab..aba877d15448 100644 --- a/sfx2/source/menu/mnuitem.cxx +++ b/sfx2/source/menu/mnuitem.cxx @@ -88,7 +88,7 @@ void SfxMenuControl::Bind( } -//-------------------------------------------------------------------- + // binds the item to the specified menu and assignes the title @@ -106,7 +106,7 @@ void SfxMenuControl::Bind( aTitle = rTitle; } -//-------------------------------------------------------------------- + // Constructor for explicit registration @@ -117,7 +117,7 @@ SfxMenuControl::SfxMenuControl( sal_Bool bShowStrings ) { } -//-------------------------------------------------------------------- + // Constructor for array SfxMenuControl::SfxMenuControl(): @@ -127,7 +127,7 @@ SfxMenuControl::SfxMenuControl(): { } -//-------------------------------------------------------------------- + SfxMenuControl::SfxMenuControl(sal_uInt16 nSlotId, SfxBindings& rBindings): SfxControllerItem(nSlotId, rBindings), @@ -143,14 +143,14 @@ SfxMenuControl::SfxMenuControl(sal_uInt16 nSlotId, SfxBindings& rBindings): } -//-------------------------------------------------------------------- + SfxMenuControl::~SfxMenuControl() { delete pSubMenu; } -//-------------------------------------------------------------------- + // changes the state in the virtual menu @@ -236,7 +236,7 @@ void SfxMenuControl::StateChanged pOwnMenu->CheckItem( GetId(), bCheck ); } -//-------------------------------------------------------------------- + SfxMenuControl* SfxMenuControl::CreateImpl( sal_uInt16 /*nId*/, Menu& /*rMenu*/, SfxBindings& /*rBindings*/ ) { @@ -249,7 +249,7 @@ void SfxMenuControl::RegisterControl( sal_uInt16 nSlotId, SfxModule *pMod ) SfxMenuControl::CreateImpl, TYPE(SfxStringItem), nSlotId ) ); } -//-------------------------------------------------------------------- + void SfxMenuControl::RegisterMenuControl(SfxModule* pMod, SfxMenuCtrlFactory* pFact) { SFX_APP()->RegisterMenuControl_Impl( pMod, pFact ); @@ -288,7 +288,7 @@ SfxMenuControl* SfxMenuControl::CreateControl( sal_uInt16 nId, Menu &rMenu, SfxB return 0; } -//-------------------------------------------------------------------- + PopupMenu* SfxMenuControl::GetPopup () const { diff --git a/sfx2/source/menu/mnumgr.cxx b/sfx2/source/menu/mnumgr.cxx index 1b189f721e2b..122d9335fef4 100644 --- a/sfx2/source/menu/mnumgr.cxx +++ b/sfx2/source/menu/mnumgr.cxx @@ -78,7 +78,7 @@ void TryToHideDisabledEntries_Impl( Menu* pMenu ) } } -//-------------------------------------------------------------------- + SfxMenuManager::~SfxMenuManager() { @@ -87,7 +87,7 @@ SfxMenuManager::~SfxMenuManager() pBindings->LEAVEREGISTRATIONS(); } -//-------------------------------------------------------------------- + void SfxMenuManager::Construct( SfxVirtualMenu& rMenu ) { @@ -99,7 +99,7 @@ void SfxMenuManager::Construct( SfxVirtualMenu& rMenu ) TryToHideDisabledEntries_Impl( pSvMenu ); } -//------------------------------------------------------------------------- + void InsertVerbs_Impl( SfxBindings* pBindings, const com::sun::star::uno::Sequence < com::sun::star::embed::VerbDescriptor >& aVerbs, Menu* pMenu ) { SfxViewShell *pView = pBindings->GetDispatcher()->GetFrame()->GetViewShell(); @@ -203,7 +203,7 @@ PopupMenu* InsertThesaurusSubmenu_Impl( SfxBindings* pBindings, Menu* pSVMenu ) return pThesSubMenu; } -// ------------------------------------------------------------------------ + // executes the function for the selected item IMPL_LINK( SfxMenuManager, Select, Menu *, pSelMenu ) @@ -237,7 +237,7 @@ SfxPopupMenuManager::~SfxPopupMenuManager() { } -//------------------------------------------------------------------------- + void SfxPopupMenuManager::RemoveDisabledEntries() { @@ -245,7 +245,7 @@ void SfxPopupMenuManager::RemoveDisabledEntries() TryToHideDisabledEntries_Impl( pSVMenu ); } -//-------------------------------------------------------------------- + sal_uInt16 SfxPopupMenuManager::Execute( const Point& rPos, Window* pWindow ) { @@ -254,7 +254,7 @@ sal_uInt16 SfxPopupMenuManager::Execute( const Point& rPos, Window* pWindow ) return nVal; } -//------------------------------------------------------------------------- + SfxMenuManager::SfxMenuManager( Menu* pMenuArg, SfxBindings &rBindings ) : pMenu(0), diff --git a/sfx2/source/menu/virtmenu.cxx b/sfx2/source/menu/virtmenu.cxx index 8f1a3a1319e3..c728b471fc9f 100644 --- a/sfx2/source/menu/virtmenu.cxx +++ b/sfx2/source/menu/virtmenu.cxx @@ -166,7 +166,7 @@ void SfxVirtualMenu::Construct_Impl() pResMgr = pParent->pResMgr; } -//-------------------------------------------------------------------- + SfxVirtualMenu::SfxVirtualMenu( sal_uInt16 nOwnId, SfxVirtualMenu* pOwnParent, Menu& rMenu, sal_Bool bWithHelp, @@ -198,7 +198,7 @@ SfxVirtualMenu::SfxVirtualMenu( sal_uInt16 nOwnId, bHelpInitialized = sal_False; } -//-------------------------------------------------------------------- + // creates a virtual menu from a StarView MenuBar or PopupMenu @@ -232,7 +232,7 @@ SfxVirtualMenu::SfxVirtualMenu( Menu *pStarViewMenu, sal_Bool bWithHelp, bHelpInitialized = sal_False; } -//-------------------------------------------------------------------- + /* The destructor of the class SfxVirtualMenu releases bounded items and the associated StarView-PopupMenu is released from its parent. @@ -283,7 +283,7 @@ SfxVirtualMenu::~SfxVirtualMenu() DBG_OUTF( ("SfxVirtualMenu %lx destroyed", this) ); DBG_ASSERT( !nLocks, "destroying active menu" ); } -//-------------------------------------------------------------------- + // internal: creates the virtual menu from the pSVMenu void SfxVirtualMenu::CreateFromSVMenu() @@ -489,7 +489,7 @@ void SfxVirtualMenu::CreateFromSVMenu() pBindings->LEAVEREGISTRATIONS(); --nLocks; } -//-------------------------------------------------------------------- + // called on activation of the SV-Menu @@ -566,7 +566,7 @@ IMPL_LINK_NOARG(SfxVirtualMenu, SettingsChanged) return 0; } -//-------------------------------------------------------------------- + void SfxVirtualMenu::UpdateImages( Menu* pMenu ) { @@ -607,7 +607,7 @@ void SfxVirtualMenu::UpdateImages( Menu* pMenu ) } } -//-------------------------------------------------------------------- + void SfxVirtualMenu::RemoveMenuImages( Menu* pMenu ) { @@ -626,7 +626,7 @@ void SfxVirtualMenu::RemoveMenuImages( Menu* pMenu ) } } -//-------------------------------------------------------------------- + bool SfxVirtualMenu::Bind_Impl( Menu *pMenu ) { @@ -744,7 +744,7 @@ void SfxVirtualMenu::UnbindControllers() } -//-------------------------------------------------------------------- + void SfxVirtualMenu::InsertAddOnsMenuItem( Menu* pMenu ) { // Create special popup menu that is filled with the 3rd party components popup menu items @@ -781,7 +781,7 @@ void SfxVirtualMenu::InsertAddOnsMenuItem( Menu* pMenu ) delete pAddonMenu; } -//-------------------------------------------------------------------- + // called on activation of the SV-Menu @@ -917,7 +917,7 @@ IMPL_LINK( SfxVirtualMenu, Activate, Menu *, pMenu ) } } -//-------------------------------------------------------------------- + IMPL_LINK( SfxVirtualMenu, Deactivate, Menu *, pMenu ) { @@ -932,7 +932,7 @@ IMPL_LINK( SfxVirtualMenu, Deactivate, Menu *, pMenu ) } return sal_True; } -//-------------------------------------------------------------------- + // called on activation of the SV-Menu @@ -980,7 +980,7 @@ IMPL_LINK( SfxVirtualMenu, Select, Menu *, pMenu ) return sal_True; } -//-------------------------------------------------------------------- + // returns the associated StarView-menu @@ -991,7 +991,7 @@ Menu* SfxVirtualMenu::GetSVMenu() const return pSVMenu; } -//-------------------------------------------------------------------- + // set the checkmark of the specified item @@ -1003,7 +1003,7 @@ void SfxVirtualMenu::CheckItem( sal_uInt16 nItemId, sal_Bool bCheck ) if (pSVMenu->GetItemPos( nItemId ) != MENU_ITEM_NOTFOUND ) pSVMenu->CheckItem( nItemId, bCheck ); } -//-------------------------------------------------------------------- + // set the enabled-state of the specified item @@ -1016,7 +1016,7 @@ void SfxVirtualMenu::EnableItem( sal_uInt16 nItemId, sal_Bool bEnable ) if (pSVMenu->GetItemPos( nItemId ) != MENU_ITEM_NOTFOUND ) pSVMenu->EnableItem( nItemId, bEnable ); } -//-------------------------------------------------------------------- + // set the text of the specified item @@ -1029,7 +1029,7 @@ void SfxVirtualMenu::SetItemText( sal_uInt16 nItemId, const OUString& rText ) pSVMenu->SetItemText( nItemId, rText ); } -//-------------------------------------------------------------------- + void SfxVirtualMenu::SetPopupMenu( sal_uInt16 nItemId, PopupMenu *pMenu ) @@ -1046,7 +1046,7 @@ void SfxVirtualMenu::SetPopupMenu( sal_uInt16 nItemId, PopupMenu *pMenu ) } } -//-------------------------------------------------------------------- + // Forces the initialization, which is otherwise only happens in Activate diff --git a/sfx2/source/notify/eventsupplier.cxx b/sfx2/source/notify/eventsupplier.cxx index 4ed2da689951..5c49ba694b9f 100644 --- a/sfx2/source/notify/eventsupplier.cxx +++ b/sfx2/source/notify/eventsupplier.cxx @@ -47,16 +47,16 @@ #include <sfx2/frame.hxx> #include <macroloader.hxx> -//-------------------------------------------------------------------------------------------------------- + #define MACRO_PRFIX "macro://" #define MACRO_POSTFIX "()" using namespace css; -//-------------------------------------------------------------------------------------------------------- + // --- XNameReplace --- -//-------------------------------------------------------------------------------------------------------- + void SAL_CALL SfxEvents_Impl::replaceByName( const OUString & aName, const uno::Any & rElement ) throw( lang::IllegalArgumentException, container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException ) @@ -112,9 +112,9 @@ void SAL_CALL SfxEvents_Impl::replaceByName( const OUString & aName, const uno:: throw container::NoSuchElementException(); } -//-------------------------------------------------------------------------------------------------------- + // --- XNameAccess --- -//-------------------------------------------------------------------------------------------------------- + uno::Any SAL_CALL SfxEvents_Impl::getByName( const OUString& aName ) throw( container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException ) @@ -134,13 +134,13 @@ uno::Any SAL_CALL SfxEvents_Impl::getByName( const OUString& aName ) throw container::NoSuchElementException(); } -//-------------------------------------------------------------------------------------------------------- + uno::Sequence< OUString > SAL_CALL SfxEvents_Impl::getElementNames() throw ( uno::RuntimeException ) { return maEventNames; } -//-------------------------------------------------------------------------------------------------------- + sal_Bool SAL_CALL SfxEvents_Impl::hasByName( const OUString& aName ) throw ( uno::RuntimeException ) { ::osl::MutexGuard aGuard( maMutex ); @@ -158,16 +158,16 @@ sal_Bool SAL_CALL SfxEvents_Impl::hasByName( const OUString& aName ) throw ( uno return sal_False; } -//-------------------------------------------------------------------------------------------------------- + // --- XElementAccess ( parent of XNameAccess ) --- -//-------------------------------------------------------------------------------------------------------- + uno::Type SAL_CALL SfxEvents_Impl::getElementType() throw ( uno::RuntimeException ) { uno::Type aElementType = ::getCppuType( (const uno::Sequence < beans::PropertyValue > *)0 ); return aElementType; } -//-------------------------------------------------------------------------------------------------------- + sal_Bool SAL_CALL SfxEvents_Impl::hasElements() throw ( uno::RuntimeException ) { ::osl::MutexGuard aGuard( maMutex ); @@ -271,9 +271,9 @@ void SfxEvents_Impl::Execute( uno::Any& aEventData, const document::DocumentEven } } -//-------------------------------------------------------------------------------------------------------- + // --- ::document::XEventListener --- -//-------------------------------------------------------------------------------------------------------- + void SAL_CALL SfxEvents_Impl::notifyEvent( const document::EventObject& aEvent ) throw( uno::RuntimeException ) { ::osl::ClearableMutexGuard aGuard( maMutex ); @@ -301,9 +301,9 @@ void SAL_CALL SfxEvents_Impl::notifyEvent( const document::EventObject& aEvent ) Execute( aEventData, document::DocumentEvent(aEvent.Source, aEvent.EventName, NULL, uno::Any()), mpObjShell ); } -//-------------------------------------------------------------------------------------------------------- + // --- ::lang::XEventListener --- -//-------------------------------------------------------------------------------------------------------- + void SAL_CALL SfxEvents_Impl::disposing( const lang::EventObject& /*Source*/ ) throw( uno::RuntimeException ) { ::osl::MutexGuard aGuard( maMutex ); @@ -315,8 +315,8 @@ void SAL_CALL SfxEvents_Impl::disposing( const lang::EventObject& /*Source*/ ) t } } -//-------------------------------------------------------------------------------------------------------- -//-------------------------------------------------------------------------------------------------------- + + SfxEvents_Impl::SfxEvents_Impl( SfxObjectShell* pShell, uno::Reference< document::XEventBroadcaster > xBroadcaster ) { @@ -335,12 +335,12 @@ SfxEvents_Impl::SfxEvents_Impl( SfxObjectShell* pShell, mxBroadcaster->addEventListener( this ); } -//-------------------------------------------------------------------------------------------------------- + SfxEvents_Impl::~SfxEvents_Impl() { } -//-------------------------------------------------------------------------------------------------------- + SvxMacro* SfxEvents_Impl::ConvertToMacro( const uno::Any& rElement, SfxObjectShell* pObjShell, sal_Bool bNormalizeMacro ) { SvxMacro* pMacro = NULL; diff --git a/sfx2/source/notify/globalevents.cxx b/sfx2/source/notify/globalevents.cxx index 367e8adf700a..c02bab054160 100644 --- a/sfx2/source/notify/globalevents.cxx +++ b/sfx2/source/notify/globalevents.cxx @@ -227,7 +227,7 @@ uno::Any SAL_CALL ModelCollectionEnumeration::nextElement() return uno::makeAny(xModel); } -//----------------------------------------------------------------------------- + SfxGlobalEvents_Impl::SfxGlobalEvents_Impl( const uno::Reference < uno::XComponentContext >& rxContext) : ModelCollectionMutexBase( ) , m_xJobExecutorListener( task::theJobExecutor::get( rxContext ), uno::UNO_QUERY_THROW ) @@ -242,12 +242,12 @@ SfxGlobalEvents_Impl::SfxGlobalEvents_Impl( const uno::Reference < uno::XCompone m_refCount--; } -//----------------------------------------------------------------------------- + SfxGlobalEvents_Impl::~SfxGlobalEvents_Impl() { } -//----------------------------------------------------------------------------- + uno::Reference< container::XNameReplace > SAL_CALL SfxGlobalEvents_Impl::getEvents() throw(uno::RuntimeException) { @@ -257,7 +257,7 @@ uno::Reference< container::XNameReplace > SAL_CALL SfxGlobalEvents_Impl::getEven // <- SAFE } -//----------------------------------------------------------------------------- + void SAL_CALL SfxGlobalEvents_Impl::addEventListener(const uno::Reference< document::XEventListener >& xListener) throw(uno::RuntimeException) { @@ -265,7 +265,7 @@ void SAL_CALL SfxGlobalEvents_Impl::addEventListener(const uno::Reference< docum m_aLegacyListeners.addInterface(xListener); } -//----------------------------------------------------------------------------- + void SAL_CALL SfxGlobalEvents_Impl::removeEventListener(const uno::Reference< document::XEventListener >& xListener) throw(uno::RuntimeException) { @@ -273,21 +273,21 @@ void SAL_CALL SfxGlobalEvents_Impl::removeEventListener(const uno::Reference< do m_aLegacyListeners.removeInterface(xListener); } -//----------------------------------------------------------------------------- + void SAL_CALL SfxGlobalEvents_Impl::addDocumentEventListener( const uno::Reference< document::XDocumentEventListener >& _Listener ) throw(uno::RuntimeException) { m_aDocumentListeners.addInterface( _Listener ); } -//----------------------------------------------------------------------------- + void SAL_CALL SfxGlobalEvents_Impl::removeDocumentEventListener( const uno::Reference< document::XDocumentEventListener >& _Listener ) throw(uno::RuntimeException) { m_aDocumentListeners.removeInterface( _Listener ); } -//----------------------------------------------------------------------------- + void SAL_CALL SfxGlobalEvents_Impl::notifyDocumentEvent( const OUString& /*_EventName*/, const uno::Reference< frame::XController2 >& /*_ViewController*/, const uno::Any& /*_Supplement*/ ) throw (lang::IllegalArgumentException, lang::NoSupportException, uno::RuntimeException) @@ -296,7 +296,7 @@ void SAL_CALL SfxGlobalEvents_Impl::notifyDocumentEvent( const OUString& /*_Even throw lang::NoSupportException(OUString(), *this); } -//----------------------------------------------------------------------------- + void SAL_CALL SfxGlobalEvents_Impl::notifyEvent(const document::EventObject& aEvent) throw(uno::RuntimeException) { @@ -306,7 +306,7 @@ void SAL_CALL SfxGlobalEvents_Impl::notifyEvent(const document::EventObject& aEv implts_notifyListener(aDocEvent); } -//----------------------------------------------------------------------------- + void SAL_CALL SfxGlobalEvents_Impl::documentEventOccured( const document::DocumentEvent& _Event ) throw (uno::RuntimeException) { @@ -315,7 +315,7 @@ void SAL_CALL SfxGlobalEvents_Impl::documentEventOccured( const document::Docume implts_notifyListener(_Event); } -//----------------------------------------------------------------------------- + void SAL_CALL SfxGlobalEvents_Impl::disposing(const lang::EventObject& aEvent) throw(uno::RuntimeException) { @@ -330,7 +330,7 @@ void SAL_CALL SfxGlobalEvents_Impl::disposing(const lang::EventObject& aEvent) // <- SAFE } -//----------------------------------------------------------------------------- + sal_Bool SAL_CALL SfxGlobalEvents_Impl::has(const uno::Any& aElement) throw (uno::RuntimeException) { @@ -350,7 +350,7 @@ sal_Bool SAL_CALL SfxGlobalEvents_Impl::has(const uno::Any& aElement) return bHas; } -//----------------------------------------------------------------------------- + void SAL_CALL SfxGlobalEvents_Impl::insert( const uno::Any& aElement ) throw (lang::IllegalArgumentException , container::ElementExistException, @@ -387,7 +387,7 @@ void SAL_CALL SfxGlobalEvents_Impl::insert( const uno::Any& aElement ) } } -//----------------------------------------------------------------------------- + void SAL_CALL SfxGlobalEvents_Impl::remove( const uno::Any& aElement ) throw (lang::IllegalArgumentException , container::NoSuchElementException, @@ -424,7 +424,7 @@ void SAL_CALL SfxGlobalEvents_Impl::remove( const uno::Any& aElement ) } } -//----------------------------------------------------------------------------- + uno::Reference< container::XEnumeration > SAL_CALL SfxGlobalEvents_Impl::createEnumeration() throw (uno::RuntimeException) { @@ -441,14 +441,14 @@ uno::Reference< container::XEnumeration > SAL_CALL SfxGlobalEvents_Impl::createE return xEnum; } -//----------------------------------------------------------------------------- + uno::Type SAL_CALL SfxGlobalEvents_Impl::getElementType() throw (uno::RuntimeException) { return ::getCppuType(static_cast< uno::Reference< frame::XModel >* >(NULL)); } -//----------------------------------------------------------------------------- + sal_Bool SAL_CALL SfxGlobalEvents_Impl::hasElements() throw (uno::RuntimeException) { @@ -458,7 +458,7 @@ sal_Bool SAL_CALL SfxGlobalEvents_Impl::hasElements() // <- SAFE } -//----------------------------------------------------------------------------- + void SfxGlobalEvents_Impl::implts_notifyJobExecution(const document::EventObject& aEvent) { try @@ -471,7 +471,7 @@ void SfxGlobalEvents_Impl::implts_notifyJobExecution(const document::EventObject {} } -//----------------------------------------------------------------------------- + void SfxGlobalEvents_Impl::implts_checkAndExecuteEventBindings(const document::DocumentEvent& aEvent) { try @@ -497,7 +497,7 @@ void SfxGlobalEvents_Impl::implts_checkAndExecuteEventBindings(const document::D } } -//----------------------------------------------------------------------------- + void SfxGlobalEvents_Impl::implts_notifyListener(const document::DocumentEvent& aEvent) { // containers are threadsafe @@ -507,7 +507,7 @@ void SfxGlobalEvents_Impl::implts_notifyListener(const document::DocumentEvent& m_aDocumentListeners.notifyEach( &document::XDocumentEventListener::documentEventOccured, aEvent ); } -//----------------------------------------------------------------------------- + // not threadsafe ... must be locked from outside! TModelList::iterator SfxGlobalEvents_Impl::impl_searchDoc(const uno::Reference< frame::XModel >& xModel) { diff --git a/sfx2/source/notify/hintpost.cxx b/sfx2/source/notify/hintpost.cxx index 359a8a831506..fddafb36f30c 100644 --- a/sfx2/source/notify/hintpost.cxx +++ b/sfx2/source/notify/hintpost.cxx @@ -23,7 +23,7 @@ #include <sfx2/app.hxx> #include "sfxtypes.hxx" -//-------------------------------------------------------------------- + SfxHintPoster::SfxHintPoster( const GenLink& rLink ): aLink(rLink) @@ -31,13 +31,13 @@ SfxHintPoster::SfxHintPoster( const GenLink& rLink ): } -//-------------------------------------------------------------------- + SfxHintPoster::~SfxHintPoster() { } -//-------------------------------------------------------------------- + void SfxHintPoster::Post( SfxHint* pHintToPost ) { @@ -45,7 +45,7 @@ void SfxHintPoster::Post( SfxHint* pHintToPost ) AddRef(); } -//-------------------------------------------------------------------- + IMPL_LINK_INLINE_START( SfxHintPoster, DoEvent_Impl, SfxHint *, pPostedHint ) { @@ -55,14 +55,14 @@ IMPL_LINK_INLINE_START( SfxHintPoster, DoEvent_Impl, SfxHint *, pPostedHint ) } IMPL_LINK_INLINE_END( SfxHintPoster, DoEvent_Impl, SfxHint *, pPostedHint ) -//-------------------------------------------------------------------- + void SfxHintPoster::Event( SfxHint* pPostedHint ) { aLink.Call( pPostedHint ); } -//-------------------------------------------------------------------- + void SfxHintPoster::SetEventHdl( const GenLink& rLink ) { diff --git a/sfx2/source/statbar/stbitem.cxx b/sfx2/source/statbar/stbitem.cxx index c03b48284fd6..4c5c34758d58 100644 --- a/sfx2/source/statbar/stbitem.cxx +++ b/sfx2/source/statbar/stbitem.cxx @@ -50,7 +50,7 @@ using namespace ::com::sun::star; -//-------------------------------------------------------------------- + sal_uInt16 SfxStatusBarControl::convertAwtToVCLMouseButtons( sal_Int16 nAwtMouseButtons ) { @@ -66,7 +66,7 @@ sal_uInt16 SfxStatusBarControl::convertAwtToVCLMouseButtons( sal_Int16 nAwtMouse return nVCLMouseButtons; } -//-------------------------------------------------------------------- + svt::StatusbarController* SAL_CALL SfxStatusBarControllerFactory( const uno::Reference< frame::XFrame >& rFrame, @@ -128,7 +128,7 @@ svt::StatusbarController* SAL_CALL SfxStatusBarControllerFactory( return NULL; } -//-------------------------------------------------------------------- + SfxStatusBarControl::SfxStatusBarControl ( @@ -161,7 +161,7 @@ SfxStatusBarControl::SfxStatusBarControl { } -//-------------------------------------------------------------------- + SfxStatusBarControl::~SfxStatusBarControl() @@ -173,7 +173,7 @@ SfxStatusBarControl::~SfxStatusBarControl() {} -//-------------------------------------------------------------------- + // XInterface uno::Any SAL_CALL SfxStatusBarControl::queryInterface( const uno::Type & rType ) throw( uno::RuntimeException) @@ -191,7 +191,7 @@ void SAL_CALL SfxStatusBarControl::release() throw() OWeakObject::release(); } -//-------------------------------------------------------------------- + // XEventListener void SAL_CALL SfxStatusBarControl::disposing( const lang::EventObject& aEvent ) throw( uno::RuntimeException ) @@ -199,7 +199,7 @@ throw( uno::RuntimeException ) svt::StatusbarController::disposing( aEvent ); } -//-------------------------------------------------------------------- + // XComponent void SAL_CALL SfxStatusBarControl::dispose() throw (uno::RuntimeException) @@ -207,7 +207,7 @@ throw (uno::RuntimeException) svt::StatusbarController::dispose(); } -//-------------------------------------------------------------------- + // XStatusListener void SAL_CALL SfxStatusBarControl::statusChanged( const frame::FeatureStateEvent& rEvent ) throw ( ::com::sun::star::uno::RuntimeException ) @@ -313,7 +313,7 @@ throw ( ::com::sun::star::uno::RuntimeException ) } } -//-------------------------------------------------------------------- + // XStatusbarController ::sal_Bool SAL_CALL SfxStatusBarControl::mouseButtonDown( @@ -332,7 +332,7 @@ throw ( uno::RuntimeException ) return MouseButtonDown( aMouseEvent ); } -//-------------------------------------------------------------------- + ::sal_Bool SAL_CALL SfxStatusBarControl::mouseMove( const awt::MouseEvent& rMouseEvent ) @@ -349,7 +349,7 @@ throw (uno::RuntimeException) return MouseMove( aMouseEvent ); } -//-------------------------------------------------------------------- + ::sal_Bool SAL_CALL SfxStatusBarControl::mouseButtonUp( const ::awt::MouseEvent& rMouseEvent ) @@ -366,7 +366,7 @@ throw ( uno::RuntimeException ) return MouseButtonUp( aMouseEvent ); } -//-------------------------------------------------------------------- + void SAL_CALL SfxStatusBarControl::command( const awt::Point& rPos, @@ -382,7 +382,7 @@ throw (::com::sun::star::uno::RuntimeException) Command( aCmdEvent ); } -//-------------------------------------------------------------------- + void SAL_CALL SfxStatusBarControl::paint( const uno::Reference< awt::XGraphics >& xGraphics, @@ -401,7 +401,7 @@ throw ( ::uno::RuntimeException ) } } -//-------------------------------------------------------------------- + void SAL_CALL SfxStatusBarControl::click( const awt::Point& ) throw ( uno::RuntimeException ) @@ -410,7 +410,7 @@ throw ( uno::RuntimeException ) Click(); } -//-------------------------------------------------------------------- + void SAL_CALL SfxStatusBarControl::doubleClick( const awt::Point& ) throw ( uno::RuntimeException ) @@ -419,9 +419,9 @@ throw ( uno::RuntimeException ) DoubleClick(); } -//-------------------------------------------------------------------- + // old sfx2 interface -//-------------------------------------------------------------------- + void SfxStatusBarControl::StateChanged ( @@ -457,7 +457,7 @@ void SfxStatusBarControl::StateChanged } } -//-------------------------------------------------------------------- + sal_Bool SfxStatusBarControl::MouseButtonDown( const MouseEvent & ) @@ -484,7 +484,7 @@ sal_Bool SfxStatusBarControl::MouseButtonDown( const MouseEvent & ) return sal_False; } -//-------------------------------------------------------------------- + sal_Bool SfxStatusBarControl::MouseMove( const MouseEvent & ) @@ -511,7 +511,7 @@ sal_Bool SfxStatusBarControl::MouseMove( const MouseEvent & ) return sal_False; } -//-------------------------------------------------------------------- + sal_Bool SfxStatusBarControl::MouseButtonUp( const MouseEvent & ) @@ -538,7 +538,7 @@ sal_Bool SfxStatusBarControl::MouseButtonUp( const MouseEvent & ) return sal_False; } -//-------------------------------------------------------------------- + void SfxStatusBarControl::Command( const CommandEvent& ) @@ -553,7 +553,7 @@ void SfxStatusBarControl::Command( const CommandEvent& ) { } -//-------------------------------------------------------------------- + void SfxStatusBarControl::Click() @@ -568,7 +568,7 @@ void SfxStatusBarControl::Click() { } -//-------------------------------------------------------------------- + void SfxStatusBarControl::DoubleClick() @@ -583,7 +583,7 @@ void SfxStatusBarControl::DoubleClick() execute( aArgs ); } -//-------------------------------------------------------------------- + void SfxStatusBarControl::Paint ( @@ -603,19 +603,19 @@ void SfxStatusBarControl::Paint { } -//-------------------------------------------------------------------- + void SfxStatusBarControl::CaptureMouse() { } -//-------------------------------------------------------------------- + void SfxStatusBarControl::ReleaseMouse() { } -//-------------------------------------------------------------------- + SfxStatusBarControl* SfxStatusBarControl::CreateControl ( @@ -662,11 +662,11 @@ SfxStatusBarControl* SfxStatusBarControl::CreateControl return NULL; } -//-------------------------------------------------------------------- + void SfxStatusBarControl::RegisterStatusBarControl(SfxModule* pMod, SfxStbCtrlFactory* pFact) { SFX_APP()->RegisterStatusBarControl_Impl( pMod, pFact ); } -//-------------------------------------------------------------------- + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sfx2/source/toolbox/imgmgr.cxx b/sfx2/source/toolbox/imgmgr.cxx index e4f06128f2db..cc18a8700fae 100644 --- a/sfx2/source/toolbox/imgmgr.cxx +++ b/sfx2/source/toolbox/imgmgr.cxx @@ -153,7 +153,7 @@ SfxImageManager_Impl::SfxImageManager_Impl( SfxModule* pModule ) m_bAppEventListener = true; } -//------------------------------------------------------------------------- + SfxImageManager_Impl::~SfxImageManager_Impl() { @@ -164,7 +164,7 @@ SfxImageManager_Impl::~SfxImageManager_Impl() delete m_aToolBoxes[i]; } -//------------------------------------------------------------------------- + ImageList* SfxImageManager_Impl::GetImageList( bool bBig ) { @@ -180,7 +180,7 @@ ImageList* SfxImageManager_Impl::GetImageList( bool bBig ) return m_pImageList[nIndex]; } -//------------------------------------------------------------------------- + Image SfxImageManager_Impl::GetImage( sal_uInt16 nId, bool bBig ) { @@ -190,7 +190,7 @@ Image SfxImageManager_Impl::GetImage( sal_uInt16 nId, bool bBig ) return Image(); } -//------------------------------------------------------------------------- + void SfxImageManager_Impl::SetSymbolsSize_Impl( sal_Int16 nNewSymbolsSize ) { @@ -236,7 +236,7 @@ void SfxImageManager_Impl::SetSymbolsSize_Impl( sal_Int16 nNewSymbolsSize ) } } -//------------------------------------------------------------------------- + IMPL_LINK_NOARG(SfxImageManager_Impl, OptionsChanged_Impl) { @@ -244,7 +244,7 @@ IMPL_LINK_NOARG(SfxImageManager_Impl, OptionsChanged_Impl) return 0L; } -//------------------------------------------------------------------------- + IMPL_LINK( SfxImageManager_Impl, SettingsChanged_Impl, VclWindowEvent*, pEvent) { @@ -274,7 +274,7 @@ IMPL_LINK( SfxImageManager_Impl, SettingsChanged_Impl, VclWindowEvent*, pEvent) return 0L; } -//------------------------------------------------------------------------- + //========================================================================= @@ -283,13 +283,13 @@ SfxImageManager::SfxImageManager( SfxModule* pModule ) pImp = ::GetImageManager( pModule ); } -//------------------------------------------------------------------------- + SfxImageManager::~SfxImageManager() { } -//------------------------------------------------------------------------- + namespace { @@ -317,7 +317,7 @@ SfxImageManager* SfxImageManager::GetImageManager( SfxModule* pModule ) return pSfxImageManager; } -//------------------------------------------------------------------------- + Image SfxImageManager::GetImage( sal_uInt16 nId, bool bBig ) const { @@ -327,7 +327,7 @@ Image SfxImageManager::GetImage( sal_uInt16 nId, bool bBig ) const return Image(); } -//------------------------------------------------------------------------- + Image SfxImageManager::GetImage( sal_uInt16 nId ) const { @@ -335,7 +335,7 @@ Image SfxImageManager::GetImage( sal_uInt16 nId ) const return GetImage( nId, bLarge ); } -//------------------------------------------------------------------------- + Image SfxImageManager::SeekImage( sal_uInt16 nId, bool bBig ) const { @@ -352,7 +352,7 @@ Image SfxImageManager::SeekImage( sal_uInt16 nId, bool bBig ) const return Image(); } -//------------------------------------------------------------------------- + Image SfxImageManager::SeekImage( sal_uInt16 nId ) const { @@ -360,7 +360,7 @@ Image SfxImageManager::SeekImage( sal_uInt16 nId ) const return SeekImage( nId, bLarge ); } -//------------------------------------------------------------------------- + void SfxImageManager::RegisterToolBox( ToolBox *pBox, sal_uInt16 nFlags ) { @@ -372,7 +372,7 @@ void SfxImageManager::RegisterToolBox( ToolBox *pBox, sal_uInt16 nFlags ) pImp->m_aToolBoxes.push_back( pInf ); } -//------------------------------------------------------------------------- + void SfxImageManager::ReleaseToolBox( ToolBox *pBox ) { diff --git a/sfx2/source/toolbox/tbxitem.cxx b/sfx2/source/toolbox/tbxitem.cxx index b51353c97617..efaeed328b08 100644 --- a/sfx2/source/toolbox/tbxitem.cxx +++ b/sfx2/source/toolbox/tbxitem.cxx @@ -218,7 +218,7 @@ IMPL_LINK( SfxToolBoxControl_Impl, WindowEventListener, VclSimpleEvent*, pEvent return 1; } -//-------------------------------------------------------------------- + SfxToolBoxControl::SfxToolBoxControl( sal_uInt16 nSlotID, @@ -239,7 +239,7 @@ SfxToolBoxControl::SfxToolBoxControl( pImpl->mpPopupWindow = 0; } -//-------------------------------------------------------------------- + SfxToolBoxControl::~SfxToolBoxControl() { @@ -252,7 +252,7 @@ SfxToolBoxControl::~SfxToolBoxControl() delete pImpl; } -//-------------------------------------------------------------------- + ToolBox& SfxToolBoxControl::GetToolBox() const { @@ -267,7 +267,7 @@ unsigned short SfxToolBoxControl::GetSlotId() const return pImpl->nSlotId; } -//-------------------------------------------------------------------- + void SAL_CALL SfxToolBoxControl::dispose() throw (::com::sun::star::uno::RuntimeException) { @@ -302,7 +302,7 @@ void SAL_CALL SfxToolBoxControl::dispose() throw (::com::sun::star::uno::Runtime pImpl->mpPopupWindow = 0; } -//-------------------------------------------------------------------- + void SfxToolBoxControl::RegisterToolBoxControl( SfxModule* pMod, SfxTbxCtrlFactory* pFact) { SFX_APP()->RegisterToolBoxControl_Impl( pMod, pFact ); @@ -865,7 +865,7 @@ void SfxToolBoxControl::createAndPositionSubToolBar( const OUString& rSubToolBar } } -//-------------------------------------------------------------------- + void SfxToolBoxControl::SetPopupWindow( SfxPopupWindow* pWindow ) { @@ -874,7 +874,7 @@ void SfxToolBoxControl::SetPopupWindow( SfxPopupWindow* pWindow ) pImpl->mpPopupWindow->SetDeleteLink_Impl( LINK( this, SfxToolBoxControl, ClosePopupWindow )); } -//-------------------------------------------------------------------- + IMPL_LINK_NOARG(SfxToolBoxControl, PopupModeEndHdl) { @@ -899,7 +899,7 @@ IMPL_LINK_NOARG(SfxToolBoxControl, PopupModeEndHdl) return 1; } -//-------------------------------------------------------------------- + IMPL_LINK( SfxToolBoxControl, ClosePopupWindow, SfxPopupWindow *, pWindow ) { if ( pWindow == pImpl->mpFloatingWindow ) @@ -910,7 +910,7 @@ IMPL_LINK( SfxToolBoxControl, ClosePopupWindow, SfxPopupWindow *, pWindow ) return 1; } -//-------------------------------------------------------------------- + void SfxToolBoxControl::StateChanged ( @@ -965,7 +965,7 @@ void SfxToolBoxControl::StateChanged pImpl->pBox->SetItemBits( GetId(), nItemBits ); } -//-------------------------------------------------------------------- + void SfxToolBoxControl::Select( sal_uInt16 nModifier ) { @@ -973,33 +973,33 @@ void SfxToolBoxControl::Select( sal_uInt16 nModifier ) Select( sal_Bool((nModifier & KEY_MOD1)!=0) ); } -//-------------------------------------------------------------------- + void SfxToolBoxControl::Select( sal_Bool /*bMod1*/ ) { svt::ToolboxController::execute( pImpl->nSelectModifier ); } -//-------------------------------------------------------------------- + void SfxToolBoxControl::DoubleClick() { } -//-------------------------------------------------------------------- + void SfxToolBoxControl::Click() { } -//-------------------------------------------------------------------- + SfxPopupWindowType SfxToolBoxControl::GetPopupWindowType() const { return SFX_POPUPWINDOW_NONE; } -//-------------------------------------------------------------------- + SfxPopupWindow* SfxToolBoxControl::CreatePopupWindow() { @@ -1011,14 +1011,14 @@ SfxPopupWindow* SfxToolBoxControl::CreatePopupWindowCascading() return 0; } -//-------------------------------------------------------------------- + Window* SfxToolBoxControl::CreateItemWindow( Window * ) { return 0; } -//-------------------------------------------------------------------- + SfxFrameStatusListener::SfxFrameStatusListener( const Reference< XComponentContext >& rxContext, @@ -1029,13 +1029,13 @@ SfxFrameStatusListener::SfxFrameStatusListener( { } -//-------------------------------------------------------------------- + SfxFrameStatusListener::~SfxFrameStatusListener() { } -//-------------------------------------------------------------------- + // XStatusListener void SAL_CALL SfxFrameStatusListener::statusChanged( const ::com::sun::star::frame::FeatureStateEvent& rEvent ) @@ -1152,7 +1152,7 @@ throw ( ::com::sun::star::uno::RuntimeException ) } } -//-------------------------------------------------------------------- + SfxPopupWindow::SfxPopupWindow( sal_uInt16 nId, @@ -1170,7 +1170,7 @@ SfxPopupWindow::SfxPopupWindow( ((SystemWindow *)pWindow)->GetTaskPaneList()->AddWindow( this ); } -//-------------------------------------------------------------------- + SfxPopupWindow::SfxPopupWindow( sal_uInt16 nId, @@ -1188,7 +1188,7 @@ SfxPopupWindow::SfxPopupWindow( ((SystemWindow *)pWindow)->GetTaskPaneList()->AddWindow( this ); } -//-------------------------------------------------------------------- + SfxPopupWindow::SfxPopupWindow( sal_uInt16 nId, @@ -1224,7 +1224,7 @@ SfxPopupWindow::SfxPopupWindow( ((SystemWindow *)pWindow)->GetTaskPaneList()->AddWindow( this ); } -//-------------------------------------------------------------------- + SfxPopupWindow::~SfxPopupWindow() { @@ -1239,7 +1239,7 @@ SfxPopupWindow::~SfxPopupWindow() ((SystemWindow *)pWindow)->GetTaskPaneList()->RemoveWindow( this ); } -//-------------------------------------------------------------------- + SfxFrameStatusListener* SfxPopupWindow::GetOrCreateStatusListener() { @@ -1256,7 +1256,7 @@ SfxFrameStatusListener* SfxPopupWindow::GetOrCreateStatusListener() return m_pStatusListener; } -//-------------------------------------------------------------------- + void SfxPopupWindow::BindListener() { @@ -1265,7 +1265,7 @@ void SfxPopupWindow::BindListener() m_pStatusListener->bindListener(); } -//-------------------------------------------------------------------- + void SfxPopupWindow::UnbindListener() { @@ -1274,7 +1274,7 @@ void SfxPopupWindow::UnbindListener() m_pStatusListener->unbindListener(); } -//-------------------------------------------------------------------- + void SfxPopupWindow::AddStatusListener( const OUString& rCommandURL ) { @@ -1283,7 +1283,7 @@ void SfxPopupWindow::AddStatusListener( const OUString& rCommandURL ) m_pStatusListener->addStatusListener( rCommandURL ); } -//-------------------------------------------------------------------- + bool SfxPopupWindow::Close() { @@ -1294,7 +1294,7 @@ bool SfxPopupWindow::Close() return true; } -//-------------------------------------------------------------------- + void SfxPopupWindow::PopupModeEnd() { @@ -1311,7 +1311,7 @@ void SfxPopupWindow::PopupModeEnd() Close(); } -//-------------------------------------------------------------------- + void SfxPopupWindow::DeleteFloatingWindow() { @@ -1322,7 +1322,7 @@ void SfxPopupWindow::DeleteFloatingWindow() } } -//-------------------------------------------------------------------- + void SfxPopupWindow::MouseMove( const ::MouseEvent& rMEvt ) { @@ -1348,14 +1348,14 @@ void SfxPopupWindow::MouseMove( const ::MouseEvent& rMEvt ) } } -//-------------------------------------------------------------------- + void SfxPopupWindow::StartCascading() { m_bCascading= sal_True; } -//-------------------------------------------------------------------- + SfxPopupWindow* SfxPopupWindow::Clone() const @@ -1373,7 +1373,7 @@ SfxPopupWindow* SfxPopupWindow::Clone() const return 0; } -//-------------------------------------------------------------------- + void SfxPopupWindow::StateChanged( sal_uInt16 /*nSID*/, @@ -1400,7 +1400,7 @@ void SfxPopupWindow::StateChanged( } } -//-------------------------------------------------------------------- + void SfxPopupWindow::Delete() { @@ -1409,7 +1409,7 @@ void SfxPopupWindow::Delete() delete this; } -//-------------------------------------------------------------------- + SfxRecentFilesToolBoxControl::SfxRecentFilesToolBoxControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rBox ) : SfxToolBoxControl( nSlotId, nId, rBox ) diff --git a/sfx2/source/view/frame.cxx b/sfx2/source/view/frame.cxx index f565c8b54a2c..099e0907caa6 100644 --- a/sfx2/source/view/frame.cxx +++ b/sfx2/source/view/frame.cxx @@ -84,7 +84,7 @@ SvCompatWeakHdl* SfxFrame::GetHdl() return pImp->GetHdl(); } -//-------------------------------------------------------------------- + void SfxFrame::Construct_Impl() { pImp = new SfxFrame_Impl( this ); @@ -93,7 +93,7 @@ void SfxFrame::Construct_Impl() pFramesArr_Impl->push_back( this ); } -//-------------------------------------------------------------------- + SfxFrame::~SfxFrame() { @@ -240,7 +240,7 @@ bool SfxFrame::PrepareClose_Impl( sal_Bool bUI ) return nRet; } -//-------------------------------------------------------------------- + SfxFrame* SfxFrame::GetChildFrame( sal_uInt16 nPos ) const { @@ -458,7 +458,7 @@ void SfxFrame::UpdateDescriptor( SfxObjectShell *pDoc ) pSet->Put( SfxStringItem( SID_FILTER_NAME, aFilter )); } -//------------------------------------------------------------------------- + SfxFrameDescriptor* SfxFrame::GetDescriptor() const { @@ -475,7 +475,7 @@ SfxFrameDescriptor* SfxFrame::GetDescriptor() const return pImp->pDescr; } -//------------------------------------------------------------------------- + void SfxFrame::GetTargetList( TargetList& rList ) const { @@ -501,7 +501,7 @@ void SfxFrame::GetTargetList( TargetList& rList ) const } } -//------------------------------------------------------------------------- + sal_Bool SfxFrame::IsParent( SfxFrame *pFrame ) const { @@ -554,7 +554,7 @@ bool SfxFrameItem::operator==( const SfxPoolItem &rItem ) const ((SfxFrameItem&)rItem).wFrame == wFrame; } -//-------------------------------------------------------------------- + OUString SfxFrameItem::GetValueText() const { diff --git a/sfx2/source/view/frame2.cxx b/sfx2/source/view/frame2.cxx index 9e2d9f6b0043..9bcba34d75c5 100644 --- a/sfx2/source/view/frame2.cxx +++ b/sfx2/source/view/frame2.cxx @@ -60,7 +60,7 @@ using ::com::sun::star::lang::XMultiServiceFactory; using ::com::sun::star::lang::XComponent; using ::com::sun::star::frame::XComponentLoader; -//------------------------------------------------------------------------ + class SfxFrameWindow_Impl : public Window { diff --git a/sfx2/source/view/frmload.cxx b/sfx2/source/view/frmload.cxx index ddb17a1c4316..01f146aca582 100644 --- a/sfx2/source/view/frmload.cxx +++ b/sfx2/source/view/frmload.cxx @@ -117,9 +117,9 @@ public: virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() throw (css::uno::RuntimeException); - //---------------------------------------------------------------------------------- + // XSynchronousFrameLoader - //---------------------------------------------------------------------------------- + virtual sal_Bool SAL_CALL load( const css::uno::Sequence< css::beans::PropertyValue >& _rArgs, const css::uno::Reference< css::frame::XFrame >& _rxFrame ) throw( css::uno::RuntimeException ); virtual void SAL_CALL cancel() throw( css::uno::RuntimeException ); @@ -206,7 +206,7 @@ SfxFrameLoader_Impl::~SfxFrameLoader_Impl() { } -// -------------------------------------------------------------------------------------------------------------------- + const SfxFilter* SfxFrameLoader_Impl::impl_detectFilterForURL( const OUString& sURL, const ::comphelper::NamedValueCollection& i_rDescriptor, const SfxFilterMatcher& rMatcher ) const { @@ -253,7 +253,7 @@ const SfxFilter* SfxFrameLoader_Impl::impl_detectFilterForURL( const OUString& s return pFilter; } -// -------------------------------------------------------------------------------------------------------------------- + const SfxFilter* SfxFrameLoader_Impl::impl_getFilterFromServiceName_nothrow( const OUString& i_rServiceName ) const { try @@ -298,7 +298,7 @@ const SfxFilter* SfxFrameLoader_Impl::impl_getFilterFromServiceName_nothrow( con return NULL; } -// -------------------------------------------------------------------------------------------------------------------- + OUString SfxFrameLoader_Impl::impl_askForFilter_nothrow( const Reference< XInteractionHandler >& i_rxHandler, const OUString& i_rDocumentURL ) const { @@ -320,7 +320,7 @@ OUString SfxFrameLoader_Impl::impl_askForFilter_nothrow( const Reference< XInter return sFilterName; } -// -------------------------------------------------------------------------------------------------------------------- + namespace { sal_Bool lcl_getDispatchResult( const SfxPoolItem* _pResult ) @@ -342,7 +342,7 @@ namespace } } -// -------------------------------------------------------------------------------------------------------------------- + sal_Bool SfxFrameLoader_Impl::impl_createNewDocWithSlotParam( const sal_uInt16 _nSlotID, const Reference< XFrame >& i_rxFrame, const bool i_bHidden ) { @@ -353,7 +353,7 @@ sal_Bool SfxFrameLoader_Impl::impl_createNewDocWithSlotParam( const sal_uInt16 _ return lcl_getDispatchResult( SFX_APP()->ExecuteSlot( aRequest ) ); } -// -------------------------------------------------------------------------------------------------------------------- + void SfxFrameLoader_Impl::impl_determineFilter( ::comphelper::NamedValueCollection& io_rDescriptor ) const { const OUString sURL = io_rDescriptor.getOrDefault( "URL", OUString() ); @@ -402,7 +402,7 @@ void SfxFrameLoader_Impl::impl_determineFilter( ::comphelper::NamedValueCollecti } } -// -------------------------------------------------------------------------------------------------------------------- + SfxObjectShellRef SfxFrameLoader_Impl::impl_findObjectShell( const Reference< XModel2 >& i_rxDocument ) const { for ( SfxObjectShell* pDoc = SfxObjectShell::GetFirst( NULL, sal_False ); pDoc; pDoc = SfxObjectShell::GetNext( *pDoc, NULL, sal_False ) ) @@ -417,7 +417,7 @@ SfxObjectShellRef SfxFrameLoader_Impl::impl_findObjectShell( const Reference< XM return NULL; } -// -------------------------------------------------------------------------------------------------------------------- + bool SfxFrameLoader_Impl::impl_determineTemplateDocument( ::comphelper::NamedValueCollection& io_rDescriptor ) const { try @@ -468,7 +468,7 @@ bool SfxFrameLoader_Impl::impl_determineTemplateDocument( ::comphelper::NamedVal return false; } -// -------------------------------------------------------------------------------------------------------------------- + sal_uInt16 SfxFrameLoader_Impl::impl_findSlotParam( const OUString& i_rFactoryURL ) const { OUString sSlotParam; @@ -487,7 +487,7 @@ sal_uInt16 SfxFrameLoader_Impl::impl_findSlotParam( const OUString& i_rFactoryUR return 0; } -// -------------------------------------------------------------------------------------------------------------------- + void SfxFrameLoader_Impl::impl_handleCaughtError_nothrow( const Any& i_rCaughtError, const ::comphelper::NamedValueCollection& i_rDescriptor ) const { try @@ -519,7 +519,7 @@ void SfxFrameLoader_Impl::impl_handleCaughtError_nothrow( const Any& i_rCaughtEr } } -// -------------------------------------------------------------------------------------------------------------------- + void SfxFrameLoader_Impl::impl_removeLoaderArguments( ::comphelper::NamedValueCollection& io_rDescriptor ) { // remove the arguments which are for the loader only, and not for a call to attachResource @@ -527,7 +527,7 @@ void SfxFrameLoader_Impl::impl_removeLoaderArguments( ::comphelper::NamedValueCo io_rDescriptor.remove( "Model" ); } -// -------------------------------------------------------------------------------------------------------------------- + ::comphelper::NamedValueCollection SfxFrameLoader_Impl::impl_extractViewCreationArgs( ::comphelper::NamedValueCollection& io_rDescriptor ) { const sal_Char* pKnownViewArgs[] = { @@ -546,7 +546,7 @@ void SfxFrameLoader_Impl::impl_removeLoaderArguments( ::comphelper::NamedValueCo return aViewArgs; } -// -------------------------------------------------------------------------------------------------------------------- + sal_Int16 SfxFrameLoader_Impl::impl_determineEffectiveViewId_nothrow( const SfxObjectShell& i_rDocument, const ::comphelper::NamedValueCollection& i_rDescriptor ) { sal_Int16 nViewId = i_rDescriptor.getOrDefault( "ViewId", sal_Int16( 0 ) ); @@ -592,7 +592,7 @@ sal_Int16 SfxFrameLoader_Impl::impl_determineEffectiveViewId_nothrow( const SfxO return nViewId; } -// -------------------------------------------------------------------------------------------------------------------- + Reference< XController2 > SfxFrameLoader_Impl::impl_createDocumentView( const Reference< XModel2 >& i_rModel, const Reference< XFrame >& i_rFrame, const ::comphelper::NamedValueCollection& i_rViewFactoryArgs, const OUString& i_rViewName ) @@ -614,7 +614,7 @@ Reference< XController2 > SfxFrameLoader_Impl::impl_createDocumentView( const Re return xController; } -// -------------------------------------------------------------------------------------------------------------------- + sal_Bool SAL_CALL SfxFrameLoader_Impl::load( const Sequence< PropertyValue >& rArgs, const Reference< XFrame >& _rTargetFrame ) throw( RuntimeException ) diff --git a/sfx2/source/view/ipclient.cxx b/sfx2/source/view/ipclient.cxx index 98c61b4c8902..518bdc9888fc 100644 --- a/sfx2/source/view/ipclient.cxx +++ b/sfx2/source/view/ipclient.cxx @@ -89,7 +89,7 @@ public: //==================================================================== // SfxInPlaceClient_Impl -//-------------------------------------------------------------------- + class SfxInPlaceClient_Impl : public ::cppu::WeakImplHelper5< embed::XEmbeddedClient, embed::XInplaceClient, document::XEventListener, @@ -206,7 +206,7 @@ throw (::com::sun::star::uno::RuntimeException) } // XEmbeddedClient -//-------------------------------------------------------------------- + uno::Reference < frame::XFrame > SfxInPlaceClient_Impl::GetFrame() const { if ( !m_pClient ) @@ -309,7 +309,7 @@ void SAL_CALL SfxInPlaceClient_Impl::saveObject() // m_pClient->Invalidate(); } -//-------------------------------------------------------------------- + void SAL_CALL SfxInPlaceClient_Impl::visibilityChanged( sal_Bool bVisible ) throw ( embed::WrongStateException, uno::RuntimeException ) @@ -325,7 +325,7 @@ void SAL_CALL SfxInPlaceClient_Impl::visibilityChanged( sal_Bool bVisible ) // XInplaceClient -//-------------------------------------------------------------------- + sal_Bool SAL_CALL SfxInPlaceClient_Impl::canInplaceActivate() throw ( uno::RuntimeException ) { @@ -339,7 +339,7 @@ sal_Bool SAL_CALL SfxInPlaceClient_Impl::canInplaceActivate() return sal_True; } -//-------------------------------------------------------------------- + void SAL_CALL SfxInPlaceClient_Impl::activatingInplace() throw ( embed::WrongStateException, uno::RuntimeException ) @@ -350,7 +350,7 @@ void SAL_CALL SfxInPlaceClient_Impl::activatingInplace() m_pClient->GetViewShell()->InplaceActivating( m_pClient ); } -//-------------------------------------------------------------------- + void SAL_CALL SfxInPlaceClient_Impl::activatingUI() throw ( embed::WrongStateException, uno::RuntimeException ) @@ -363,7 +363,7 @@ void SAL_CALL SfxInPlaceClient_Impl::activatingUI() m_pClient->GetViewShell()->UIActivating( m_pClient ); } -//-------------------------------------------------------------------- + void SAL_CALL SfxInPlaceClient_Impl::deactivatedInplace() throw ( embed::WrongStateException, uno::RuntimeException ) @@ -374,7 +374,7 @@ void SAL_CALL SfxInPlaceClient_Impl::deactivatedInplace() m_pClient->GetViewShell()->InplaceDeactivated( m_pClient ); } -//-------------------------------------------------------------------- + void SAL_CALL SfxInPlaceClient_Impl::deactivatedUI() throw ( embed::WrongStateException, uno::RuntimeException ) @@ -386,7 +386,7 @@ void SAL_CALL SfxInPlaceClient_Impl::deactivatedUI() m_bUIActive = sal_False; } -//-------------------------------------------------------------------- + uno::Reference< ::com::sun::star::frame::XLayoutManager > SAL_CALL SfxInPlaceClient_Impl::getLayoutManager() throw ( embed::WrongStateException, uno::RuntimeException ) @@ -409,7 +409,7 @@ uno::Reference< ::com::sun::star::frame::XLayoutManager > SAL_CALL SfxInPlaceCli return xMan; } -//-------------------------------------------------------------------- + uno::Reference< frame::XDispatchProvider > SAL_CALL SfxInPlaceClient_Impl::getInplaceDispatchProvider() throw ( embed::WrongStateException, uno::RuntimeException ) @@ -417,7 +417,7 @@ uno::Reference< frame::XDispatchProvider > SAL_CALL SfxInPlaceClient_Impl::getIn return uno::Reference < frame::XDispatchProvider >( GetFrame(), uno::UNO_QUERY_THROW ); } -//-------------------------------------------------------------------- + awt::Rectangle SAL_CALL SfxInPlaceClient_Impl::getPlacement() throw ( embed::WrongStateException, uno::RuntimeException ) @@ -434,7 +434,7 @@ awt::Rectangle SAL_CALL SfxInPlaceClient_Impl::getPlacement() return AWTRectangle( aRealObjArea ); } -//-------------------------------------------------------------------- + awt::Rectangle SAL_CALL SfxInPlaceClient_Impl::getClipRectangle() throw ( embed::WrongStateException, uno::RuntimeException ) @@ -451,7 +451,7 @@ awt::Rectangle SAL_CALL SfxInPlaceClient_Impl::getClipRectangle() return AWTRectangle( aRealObjArea ); } -//-------------------------------------------------------------------- + void SAL_CALL SfxInPlaceClient_Impl::translateAccelerators( const uno::Sequence< awt::KeyEvent >& /*aKeys*/ ) throw ( embed::WrongStateException, uno::RuntimeException ) @@ -462,7 +462,7 @@ void SAL_CALL SfxInPlaceClient_Impl::translateAccelerators( const uno::Sequence< // TODO/MBA: keyboard accelerators } -//-------------------------------------------------------------------- + void SAL_CALL SfxInPlaceClient_Impl::scrollObject( const awt::Size& /*aOffset*/ ) throw ( embed::WrongStateException, uno::RuntimeException ) @@ -471,7 +471,7 @@ void SAL_CALL SfxInPlaceClient_Impl::scrollObject( const awt::Size& /*aOffset*/ throw uno::RuntimeException(); } -//-------------------------------------------------------------------- + void SAL_CALL SfxInPlaceClient_Impl::changedPlacement( const awt::Rectangle& aPosRect ) throw ( embed::WrongStateException, uno::Exception, @@ -523,7 +523,7 @@ void SAL_CALL SfxInPlaceClient_Impl::changedPlacement( const awt::Rectangle& aPo } // XComponentSupplier -//-------------------------------------------------------------------- + uno::Reference< util::XCloseable > SAL_CALL SfxInPlaceClient_Impl::getComponent() throw ( uno::RuntimeException ) { @@ -544,7 +544,7 @@ uno::Reference< util::XCloseable > SAL_CALL SfxInPlaceClient_Impl::getComponent( // XWindowSupplier -//-------------------------------------------------------------------- + uno::Reference< awt::XWindow > SAL_CALL SfxInPlaceClient_Impl::getWindow() throw ( uno::RuntimeException ) { @@ -555,7 +555,7 @@ uno::Reference< awt::XWindow > SAL_CALL SfxInPlaceClient_Impl::getWindow() return xWin; } -//-------------------------------------------------------------------- + // notification to the client implementation that either the object area or the scaling has been changed // as a result the logical size of the window has changed also void SfxInPlaceClient_Impl::SizeHasChanged() @@ -594,7 +594,7 @@ void SfxInPlaceClient_Impl::SizeHasChanged() } } -//-------------------------------------------------------------------- + IMPL_LINK_NOARG(SfxInPlaceClient_Impl, TimerHdl) { if ( m_pClient && m_xObject.is() ) @@ -606,7 +606,7 @@ IMPL_LINK_NOARG(SfxInPlaceClient_Impl, TimerHdl) //==================================================================== // SfxInPlaceClient -//-------------------------------------------------------------------- + SfxInPlaceClient::SfxInPlaceClient( SfxViewShell* pViewShell, Window *pDraw, sal_Int64 nAspect ) : m_pImp( new SfxInPlaceClient_Impl ), m_pViewSh( pViewShell ), @@ -622,7 +622,7 @@ SfxInPlaceClient::SfxInPlaceClient( SfxViewShell* pViewShell, Window *pDraw, sal m_pImp->m_aTimer.SetTimeoutHdl( LINK( m_pImp, SfxInPlaceClient_Impl, TimerHdl ) ); } -//-------------------------------------------------------------------- + SfxInPlaceClient::~SfxInPlaceClient() { @@ -644,7 +644,7 @@ SfxInPlaceClient::~SfxInPlaceClient() // must be guarded with mutex } -//-------------------------------------------------------------------- + void SfxInPlaceClient::SetObjectState( sal_Int32 nState ) { if ( GetObject().is() ) @@ -665,7 +665,7 @@ void SfxInPlaceClient::SetObjectState( sal_Int32 nState ) } } -//-------------------------------------------------------------------- + sal_Int64 SfxInPlaceClient::GetObjectMiscStatus() const { if ( GetObject().is() ) @@ -673,13 +673,13 @@ sal_Int64 SfxInPlaceClient::GetObjectMiscStatus() const return 0; } -//-------------------------------------------------------------------- + uno::Reference < embed::XEmbeddedObject > SfxInPlaceClient::GetObject() const { return m_pImp->m_xObject; } -//-------------------------------------------------------------------- + void SfxInPlaceClient::SetObject( const uno::Reference < embed::XEmbeddedObject >& rObject ) { if ( m_pImp->m_xObject.is() && rObject != m_pImp->m_xObject ) @@ -730,7 +730,7 @@ void SfxInPlaceClient::SetObject( const uno::Reference < embed::XEmbeddedObject m_pImp->m_aTimer.Stop(); } -//-------------------------------------------------------------------- + sal_Bool SfxInPlaceClient::SetObjArea( const Rectangle& rArea ) { if( rArea != m_pImp->m_aObjArea ) @@ -745,7 +745,7 @@ sal_Bool SfxInPlaceClient::SetObjArea( const Rectangle& rArea ) return sal_False; } -//-------------------------------------------------------------------- + Rectangle SfxInPlaceClient::GetObjArea() const { return m_pImp->m_aObjArea; @@ -759,7 +759,7 @@ Rectangle SfxInPlaceClient::GetScaledObjArea() const return aRealObjArea; } -//-------------------------------------------------------------------- + void SfxInPlaceClient::SetSizeScale( const Fraction & rScaleWidth, const Fraction & rScaleHeight ) { if ( m_pImp->m_aScaleWidth != rScaleWidth || m_pImp->m_aScaleHeight != rScaleHeight ) @@ -775,7 +775,7 @@ void SfxInPlaceClient::SetSizeScale( const Fraction & rScaleWidth, const Fractio } } -//-------------------------------------------------------------------- + sal_Bool SfxInPlaceClient::SetObjAreaAndScale( const Rectangle& rArea, const Fraction& rScaleWidth, const Fraction& rScaleHeight ) { if( rArea != m_pImp->m_aObjArea || m_pImp->m_aScaleWidth != rScaleWidth || m_pImp->m_aScaleHeight != rScaleHeight ) @@ -793,19 +793,19 @@ sal_Bool SfxInPlaceClient::SetObjAreaAndScale( const Rectangle& rArea, const Fra return sal_False; } -//-------------------------------------------------------------------- + const Fraction& SfxInPlaceClient::GetScaleWidth() const { return m_pImp->m_aScaleWidth; } -//-------------------------------------------------------------------- + const Fraction& SfxInPlaceClient::GetScaleHeight() const { return m_pImp->m_aScaleHeight; } -//-------------------------------------------------------------------- + void SfxInPlaceClient::Invalidate() { // TODO/LATER: do we need both? @@ -819,7 +819,7 @@ void SfxInPlaceClient::Invalidate() ViewChanged(); } -//-------------------------------------------------------------------- + sal_Bool SfxInPlaceClient::IsObjectUIActive() const { try { @@ -831,7 +831,7 @@ sal_Bool SfxInPlaceClient::IsObjectUIActive() const return sal_False; } -//-------------------------------------------------------------------- + sal_Bool SfxInPlaceClient::IsObjectInPlaceActive() const { try { @@ -852,7 +852,7 @@ sal_Bool SfxInPlaceClient::IsObjectInPlaceActive() const return sal_False; } -//-------------------------------------------------------------------- + SfxInPlaceClient* SfxInPlaceClient::GetClient( SfxObjectShell* pDoc, const com::sun::star::uno::Reference < com::sun::star::embed::XEmbeddedObject >& xObject ) { for ( SfxViewFrame* pFrame = SfxViewFrame::GetFirst(pDoc); pFrame; pFrame=SfxViewFrame::GetNext(*pFrame,pDoc) ) diff --git a/sfx2/source/view/printer.cxx b/sfx2/source/view/printer.cxx index a0d0168872bd..8c22941bbc4e 100644 --- a/sfx2/source/view/printer.cxx +++ b/sfx2/source/view/printer.cxx @@ -83,7 +83,7 @@ SfxPrinter* SfxPrinter::Create( SvStream& rStream, SfxItemSet* pOptions ) return pPrinter; } -//-------------------------------------------------------------------- + SvStream& SfxPrinter::Store( SvStream& rStream ) const @@ -96,7 +96,7 @@ SvStream& SfxPrinter::Store( SvStream& rStream ) const return WriteJobSetup( rStream, GetJobSetup() ); } -//-------------------------------------------------------------------- + SfxPrinter::SfxPrinter( SfxItemSet* pTheOptions ) : @@ -112,7 +112,7 @@ SfxPrinter::SfxPrinter( SfxItemSet* pTheOptions ) : pImpl = new SfxPrinter_Impl; } -//-------------------------------------------------------------------- + SfxPrinter::SfxPrinter( SfxItemSet* pTheOptions, const JobSetup& rTheOrigJobSetup ) : @@ -128,7 +128,7 @@ SfxPrinter::SfxPrinter( SfxItemSet* pTheOptions, SetJobSetup( rTheOrigJobSetup ); } -//-------------------------------------------------------------------- + SfxPrinter::SfxPrinter( SfxItemSet* pTheOptions, const OUString& rPrinterName ) : @@ -141,7 +141,7 @@ SfxPrinter::SfxPrinter( SfxItemSet* pTheOptions, pImpl = new SfxPrinter_Impl; } -//-------------------------------------------------------------------- + SfxPrinter::SfxPrinter( const SfxPrinter& rPrinter ) : @@ -160,7 +160,7 @@ SfxPrinter::SfxPrinter( const SfxPrinter& rPrinter ) : pImpl->mbRange = rPrinter.pImpl->mbRange; } -//-------------------------------------------------------------------- + SfxPrinter* SfxPrinter::Clone() const { @@ -181,7 +181,7 @@ SfxPrinter* SfxPrinter::Clone() const return new SfxPrinter( *this ); } -//-------------------------------------------------------------------- + SfxPrinter::~SfxPrinter() { @@ -189,14 +189,14 @@ SfxPrinter::~SfxPrinter() delete pImpl; } -//-------------------------------------------------------------------- + void SfxPrinter::SetOptions( const SfxItemSet &rNewOptions ) { pOptions->Set(rNewOptions); } -//-------------------------------------------------------------------- + SfxPrintOptionsDialog::SfxPrintOptionsDialog(Window *pParent, SfxViewShell *pViewShell, @@ -221,7 +221,7 @@ SfxPrintOptionsDialog::SfxPrintOptionsDialog(Window *pParent, } } -//-------------------------------------------------------------------- + SfxPrintOptionsDialog::~SfxPrintOptionsDialog() { @@ -230,7 +230,7 @@ SfxPrintOptionsDialog::~SfxPrintOptionsDialog() delete pOptions; } -//-------------------------------------------------------------------- + short SfxPrintOptionsDialog::Execute() { @@ -245,7 +245,7 @@ short SfxPrintOptionsDialog::Execute() return nRet; } -//-------------------------------------------------------------------- + bool SfxPrintOptionsDialog::Notify( NotifyEvent& rNEvt ) { @@ -258,7 +258,7 @@ bool SfxPrintOptionsDialog::Notify( NotifyEvent& rNEvt ) return ModalDialog::Notify( rNEvt ); } -//-------------------------------------------------------------------- + void SfxPrintOptionsDialog::DisableHelp() { diff --git a/sfx2/source/view/sfxbasecontroller.cxx b/sfx2/source/view/sfxbasecontroller.cxx index a69475464966..56634cd2a6e8 100644 --- a/sfx2/source/view/sfxbasecontroller.cxx +++ b/sfx2/source/view/sfxbasecontroller.cxx @@ -306,9 +306,9 @@ void SAL_CALL SfxStatusIndicator::disposing( const lang::EventObject& /*Source*/ xProgress.clear(); } -//________________________________________________________________________________________________________ + // declaration IMPL_SfxBaseController_ListenerHelper -//________________________________________________________________________________________________________ + class IMPL_SfxBaseController_ListenerHelper : public ::cppu::WeakImplHelper1< frame::XFrameActionListener > { @@ -382,9 +382,9 @@ void SAL_CALL IMPL_SfxBaseController_CloseListenerHelper::notifyClosing( const l { } -//________________________________________________________________________________________________________ + // declaration IMPL_SfxBaseController_DataContainer -//________________________________________________________________________________________________________ + struct IMPL_SfxBaseController_DataContainer { @@ -419,18 +419,18 @@ struct IMPL_SfxBaseController_DataContainer } ; // struct IMPL_SfxBaseController_DataContainer -//________________________________________________________________________________________________________ + // IMPL_SfxBaseController_ListenerHelper constructor -//________________________________________________________________________________________________________ + IMPL_SfxBaseController_ListenerHelper::IMPL_SfxBaseController_ListenerHelper( SfxBaseController* pController ) : m_pController ( pController ) { } -//________________________________________________________________________________________________________ + // IMPL_SfxBaseController_ListenerHelper destructor -//________________________________________________________________________________________________________ + IMPL_SfxBaseController_ListenerHelper::~IMPL_SfxBaseController_ListenerHelper() { @@ -457,9 +457,9 @@ void SAL_CALL IMPL_SfxBaseController_ListenerHelper::frameAction( const frame::F } } -//________________________________________________________________________________________________________ + // IMPL_SfxBaseController_ListenerHelper -> XEventListener -//________________________________________________________________________________________________________ + void SAL_CALL IMPL_SfxBaseController_ListenerHelper::disposing( const lang::EventObject& /*aEvent*/ ) throw( RuntimeException ) { @@ -468,9 +468,9 @@ void SAL_CALL IMPL_SfxBaseController_ListenerHelper::disposing( const lang::Even m_pController->getFrame()->removeFrameActionListener( this ) ; } -//________________________________________________________________________________________________________ + // SfxBaseController -> constructor -//________________________________________________________________________________________________________ + DBG_NAME(sfx2_SfxBaseController) SfxBaseController::SfxBaseController( SfxViewShell* pViewShell ) : m_pData ( new IMPL_SfxBaseController_DataContainer( m_aMutex, pViewShell, this )) @@ -479,9 +479,9 @@ SfxBaseController::SfxBaseController( SfxViewShell* pViewShell ) m_pData->m_pViewShell->SetController( this ); } -//________________________________________________________________________________________________________ + // SfxBaseController -> destructor -//________________________________________________________________________________________________________ + SfxBaseController::~SfxBaseController() { @@ -489,9 +489,9 @@ SfxBaseController::~SfxBaseController() delete m_pData; } -//________________________________________________________________________________________________________ + // SfxBaseController -> XController2 -//________________________________________________________________________________________________________ + Reference< XWindow > SAL_CALL SfxBaseController::getComponentWindow() throw (RuntimeException) { @@ -542,9 +542,9 @@ SfxViewFrame& SfxBaseController::GetViewFrame_Impl() const return *pActFrame; } -//________________________________________________________________________________________________________ + // SfxBaseController -> XController2 -> XController -//________________________________________________________________________________________________________ + void SAL_CALL SfxBaseController::attachFrame( const Reference< frame::XFrame >& xFrame ) throw( RuntimeException ) { @@ -580,9 +580,9 @@ void SAL_CALL SfxBaseController::attachFrame( const Reference< frame::XFrame >& } } -//________________________________________________________________________________________________________ + // SfxBaseController -> XController -//________________________________________________________________________________________________________ + sal_Bool SAL_CALL SfxBaseController::attachModel( const Reference< frame::XModel >& xModel ) throw( RuntimeException ) { @@ -599,9 +599,9 @@ sal_Bool SAL_CALL SfxBaseController::attachModel( const Reference< frame::XModel return sal_True; } -//________________________________________________________________________________________________________ + // SfxBaseController -> XController -//________________________________________________________________________________________________________ + sal_Bool SAL_CALL SfxBaseController::suspend( sal_Bool bSuspend ) throw( RuntimeException ) { @@ -657,9 +657,9 @@ sal_Bool SAL_CALL SfxBaseController::suspend( sal_Bool bSuspend ) throw( Runtime } } -//________________________________________________________________________________________________________ + // SfxBaseController -> XController -//________________________________________________________________________________________________________ + uno::Any SfxBaseController::getViewData() throw( RuntimeException ) { @@ -675,9 +675,9 @@ uno::Any SfxBaseController::getViewData() throw( RuntimeException ) return aAny ; } -//________________________________________________________________________________________________________ + // SfxBaseController -> XController -//________________________________________________________________________________________________________ + void SAL_CALL SfxBaseController::restoreViewData( const uno::Any& aValue ) throw( RuntimeException ) { @@ -690,9 +690,9 @@ void SAL_CALL SfxBaseController::restoreViewData( const uno::Any& aValue ) throw } } -//________________________________________________________________________________________________________ + // SfxBaseController -> XController -//________________________________________________________________________________________________________ + Reference< frame::XFrame > SAL_CALL SfxBaseController::getFrame() throw( RuntimeException ) { @@ -700,9 +700,9 @@ Reference< frame::XFrame > SAL_CALL SfxBaseController::getFrame() throw( Runtime return m_pData->m_xFrame; } -//________________________________________________________________________________________________________ + // SfxBaseController -> XController -//________________________________________________________________________________________________________ + Reference< frame::XModel > SAL_CALL SfxBaseController::getModel() throw( RuntimeException ) { @@ -710,9 +710,9 @@ Reference< frame::XModel > SAL_CALL SfxBaseController::getModel() throw( Runtime return m_pData->m_pViewShell ? m_pData->m_pViewShell->GetObjectShell()->GetModel() : Reference < frame::XModel > () ; } -//________________________________________________________________________________________________________ + // SfxBaseController -> XDispatchProvider -//________________________________________________________________________________________________________ + Reference< frame::XDispatch > SAL_CALL SfxBaseController::queryDispatch( const util::URL& aURL , const OUString& sTargetFrameName, @@ -868,9 +868,9 @@ Reference< frame::XDispatch > SAL_CALL SfxBaseController::queryDispatch( const return xDisp; } -//________________________________________________________________________________________________________ + // SfxBaseController -> XDispatchProvider -//________________________________________________________________________________________________________ + uno::Sequence< Reference< frame::XDispatch > > SAL_CALL SfxBaseController::queryDispatches( const uno::Sequence< frame::DispatchDescriptor >& seqDescripts ) throw( RuntimeException ) { @@ -889,9 +889,9 @@ uno::Sequence< Reference< frame::XDispatch > > SAL_CALL SfxBaseController::query return lDispatcher; } -//________________________________________________________________________________________________________ + // SfxBaseController -> XControllerBorder -//________________________________________________________________________________________________________ + frame::BorderWidths SAL_CALL SfxBaseController::getBorder() throw ( RuntimeException ) @@ -963,9 +963,9 @@ void SfxBaseController::BorderWidthsChanged_Impl() } } -//________________________________________________________________________________________________________ + // SfxBaseController -> XComponent -//________________________________________________________________________________________________________ + void SAL_CALL SfxBaseController::dispose() throw( RuntimeException ) { @@ -1034,18 +1034,18 @@ void SAL_CALL SfxBaseController::dispose() throw( RuntimeException ) } } -//________________________________________________________________________________________________________ + // SfxBaseController -> XComponent -//________________________________________________________________________________________________________ + void SAL_CALL SfxBaseController::addEventListener( const Reference< lang::XEventListener >& aListener ) throw( RuntimeException ) { m_pData->m_aListenerContainer.addInterface( ::getCppuType((const Reference< lang::XEventListener >*)0), aListener ); } -//________________________________________________________________________________________________________ + // SfxBaseController -> XComponent -//________________________________________________________________________________________________________ + void SAL_CALL SfxBaseController::removeEventListener( const Reference< lang::XEventListener >& aListener ) throw( RuntimeException ) { diff --git a/sfx2/source/view/userinputinterception.cxx b/sfx2/source/view/userinputinterception.cxx index e557c9a28b22..dc5d77905df3 100644 --- a/sfx2/source/view/userinputinterception.cxx +++ b/sfx2/source/view/userinputinterception.cxx @@ -117,56 +117,56 @@ namespace sfx2 //==================================================================== //= UserInputInterception //==================================================================== - //-------------------------------------------------------------------- + UserInputInterception::UserInputInterception( ::cppu::OWeakObject& _rControllerImpl, ::osl::Mutex& _rMutex ) :m_pData( new UserInputInterception_Data( _rControllerImpl, _rMutex ) ) { } - //-------------------------------------------------------------------- + UserInputInterception::~UserInputInterception() { } - //-------------------------------------------------------------------- + void UserInputInterception::addKeyHandler( const Reference< XKeyHandler >& _rxHandler ) throw (RuntimeException) { if ( _rxHandler.is() ) m_pData->m_aKeyHandlers.addInterface( _rxHandler ); } - //-------------------------------------------------------------------- + void UserInputInterception::removeKeyHandler( const Reference< XKeyHandler >& _rxHandler ) throw (RuntimeException) { m_pData->m_aKeyHandlers.removeInterface( _rxHandler ); } - //-------------------------------------------------------------------- + void UserInputInterception::addMouseClickHandler( const Reference< XMouseClickHandler >& _rxHandler ) throw (RuntimeException) { if ( _rxHandler.is() ) m_pData->m_aMouseClickHandlers.addInterface( _rxHandler ); } - //-------------------------------------------------------------------- + void UserInputInterception::removeMouseClickHandler( const Reference< XMouseClickHandler >& _rxHandler ) throw (RuntimeException) { m_pData->m_aMouseClickHandlers.removeInterface( _rxHandler ); } - //-------------------------------------------------------------------- + bool UserInputInterception::hasKeyHandlers() const { return m_pData->m_aKeyHandlers.getLength() > 0; } - //-------------------------------------------------------------------- + bool UserInputInterception::hasMouseClickListeners() const { return m_pData->m_aMouseClickHandlers.getLength() > 0; } - //-------------------------------------------------------------------- + bool UserInputInterception::handleNotifyEvent( const NotifyEvent& _rEvent ) { Reference < XInterface > xHoldAlive( m_pData->m_rControllerImpl ); diff --git a/sfx2/source/view/viewfrm.cxx b/sfx2/source/view/viewfrm.cxx index 2d39b8805e69..607ce9474a79 100644 --- a/sfx2/source/view/viewfrm.cxx +++ b/sfx2/source/view/viewfrm.cxx @@ -140,14 +140,14 @@ using ::com::sun::star::container::XIndexContainer; #include "../appl/app.hrc" #include "impviewframe.hxx" -//------------------------------------------------------------------------- + DBG_NAME(SfxViewFrame) #define SfxViewFrame #include "sfxslots.hxx" #undef SfxViewFrame -//------------------------------------------------------------------------- + SFX_IMPL_INTERFACE(SfxViewFrame,SfxShell,SfxResId(0)) { @@ -162,7 +162,7 @@ SFX_IMPL_INTERFACE(SfxViewFrame,SfxShell,SfxResId(0)) TYPEINIT2(SfxViewFrame,SfxShell,SfxListener); TYPEINIT1(SfxViewFrameItem, SfxPoolItem); -//------------------------------------------------------------------------- + namespace { bool moduleHasToolPanels( SfxViewFrame_Impl& i_rViewFrameImpl ) @@ -176,7 +176,7 @@ namespace } } -//------------------------------------------------------------------------- + static sal_Bool AskPasswordToModify_Impl( const uno::Reference< task::XInteractionHandler >& xHandler, const OUString& aPath, const SfxFilter* pFilter, sal_uInt32 nPasswordHash, const uno::Sequence< beans::PropertyValue > aInfo ) { // TODO/LATER: In future the info should replace the direct hash completely @@ -225,20 +225,20 @@ static sal_Bool AskPasswordToModify_Impl( const uno::Reference< task::XInteracti return bResult; } -//------------------------------------------------------------------------- + void SfxViewFrame::SetDowning_Impl() { pImp->bIsDowning = sal_True; } -//------------------------------------------------------------------------- + sal_Bool SfxViewFrame::IsDowning_Impl() const { return pImp->bIsDowning; } -//-------------------------------------------------------------------- + class SfxViewNotificatedFrameList_Impl : public SfxListener, public SfxViewFrameArr_Impl { @@ -252,7 +252,7 @@ public: void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); }; -//------------------------------------------------------------------------- + void SfxViewNotificatedFrameList_Impl::Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) { if ( rHint.IsA(TYPE(SfxSimpleHint)) ) @@ -272,7 +272,7 @@ void SfxViewNotificatedFrameList_Impl::Notify( SfxBroadcaster& rBC, const SfxHin } } -//------------------------------------------------------------------------- + long ReloadDecouple_Impl( void* pObj, void* pArg ) { @@ -856,7 +856,7 @@ void SfxViewFrame::ExecReload_Impl( SfxRequest& rReq ) } } -//------------------------------------------------------------------------- + void SfxViewFrame::StateReload_Impl( SfxItemSet& rSet ) { SfxObjectShell* pSh = GetObjectShell(); @@ -930,7 +930,7 @@ void SfxViewFrame::StateReload_Impl( SfxItemSet& rSet ) } -//-------------------------------------------------------------------- + void SfxViewFrame::ExecHistory_Impl( SfxRequest &rReq ) { // Is there an Undo-Manager on the top Shell? @@ -977,7 +977,7 @@ void SfxViewFrame::ExecHistory_Impl( SfxRequest &rReq ) rReq.Done(); } -//-------------------------------------------------------------------- + void SfxViewFrame::StateHistory_Impl( SfxItemSet &rSet ) { // Search for Undo-Manager @@ -1032,7 +1032,7 @@ void SfxViewFrame::StateHistory_Impl( SfxItemSet &rSet ) rSet.DisableItem( SID_REPEAT ); } -//-------------------------------------------------------------------- + void SfxViewFrame::PopShellAndSubShells_Impl( SfxViewShell& i_rViewShell ) { i_rViewShell.PopSubShells_Impl(); @@ -1055,7 +1055,7 @@ void SfxViewFrame::PopShellAndSubShells_Impl( SfxViewShell& i_rViewShell ) } -//-------------------------------------------------------------------- + void SfxViewFrame::ReleaseObjectShell_Impl() /* [Description] @@ -1127,7 +1127,7 @@ void SfxViewFrame::ReleaseObjectShell_Impl() GetDispatcher()->SetDisableFlags( 0 ); } -//-------------------------------------------------------------------- + sal_Bool SfxViewFrame::Close() { DBG_CHKTHIS(SfxViewFrame, 0); @@ -1151,7 +1151,7 @@ sal_Bool SfxViewFrame::Close() return sal_True; } -//-------------------------------------------------------------------- + void SfxViewFrame::DoActivate( sal_Bool bUI, SfxViewFrame* pOldFrame ) { @@ -1174,7 +1174,7 @@ void SfxViewFrame::DoActivate( sal_Bool bUI, SfxViewFrame* pOldFrame ) } } -//-------------------------------------------------------------------- + void SfxViewFrame::DoDeactivate(sal_Bool bUI, SfxViewFrame* pNewFrame ) { DBG_CHKTHIS(SfxViewFrame, 0); @@ -1195,7 +1195,7 @@ void SfxViewFrame::DoDeactivate(sal_Bool bUI, SfxViewFrame* pNewFrame ) } } -//------------------------------------------------------------------------ + void SfxViewFrame::InvalidateBorderImpl( const SfxViewShell* pSh ) { if( pSh && !nAdjustPosPixelLock ) @@ -1213,7 +1213,7 @@ void SfxViewFrame::InvalidateBorderImpl( const SfxViewShell* pSh ) } } -//------------------------------------------------------------------------ + sal_Bool SfxViewFrame::SetBorderPixelImpl ( const SfxViewShell* pVSh, @@ -1256,7 +1256,7 @@ sal_Bool SfxViewFrame::SetBorderPixelImpl return sal_True; } -//------------------------------------------------------------------------ + const SvBorder& SfxViewFrame::GetBorderPixelImpl ( const SfxViewShell* /*pSh*/ @@ -1266,7 +1266,7 @@ const SvBorder& SfxViewFrame::GetBorderPixelImpl return pImp->aBorder; } -//-------------------------------------------------------------------- + void SfxViewFrame::Notify( SfxBroadcaster& /*rBC*/, const SfxHint& rHint ) { {DBG_CHKTHIS(SfxViewFrame, 0);} @@ -1394,7 +1394,7 @@ void SfxViewFrame::Notify( SfxBroadcaster& /*rBC*/, const SfxHint& rHint ) } } -//------------------------------------------------------------------------ + void SfxViewFrame::Construct_Impl( SfxObjectShell *pObjSh ) { pImp->bResizeInToOut = sal_True; @@ -1476,7 +1476,7 @@ SfxViewFrame::SfxViewFrame rFrame.CreateWorkWindow_Impl(); } -//------------------------------------------------------------------------ + SfxViewFrame::~SfxViewFrame() { DBG_DTOR(SfxViewFrame, 0); @@ -1509,7 +1509,7 @@ SfxViewFrame::~SfxViewFrame() delete pImp; } -//------------------------------------------------------------------------ + void SfxViewFrame::KillDispatcher_Impl() // Remove and delete the Dispatcher. @@ -1530,13 +1530,13 @@ void SfxViewFrame::KillDispatcher_Impl() } } -//------------------------------------------------------------------------ + SfxViewFrame* SfxViewFrame::Current() { return SfxApplication::Get() ? SFX_APP()->Get_Impl()->pViewFrame : NULL; } -//-------------------------------------------------------------------- + // returns the first window of spec. type viewing the specified doc. SfxViewFrame* SfxViewFrame::GetFirst ( @@ -1559,7 +1559,7 @@ SfxViewFrame* SfxViewFrame::GetFirst return 0; } -//-------------------------------------------------------------------- + // returns thenext window of spec. type viewing the specified doc. SfxViewFrame* SfxViewFrame::GetNext @@ -1590,14 +1590,14 @@ SfxViewFrame* SfxViewFrame::GetNext return 0; } -//-------------------------------------------------------------------- + SfxProgress* SfxViewFrame::GetProgress() const { SfxObjectShell *pObjSh = GetObjectShell(); return pObjSh ? pObjSh->GetProgress() : 0; } -//-------------------------------------------------------------------- + void SfxViewFrame::DoAdjustPosSizePixel //! divide on Inner.../Outer... ( SfxViewShell* pSh, @@ -1626,19 +1626,19 @@ bool SfxViewFrameItem::operator==( const SfxPoolItem &rItem ) const return PTR_CAST(SfxViewFrameItem, &rItem)->pFrame== pFrame; } -//-------------------------------------------------------------------- + OUString SfxViewFrameItem::GetValueText() const { return OUString(); } -//-------------------------------------------------------------------- + SfxPoolItem* SfxViewFrameItem::Clone( SfxItemPool *) const { return new SfxViewFrameItem( pFrame); } -//-------------------------------------------------------------------- + void SfxViewFrame::SetViewShell_Impl( SfxViewShell *pVSh ) /* [Description] @@ -1655,7 +1655,7 @@ void SfxViewFrame::SetViewShell_Impl( SfxViewShell *pVSh ) pImp->bResizeInToOut = sal_False; } -//-------------------------------------------------------------------- + /* [Description] The ParentViewFrame of the Containers ViewFrame in the internal InPlace @@ -1667,20 +1667,20 @@ SfxViewFrame* SfxViewFrame::GetParentViewFrame_Impl() const return NULL; } -//-------------------------------------------------------------------- + void SfxViewFrame::ForceOuterResize_Impl(sal_Bool bOn) { if ( !pImp->bDontOverwriteResizeInToOut ) pImp->bResizeInToOut = !bOn; } -//-------------------------------------------------------------------- + sal_Bool SfxViewFrame::IsResizeInToOut_Impl() const { return pImp->bResizeInToOut; } -//-------------------------------------------------------------------- + void SfxViewFrame::GetDocNumber_Impl() { DBG_ASSERT( GetObjectShell(), "No Document!" ); @@ -1688,7 +1688,7 @@ void SfxViewFrame::GetDocNumber_Impl() pImp->nDocViewNo = GetObjectShell()->GetNoSet_Impl().GetFreeIndex()+1; } -//-------------------------------------------------------------------- + void SfxViewFrame::Enable( sal_Bool bEnable ) { @@ -1728,7 +1728,7 @@ void SfxViewFrame::Enable( sal_Bool bEnable ) } } -//-------------------------------------------------------------------- + void SfxViewFrame::Show() /* [Description] @@ -1764,13 +1764,13 @@ void SfxViewFrame::Show() GetFrame().GetWindow().Show(); } -//-------------------------------------------------------------------- + sal_Bool SfxViewFrame::IsVisible() const { return pImp->bObjLocked; } -//-------------------------------------------------------------------- + void SfxViewFrame::LockObjectShell_Impl( sal_Bool bLock ) { DBG_ASSERT( pImp->bObjLocked != bLock, "Wrong Locked status!" ); @@ -1780,7 +1780,7 @@ void SfxViewFrame::LockObjectShell_Impl( sal_Bool bLock ) pImp->bObjLocked = bLock; } -//-------------------------------------------------------------------- + void SfxViewFrame::MakeActive_Impl( sal_Bool bGrabFocus ) { if ( GetViewShell() && !GetFrame().IsClosing_Impl() ) @@ -1832,14 +1832,14 @@ void SfxViewFrame::MakeActive_Impl( sal_Bool bGrabFocus ) } } -//------------------------------------------------------------------------- + void SfxViewFrame::SetQuietMode_Impl( sal_Bool bOn ) { GetDispatcher()->SetQuietMode_Impl( bOn ); } -//------------------------------------------------------------------------- + SfxObjectShell* SfxViewFrame::GetObjectShell() { @@ -1873,7 +1873,7 @@ SfxViewFrame* SfxViewFrame::GetActiveChildFrame_Impl() const return pViewFrame; } -//-------------------------------------------------------------------- + SfxViewFrame* SfxViewFrame::LoadViewIntoFrame_Impl_NoThrow( const SfxObjectShell& i_rDoc, const Reference< XFrame >& i_rFrame, const sal_uInt16 i_nViewId, const bool i_bHidden ) { @@ -1944,7 +1944,7 @@ SfxViewFrame* SfxViewFrame::LoadViewIntoFrame_Impl_NoThrow( const SfxObjectShell return NULL; } -//-------------------------------------------------------------------- + SfxViewShell* SfxViewFrame::LoadViewIntoFrame_Impl( const SfxObjectShell& i_rDoc, const Reference< XFrame >& i_rFrame, const Sequence< PropertyValue >& i_rLoadArgs, const sal_uInt16 i_nViewId, const bool i_bHidden ) @@ -1974,35 +1974,35 @@ SfxViewShell* SfxViewFrame::LoadViewIntoFrame_Impl( const SfxObjectShell& i_rDoc return pViewShell; } -//-------------------------------------------------------------------- + SfxViewFrame* SfxViewFrame::LoadHiddenDocument( SfxObjectShell& i_rDoc, const sal_uInt16 i_nViewId ) { return LoadViewIntoFrame_Impl_NoThrow( i_rDoc, Reference< XFrame >(), i_nViewId, true ); } -//-------------------------------------------------------------------- + SfxViewFrame* SfxViewFrame::LoadDocument( SfxObjectShell& i_rDoc, const sal_uInt16 i_nViewId ) { return LoadViewIntoFrame_Impl_NoThrow( i_rDoc, Reference< XFrame >(), i_nViewId, false ); } -//-------------------------------------------------------------------- + SfxViewFrame* SfxViewFrame::LoadDocumentIntoFrame( SfxObjectShell& i_rDoc, const Reference< XFrame >& i_rTargetFrame, const sal_uInt16 i_nViewId ) { return LoadViewIntoFrame_Impl_NoThrow( i_rDoc, i_rTargetFrame, i_nViewId, false ); } -//-------------------------------------------------------------------- + SfxViewFrame* SfxViewFrame::LoadDocumentIntoFrame( SfxObjectShell& i_rDoc, const SfxFrameItem* i_pFrameItem, const sal_uInt16 i_nViewId ) { return LoadViewIntoFrame_Impl_NoThrow( i_rDoc, i_pFrameItem && i_pFrameItem->GetFrame() ? i_pFrameItem->GetFrame()->GetFrameInterface() : NULL, i_nViewId, false ); } -//-------------------------------------------------------------------- + SfxViewFrame* SfxViewFrame::DisplayNewDocument( SfxObjectShell& i_rDoc, const SfxRequest& i_rCreateDocRequest, const sal_uInt16 i_nViewId ) { SFX_REQUEST_ARG( i_rCreateDocRequest, pFrameItem, SfxUnoFrameItem, SID_FILLFRAME, false ); @@ -2016,7 +2016,7 @@ SfxViewFrame* SfxViewFrame::DisplayNewDocument( SfxObjectShell& i_rDoc, const Sf ); } -//-------------------------------------------------------------------- + SfxViewFrame* SfxViewFrame::Get( const Reference< XController>& i_rController, const SfxObjectShell* i_pDoc ) { @@ -2050,7 +2050,7 @@ SfxViewFrame* SfxViewFrame::Get( const Reference< XController>& i_rController, c return pViewFrame; } -//-------------------------------------------------------------------- + void SfxViewFrame::SaveCurrentViewData_Impl( const sal_uInt16 i_nNewViewId ) { @@ -2116,7 +2116,7 @@ void SfxViewFrame::SaveCurrentViewData_Impl( const sal_uInt16 i_nNewViewId ) } } -//-------------------------------------------------------------------- + sal_Bool SfxViewFrame::SwitchToViewShell_Impl ( @@ -2210,19 +2210,19 @@ sal_Bool SfxViewFrame::SwitchToViewShell_Impl return sal_True; } -//------------------------------------------------------------------------- + void SfxViewFrame::SetCurViewId_Impl( const sal_uInt16 i_nID ) { pImp->nCurViewId = i_nID; } -//------------------------------------------------------------------------- + sal_uInt16 SfxViewFrame::GetCurViewId() const { return pImp->nCurViewId; } -//------------------------------------------------------------------------- + void SfxViewFrame::ExecView_Impl ( SfxRequest& rReq // The executable <SfxRequest> @@ -2324,7 +2324,7 @@ void SfxViewFrame::ExecView_Impl } } -//------------------------------------------------------------------------- + /* TODO as96863: This method try to collect information about the count of currently open documents. But the algorithm is implemented very simple ... @@ -2374,7 +2374,7 @@ sal_Bool impl_maxOpenDocCountReached() return (nOpenDocs >= nMaxDocs); } -//------------------------------------------------------------------------- + void SfxViewFrame::StateView_Impl ( SfxItemSet& rSet /* empty <SfxItemSet> with <Which-Ranges>, @@ -2449,13 +2449,13 @@ void SfxViewFrame::StateView_Impl } } -//------------------------------------------------------------------------- + void SfxViewFrame::ToTop() { GetFrame().Appear(); } -//------------------------------------------------------------------------- + SfxViewFrame* SfxViewFrame::GetParentViewFrame() const /* [Description] @@ -2466,7 +2466,7 @@ SfxViewFrame* SfxViewFrame::GetParentViewFrame() const return pFrame ? pFrame->GetCurrentViewFrame() : NULL; } -//------------------------------------------------------------------------- + SfxFrame& SfxViewFrame::GetFrame() const /* [Description] @@ -2476,7 +2476,7 @@ SfxFrame& SfxViewFrame::GetFrame() const return pImp->rFrame; } -//------------------------------------------------------------------------- + SfxViewFrame* SfxViewFrame::GetTopViewFrame() const { return GetFrame().GetTopFrame().GetCurrentViewFrame(); @@ -3158,7 +3158,7 @@ void SfxViewFrame::ChildWindowExecute( SfxRequest &rReq ) } } -//-------------------------------------------------------------------- + void SfxViewFrame::ChildWindowState( SfxItemSet& rState ) @@ -3236,7 +3236,7 @@ void SfxViewFrame::ChildWindowState( SfxItemSet& rState ) } } -//-------------------------------------------------------------------- + SfxWorkWindow* SfxViewFrame::GetWorkWindow_Impl( sal_uInt16 /*nId*/ ) { SfxWorkWindow* pWork = 0; @@ -3251,7 +3251,7 @@ void SfxViewFrame::SetChildWindow(sal_uInt16 nId, sal_Bool bOn, sal_Bool bSetFoc pWork->SetChildWindow_Impl( nId, bOn, bSetFocus ); } -//-------------------------------------------------------------------- + void SfxViewFrame::ToggleChildWindow(sal_uInt16 nId) { @@ -3260,7 +3260,7 @@ void SfxViewFrame::ToggleChildWindow(sal_uInt16 nId) pWork->ToggleChildWindow_Impl( nId, sal_True ); } -//-------------------------------------------------------------------- + bool SfxViewFrame::HasChildWindow( sal_uInt16 nId ) { @@ -3268,7 +3268,7 @@ bool SfxViewFrame::HasChildWindow( sal_uInt16 nId ) return pWork && pWork->HasChildWindow_Impl(nId); } -//-------------------------------------------------------------------- + sal_Bool SfxViewFrame::KnowsChildWindow( sal_uInt16 nId ) { @@ -3276,7 +3276,7 @@ sal_Bool SfxViewFrame::KnowsChildWindow( sal_uInt16 nId ) return pWork ? pWork->KnowsChildWindow_Impl(nId) : sal_False; } -//-------------------------------------------------------------------- + void SfxViewFrame::ShowChildWindow( sal_uInt16 nId, sal_Bool bVisible ) { @@ -3288,7 +3288,7 @@ void SfxViewFrame::ShowChildWindow( sal_uInt16 nId, sal_Bool bVisible ) } } -//-------------------------------------------------------------------- + SfxChildWindow* SfxViewFrame::GetChildWindow(sal_uInt16 nId) { @@ -3311,7 +3311,7 @@ void SfxViewFrame::SetViewFrame( SfxViewFrame* pFrame ) SFX_APP()->SetViewFrame_Impl( pFrame ); } -// --------------------------------------------------------------------------------------------------------------------- + void SfxViewFrame::ActivateToolPanel( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& i_rFrame, const OUString& i_rPanelURL ) { SolarMutexGuard aGuard; @@ -3329,7 +3329,7 @@ void SfxViewFrame::ActivateToolPanel( const ::com::sun::star::uno::Reference< :: pViewFrame->ActivateToolPanel_Impl( i_rPanelURL ); } -// --------------------------------------------------------------------------------------------------------------------- + void SfxViewFrame::ActivateToolPanel_Impl( const OUString& i_rPanelURL ) { // ensure the task pane is visible diff --git a/sfx2/source/view/viewfrm2.cxx b/sfx2/source/view/viewfrm2.cxx index e073426e8e97..8633f23d51b7 100644 --- a/sfx2/source/view/viewfrm2.cxx +++ b/sfx2/source/view/viewfrm2.cxx @@ -55,7 +55,7 @@ using namespace ::com::sun::star::beans; using ::com::sun::star::lang::XMultiServiceFactory; using ::com::sun::star::lang::XComponent; -//-------------------------------------------------------------------- + void SfxFrameViewWindow_Impl::StateChanged( StateChangedType nStateChange ) { if ( nStateChange == STATE_CHANGE_INITSHOW ) @@ -78,7 +78,7 @@ void SfxFrameViewWindow_Impl::Resize() //======================================================================== -//-------------------------------------------------------------------- + void SfxViewFrame::UpdateTitle() /* [Description] diff --git a/sfx2/source/view/viewsh.cxx b/sfx2/source/view/viewsh.cxx index f7a83e3319a8..1416c0fe5d2f 100644 --- a/sfx2/source/view/viewsh.cxx +++ b/sfx2/source/view/viewsh.cxx @@ -299,7 +299,7 @@ SFX_IMPL_INTERFACE(SfxViewShell,SfxShell,SfxResId(0)) TYPEINIT2(SfxViewShell,SfxShell,SfxListener); -//-------------------------------------------------------------------- + /** search for a filter name dependent on type and module */ @@ -341,7 +341,7 @@ static OUString impl_retrieveFilterNameFromTypeAndModule( return aFoundFilterName; } -//-------------------------------------------------------------------- + /** search for an internal typename, which map to the current app module and map also to a "family" of file formats as e.g. PDF/MS Doc/OOo Doc. */ @@ -410,7 +410,7 @@ OUString impl_searchFormatTypeForApp(const css::uno::Reference< css::frame::XFra return OUString(); } -//-------------------------------------------------------------------- + void SfxViewShell::IPClientGone_Impl( SfxInPlaceClient *pIPClient ) { @@ -428,7 +428,7 @@ void SfxViewShell::IPClientGone_Impl( SfxInPlaceClient *pIPClient ) -//-------------------------------------------------------------------- + void SfxViewShell::ExecMisc_Impl( SfxRequest &rReq ) { @@ -778,7 +778,7 @@ void SfxViewShell::ExecMisc_Impl( SfxRequest &rReq ) } } -//-------------------------------------------------------------------- + void SfxViewShell::GetState_Impl( SfxItemSet &rSet ) { @@ -843,7 +843,7 @@ void SfxViewShell::GetState_Impl( SfxItemSet &rSet ) } } -//-------------------------------------------------------------------- + void SfxViewShell::SetZoomFactor( const Fraction &rZoomX, const Fraction &rZoomY ) @@ -855,7 +855,7 @@ void SfxViewShell::SetZoomFactor( const Fraction &rZoomX, GetWindow()->SetMapMode( aMap ); } -//-------------------------------------------------------------------- + ErrCode SfxViewShell::DoVerb(long /*nVerb*/) /* [Description] @@ -869,7 +869,7 @@ ErrCode SfxViewShell::DoVerb(long /*nVerb*/) return ERRCODE_SO_NOVERBS; } -//-------------------------------------------------------------------- + void SfxViewShell::OutplaceActivated( sal_Bool bActive, SfxInPlaceClient* /*pClient*/ ) { @@ -877,7 +877,7 @@ void SfxViewShell::OutplaceActivated( sal_Bool bActive, SfxInPlaceClient* /*pCli GetFrame()->GetFrame().Appear(); } -//-------------------------------------------------------------------- + void SfxViewShell::InplaceActivating( SfxInPlaceClient* /*pClient*/ ) { @@ -885,14 +885,14 @@ void SfxViewShell::InplaceActivating( SfxInPlaceClient* /*pClient*/ ) // but may be the bug will not affect the real office vcl windows, then it is not required } -//-------------------------------------------------------------------- + void SfxViewShell::InplaceDeactivated( SfxInPlaceClient* /*pClient*/ ) { // TODO/LATER: paint the replacement image in normal way if the painting was stopped } -//-------------------------------------------------------------------- + void SfxViewShell::UIActivating( SfxInPlaceClient* /*pClient*/ ) { @@ -905,7 +905,7 @@ void SfxViewShell::UIActivating( SfxInPlaceClient* /*pClient*/ ) pFrame->GetDispatcher()->Update_Impl( sal_True ); } -//-------------------------------------------------------------------- + void SfxViewShell::UIDeactivated( SfxInPlaceClient* /*pClient*/ ) { @@ -916,7 +916,7 @@ void SfxViewShell::UIDeactivated( SfxInPlaceClient* /*pClient*/ ) pFrame->GetBindings().InvalidateAll(sal_True); } -//-------------------------------------------------------------------- + SfxInPlaceClient* SfxViewShell::FindIPClient ( @@ -940,14 +940,14 @@ SfxInPlaceClient* SfxViewShell::FindIPClient return 0; } -//-------------------------------------------------------------------- + SfxInPlaceClient* SfxViewShell::GetIPClient() const { return GetUIActiveClient(); } -//-------------------------------------------------------------------- + SfxInPlaceClient* SfxViewShell::GetUIActiveIPClient_Impl() const { @@ -982,7 +982,7 @@ SfxInPlaceClient* SfxViewShell::GetUIActiveClient() const return NULL; } -//-------------------------------------------------------------------- + void SfxViewShell::Activate( sal_Bool bMDI ) { @@ -997,14 +997,14 @@ void SfxViewShell::Activate( sal_Bool bMDI ) } } -//-------------------------------------------------------------------- + void SfxViewShell::Deactivate(sal_Bool /*bMDI*/) { DBG_CHKTHIS(SfxViewShell, 0); } -//-------------------------------------------------------------------- + void SfxViewShell::AdjustPosSizePixel ( @@ -1016,7 +1016,7 @@ void SfxViewShell::AdjustPosSizePixel DBG_CHKTHIS(SfxViewShell, 0); } -//-------------------------------------------------------------------- + void SfxViewShell::Move() @@ -1038,7 +1038,7 @@ void SfxViewShell::Move() { } -//-------------------------------------------------------------------- + void SfxViewShell::OuterResizePixel ( @@ -1089,7 +1089,7 @@ void SfxViewShell::OuterResizePixel SetBorderPixel( SvBorder() ); } -//-------------------------------------------------------------------- + void SfxViewShell::InnerResizePixel ( @@ -1140,7 +1140,7 @@ void SfxViewShell::InnerResizePixel SetBorderPixel( SvBorder() ); } -//-------------------------------------------------------------------- + void SfxViewShell::InvalidateBorder() { @@ -1154,7 +1154,7 @@ void SfxViewShell::InvalidateBorder() } } -//-------------------------------------------------------------------- + void SfxViewShell::SetBorderPixel( const SvBorder &rBorder ) { @@ -1170,7 +1170,7 @@ void SfxViewShell::SetBorderPixel( const SvBorder &rBorder ) } } -//-------------------------------------------------------------------- + const SvBorder& SfxViewShell::GetBorderPixel() const { @@ -1180,7 +1180,7 @@ const SvBorder& SfxViewShell::GetBorderPixel() const return GetViewFrame()->GetBorderPixelImpl( this ); } -//-------------------------------------------------------------------- + void SfxViewShell::SetWindow ( @@ -1222,7 +1222,7 @@ void SfxViewShell::SetWindow //SFX_APP()->GrabFocus( pWindow ); } -//-------------------------------------------------------------------- + SfxViewShell::SfxViewShell ( @@ -1256,7 +1256,7 @@ SfxViewShell::SfxViewShell rViewArr.push_back(this); } -//-------------------------------------------------------------------- + SfxViewShell::~SfxViewShell() { @@ -1284,7 +1284,7 @@ SfxViewShell::~SfxViewShell() DELETEZ( pIPClientList ); } -//-------------------------------------------------------------------- + bool SfxViewShell::PrepareClose ( @@ -1312,7 +1312,7 @@ bool SfxViewShell::PrepareClose return true; } -//-------------------------------------------------------------------- + SfxViewShell* SfxViewShell::Current() { @@ -1320,7 +1320,7 @@ SfxViewShell* SfxViewShell::Current() return pCurrent ? pCurrent->GetViewShell() : NULL; } -//-------------------------------------------------------------------- + SfxViewShell* SfxViewShell::Get( const Reference< XController>& i_rController ) { @@ -1338,7 +1338,7 @@ SfxViewShell* SfxViewShell::Get( const Reference< XController>& i_rController ) return NULL; } -//-------------------------------------------------------------------- + SdrView* SfxViewShell::GetDrawView() const @@ -1354,7 +1354,7 @@ SdrView* SfxViewShell::GetDrawView() const return 0; } -//-------------------------------------------------------------------- + OUString SfxViewShell::GetSelectionText ( @@ -1384,7 +1384,7 @@ OUString SfxViewShell::GetSelectionText return OUString(); } -//-------------------------------------------------------------------- + sal_Bool SfxViewShell::HasSelection( sal_Bool ) const @@ -1465,13 +1465,13 @@ void SfxViewShell::PushSubShells_Impl( sal_Bool bPush ) pDisp->Flush(); } -//-------------------------------------------------------------------- + void SfxViewShell::WriteUserData( OUString&, bool ) { } -//-------------------------------------------------------------------- + void SfxViewShell::ReadUserData(const OUString&, bool ) { @@ -1486,7 +1486,7 @@ void SfxViewShell::WriteUserDataSequence ( uno::Sequence < beans::PropertyValue } -//-------------------------------------------------------------------- + // returns the first shell of spec. type viewing the specified doc. SfxViewShell* SfxViewShell::GetFirst @@ -1523,7 +1523,7 @@ SfxViewShell* SfxViewShell::GetFirst return 0; } -//-------------------------------------------------------------------- + // returns the next shell of spec. type viewing the specified doc. SfxViewShell* SfxViewShell::GetNext @@ -1565,7 +1565,7 @@ SfxViewShell* SfxViewShell::GetNext return 0; } -//-------------------------------------------------------------------- + void SfxViewShell::Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) @@ -1604,7 +1604,7 @@ void SfxViewShell::Notify( SfxBroadcaster& rBC, } } -//-------------------------------------------------------------------- + sal_Bool SfxViewShell::ExecKey_Impl(const KeyEvent& aKey) { @@ -1619,7 +1619,7 @@ sal_Bool SfxViewShell::ExecKey_Impl(const KeyEvent& aKey) return pImp->m_pAccExec->execute(aKey.GetKeyCode()); } -//-------------------------------------------------------------------- + bool SfxViewShell::KeyInput( const KeyEvent &rKeyEvent ) @@ -1652,7 +1652,7 @@ bool SfxViewShell::GlobalKeyInput_Impl( const KeyEvent &rKeyEvent ) return ExecKey_Impl(rKeyEvent); } -//-------------------------------------------------------------------- + void SfxViewShell::ShowCursor( bool /*bOn*/ ) @@ -1666,7 +1666,7 @@ void SfxViewShell::ShowCursor( bool /*bOn*/ ) { } -//-------------------------------------------------------------------- + void SfxViewShell::GotFocus() const @@ -1685,7 +1685,7 @@ void SfxViewShell::GotFocus() const { } -//-------------------------------------------------------------------- + void SfxViewShell::ResetAllClients_Impl( SfxInPlaceClient *pIP ) { @@ -1701,7 +1701,7 @@ void SfxViewShell::ResetAllClients_Impl( SfxInPlaceClient *pIP ) } } -//-------------------------------------------------------------------- + void SfxViewShell::DisconnectAllClients() { @@ -1714,13 +1714,13 @@ void SfxViewShell::DisconnectAllClients() delete pClients->at( n ); } -//-------------------------------------------------------------------- + void SfxViewShell::QueryObjAreaPixel( Rectangle& ) const { } -//-------------------------------------------------------------------- + void SfxViewShell::VisAreaChanged(const Rectangle& /*rVisArea*/) { @@ -1737,7 +1737,7 @@ void SfxViewShell::VisAreaChanged(const Rectangle& /*rVisArea*/) } } -//-------------------------------------------------------------------- + void SfxViewShell::CheckIPClient_Impl( SfxInPlaceClient *pIPClient, const Rectangle& rVisArea ) { if ( GetObjectShell()->IsInClose() ) @@ -1775,7 +1775,7 @@ void SfxViewShell::CheckIPClient_Impl( SfxInPlaceClient *pIPClient, const Rectan } } -//-------------------------------------------------------------------- + void SfxViewShell::DiscardClients_Impl() /* [Description] @@ -1793,14 +1793,14 @@ void SfxViewShell::DiscardClients_Impl() delete pClients->at( n ); } -//-------------------------------------------------------------------- + SfxObjectShell* SfxViewShell::GetObjectShell() { return pFrame ? pFrame->GetObjectShell() : NULL; } -//-------------------------------------------------------------------- + Reference< XModel > SfxViewShell::GetCurrentDocument() const { @@ -1813,7 +1813,7 @@ Reference< XModel > SfxViewShell::GetCurrentDocument() const return xDocument; } -//-------------------------------------------------------------------- + void SfxViewShell::SetCurrentDocument() const { @@ -1822,14 +1822,14 @@ void SfxViewShell::SetCurrentDocument() const SfxObjectShell::SetCurrentComponent( xDocument ); } -//-------------------------------------------------------------------- + const Size& SfxViewShell::GetMargin() const { return pImp->aMargin; } -//-------------------------------------------------------------------- + void SfxViewShell::SetMargin( const Size& rSize ) { @@ -1847,27 +1847,27 @@ void SfxViewShell::SetMargin( const Size& rSize ) } } -//-------------------------------------------------------------------- + void SfxViewShell::MarginChanged() { } -//-------------------------------------------------------------------- + sal_Bool SfxViewShell::IsShowView_Impl() const { return pImp->m_bIsShowView; } -//-------------------------------------------------------------------- + SfxFrame* SfxViewShell::GetSmartSelf( SfxFrame* pSelf, SfxMedium& /*rMedium*/ ) { return pSelf; } -//------------------------------------------------------------------------ + void SfxViewShell::JumpToMark( const OUString& rMark ) { @@ -1878,7 +1878,7 @@ void SfxViewShell::JumpToMark( const OUString& rMark ) &aMarkItem, 0L ); } -//------------------------------------------------------------------------ + SfxInPlaceClientList* SfxViewShell::GetIPClientList_Impl( sal_Bool bCreate ) const { |