diff options
| author | Alexander Wilms <f.alexander.wilms@gmail.com> | 2014-02-25 20:34:55 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2014-02-26 08:12:10 -0600 |
| commit | c7c40687f6d1e0f155dde44d8803a2e957797c08 (patch) | |
| tree | 20e6807f1ded95c85d3477f8951caa62f352e954 /sfx2/source | |
| parent | ff0562fa4f7d8b7aceca16771d84db87d3f19756 (diff) | |
Remove visual noise from sfx2
Change-Id: I0f556a386ce64d154b695c2a35f808c94b9f0b7a
Reviewed-on: https://gerrit.libreoffice.org/8310
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'sfx2/source')
91 files changed, 409 insertions, 409 deletions
diff --git a/sfx2/source/appl/app.cxx b/sfx2/source/appl/app.cxx index 7a500e8c0263..85560fc5d602 100644 --- a/sfx2/source/appl/app.cxx +++ b/sfx2/source/appl/app.cxx @@ -243,7 +243,7 @@ SfxApplication::~SfxApplication() pApp = 0; } -//==================================================================== + const OUString& SfxApplication::GetLastDir_Impl() const diff --git a/sfx2/source/appl/app.src b/sfx2/source/appl/app.src index 7559adb1a159..448e68d297ba 100644 --- a/sfx2/source/appl/app.src +++ b/sfx2/source/appl/app.src @@ -324,7 +324,7 @@ String RID_STR_HLPFILENOTEXIST Text [ en-US ] = "The help file for this topic is not installed." ; }; - //---------------------------------------------------------------------------- + String RID_ENVTOOLBOX { diff --git a/sfx2/source/appl/appbas.cxx b/sfx2/source/appl/appbas.cxx index 57a3733477b0..510a4796ed97 100644 --- a/sfx2/source/appl/appbas.cxx +++ b/sfx2/source/appl/appbas.cxx @@ -86,7 +86,7 @@ using namespace ::com::sun::star::script; using ::basic::BasicManagerRepository; -//========================================================================= + sal_uInt16 SfxApplication::SaveBasicAndDialogContainer() const { if ( pAppData_Impl->pBasicManager->isValid() ) diff --git a/sfx2/source/appl/appbaslib.cxx b/sfx2/source/appl/appbaslib.cxx index 7d295cdef8cc..aeee95233dff 100644 --- a/sfx2/source/appl/appbaslib.cxx +++ b/sfx2/source/appl/appbaslib.cxx @@ -36,7 +36,7 @@ using namespace ::com::sun::star::embed; using ::osl::MutexGuard; using ::osl::Mutex; -//============================================================================ + SfxBasicManagerHolder::SfxBasicManagerHolder() :mpBasicManager( NULL ) { @@ -153,7 +153,7 @@ SfxBasicManagerHolder::LegacyPsswdBinaryLimitExceeded( Sequence< OUString >& sMo return sal_True; } -//============================================================================ + // Service for application library container extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL @@ -165,7 +165,7 @@ com_sun_star_comp_sfx2_ApplicationDialogLibraryContainer_get_implementation( return SFX_APP()->GetDialogContainer(); } -//============================================================================ + // Service for application library container extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL diff --git a/sfx2/source/appl/appchild.cxx b/sfx2/source/appl/appchild.cxx index 4714bb9026f9..1ab79aa492f0 100644 --- a/sfx2/source/appl/appchild.cxx +++ b/sfx2/source/appl/appchild.cxx @@ -34,7 +34,7 @@ #include <sfx2/module.hxx> #include <sfx2/sfxsids.hrc> -//========================================================================= + void SfxApplication::RegisterChildWindow_Impl( SfxModule *pMod, SfxChildWinFactory *pFact ) diff --git a/sfx2/source/appl/appdde.cxx b/sfx2/source/appl/appdde.cxx index 502759c4c8ad..b4b949fd9618 100644 --- a/sfx2/source/appl/appdde.cxx +++ b/sfx2/source/appl/appdde.cxx @@ -44,7 +44,7 @@ #include <comphelper/string.hxx> #include <com/sun/star/ucb/IllegalIdentifierException.hpp> -//======================================================================== + OUString SfxDdeServiceName_Impl( const OUString& sIn ) { diff --git a/sfx2/source/appl/appinit.cxx b/sfx2/source/appl/appinit.cxx index 18a9aae3cb7b..48b55e60cb8a 100644 --- a/sfx2/source/appl/appinit.cxx +++ b/sfx2/source/appl/appinit.cxx @@ -146,14 +146,14 @@ Sequence< OUString > SAL_CALL SfxTerminateListener_Impl::getSupportedServiceName return lNames; } -//==================================================================== + typedef bool ( *PFunc_getSpecialCharsForEdit)( Window* i_pParent, const Font& i_rFont, OUString& o_rOutString ); -//==================================================================== + // Lazy binding of the GetSpecialCharsForEdit function as it resides in // a library above us. -//==================================================================== + #ifndef DISABLE_DYNLOADING @@ -195,7 +195,7 @@ OUString GetSpecialCharsForEdit(Window* pParent, const Font& rFont) return aRet; } -//==================================================================== + bool SfxApplication::Initialize_Impl() { diff --git a/sfx2/source/appl/appmain.cxx b/sfx2/source/appl/appmain.cxx index 7be5e02cea86..e1ee67783280 100644 --- a/sfx2/source/appl/appmain.cxx +++ b/sfx2/source/appl/appmain.cxx @@ -49,7 +49,7 @@ DBG_NAME(SfxAppMainWizMenu) DBG_NAME(SfxAppMainOLEReg) DBG_NAME(SfxAppMainCHAOSReg) -//=================================================================== + TYPEINIT2(SfxApplication,SfxShell,SfxBroadcaster); diff --git a/sfx2/source/appl/appmisc.cxx b/sfx2/source/appl/appmisc.cxx index 536105edba7d..50215417c39c 100644 --- a/sfx2/source/appl/appmisc.cxx +++ b/sfx2/source/appl/appmisc.cxx @@ -85,12 +85,12 @@ using namespace ::com::sun::star::util; using namespace ::com::sun::star::beans; using namespace ::com::sun::star::container; -//=================================================================== + #define SfxApplication #include "sfxslots.hxx" -//==================================================================== + #define SFX_ITEMTYPE_STATBAR 4 diff --git a/sfx2/source/appl/appopen.cxx b/sfx2/source/appl/appopen.cxx index 12100ab243f0..acc08d8a0f8e 100644 --- a/sfx2/source/appl/appopen.cxx +++ b/sfx2/source/appl/appopen.cxx @@ -113,7 +113,7 @@ using namespace ::com::sun::star::container; using namespace ::cppu; using namespace ::sfx2; -//========================================================================= + class SfxOpenDocStatusListener_Impl : public WeakImplHelper1< XDispatchResultListener > { @@ -138,7 +138,7 @@ void SAL_CALL SfxOpenDocStatusListener_Impl::disposing( const EventObject& ) thr { } -//==================================================================== + void SetTemplate_Impl( const OUString &rFileName, const OUString &rLongName, @@ -149,7 +149,7 @@ void SetTemplate_Impl( const OUString &rFileName, pDoc->ResetFromTemplate( rLongName, rFileName ); } -//==================================================================== + class SfxDocPasswordVerifier : public ::comphelper::IDocPasswordVerifier { public: @@ -205,7 +205,7 @@ private: return eResult; } -//==================================================================== + diff --git a/sfx2/source/appl/appquit.cxx b/sfx2/source/appl/appquit.cxx index 482c0c34f14f..696e39d32b5d 100644 --- a/sfx2/source/appl/appquit.cxx +++ b/sfx2/source/appl/appquit.cxx @@ -56,7 +56,7 @@ using ::basic::BasicManagerRepository; -//=================================================================== + sal_Bool SfxApplication::QueryExit_Impl() { sal_Bool bQuit = sal_True; diff --git a/sfx2/source/appl/appreg.cxx b/sfx2/source/appl/appreg.cxx index ce07f9a5749b..7c1cde67c0fd 100644 --- a/sfx2/source/appl/appreg.cxx +++ b/sfx2/source/appl/appreg.cxx @@ -40,7 +40,7 @@ #include <sfx2/objface.hxx> #include <sfx2/mnuitem.hxx> -//=================================================================== + void SfxApplication::Registrations_Impl() { diff --git a/sfx2/source/appl/appuno.cxx b/sfx2/source/appl/appuno.cxx index 58d62d908500..59a4a354698a 100644 --- a/sfx2/source/appl/appuno.cxx +++ b/sfx2/source/appl/appuno.cxx @@ -1676,7 +1676,7 @@ uno::Sequence< beans::PropertyValue > SAL_CALL return rProperties; } -//========================================================================= + RequestFilterOptions::RequestFilterOptions( uno::Reference< frame::XModel > rModel, uno::Sequence< beans::PropertyValue > rProperties ) @@ -1711,7 +1711,7 @@ uno::Sequence< uno::Reference< task::XInteractionContinuation > > return m_lContinuations; } -//========================================================================= + class RequestPackageReparation_Impl : public ::cppu::WeakImplHelper1< task::XInteractionRequest > { uno::Any m_aRequest; @@ -1781,7 +1781,7 @@ com::sun::star::uno::Reference < task::XInteractionRequest > RequestPackageRepar return com::sun::star::uno::Reference < task::XInteractionRequest >(pImp); } -//========================================================================= + class NotifyBrokenPackage_Impl : public ::cppu::WeakImplHelper1< task::XInteractionRequest > { uno::Any m_aRequest; diff --git a/sfx2/source/appl/childwin.cxx b/sfx2/source/appl/childwin.cxx index 3d2c26b2a354..b4f01aa40891 100644 --- a/sfx2/source/appl/childwin.cxx +++ b/sfx2/source/appl/childwin.cxx @@ -144,7 +144,7 @@ sal_Bool GetSplitSizeFromString( const OUString& rStr, Size& rSize ) return sal_False; } -//========================================================================= + SfxChildWindow::SfxChildWindow(Window *pParentWindow, sal_uInt16 nId) : pParent(pParentWindow) , nType(nId) diff --git a/sfx2/source/appl/module.cxx b/sfx2/source/appl/module.cxx index 1848e74c4bf7..5a96e8777590 100644 --- a/sfx2/source/appl/module.cxx +++ b/sfx2/source/appl/module.cxx @@ -99,20 +99,20 @@ ImageList* SfxModule_Impl::GetImageList( ResMgr* pResMgr, bool bBig ) TYPEINIT1(SfxModule, SfxShell); -//========================================================================= + SFX_IMPL_INTERFACE(SfxModule,SfxShell,SfxResId(0)) { } -//==================================================================== + ResMgr* SfxModule::GetResMgr() { return pResMgr; } -//==================================================================== + SfxModule::SfxModule( ResMgr* pMgrP, sal_Bool bDummyP, SfxObjectFactory* pFactoryP, ... ) @@ -149,7 +149,7 @@ void SfxModule::Construct_Impl() } } -//==================================================================== + SfxModule::~SfxModule() { diff --git a/sfx2/source/appl/newhelp.cxx b/sfx2/source/appl/newhelp.cxx index 86deefaa3967..664302cbcdbc 100644 --- a/sfx2/source/appl/newhelp.cxx +++ b/sfx2/source/appl/newhelp.cxx @@ -168,10 +168,10 @@ using namespace ::comphelper; Reference< util::XURLTransformer > xTrans( util::URLTransformer::create( ::comphelper::getProcessComponentContext() ) ); \ xTrans->parseStrict( aURL ) -//......................................................................... + namespace sfx2 { -//......................................................................... + void HandleTaskPaneList( Window* pWindow, sal_Bool bAddToList ) { @@ -240,10 +240,10 @@ namespace sfx2 return sSearchStr; } -//......................................................................... + // namespace sfx2 } -//......................................................................... + // struct IndexEntry_Impl ------------------------------------------------ diff --git a/sfx2/source/appl/workwin.cxx b/sfx2/source/appl/workwin.cxx index b595b666cedb..fac78faacc5f 100644 --- a/sfx2/source/appl/workwin.cxx +++ b/sfx2/source/appl/workwin.cxx @@ -146,10 +146,10 @@ DBG_NAME(SfxWorkWindow) //SV_IMPL_OBJARR( SfxObjectBarArr_Impl, SfxObjectBar_Impl ); -//==================================================================== + // Sort the Children according their alignment // The order corresponds to the enum SfxChildAlignment (->CHILDWIN.HXX). -// + // Help to make changes to the alignment compatible! @@ -541,7 +541,7 @@ void SfxWorkWindow::Sort_Impl() } -//==================================================================== + // constructor for workwin of a Frame SfxFrameWorkWin_Impl::SfxFrameWorkWin_Impl( Window *pWin, SfxFrame *pFrm, SfxFrame* pMaster ) @@ -579,7 +579,7 @@ SfxFrameWorkWin_Impl::SfxFrameWorkWin_Impl( Window *pWin, SfxFrame *pFrm, SfxFra nUpdateMode = SFX_VISIBILITY_STANDARD; } -//==================================================================== + // Constructor of the base class SfxWorkWindow::SfxWorkWindow( Window *pWin, SfxBindings& rB, SfxWorkWindow* pParentWorkwin ) : @@ -625,7 +625,7 @@ SfxWorkWindow::SfxWorkWindow( Window *pWin, SfxBindings& rB, SfxWorkWindow* pPar pLayoutManagerListener->setFrame( xFrame ); } -//==================================================================== + // Destructor SfxWorkWindow::~SfxWorkWindow() @@ -755,7 +755,7 @@ void SfxWorkWindow::DeleteControllers_Impl() nChildren = 0; } -//==================================================================== + // Virtual method for placing the child window. void SfxWorkWindow::ArrangeChildren_Impl( sal_Bool /*bForce*/) diff --git a/sfx2/source/bastyp/bitset.cxx b/sfx2/source/bastyp/bitset.cxx index fc336bc9d2a8..45f6894d0738 100644 --- a/sfx2/source/bastyp/bitset.cxx +++ b/sfx2/source/bastyp/bitset.cxx @@ -25,7 +25,7 @@ #include <limits.h> #include <algorithm> -//==================================================================== + // add nOffset to each bit-value in the set BitSet BitSet::operator<<( sal_uInt16 nOffset ) const diff --git a/sfx2/source/bastyp/fltlst.cxx b/sfx2/source/bastyp/fltlst.cxx index 442c33d80829..acadc3f0e82c 100644 --- a/sfx2/source/bastyp/fltlst.cxx +++ b/sfx2/source/bastyp/fltlst.cxx @@ -31,9 +31,9 @@ #include <vcl/svapp.hxx> #include <osl/mutex.hxx> -//***************************************************************************************************************** + // namespaces -//***************************************************************************************************************** + using namespace ::com::sun::star; @@ -67,7 +67,7 @@ class SfxRefreshListener : public ::cppu::WeakImplHelper1<com::sun::star::util:: } }; -/*-************************************************************************************************************//** +/*-************************************************************************************************************ @short ctor @descr These initialize an instance of a SfxFilterListener class. Created object listen automaticly on right FilterFactory-Service for all changes and synchronize right SfxFilterContainer with diff --git a/sfx2/source/bastyp/progress.cxx b/sfx2/source/bastyp/progress.cxx index 4cac16ace272..816d2bc76daa 100644 --- a/sfx2/source/bastyp/progress.cxx +++ b/sfx2/source/bastyp/progress.cxx @@ -70,11 +70,11 @@ struct SfxProgress_Impl }; -//======================================================================== + #include "sfxslots.hxx" -//======================================================================== + extern sal_uInt32 Get10ThSec(); diff --git a/sfx2/source/config/evntconf.cxx b/sfx2/source/config/evntconf.cxx index ad368c99cf74..c422cfaa996b 100644 --- a/sfx2/source/config/evntconf.cxx +++ b/sfx2/source/config/evntconf.cxx @@ -137,7 +137,7 @@ void SfxEventNamesItem::AddEvent( const OUString& rName, const OUString& rUIName } -//========================================================================== + uno::Any CreateEventData_Impl( const SvxMacro *pMacro ) diff --git a/sfx2/source/control/bindings.cxx b/sfx2/source/control/bindings.cxx index 1b3d176a683f..67dcb3fa2047 100644 --- a/sfx2/source/control/bindings.cxx +++ b/sfx2/source/control/bindings.cxx @@ -81,7 +81,7 @@ DBG_NAME(SfxBindingsNextJob_Impl) DBG_NAME(SfxBindingsUpdate_Impl) DBG_NAME(SfxBindingsInvalidateAll) -//==================================================================== + static sal_uInt16 nTimeOut = 300; @@ -91,11 +91,11 @@ static sal_uInt16 nTimeOut = 300; typedef boost::unordered_map< sal_uInt16, bool > InvalidateSlotMap; -//==================================================================== + typedef std::vector<SfxStateCache*> SfxStateCacheArr_Impl; -//==================================================================== + class SfxAsyncExec_Impl { @@ -207,7 +207,7 @@ public: } }; -//========================================================================== + SfxBindings::SfxBindings() : pImp(new SfxBindings_Impl), @@ -238,7 +238,7 @@ SfxBindings::SfxBindings() pImp->aTimer.SetTimeoutHdl( LINK(this, SfxBindings, NextJob_Impl) ); } -//==================================================================== + SfxBindings::~SfxBindings() diff --git a/sfx2/source/control/ctrlitem.cxx b/sfx2/source/control/ctrlitem.cxx index 4851580fc24e..2f3cf6f80670 100644 --- a/sfx2/source/control/ctrlitem.cxx +++ b/sfx2/source/control/ctrlitem.cxx @@ -26,7 +26,7 @@ #include "statcach.hxx" #include <sfx2/viewfrm.hxx> -//==================================================================== + DBG_NAME(SfxControllerItem); @@ -70,7 +70,7 @@ sal_Bool SfxControllerItem::IsBound() const return pNext != this; } -//==================================================================== + // registeres with the id at the bindings void SfxControllerItem::Bind( sal_uInt16 nNewId, SfxBindings *pBindinx ) @@ -110,7 +110,7 @@ void SfxControllerItem::BindInternal_Impl( sal_uInt16 nNewId, SfxBindings *pBind } -//==================================================================== + void SfxControllerItem::UnBind() @@ -135,7 +135,7 @@ void SfxControllerItem::UnBind() pNext = this; } -//==================================================================== + void SfxControllerItem::ReBind() diff --git a/sfx2/source/control/dispatch.cxx b/sfx2/source/control/dispatch.cxx index 7c956e083f18..f9642fb819ef 100644 --- a/sfx2/source/control/dispatch.cxx +++ b/sfx2/source/control/dispatch.cxx @@ -114,7 +114,7 @@ struct SfxDispatcher_Impl { //When the dispatched is locked, SfxRequests accumulate in aReqArr for //later dispatch when unlocked via Post - // + //The pointers are typically deleted in Post, only if we never get around //to posting them do we delete the unposted requests. SfxRequestPtrArray aReqArr; @@ -218,7 +218,7 @@ sal_Bool SfxDispatcher::IsOnTop(const SfxShell& rShell) return CheckVirtualStack(rShell, sal_False); } -//==================================================================== + sal_Bool SfxDispatcher::IsLocked( sal_uInt16 ) const /* [Description] @@ -356,7 +356,7 @@ int SfxDispatcher::Call_Impl( SfxShell& rShell, const SfxSlot &rSlot, SfxRequest return sal_False; } -//==================================================================== + void SfxDispatcher::Construct_Impl( SfxDispatcher* pParent ) { pImp.reset(new SfxDispatcher_Impl); @@ -422,7 +422,7 @@ SfxDispatcher::SfxDispatcher( SfxViewFrame *pViewFrame ) pImp->pFrame = pViewFrame; } -//==================================================================== + SfxDispatcher::~SfxDispatcher() /* [Description] @@ -465,7 +465,7 @@ SfxDispatcher::~SfxDispatcher() } } -//==================================================================== + void SfxDispatcher::Pop ( SfxShell& rShell, /* the stack to take the SfxShell instance. */ diff --git a/sfx2/source/control/msg.cxx b/sfx2/source/control/msg.cxx index a053010fcb10..4fc4cbf18e93 100644 --- a/sfx2/source/control/msg.cxx +++ b/sfx2/source/control/msg.cxx @@ -21,7 +21,7 @@ #include <svl/eitem.hxx> #include <sfx2/msg.hxx> -//==================================================================== + SfxSlotKind SfxSlot::GetKind() const { diff --git a/sfx2/source/control/msgpool.cxx b/sfx2/source/control/msgpool.cxx index f99e8978fa8c..41ddaa2bcd7e 100644 --- a/sfx2/source/control/msgpool.cxx +++ b/sfx2/source/control/msgpool.cxx @@ -46,7 +46,7 @@ SfxSlotPool::SfxSlotPool( SfxSlotPool *pParent, ResMgr* pResManager ) _pResMgr = SfxApplication::GetOrCreate()->GetOffResManager_Impl(); } -//==================================================================== + SfxSlotPool::~SfxSlotPool() { @@ -57,7 +57,7 @@ SfxSlotPool::~SfxSlotPool() delete _pGroups; } -//==================================================================== + // registers the availability of the Interface of functions void SfxSlotPool::RegisterInterface( SfxInterface& rInterface ) @@ -98,7 +98,7 @@ void SfxSlotPool::RegisterInterface( SfxInterface& rInterface ) } } -//==================================================================== + TypeId SfxSlotPool::GetSlotType( sal_uInt16 nId ) const { @@ -106,7 +106,7 @@ TypeId SfxSlotPool::GetSlotType( sal_uInt16 nId ) const return pSlot ? pSlot->GetType()->Type() : 0; } -//==================================================================== + // unregisters the availability of the Interface of functions void SfxSlotPool::ReleaseInterface( SfxInterface& rInterface ) diff --git a/sfx2/source/control/objface.cxx b/sfx2/source/control/objface.cxx index dd42fcf68db8..2be61cec80f2 100644 --- a/sfx2/source/control/objface.cxx +++ b/sfx2/source/control/objface.cxx @@ -37,7 +37,7 @@ DBG_NAME(SfxInterface) -//==================================================================== + extern "C" #ifdef WNT @@ -52,7 +52,7 @@ SfxCompareSlots_Impl( const void* pSmaller, const void* pBigger ) ( (int) ((SfxSlot*)pBigger)->GetSlotId() ); } -//========================================================================= + struct SfxObjectUI_Impl { @@ -111,9 +111,9 @@ struct SfxInterface_Impl static SfxObjectUI_Impl* CreateObjectBarUI_Impl( sal_uInt16 nPos, const ResId& rResId, sal_uInt32 nFeature, const OUString *pStr ); -//==================================================================== -//==================================================================== + + // constuctor, registeres a new unit SfxInterface::SfxInterface( const char *pClassName, diff --git a/sfx2/source/control/querystatus.cxx b/sfx2/source/control/querystatus.cxx index 47a456f71673..7b1dc9b3da99 100644 --- a/sfx2/source/control/querystatus.cxx +++ b/sfx2/source/control/querystatus.cxx @@ -202,7 +202,7 @@ SfxItemState SfxQueryStatus_Impl::QueryState( SfxPoolItem*& rpPoolItem ) return m_eState; } -//************************************************************************* + SfxQueryStatus::SfxQueryStatus( const Reference< XDispatchProvider >& rDispatchProvider, sal_uInt16 nSlotId, const OUString& rCommand ) { diff --git a/sfx2/source/control/request.cxx b/sfx2/source/control/request.cxx index 3d364d23dc8e..f60ded1c27c4 100644 --- a/sfx2/source/control/request.cxx +++ b/sfx2/source/control/request.cxx @@ -41,7 +41,7 @@ #include <sfx2/objface.hxx> #include <rtl/strbuf.hxx> -//=================================================================== + using namespace ::com::sun::star; @@ -93,7 +93,7 @@ struct SfxRequest_Impl: public SfxListener }; -//==================================================================== + void SfxRequest_Impl::Notify( SfxBroadcaster&, const SfxHint &rHint ) { @@ -102,7 +102,7 @@ void SfxRequest_Impl::Notify( SfxBroadcaster&, const SfxHint &rHint ) pAnti->Cancel(); } -//==================================================================== + void SfxRequest_Impl::SetPool( SfxItemPool *pNewPool ) { @@ -116,7 +116,7 @@ void SfxRequest_Impl::SetPool( SfxItemPool *pNewPool ) } } -//==================================================================== + SfxRequest::~SfxRequest() diff --git a/sfx2/source/control/shell.cxx b/sfx2/source/control/shell.cxx index 44d73a8a157b..77ea0648025a 100644 --- a/sfx2/source/control/shell.cxx +++ b/sfx2/source/control/shell.cxx @@ -58,15 +58,15 @@ public: } }; -//==================================================================== + DBG_NAME(SfxShell) -//==================================================================== + TYPEINIT0(SfxShell); -//==================================================================== + class SfxVerbSlotArr_Impl : public std::vector<SfxSlot*> { public: @@ -79,9 +79,9 @@ public: using namespace com::sun::star; -//========================================================================= + // SfxShell_Impl -//========================================================================= + struct SfxShell_Impl: public SfxBroadcaster { OUString aObjectName; // Name of Sbx-Objects @@ -105,9 +105,9 @@ struct SfxShell_Impl: public SfxBroadcaster ~SfxShell_Impl() { delete pExecuter; delete pUpdater;} }; -//========================================================================= + // SfxShell -//========================================================================= + void SfxShell::EmptyExecStub(SfxShell *, SfxRequest &) { diff --git a/sfx2/source/control/statcach.cxx b/sfx2/source/control/statcach.cxx index bd78e889c158..43589bb5e7d6 100644 --- a/sfx2/source/control/statcach.cxx +++ b/sfx2/source/control/statcach.cxx @@ -53,7 +53,7 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::util; -//==================================================================== + DBG_NAME(SfxStateCache) DBG_NAME(SfxStateCacheSetState) diff --git a/sfx2/source/dialog/backingwindow.cxx b/sfx2/source/dialog/backingwindow.cxx index 5a6c242c49cf..f988fc7b7b1d 100644 --- a/sfx2/source/dialog/backingwindow.cxx +++ b/sfx2/source/dialog/backingwindow.cxx @@ -90,12 +90,12 @@ BackingWindow::BackingWindow( Window* i_pParent ) : //Containers are invisible to cursor traversal //So on pressing "right" when in Help the //extension button is considered as a candidate - // + //But the containers are not invisible to the PushButton ctor which checks //if the preceeding window of its parent is a button and if it then //defaults to grouping with it and if it is not a button defaults to //setting itself as the start of a new group. - // + //So here take the second button and set it as explicitly not the start //of a group, i.e. allow it to be grouped with the preceeding //PushButton so when seen as a candidate by cursor travelling diff --git a/sfx2/source/dialog/dialog.src b/sfx2/source/dialog/dialog.src index 08371c480d46..fb5c2c9b9e0e 100644 --- a/sfx2/source/dialog/dialog.src +++ b/sfx2/source/dialog/dialog.src @@ -95,7 +95,7 @@ Menu MN_CONTEXT_TEMPLDLG }; }; - //------------------------------------------------------------------------ + String SID_NAVIGATOR { Text [ en-US ] = "Navigator"; diff --git a/sfx2/source/dialog/filtergrouping.cxx b/sfx2/source/dialog/filtergrouping.cxx index 74dc1fc8b4e5..29be1aedef9f 100644 --- a/sfx2/source/dialog/filtergrouping.cxx +++ b/sfx2/source/dialog/filtergrouping.cxx @@ -39,10 +39,10 @@ #include <map> #include <algorithm> -//........................................................................ + namespace sfx2 { -//........................................................................ + using namespace ::com::sun::star::uno; using namespace ::com::sun::star::ui::dialogs; @@ -50,7 +50,7 @@ namespace sfx2 using namespace ::com::sun::star::beans; using namespace ::utl; - //==================================================================== + /** Some general words about what's going on here .... @@ -118,7 +118,7 @@ namespace sfx2 */ - //==================================================================== + typedef StringPair FilterDescriptor; // a single filter or a filter class (display name and filter mask) typedef ::std::list< FilterDescriptor > FilterGroup; // a list of single filter entries @@ -144,9 +144,9 @@ namespace sfx2 typedef ::std::vector< OUString > StringArray; -// ======================================================================= + // = reading of configuration data -// ======================================================================= + void lcl_ReadFilterClass( const OConfigurationNode& _rClassesNode, const OUString& _rLogicalClassName, @@ -229,7 +229,7 @@ namespace sfx2 _rGlobalClasses.clear(); _rGlobalClassNames.clear(); - //================================================================ + // get the list describing the order of all global classes Sequence< OUString > aGlobalClasses; _rFilterClassification.getNodeValue( "GlobalFilters/Order" ) >>= aGlobalClasses; @@ -255,7 +255,7 @@ namespace sfx2 // while aClassReferrer maps from the logical name of the class to the position within _rGlobalClasses where // it's dummy entry resides - //================================================================ + // go for all the single class entries OConfigurationNode aFilterClassesNode = _rFilterClassification.openNode( "GlobalFilters/Classes" ); @@ -313,7 +313,7 @@ namespace sfx2 void lcl_ReadClassification( FilterClassList& _rGlobalClasses, StringArray& _rGlobalClassNames, FilterClassList& _rLocalClasses ) { - //================================================================ + // open our config node OConfigurationTreeRoot aFilterClassification = OConfigurationTreeRoot::createWithComponentContext( ::comphelper::getProcessComponentContext(), @@ -322,19 +322,19 @@ namespace sfx2 OConfigurationTreeRoot::CM_READONLY ); - //================================================================ + // go for the global classes lcl_ReadGlobalFilters( aFilterClassification, _rGlobalClasses, _rGlobalClassNames ); - //================================================================ + // fo for the local classes lcl_ReadLocalFilters( aFilterClassification, _rLocalClasses ); } -// ======================================================================= + // = grouping and classifying -// ======================================================================= + // a struct which adds helps remembering a reference to a class entry @@ -403,14 +403,14 @@ namespace sfx2 static const sal_Unicode s_cWildcardSeparator( ';' ); - //==================================================================== + const OUString& getSeparatorString() { static OUString s_sSeparatorString( &s_cWildcardSeparator, 1 ); return s_sSeparatorString; } - //==================================================================== + struct CheckAppendSingleWildcard : public ::std::unary_function< OUString, void > { OUString& _rToBeExtended; @@ -446,7 +446,7 @@ namespace sfx2 } }; - //==================================================================== + // a helper struct which adds a fixed (Sfx-)filter to a filter group entry given by iterator struct AppendWildcardToDescriptor : public ::std::unary_function< FilterGroupEntryReferrer::value_type, void > { @@ -468,7 +468,7 @@ namespace sfx2 } }; - //==================================================================== + AppendWildcardToDescriptor::AppendWildcardToDescriptor( const OUString& _rWildCard ) { DBG_ASSERT( !_rWildCard.isEmpty(), @@ -572,13 +572,13 @@ namespace sfx2 { _rAllFilters.clear(); - // =============================================================== + // read the classification of filters FilterClassList aGlobalClasses, aLocalClasses; StringArray aGlobalClassNames; lcl_ReadClassification( aGlobalClasses, aGlobalClassNames, aLocalClasses ); - // =============================================================== + // for the global filter classes FilterGroupEntryReferrer aGlobalClassesRef; lcl_InitGlobalClasses( _rAllFilters, aGlobalClasses, aGlobalClassesRef ); @@ -589,7 +589,7 @@ namespace sfx2 while ( nGlobalClasses-- ) _rAllFilters.push_back( FilterGroup() ); - // =============================================================== + // for the local classes: // if n filters belong to a local class, they do not appear in their respective group explicitly, instead // and entry for the class is added to the group and the extensions of the filters are collected under @@ -605,7 +605,7 @@ namespace sfx2 // (where they finally belong to) MapGroupEntry2GroupEntry aLocalFinalPositions; - // =============================================================== + // now add the filters // the group which we currently work with GroupedFilterList::iterator aCurrentGroup = _rAllFilters.end(); // no current group @@ -623,7 +623,7 @@ namespace sfx2 DBG_ASSERT( !sFilterWildcard.isEmpty(), "sfx2::lcl_GroupAndClassify: invalid wildcard of this filter!" ); - // =========================================================== + // check for a change in the group OUString aServiceName = pFilter->GetServiceName(); if ( aServiceName != aCurrentServiceName ) @@ -663,7 +663,7 @@ namespace sfx2 if (aCurrentGroup == _rAllFilters.end()) aCurrentGroup = _rAllFilters.begin(); - // =========================================================== + // check if the filter is part of a global group ::std::pair< FilterGroupEntryReferrer::iterator, FilterGroupEntryReferrer::iterator > aBelongsTo = aGlobalClassesRef.equal_range( sFilterName ); @@ -675,7 +675,7 @@ namespace sfx2 aExtendWildcard ); - // =========================================================== + // add the filter to it's group // for this, check if the filter is part of a local filter @@ -759,9 +759,9 @@ namespace sfx2 } }; -// ======================================================================= + // = handling for the "all files" entry -// ======================================================================= + sal_Bool lcl_hasAllFilesFilter( TSortedFilterList& _rFilterMatcher, OUString& /* [out] */ _rAllFilterName ) @@ -769,7 +769,7 @@ namespace sfx2 sal_Bool bHasAll = sal_False; _rAllFilterName = SfxResId( STR_SFX_FILTERNAME_ALL ).toString(); - // =============================================================== + // check if there's already a filter <ALL> for ( const SfxFilter* pFilter = _rFilterMatcher.First(); pFilter && !bHasAll; pFilter = _rFilterMatcher.Next() ) { @@ -782,7 +782,7 @@ namespace sfx2 void lcl_EnsureAllFilesEntry( TSortedFilterList& _rFilterMatcher, GroupedFilterList& _rFilters ) { - // =============================================================== + OUString sAllFilterName; if ( !lcl_hasAllFilesFilter( _rFilterMatcher, sAllFilterName ) ) { @@ -796,9 +796,9 @@ namespace sfx2 } } -// ======================================================================= + // = filling an XFilterManager -// ======================================================================= + struct AppendFilterGroup : public ::std::unary_function< FilterGroup, void > @@ -1139,16 +1139,16 @@ namespace sfx2 if ( !_rxFilterManager.is() ) return; - // =============================================================== + // group and classify the filters GroupedFilterList aAllFilters; lcl_GroupAndClassify( _rFilterMatcher, aAllFilters ); - // =============================================================== + // ensure that we have the one "all files" entry lcl_EnsureAllFilesEntry( _rFilterMatcher, aAllFilters ); - // =============================================================== + // the first non-empty string - which we assume is the first overall entry if ( !aAllFilters.empty() ) { @@ -1160,7 +1160,7 @@ namespace sfx2 aGroup.appendGroup( rFirstGroup, false ); } - // =============================================================== + // append the filters to the manager if ( !aAllFilters.empty() ) { @@ -1198,9 +1198,9 @@ namespace sfx2 return sRet; } -//........................................................................ + } // namespace sfx2 -//........................................................................ + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sfx2/source/dialog/filtergrouping.hxx b/sfx2/source/dialog/filtergrouping.hxx index 603e15de5e3d..65daf82b56ae 100644 --- a/sfx2/source/dialog/filtergrouping.hxx +++ b/sfx2/source/dialog/filtergrouping.hxx @@ -24,10 +24,10 @@ #include <com/sun/star/container/XEnumeration.hpp> #include "filedlgimpl.hxx" -//........................................................................ + namespace sfx2 { -//........................................................................ + class TSortedFilterList { @@ -46,7 +46,7 @@ namespace sfx2 const SfxFilter* impl_getFilter(sal_Int32 nIndex); }; - //-------------------------------------------------------------------- + /** adds the given filters to the filter manager. <p>To be used when saving generic files.</p> */ @@ -65,7 +65,7 @@ namespace sfx2 FileDialogHelper_Impl& _rFileDlgImpl ); - //-------------------------------------------------------------------- + /** adds the given filters to the filter manager. <p>To be used when opening generic files.</p> */ @@ -76,7 +76,7 @@ namespace sfx2 FileDialogHelper_Impl& _rFileDlgImpl ); - //-------------------------------------------------------------------- + /** adds the given extension to the display text. <p>To be used when opening or save generic files.</p> */ @@ -87,9 +87,9 @@ namespace sfx2 FileDialogHelper_Impl& _rFileDlgImpl ); -//........................................................................ + } // namespace sfx2 -//........................................................................ + #endif // INCLUDED_SFX2_SOURCE_DIALOG_FILTERGROUPING_HXX diff --git a/sfx2/source/dialog/itemconnect.cxx b/sfx2/source/dialog/itemconnect.cxx index 1948ef4b650b..8fe25fef6680 100644 --- a/sfx2/source/dialog/itemconnect.cxx +++ b/sfx2/source/dialog/itemconnect.cxx @@ -23,13 +23,13 @@ #include <list> #include <svl/itempool.hxx> -// ============================================================================ + namespace sfx { -// ============================================================================ + // Helpers -// ============================================================================ + namespace { @@ -70,17 +70,17 @@ void ItemWrapperHelper::RemoveDefaultItem( SfxItemSet& rDestSet, const SfxItemSe rDestSet.ClearItem( nWhich ); } -// ============================================================================ + // Base control wrapper classes -// ============================================================================ + ControlWrapperBase::~ControlWrapperBase() { } -// ============================================================================ + // Single control wrappers -// ============================================================================ + DummyWindowWrapper::DummyWindowWrapper( Window& rWindow ) : SingleControlWrapperType( rWindow ) @@ -162,9 +162,9 @@ void ColorListBoxWrapper::SetControlValue( Color aColor ) GetControl().SelectEntry( aColor ); } -// ============================================================================ + // Multi control wrappers -// ============================================================================ + typedef std::vector< ControlWrapperBase* > ControlWrpVec; typedef ControlWrpVec::iterator ControlWrpVecI; @@ -209,9 +209,9 @@ void MultiControlWrapperHelper::SetControlDontKnow( bool bSet ) (*aIt)->SetControlDontKnow( bSet ); } -// ============================================================================ + // Base connection classes -// ============================================================================ + ItemConnectionBase::ItemConnectionBase( ItemConnFlags nFlags ) : mnFlags( nFlags ) @@ -254,9 +254,9 @@ TriState ItemConnectionBase::GetShowState( bool bKnown ) const return lclConvertToTriState( bKnown, (mnFlags & ITEMCONN_SHOW_KNOWN) != 0, (mnFlags & ITEMCONN_HIDE_UNKNOWN) != 0 ); } -// ============================================================================ + // Standard connections -// ============================================================================ + DummyItemConnection::DummyItemConnection( sal_uInt16 nSlot, Window& rWindow, ItemConnFlags nFlags ) : ItemConnectionBase( nFlags ), @@ -280,9 +280,9 @@ bool DummyItemConnection::FillItemSet( SfxItemSet& /*rDestSet*/, const SfxItemSe return false; // item set not changed } -// ============================================================================ + // Array of connections -// ============================================================================ + class ItemConnectionArrayImpl { @@ -358,7 +358,7 @@ bool ItemConnectionArray::FillItemSet( SfxItemSet& rDestSet, const SfxItemSet& r return mxImpl->FillItemSet( rDestSet, rOldSet ); } -// ============================================================================ + } // namespace sfx diff --git a/sfx2/source/dialog/partwnd.cxx b/sfx2/source/dialog/partwnd.cxx index 63b156247d2c..591a9598f6fc 100644 --- a/sfx2/source/dialog/partwnd.cxx +++ b/sfx2/source/dialog/partwnd.cxx @@ -43,9 +43,9 @@ #include <sfx2/frame.hxx> #include <sfx2/sfxuno.hxx> -//**************************************************************************** + // SfxPartChildWnd_Impl -//**************************************************************************** + SFX_IMPL_DOCKINGWINDOW( SfxPartChildWnd_Impl, SID_BROWSER ); @@ -93,9 +93,9 @@ sal_Bool SfxPartChildWnd_Impl::QueryClose() return ( (SfxPartDockWnd_Impl*)pWindow )->QueryClose(); } -//**************************************************************************** + // SfxPartDockWnd_Impl -//**************************************************************************** + SfxPartDockWnd_Impl::SfxPartDockWnd_Impl ( @@ -138,13 +138,13 @@ SfxPartDockWnd_Impl::SfxPartDockWnd_Impl } } -//**************************************************************************** + SfxPartDockWnd_Impl::~SfxPartDockWnd_Impl() { } -//**************************************************************************** + void SfxPartDockWnd_Impl::Resize() @@ -157,7 +157,7 @@ void SfxPartDockWnd_Impl::Resize() SfxDockingWindow::Resize(); } -//**************************************************************************** + sal_Bool SfxPartDockWnd_Impl::QueryClose() { @@ -177,7 +177,7 @@ sal_Bool SfxPartDockWnd_Impl::QueryClose() return bClose; } -//**************************************************************************** + bool SfxPartDockWnd_Impl::Notify( NotifyEvent& rEvt ) { diff --git a/sfx2/source/dialog/recfloat.src b/sfx2/source/dialog/recfloat.src index 5acb91e66ad9..51c9c79f9a70 100644 --- a/sfx2/source/dialog/recfloat.src +++ b/sfx2/source/dialog/recfloat.src @@ -20,7 +20,7 @@ #include "helpid.hrc" #include "dialog.hrc" - // ----------------------------------------------------------------------- + #define STD_MASKCOLOR Color { Red = 0xC000; Green = 0xC000; Blue = 0xC000; } FloatingWindow SID_RECORDING_FLOATWINDOW diff --git a/sfx2/source/dialog/srchdlg.cxx b/sfx2/source/dialog/srchdlg.cxx index 324de6c3b269..3dada2fd5621 100644 --- a/sfx2/source/dialog/srchdlg.cxx +++ b/sfx2/source/dialog/srchdlg.cxx @@ -29,15 +29,15 @@ using namespace ::com::sun::star::uno; -// ============================================================================ + namespace sfx2 { #define MAX_SAVE_COUNT (sal_uInt16)10 -// ============================================================================ + // SearchDialog -// ============================================================================ + SearchDialog::SearchDialog(Window* pWindow, const OUString& rConfigName) : ModelessDialog(pWindow, "SearchDialog", "sfx/ui/searchdialog.ui") @@ -165,10 +165,10 @@ void SearchDialog::Move() m_sWinState = GetWindowState( WINDOWSTATE_MASK_POS | WINDOWSTATE_MASK_STATE ); } -// ============================================================================ + } // namespace sfx2 -// ============================================================================ + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sfx2/source/dialog/taskpane.cxx b/sfx2/source/dialog/taskpane.cxx index 63ddd9598f33..f8687b149077 100644 --- a/sfx2/source/dialog/taskpane.cxx +++ b/sfx2/source/dialog/taskpane.cxx @@ -54,10 +54,10 @@ #include <tools/urlobj.hxx> #include <boost/noncopyable.hpp> -//...................................................................................................................... + namespace sfx2 { -//...................................................................................................................... + using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::XComponentContext; @@ -89,9 +89,9 @@ namespace sfx2 namespace PosSize = ::com::sun::star::awt::PosSize; - //================================================================================================================== + //= helpers - //================================================================================================================== + namespace { @@ -196,9 +196,9 @@ 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 ) @@ -228,9 +228,9 @@ namespace sfx2 m_aTaskPane.SetPosSizePixel( Point(), GetContentWindow().GetOutputSizePixel() ); } - //================================================================================================================== + //= TaskPaneWrapper - //================================================================================================================== + SFX_IMPL_DOCKINGWINDOW( TaskPaneWrapper, SID_TASKPANE ); @@ -259,9 +259,9 @@ namespace sfx2 pDockingWindow->ActivateToolPanel( i_rPanelURL ); } - //================================================================================================================== + //= CustomPanelUIElement - //================================================================================================================== + class CustomPanelUIElement { public: @@ -291,9 +291,9 @@ namespace sfx2 Reference< XWindow > m_xPanelWindow; }; - //================================================================================================================== + //= CustomToolPanel - //================================================================================================================== + class CustomToolPanel : public ::svt::ToolPanelBase { public: @@ -497,9 +497,9 @@ namespace sfx2 return xPanelAccessible; } - //================================================================================================================== + //= ModuleTaskPane_Impl - //================================================================================================================== + class ModuleTaskPane_Impl : public ::boost::noncopyable { public: @@ -719,9 +719,9 @@ namespace sfx2 m_aPanelDeck.SetLayouter( new ::svt::TabDeckLayouter( m_aPanelDeck, m_aPanelDeck, i_eTabAlignment, i_eTabContent ) ); } - //================================================================================================================== + //= ModuleTaskPane - //================================================================================================================== + ModuleTaskPane::ModuleTaskPane( Window& i_rParentWindow, const Reference< XFrame >& i_rDocumentFrame ) :Window( &i_rParentWindow, WB_DIALOGCONTROL ) @@ -784,9 +784,9 @@ namespace sfx2 m_pImpl->SetTabsLayout( i_eTabAlignment, i_eTabContent ); } - // ===================================================================================================================== + // = PanelSelectorLayout - // ===================================================================================================================== + enum PanelSelectorLayout { LAYOUT_DRAWERS, @@ -796,9 +796,9 @@ namespace sfx2 LAYOUT_TABS_BOTTOM }; - //================================================================================================================== + //= helper - //================================================================================================================== + namespace { PanelSelectorLayout lcl_getTabLayoutFromAlignment( const SfxChildAlignment i_eAlignment ) @@ -817,9 +817,9 @@ namespace sfx2 } } - // ===================================================================================================================== + // = PanelDescriptor - // ===================================================================================================================== + /** is a helper class for TaskPaneController_Impl, holding the details about a single panel which is not contained in the IToolPanel implementation itself. */ @@ -841,9 +841,9 @@ namespace sfx2 } }; - //================================================================================================================== + //= TaskPaneController_Impl - //================================================================================================================== + class TaskPaneController_Impl :public ::boost::noncopyable ,public ::svt::IToolPanelDeckListener { @@ -1252,9 +1252,9 @@ namespace sfx2 } SAL_WNODEPRECATED_DECLARATIONS_POP - //================================================================================================================== + //= TaskPaneController - //================================================================================================================== + TaskPaneController::TaskPaneController( ModuleTaskPane& i_rTaskPane, TitledDockingWindow& i_rDockingWindow ) :m_pImpl( new TaskPaneController_Impl( i_rTaskPane, i_rDockingWindow ) ) @@ -1272,8 +1272,8 @@ namespace sfx2 m_pImpl->ActivateToolPanel( i_rPanelURL ); } -//...................................................................................................................... + } // namespace sfx2 -//...................................................................................................................... + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sfx2/source/dialog/templdlg.cxx b/sfx2/source/dialog/templdlg.cxx index e4bcbb541a05..61c847daa2e5 100644 --- a/sfx2/source/dialog/templdlg.cxx +++ b/sfx2/source/dialog/templdlg.cxx @@ -69,7 +69,7 @@ using namespace ::com::sun::star::beans; using namespace ::com::sun::star::frame; using namespace ::com::sun::star::uno; -//========================================================================= + // Window is now created dynamically. So here margins, etc. #define SFX_TEMPLDLG_HFRAME 3 @@ -85,7 +85,7 @@ static sal_uInt16 nLastItemId = USHRT_MAX; // filter box has maximum 14 entries visible #define MAX_FILTER_ENTRIES 14 -//========================================================================= + TYPEINIT0(SfxCommonTemplateDialog_Impl); TYPEINIT1(SfxTemplateDialog_Impl,SfxCommonTemplateDialog_Impl); diff --git a/sfx2/source/dialog/titledockwin.cxx b/sfx2/source/dialog/titledockwin.cxx index 1499ca0a28eb..e51167ab0eb4 100644 --- a/sfx2/source/dialog/titledockwin.cxx +++ b/sfx2/source/dialog/titledockwin.cxx @@ -27,14 +27,14 @@ #include <svl/eitem.hxx> #include <vcl/settings.hxx> -//...................................................................................................................... + namespace sfx2 { -//...................................................................................................................... - //================================================================================================================== + + //= TitledDockingWindow - //================================================================================================================== + TitledDockingWindow::TitledDockingWindow( SfxBindings* i_pBindings, SfxChildWindow* i_pChildWindow, Window* i_pParent, WinBits i_nStyle ) @@ -337,8 +337,8 @@ namespace sfx2 } } -//...................................................................................................................... + } // namespace sfx2 -//...................................................................................................................... + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sfx2/source/dialog/tplpitem.cxx b/sfx2/source/dialog/tplpitem.cxx index 58b7ce855a55..19836f2a124a 100644 --- a/sfx2/source/dialog/tplpitem.cxx +++ b/sfx2/source/dialog/tplpitem.cxx @@ -25,7 +25,7 @@ TYPEINIT1_AUTOFACTORY(SfxTemplateItem, SfxFlagItem); -//========================================================================= + SfxTemplateItem::SfxTemplateItem() : SfxFlagItem() diff --git a/sfx2/source/doc/Metadatable.cxx b/sfx2/source/doc/Metadatable.cxx index 2cf506594ddf..67ac903e573b 100644 --- a/sfx2/source/doc/Metadatable.cxx +++ b/sfx2/source/doc/Metadatable.cxx @@ -126,7 +126,7 @@ static bool isStylesFile (OUString const & i_rPath) } -//============================================================================= + // XML ID handling --------------------------------------------------- /** handles registration of XMetadatable. @@ -346,7 +346,7 @@ private: }; -//============================================================================= + // XmlIdRegistry ::sfx2::IXmlIdRegistry * createXmlIdRegistry(const bool i_DocIsClipboard) @@ -425,7 +425,7 @@ template< typename T > return id; } -//============================================================================= + // Document XML ID Registry (_Impl) /// element list @@ -623,7 +623,7 @@ XmlIdRegistryDocument::XmlIdRegistry_Impl::TryInsertMetadatable( } } -//============================================================================= + // Document XML ID Registry @@ -906,7 +906,7 @@ XmlIdRegistryDocument::JoinMetadatables( } -//============================================================================= + // Clipboard XML ID Registry (_Impl) struct RMapEntry @@ -1080,7 +1080,7 @@ XmlIdRegistryClipboard::XmlIdRegistry_Impl::TryInsertMetadatable( } } -//============================================================================= + // Clipboard XML ID Registry @@ -1292,7 +1292,7 @@ XmlIdRegistryClipboard::SourceLink(Metadatable const& i_rObject) } -//============================================================================= + // Metadatable mixin @@ -1574,7 +1574,7 @@ Metadatable::JoinMetadatable(Metadatable const & i_rOther, } -//============================================================================= + // XMetadatable mixin // ::com::sun::star::rdf::XNode: @@ -1666,7 +1666,7 @@ throw (uno::RuntimeException) } // namespace sfx2 -//============================================================================= + #if OSL_DEBUG_LEVEL > 1 diff --git a/sfx2/source/doc/SfxDocumentMetaData.cxx b/sfx2/source/doc/SfxDocumentMetaData.cxx index 856177d7acfc..12c5d9f1b0a7 100644 --- a/sfx2/source/doc/SfxDocumentMetaData.cxx +++ b/sfx2/source/doc/SfxDocumentMetaData.cxx @@ -458,8 +458,8 @@ const char* s_stdMeta[] = { "dc:date", // dateTime "meta:print-date", // dateTime "meta:template", // XLink - "meta:auto-reload", // ... - "meta:hyperlink-behaviour", // ... + "meta:auto-reload", + "meta:hyperlink-behaviour", "dc:language", // language "meta:editing-cycles", // nonNegativeInteger "meta:editing-duration", // duration diff --git a/sfx2/source/doc/doc.src b/sfx2/source/doc/doc.src index 515138e3316d..2d09e7483422 100644 --- a/sfx2/source/doc/doc.src +++ b/sfx2/source/doc/doc.src @@ -20,7 +20,7 @@ #include "doc.hrc" #define __RSC - // ----------------------------------------------------------------------- + QueryBox MSG_CONFIRM_FILTER { Buttons = WB_YES_NO ; diff --git a/sfx2/source/doc/docfac.cxx b/sfx2/source/doc/docfac.cxx index 0a04920f25c1..6839cbfd9fc2 100644 --- a/sfx2/source/doc/docfac.cxx +++ b/sfx2/source/doc/docfac.cxx @@ -55,15 +55,15 @@ using namespace ::com::sun::star; -//======================================================================== + typedef std::vector<SfxViewFactory*> SfxViewFactoryArr_Impl; -//======================================================================== + DBG_NAME(SfxObjectFactory) -//======================================================================== + struct SfxObjectFactory_Impl { @@ -86,7 +86,7 @@ struct SfxObjectFactory_Impl {} }; -//======================================================================== + SfxFilterContainer* SfxObjectFactory::GetFilterContainer( sal_Bool /*bForceLoad*/ ) const { diff --git a/sfx2/source/doc/docfile.cxx b/sfx2/source/doc/docfile.cxx index 141cd90559ac..45c6e3cc0cd7 100644 --- a/sfx2/source/doc/docfile.cxx +++ b/sfx2/source/doc/docfile.cxx @@ -164,7 +164,7 @@ bool IsLockingUsed() #endif } // anonymous namespace -//========================================================== + @@ -857,7 +857,7 @@ void SfxMedium::SetEncryptionDataToStorage_Impl() // actually, the checks for sftp: here are just wishful thinking; I // don't this there is any support for actually editing documents // behind sftp: URLs anyway. -// + // Sure, there could perhaps be a 3rd-party extension that brings UCB // the potential to handle files behind sftp:. But there could also be // an extension that handles some arbitrary foobar: scheme *and* it diff --git a/sfx2/source/doc/docinf.cxx b/sfx2/source/doc/docinf.cxx index f3c56bd05118..c540545a305b 100644 --- a/sfx2/source/doc/docinf.cxx +++ b/sfx2/source/doc/docinf.cxx @@ -32,7 +32,7 @@ #include <vcl/gdimtf.hxx> #include <vcl/dibtools.hxx> #include "oleprops.hxx" -// ============================================================================ + // stream names #define STREAM_SUMMARYINFO "\005SummaryInformation" diff --git a/sfx2/source/doc/docmacromode.cxx b/sfx2/source/doc/docmacromode.cxx index e7e8a701ffbc..5752b6cb1d0a 100644 --- a/sfx2/source/doc/docmacromode.cxx +++ b/sfx2/source/doc/docmacromode.cxx @@ -38,10 +38,10 @@ #include <tools/diagnose_ex.h> #include <tools/urlobj.hxx> -//........................................................................ + namespace sfx2 { -//........................................................................ + using ::com::sun::star::uno::Reference; using ::com::sun::star::task::XInteractionHandler; @@ -67,9 +67,9 @@ namespace sfx2 namespace MacroExecMode = ::com::sun::star::document::MacroExecMode; - //==================================================================== + //= DocumentMacroMode_Data - //==================================================================== + struct DocumentMacroMode_Data { IMacroDocumentAccess& m_rDocumentAccess; @@ -84,12 +84,12 @@ namespace sfx2 } }; - //==================================================================== + //= helper - //==================================================================== + namespace { - //................................................................ + void lcl_showGeneralSfxErrorOnce( const Reference< XInteractionHandler >& rxHandler, const sal_Int32 nSfxErrorCode, sal_Bool& rbAlreadyShown ) { if ( rbAlreadyShown ) @@ -102,13 +102,13 @@ namespace sfx2 rbAlreadyShown = sal_True; } - //................................................................ + void lcl_showMacrosDisabledError( const Reference< XInteractionHandler >& rxHandler, sal_Bool& rbAlreadyShown ) { lcl_showGeneralSfxErrorOnce( rxHandler, ERRCODE_SFX_MACROS_SUPPORT_DISABLED, rbAlreadyShown ); } - //................................................................ + void lcl_showDocumentMacrosDisabledError( const Reference< XInteractionHandler >& rxHandler, sal_Bool& rbAlreadyShown ) { #ifdef MACOSX @@ -118,7 +118,7 @@ namespace sfx2 #endif } - //................................................................ + sal_Bool lcl_showMacroWarning( const Reference< XInteractionHandler >& rxHandler, const OUString& rDocumentLocation ) { @@ -128,9 +128,9 @@ namespace sfx2 } } - //==================================================================== + //= DocumentMacroMode - //==================================================================== + DocumentMacroMode::DocumentMacroMode( IMacroDocumentAccess& rDocumentAccess ) :m_pData( new DocumentMacroMode_Data( rDocumentAccess ) ) @@ -434,8 +434,8 @@ namespace sfx2 return bAllow; } -//........................................................................ + } // namespace sfx2 -//........................................................................ + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sfx2/source/doc/docstoragemodifylistener.cxx b/sfx2/source/doc/docstoragemodifylistener.cxx index 5bb66ba48ea4..a76a5e2923d7 100644 --- a/sfx2/source/doc/docstoragemodifylistener.cxx +++ b/sfx2/source/doc/docstoragemodifylistener.cxx @@ -20,10 +20,10 @@ #include <sfx2/docstoragemodifylistener.hxx> #include <comphelper/solarmutex.hxx> -//........................................................................ + namespace sfx2 { -//........................................................................ + using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::XInterface; @@ -36,9 +36,9 @@ namespace sfx2 using ::com::sun::star::uno::makeAny; using ::com::sun::star::lang::EventObject; - //==================================================================== + //= - //==================================================================== + DocumentStorageModifyListener::DocumentStorageModifyListener( IModifiableDocument& _rDocument, comphelper::SolarMutex& _rMutex ) :m_pDocument( &_rDocument ) @@ -75,8 +75,8 @@ namespace sfx2 // in case the document is re-based to another storage. } -//........................................................................ + } // namespace sfx2 -//........................................................................ + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sfx2/source/doc/doctempl.cxx b/sfx2/source/doc/doctempl.cxx index c8fb07e37b11..35cb048a568e 100644 --- a/sfx2/source/doc/doctempl.cxx +++ b/sfx2/source/doc/doctempl.cxx @@ -97,14 +97,14 @@ using namespace ::ucbhelper; using ::std::vector; using ::std::advance; -//======================================================================== + #define TITLE "Title" #define TARGET_URL "TargetURL" #define COMMAND_TRANSFER "transfer" -//======================================================================== + class RegionData_Impl; @@ -279,7 +279,7 @@ static sal_Bool getTextProperty_Impl( Content& rContent, const OUString& rPropName, OUString& rPropValue ); -//======================================================================== + OUString SfxDocumentTemplates::GetFullRegionName ( diff --git a/sfx2/source/doc/doctemplates.cxx b/sfx2/source/doc/doctemplates.cxx index cea14a6007e1..0a051139bb95 100644 --- a/sfx2/source/doc/doctemplates.cxx +++ b/sfx2/source/doc/doctemplates.cxx @@ -84,7 +84,7 @@ #include <vector> -//============================================================================= + #define SERVICENAME_TYPEDETECTION "com.sun.star.document.TypeDetection" @@ -111,7 +111,7 @@ #define C_DELIM ';' -//============================================================================= + using namespace ::com::sun::star; using namespace ::com::sun::star::beans; @@ -146,7 +146,7 @@ class WaitWindow_Impl : public WorkWindow #define X_OFFSET 15 #define Y_OFFSET 15 -//============================================================================= + struct NamePair_Impl { @@ -314,7 +314,7 @@ public: void finished() { mpUpdater = NULL; } }; -//============================================================================= + class Updater_Impl : public ::osl::Thread { @@ -329,7 +329,7 @@ public: virtual void SAL_CALL onTerminated(); }; -//============================================================================= + class DocTemplates_EntryData_Impl { @@ -366,7 +366,7 @@ public: void setType( const OUString& rType ) { maType = rType; } }; -//============================================================================= + class GroupData_Impl { diff --git a/sfx2/source/doc/doctemplateslocal.cxx b/sfx2/source/doc/doctemplateslocal.cxx index e250d9f0bca6..8faa07de09bb 100644 --- a/sfx2/source/doc/doctemplateslocal.cxx +++ b/sfx2/source/doc/doctemplateslocal.cxx @@ -87,7 +87,7 @@ void SAL_CALL DocTemplLocaleHelper::WriteGroupLocalizationSequence( const uno::R xWriterHandler->endDocument(); } -// ================================================================================== + uno::Sequence< beans::StringPair > SAL_CALL DocTemplLocaleHelper::ReadLocalizationSequence_Impl( const uno::Reference< io::XInputStream >& xInStream, const OUString& aStringID, const uno::Reference< uno::XComponentContext > xContext ) diff --git a/sfx2/source/doc/docundomanager.cxx b/sfx2/source/doc/docundomanager.cxx index 5401b8d7b047..b8e85653ee5d 100644 --- a/sfx2/source/doc/docundomanager.cxx +++ b/sfx2/source/doc/docundomanager.cxx @@ -36,10 +36,10 @@ #include <boost/noncopyable.hpp> #include <stack> -//...................................................................................................................... + namespace sfx2 { -//...................................................................................................................... + using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::XInterface; @@ -71,9 +71,9 @@ namespace sfx2 using ::svl::IUndoManager; - //================================================================================================================== + //= DocumentUndoManager_Impl - //================================================================================================================== + struct DocumentUndoManager_Impl : public ::framework::IUndoManagerImplementation { DocumentUndoManager& rAntiImpl; @@ -160,9 +160,9 @@ namespace sfx2 } } - //================================================================================================================== + //= SolarMutexFacade - //================================================================================================================== + /** a facade for the SolarMutex, implementing ::framework::IMutex (as opposed to ::vos::IMutex) */ class SolarMutexFacade : public ::framework::IMutex @@ -185,9 +185,9 @@ namespace sfx2 } }; - //================================================================================================================== + //= UndoManagerGuard - //================================================================================================================== + class UndoManagerGuard :public ::framework::IMutexGuard ,public ::boost::noncopyable { @@ -224,9 +224,9 @@ namespace sfx2 SolarMutexFacade m_solarMutexFacade; }; - //================================================================================================================== + //= DocumentUndoManager - //================================================================================================================== + DocumentUndoManager::DocumentUndoManager( SfxBaseModel& i_document ) :SfxModelSubComponent( i_document ) @@ -445,8 +445,8 @@ namespace sfx2 throw NoSupportException( OUString(), m_pImpl->getThis() ); } -//...................................................................................................................... + } // namespace sfx2 -//...................................................................................................................... + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sfx2/source/doc/guisaveas.cxx b/sfx2/source/doc/guisaveas.cxx index be619af4a12d..72918b4174d1 100644 --- a/sfx2/source/doc/guisaveas.cxx +++ b/sfx2/source/doc/guisaveas.cxx @@ -181,9 +181,9 @@ static sal_Int32 getDontFlags( sal_Int8 nStoreMode ) | ( ( ( nStoreMode & EXPORT_REQUESTED ) && !( nStoreMode & WIDEEXPORT_REQUESTED ) ) ? SFX_FILTER_IMPORT : 0 ) ); } -//========================================================================= + // class DocumentSettingsGuard -//========================================================================= + class DocumentSettingsGuard { @@ -244,9 +244,9 @@ public: }; } // anonymous namespace -//========================================================================= + // class ModelData_Impl -//========================================================================= + class ModelData_Impl { SfxStoringHelper* m_pOwner; @@ -1298,9 +1298,9 @@ OUString ModelData_Impl::GetRecommendedName( const OUString& aSuggestedName, con } -//========================================================================= + // class SfxStoringHelper -//========================================================================= + SfxStoringHelper::SfxStoringHelper() { diff --git a/sfx2/source/doc/new.cxx b/sfx2/source/doc/new.cxx index 4fb3137c660b..1d12e6e4fe78 100644 --- a/sfx2/source/doc/new.cxx +++ b/sfx2/source/doc/new.cxx @@ -39,11 +39,11 @@ #include <sfx2/printer.hxx> #include <vcl/waitobj.hxx> -//======================================================================== + #define MORE_BTN(x) pMoreBt->x -//======================================================================== + void SfxPreviewBase_Impl::SetObjectShell( SfxObjectShell* pObj ) { diff --git a/sfx2/source/doc/objcont.cxx b/sfx2/source/doc/objcont.cxx index 2f1d53cbd12c..6bff9869616d 100644 --- a/sfx2/source/doc/objcont.cxx +++ b/sfx2/source/doc/objcont.cxx @@ -78,7 +78,7 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::uno; -//==================================================================== + static bool operator> (const util::DateTime& i_rLeft, const util::DateTime& i_rRight) @@ -172,7 +172,7 @@ SfxObjectShell::CreatePreviewMetaFile_Impl( sal_Bool bFullContent ) const return pFile; } -//==================================================================== + void SfxObjectShell::UpdateDocInfoForSave() { diff --git a/sfx2/source/doc/objitem.cxx b/sfx2/source/doc/objitem.cxx index 39400c3ba380..15798ae5b362 100644 --- a/sfx2/source/doc/objitem.cxx +++ b/sfx2/source/doc/objitem.cxx @@ -22,12 +22,12 @@ #include <sfx2/objitem.hxx> #include <com/sun/star/lang/XUnoTunnel.hpp> -//==================================================================== + TYPEINIT1_AUTOFACTORY(SfxObjectShellItem,SfxPoolItem) TYPEINIT1_AUTOFACTORY(SfxObjectItem,SfxPoolItem) -//========================================================================= + bool SfxObjectShellItem::operator==( const SfxPoolItem &rItem ) const { @@ -98,7 +98,7 @@ bool SfxObjectShellItem::PutValue( const com::sun::star::uno::Any& rVal, sal_uIn return true; } -//========================================================================= + SfxObjectItem::SfxObjectItem( sal_uInt16 nWhichId, SfxShell *pSh ) : SfxPoolItem( nWhichId ), diff --git a/sfx2/source/doc/objmisc.cxx b/sfx2/source/doc/objmisc.cxx index 09d40c9be26e..a463bf5a8946 100644 --- a/sfx2/source/doc/objmisc.cxx +++ b/sfx2/source/doc/objmisc.cxx @@ -157,7 +157,7 @@ public: void SetAttribute( const SvKeyValue& rKV ); }; -//========================================================================= + sal_uInt16 const aTitleMap_Impl[3][2] = { @@ -167,7 +167,7 @@ sal_uInt16 const aTitleMap_Impl[3][2] = /* SFX_TITLE_HISTORY */ { 32, SFX_TITLE_FULLNAME } }; -//========================================================================= + void SfxObjectShell::AbortImport() { diff --git a/sfx2/source/doc/objserv.cxx b/sfx2/source/doc/objserv.cxx index 365ee234abb3..50c46815f874 100644 --- a/sfx2/source/doc/objserv.cxx +++ b/sfx2/source/doc/objserv.cxx @@ -110,7 +110,7 @@ using namespace ::com::sun::star::beans; using namespace ::com::sun::star::document; using namespace ::com::sun::star::task; -//==================================================================== + class SfxSaveAsContext_Impl { @@ -127,12 +127,12 @@ public: { _rNewNameVar = ""; } }; -//==================================================================== + #define SfxObjectShell #include "sfxslots.hxx" -//========================================================================= + @@ -140,7 +140,7 @@ SFX_IMPL_INTERFACE(SfxObjectShell,SfxShell,SfxResId(0)) { } -//========================================================================= + class SfxClosePreventer_Impl : public ::cppu::WeakImplHelper1< ::com::sun::star::util::XCloseListener > { @@ -187,7 +187,7 @@ void SAL_CALL SfxClosePreventer_Impl::notifyClosing( const lang::EventObject& ) void SAL_CALL SfxClosePreventer_Impl::disposing( const lang::EventObject& ) throw ( uno::RuntimeException ) {} -//========================================================================= + class SfxInstanceCloseGuard_Impl { SfxClosePreventer_Impl* m_pPreventer; @@ -256,7 +256,7 @@ SfxInstanceCloseGuard_Impl::~SfxInstanceCloseGuard_Impl() } } -//========================================================================= + void SfxObjectShell::PrintExec_Impl(SfxRequest &rReq) { @@ -598,7 +598,7 @@ void SfxObjectShell::ExecFile_Impl(SfxRequest &rReq) } // TODO/LATER: do the following GUI related actions in standalown method - // ======================================================================================================== + // Introduce a status indicator for GUI operation SFX_REQUEST_ARG( rReq, pStatusIndicatorItem, SfxUnoAnyItem, SID_PROGRESS_STATUSBAR_CONTROL, false ); if ( !pStatusIndicatorItem ) @@ -660,7 +660,7 @@ void SfxObjectShell::ExecFile_Impl(SfxRequest &rReq) // but it is not clear here whether the saving will be done or saveAs operation GetMedium()->GetItemSet()->Put( *pInteractionHandlerItem ); } - // ======================================================================================================== + sal_Bool bPreselectPassword = sal_False; SFX_ITEMSET_ARG( GetMedium()->GetItemSet(), pOldEncryptionDataItem, SfxUnoAnyItem, SID_ENCRYPTIONDATA, false ); diff --git a/sfx2/source/doc/objstor.cxx b/sfx2/source/doc/objstor.cxx index fb80c47c976c..cb6e5241698a 100644 --- a/sfx2/source/doc/objstor.cxx +++ b/sfx2/source/doc/objstor.cxx @@ -142,7 +142,7 @@ using namespace ::com::sun::star::document; using namespace ::rtl; using namespace ::cppu; -//========================================================================= + void impl_addToModelCollection(const css::uno::Reference< css::frame::XModel >& xModel) { if (!xModel.is()) @@ -161,7 +161,7 @@ void impl_addToModelCollection(const css::uno::Reference< css::frame::XModel >& } } -//========================================================================= + sal_Bool SfxObjectShell::Save() { diff --git a/sfx2/source/doc/objxtor.cxx b/sfx2/source/doc/objxtor.cxx index 15cb8dd03ee3..e9a3a76e54af 100644 --- a/sfx2/source/doc/objxtor.cxx +++ b/sfx2/source/doc/objxtor.cxx @@ -108,7 +108,7 @@ using namespace ::com::sun::star::document; using ::basic::BasicManagerRepository; #include <uno/mapping.hxx> -//==================================================================== + DBG_NAME(SfxObjectShell) @@ -149,7 +149,7 @@ OString lclGetVBAGlobalConstName( const Reference< XInterface >& rxComponent ) } // namespace -//========================================================================= + class SfxModelListener_Impl : public ::cppu::WeakImplHelper1< ::com::sun::star::util::XCloseListener > { diff --git a/sfx2/source/doc/oleprops.cxx b/sfx2/source/doc/oleprops.cxx index c6e800c7e402..2f90e0da95a1 100644 --- a/sfx2/source/doc/oleprops.cxx +++ b/sfx2/source/doc/oleprops.cxx @@ -26,10 +26,10 @@ #include <rtl/tencinfo.h> #include <rtl/strbuf.hxx> -// ============================================================================ -// ============================================================================ + + #define STREAM_BUFFER_SIZE 2048 @@ -66,7 +66,7 @@ bool operator==(const util::Date &i_rLeft, const util::Date &i_rRight) && i_rLeft.Day == i_rRight.Day; } -// ============================================================================ + /** Property representing a signed 32-bit integer value. */ class SfxOleInt32Property : public SfxOlePropertyBase @@ -85,7 +85,7 @@ private: sal_Int32 mnValue; }; -// ============================================================================ + /** Property representing a floating-point value. */ class SfxOleDoubleProperty : public SfxOlePropertyBase @@ -104,7 +104,7 @@ private: double mfValue; }; -// ============================================================================ + /** Property representing a boolean value. */ class SfxOleBoolProperty : public SfxOlePropertyBase @@ -123,7 +123,7 @@ private: bool mbValue; }; -// ============================================================================ + /** Base class for properties that contain a single string value. */ class SfxOleStringPropertyBase : public SfxOlePropertyBase, public SfxOleStringHelper @@ -146,7 +146,7 @@ private: OUString maValue; }; -// ============================================================================ + /** Property representing a bytestring value. */ class SfxOleString8Property : public SfxOleStringPropertyBase @@ -163,7 +163,7 @@ private: virtual void ImplSave( SvStream& rStrm ); }; -// ============================================================================ + /** Property representing a Unicode string value. */ class SfxOleString16Property : public SfxOleStringPropertyBase @@ -176,7 +176,7 @@ private: virtual void ImplSave( SvStream& rStrm ); }; -// ============================================================================ + /** Property representing a filetime value as defined by the Windows API. */ class SfxOleFileTimeProperty : public SfxOlePropertyBase @@ -218,7 +218,7 @@ private: util::Date maDate; }; -// ============================================================================ + /** Property representing a thumbnail picture. @@ -240,7 +240,7 @@ private: uno::Sequence<sal_uInt8> mData; }; -// ============================================================================ + /** Property representing a BLOB (which presumably stands for binary large object). @@ -262,7 +262,7 @@ private: uno::Sequence<sal_uInt8> mData; }; -// ============================================================================ + sal_uInt16 SfxOleTextEncoding::GetCodePage() const { @@ -1297,7 +1297,7 @@ const SvGlobalName& SfxOlePropertySet::GetSectionGuid( SfxOleSectionType eSectio return saEmptyGuid; } -// ============================================================================ + //} // namespace diff --git a/sfx2/source/doc/oleprops.hxx b/sfx2/source/doc/oleprops.hxx index 76d161955406..8e09a5be2164 100644 --- a/sfx2/source/doc/oleprops.hxx +++ b/sfx2/source/doc/oleprops.hxx @@ -31,11 +31,11 @@ #include <com/sun/star/util/Date.hpp> -// ============================================================================ + //namespace { -// ============================================================================ + // property type IDs const sal_Int32 PROPTYPE_INT16 = 2; const sal_Int32 PROPTYPE_INT32 = 3; @@ -93,7 +93,7 @@ const sal_Int32 CLIPFMT_WIN = -1; // predefined clipboard data format IDs const sal_Int32 CLIPDATAFMT_DIB = 8; -// ============================================================================ + /** Helper for classes that need text encoding settings. @@ -130,7 +130,7 @@ private: TextEncRef mxTextEnc; }; -// ============================================================================ + /** Helper for classes that need to load or save string values. @@ -164,7 +164,7 @@ private: void ImplSaveString16( SvStream& rStrm, const OUString& rValue ) const; }; -// ============================================================================ + /** Base class for all classes related to OLE property sets. @@ -206,7 +206,7 @@ private: ErrCode mnErrCode; /// Current error code. }; -// ============================================================================ + /** Base class for all OLE property objects. */ class SfxOlePropertyBase : public SfxOleObjectBase @@ -229,7 +229,7 @@ private: typedef ::boost::shared_ptr< SfxOlePropertyBase > SfxOlePropertyRef; -// ============================================================================ + /** Property representing the codepage used to encode bytestrings in the entire property set. */ class SfxOleCodePageProperty : public SfxOlePropertyBase, public SfxOleTextEncoding { @@ -241,7 +241,7 @@ private: virtual void ImplSave( SvStream& rStrm ); }; -// ============================================================================ + /** Property containing custom names for other properties in the property set. */ class SfxOleDictionaryProperty : public SfxOlePropertyBase, public SfxOleStringHelper @@ -268,7 +268,7 @@ private: SfxOlePropNameMap maPropNameMap; }; -// ============================================================================ + /** A section in a property set. Contains properties with unique identifiers. */ class SfxOleSection : public SfxOleObjectBase @@ -356,7 +356,7 @@ private: typedef ::boost::shared_ptr< SfxOleSection > SfxOleSectionRef; -// ============================================================================ + /** Enumerates different section types in OLE property sets. */ enum SfxOleSectionType @@ -366,7 +366,7 @@ enum SfxOleSectionType SECTION_CUSTOM /// Custom properties. }; -// ============================================================================ + /** Represents a complete property set, may consist of several property sections. */ class SfxOlePropertySet : public SfxOleObjectBase diff --git a/sfx2/source/doc/sfxbasemodel.cxx b/sfx2/source/doc/sfxbasemodel.cxx index 01f60708e9ad..171d2cbacb22 100644 --- a/sfx2/source/doc/sfxbasemodel.cxx +++ b/sfx2/source/doc/sfxbasemodel.cxx @@ -311,7 +311,7 @@ struct IMPL_SfxBaseModel_DataContainer : public ::sfx2::IModifiableDocument // static member initialization. sal_Int64 IMPL_SfxBaseModel_DataContainer::g_nInstanceCounter = 0; -// ======================================================================================================= + // Listener that forwards notifications from the PrintHelper to the "real" listeners class SfxPrintHelperListener_Impl : public ::cppu::WeakImplHelper1< view::XPrintJobListener > @@ -511,7 +511,7 @@ SfxSaveGuard::~SfxSaveGuard() } } -// ======================================================================================================= + // constructor @@ -3166,7 +3166,7 @@ void SfxBaseModel::impl_store( const OUString& sURL } } -//******************************************************************************************************** + namespace { template< typename ListenerT, typename EventT > class NotifySingleListenerIgnoreRE @@ -3936,7 +3936,7 @@ bool SfxBaseModel::impl_getPrintHelper() return true; } -//============================================================================= + // css.frame.XModule void SAL_CALL SfxBaseModel::setIdentifier(const OUString& Identifier) throw (RuntimeException) @@ -3945,7 +3945,7 @@ bool SfxBaseModel::impl_getPrintHelper() m_pData->m_sModuleIdentifier = Identifier; } -//============================================================================= + // css.frame.XModule OUString SAL_CALL SfxBaseModel::getIdentifier() throw (RuntimeException) @@ -3958,7 +3958,7 @@ bool SfxBaseModel::impl_getPrintHelper() return OUString(); } -//============================================================================= + Reference< frame::XTitle > SfxBaseModel::impl_getTitleHelper () { SfxModelGuard aGuard( *this ); @@ -3978,7 +3978,7 @@ Reference< frame::XTitle > SfxBaseModel::impl_getTitleHelper () return m_pData->m_xTitleHelper; } -//============================================================================= + Reference< frame::XUntitledNumbers > SfxBaseModel::impl_getUntitledHelper () { SfxModelGuard aGuard( *this ); @@ -3997,7 +3997,7 @@ Reference< frame::XUntitledNumbers > SfxBaseModel::impl_getUntitledHelper () return m_pData->m_xNumberedControllers; } -//============================================================================= + // css.frame.XTitle OUString SAL_CALL SfxBaseModel::getTitle() throw (RuntimeException) @@ -4050,7 +4050,7 @@ OUString SAL_CALL SfxBaseModel::getTitle() return aResult; } -//============================================================================= + // css.frame.XTitle void SAL_CALL SfxBaseModel::setTitle( const OUString& sTitle ) throw (RuntimeException) @@ -4062,7 +4062,7 @@ void SAL_CALL SfxBaseModel::setTitle( const OUString& sTitle ) m_pData->m_bExternalTitle = sal_True; } -//============================================================================= + // css.frame.XTitleChangeBroadcaster void SAL_CALL SfxBaseModel::addTitleChangeListener( const Reference< frame::XTitleChangeListener >& xListener ) throw (RuntimeException) @@ -4075,7 +4075,7 @@ void SAL_CALL SfxBaseModel::addTitleChangeListener( const Reference< frame::XTit xBroadcaster->addTitleChangeListener (xListener); } -//============================================================================= + // css.frame.XTitleChangeBroadcaster void SAL_CALL SfxBaseModel::removeTitleChangeListener( const Reference< frame::XTitleChangeListener >& xListener ) throw (RuntimeException) @@ -4088,7 +4088,7 @@ void SAL_CALL SfxBaseModel::removeTitleChangeListener( const Reference< frame::X xBroadcaster->removeTitleChangeListener (xListener); } -//============================================================================= + // css.frame.XUntitledNumbers ::sal_Int32 SAL_CALL SfxBaseModel::leaseNumber( const Reference< XInterface >& xComponent ) throw (lang::IllegalArgumentException, @@ -4099,7 +4099,7 @@ void SAL_CALL SfxBaseModel::removeTitleChangeListener( const Reference< frame::X return impl_getUntitledHelper ()->leaseNumber (xComponent); } -//============================================================================= + // css.frame.XUntitledNumbers void SAL_CALL SfxBaseModel::releaseNumber( ::sal_Int32 nNumber ) throw (lang::IllegalArgumentException, @@ -4109,7 +4109,7 @@ void SAL_CALL SfxBaseModel::releaseNumber( ::sal_Int32 nNumber ) impl_getUntitledHelper ()->releaseNumber (nNumber); } -//============================================================================= + // css.frame.XUntitledNumbers void SAL_CALL SfxBaseModel::releaseNumberForComponent( const Reference< XInterface >& xComponent ) throw (lang::IllegalArgumentException, @@ -4119,7 +4119,7 @@ void SAL_CALL SfxBaseModel::releaseNumberForComponent( const Reference< XInterfa impl_getUntitledHelper ()->releaseNumberForComponent (xComponent); } -//============================================================================= + // css.frame.XUntitledNumbers OUString SAL_CALL SfxBaseModel::getUntitledPrefix() throw (RuntimeException) @@ -4128,7 +4128,7 @@ OUString SAL_CALL SfxBaseModel::getUntitledPrefix() return impl_getUntitledHelper ()->getUntitledPrefix (); } -//============================================================================= + // frame::XModel2 Reference< container::XEnumeration > SAL_CALL SfxBaseModel::getControllers() throw (RuntimeException) @@ -4146,7 +4146,7 @@ Reference< container::XEnumeration > SAL_CALL SfxBaseModel::getControllers() return xEnum; } -//============================================================================= + // frame::XModel2 Sequence< OUString > SAL_CALL SfxBaseModel::getAvailableViewControllerNames() throw (RuntimeException) @@ -4162,7 +4162,7 @@ Sequence< OUString > SAL_CALL SfxBaseModel::getAvailableViewControllerNames() return aViewNames; } -//============================================================================= + // frame::XModel2 Reference< frame::XController2 > SAL_CALL SfxBaseModel::createDefaultViewController( const Reference< frame::XFrame >& i_rFrame ) throw (RuntimeException , @@ -4179,7 +4179,7 @@ Reference< frame::XController2 > SAL_CALL SfxBaseModel::createDefaultViewControl return createViewController( sDefaultViewName, Sequence< PropertyValue >(), i_rFrame ); } -//============================================================================= + namespace sfx { namespace intern { /** a class which, in its dtor, cleans up variuos objects (well, at the moment only the frame) collected during @@ -4227,7 +4227,7 @@ namespace sfx { namespace intern { }; } } -//============================================================================= + SfxViewFrame* SfxBaseModel::FindOrCreateViewFrame_Impl( const Reference< XFrame >& i_rFrame, ::sfx::intern::ViewCreationGuard& i_rGuard ) const { SfxViewFrame* pViewFrame = NULL; @@ -4277,7 +4277,7 @@ SfxViewFrame* SfxBaseModel::FindOrCreateViewFrame_Impl( const Reference< XFrame return pViewFrame; } -//============================================================================= + // frame::XModel2 Reference< frame::XController2 > SAL_CALL SfxBaseModel::createViewController( const OUString& i_rViewName, const Sequence< PropertyValue >& i_rArguments, const Reference< XFrame >& i_rFrame ) @@ -4364,7 +4364,7 @@ Reference< frame::XController2 > SAL_CALL SfxBaseModel::createViewController( return pBaseController; } -//============================================================================= + // RDF DocumentMetadataAccess // rdf::XRepositorySupplier: @@ -4653,9 +4653,9 @@ throw (RuntimeException, lang::IllegalArgumentException, return xDMA->storeMetadataToMedium(i_rMedium); } -// ===================================================================================================================== + // = SfxModelSubComponent -// ===================================================================================================================== + SfxModelSubComponent::~SfxModelSubComponent() { diff --git a/sfx2/source/doc/sfxmodelfactory.cxx b/sfx2/source/doc/sfxmodelfactory.cxx index 56b910900bd9..e40a94d60845 100644 --- a/sfx2/source/doc/sfxmodelfactory.cxx +++ b/sfx2/source/doc/sfxmodelfactory.cxx @@ -30,10 +30,10 @@ #include <algorithm> #include <functional> -//........................................................................ + namespace sfx2 { -//........................................................................ + using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::XInterface; @@ -52,9 +52,9 @@ namespace sfx2 using ::com::sun::star::beans::PropertyValue; using ::com::sun::star::lang::XInitialization; - //==================================================================== + //= SfxModelFactory - declaration - //==================================================================== + typedef ::cppu::WeakImplHelper2 < XSingleServiceFactory , XServiceInfo > SfxModelFactory_Base; @@ -97,9 +97,9 @@ namespace sfx2 const SfxModelFactoryFunc m_pComponentFactoryFunc; }; - //==================================================================== + //= SfxModelFactory - implementation - //==================================================================== + SfxModelFactory::SfxModelFactory( const Reference< XMultiServiceFactory >& _rxServiceFactory, const OUString& _rImplementationName, const SfxModelFactoryFunc _pComponentFactoryFunc, diff --git a/sfx2/source/doc/templatelocnames.src b/sfx2/source/doc/templatelocnames.src index db4a288d69da..35d69dbab082 100644 --- a/sfx2/source/doc/templatelocnames.src +++ b/sfx2/source/doc/templatelocnames.src @@ -61,7 +61,7 @@ String STR_TEMPLATE_NAME10_DEF }; -///////////////////////////////////////////////// + String STR_TEMPLATE_NAME1 { diff --git a/sfx2/source/explorer/nochaos.cxx b/sfx2/source/explorer/nochaos.cxx index 58893f87b700..dbe9f0809354 100644 --- a/sfx2/source/explorer/nochaos.cxx +++ b/sfx2/source/explorer/nochaos.cxx @@ -26,9 +26,9 @@ #define WID_CHAOS_START 500 -//========================================================================= + // class CntStaticPoolDefaults_Impl -//========================================================================= + class CntItemPool; @@ -55,7 +55,7 @@ public: -//========================================================================= + class CntItemPool: public SfxItemPool { @@ -89,9 +89,9 @@ sal_uInt16 NoChaos::ReleaseItemPool() return CntItemPool::Release(); } -//========================================================================= + // CntItemPool implementation -//========================================================================= + static CntStaticPoolDefaults_Impl* pPoolDefs_Impl = NULL; @@ -159,9 +159,9 @@ sal_uInt16 CntItemPool::Release() return nRefs; } -//========================================================================= + // CntStaticPoolDefaults_Impl implementation. -//========================================================================= + inline void CntStaticPoolDefaults_Impl::Insert( SfxPoolItem* pItem, /* Static Pool Default Item */ diff --git a/sfx2/source/inc/appbas.hxx b/sfx2/source/inc/appbas.hxx index 578370d20978..ebedd3ce5a2a 100644 --- a/sfx2/source/inc/appbas.hxx +++ b/sfx2/source/inc/appbas.hxx @@ -25,7 +25,7 @@ class StarBASIC; class SbxObject; -//========================================================================= + SbxVariable* MakeVariable( StarBASIC *pBas, SbxObject *pObject, const char *pName, sal_uIntPtr nSID, SbxDataType eType=SbxOBJECT, diff --git a/sfx2/source/inc/docundomanager.hxx b/sfx2/source/inc/docundomanager.hxx index 66336c507e1b..b717be82229c 100644 --- a/sfx2/source/inc/docundomanager.hxx +++ b/sfx2/source/inc/docundomanager.hxx @@ -29,14 +29,14 @@ #include <boost/scoped_ptr.hpp> #include <boost/noncopyable.hpp> -//...................................................................................................................... + namespace sfx2 { -//...................................................................................................................... - //================================================================================================================== + + //= DocumentUndoManager - //================================================================================================================== + typedef ::cppu::ImplHelper1 < ::com::sun::star::document::XUndoManager > DocumentUndoManager_Base; struct DocumentUndoManager_Impl; @@ -95,9 +95,9 @@ namespace sfx2 ::boost::scoped_ptr< DocumentUndoManager_Impl > m_pImpl; }; -//...................................................................................................................... + } // namespace sfx2 -//...................................................................................................................... + #endif // INCLUDED_SFX2_SOURCE_INC_DOCUNDOMANAGER_HXX diff --git a/sfx2/source/inc/eventsupplier.hxx b/sfx2/source/inc/eventsupplier.hxx index d8d2a8d124da..d2bb21b76be4 100644 --- a/sfx2/source/inc/eventsupplier.hxx +++ b/sfx2/source/inc/eventsupplier.hxx @@ -49,7 +49,7 @@ namespace comphelper class SfxObjectShell; class SvxMacro; -//-------------------------------------------------------------------------------------------------------- + class SfxEvents_Impl : public ::cppu::WeakImplHelper2< css::container::XNameReplace, css::document::XEventListener > { diff --git a/sfx2/source/inc/objshimp.hxx b/sfx2/source/inc/objshimp.hxx index fb0dccafc861..02f473ba1679 100644 --- a/sfx2/source/inc/objshimp.hxx +++ b/sfx2/source/inc/objshimp.hxx @@ -33,7 +33,7 @@ namespace svtools { class AsynchronLink; } -//==================================================================== + DBG_NAMEEX(SfxObjectShell) diff --git a/sfx2/source/inc/sfxtypes.hxx b/sfx2/source/inc/sfxtypes.hxx index f26d397dc344..177bcaf0cebb 100644 --- a/sfx2/source/inc/sfxtypes.hxx +++ b/sfx2/source/inc/sfxtypes.hxx @@ -41,7 +41,7 @@ #endif #endif -//------------------------------------------------------------------------ + // Macro for the Call-Profiler under WinNT // with S_CAP a measurement can be started, and stopped with E_CAP @@ -84,7 +84,7 @@ struct _Capper #define DBG_OUTF(x) #endif -//------------------------------------------------------------------------ + #if defined(DBG_UTIL) && defined(WNT) @@ -110,7 +110,7 @@ public: #define SFX_STACK(s) #endif -//------------------------------------------------------------------------ + struct StringList_Impl : private Resource { diff --git a/sfx2/source/inc/statcach.hxx b/sfx2/source/inc/statcach.hxx index 60479bad1ba3..6387d83b2b6b 100644 --- a/sfx2/source/inc/statcach.hxx +++ b/sfx2/source/inc/statcach.hxx @@ -114,7 +114,7 @@ public: { xMyDispatch = rDisp; } }; -//-------------------------------------------------------------------- + // clears Cached-Item @@ -123,7 +123,7 @@ inline void SfxStateCache::ClearCache() bItemDirty = sal_True; } -//-------------------------------------------------------------------- + // registeres a item representing this function @@ -138,7 +138,7 @@ inline SfxControllerItem* SfxStateCache::ChangeItemLink( SfxControllerItem* pNew } return pOldBinding; } -//-------------------------------------------------------------------- + // returns the func binding which becomes called on spreading states @@ -146,7 +146,7 @@ inline SfxControllerItem* SfxStateCache::GetItemLink() const { return pController; } -//-------------------------------------------------------------------- + inline sal_uInt16 SfxStateCache::GetId() const { diff --git a/sfx2/source/inc/virtmenu.hxx b/sfx2/source/inc/virtmenu.hxx index cc637c51998c..0c002cdfb78a 100644 --- a/sfx2/source/inc/virtmenu.hxx +++ b/sfx2/source/inc/virtmenu.hxx @@ -108,7 +108,7 @@ public: DECL_LINK( Select, Menu * ); }; -//-------------------------------------------------------------------- + // return the number of virtual items in this menu @@ -116,14 +116,14 @@ inline sal_uInt16 SfxVirtualMenu::GetItemCount() const { return nCount; } -//-------------------------------------------------------------------- + inline SfxMenuControl& SfxVirtualMenu::operator[]( sal_uInt16 nPos ) const { return *(pItems+nPos); } -//-------------------------------------------------------------------- + // returns the item id at position nPos in the menu (or 0 if sep.) diff --git a/sfx2/source/inc/workwin.hxx b/sfx2/source/inc/workwin.hxx index ceed92e008a1..b05807c2495b 100644 --- a/sfx2/source/inc/workwin.hxx +++ b/sfx2/source/inc/workwin.hxx @@ -41,7 +41,7 @@ class SfxSplitWindow; class SfxWorkWindow; -//==================================================================== + // This struct makes all relevant Informationen available of Toolboxes struct SfxObjectBar_Impl @@ -64,7 +64,7 @@ struct SfxObjectBar_Impl {} }; -//------------------------------------------------------------------------------ + // This struct makes all relevant Informationen available of the status bar struct SfxStatBar_Impl @@ -80,7 +80,7 @@ struct SfxStatBar_Impl {} }; -//------------------------------------------------------------------------------ + #define CHILD_NOT_VISIBLE 0 #define CHILD_ACTIVE 1 // not disabled through HidePopups @@ -170,7 +170,7 @@ struct SfxObjectBarList_Impl #define SFX_SPLITWINDOWS_BOTTOM 3 #define SFX_SPLITWINDOWS_MAX 4 -//-------------------------------------------------------------------- + class LayoutManagerListener : public ::cppu::WeakImplHelper2< css::frame::XLayoutManagerListener, @@ -182,21 +182,21 @@ class LayoutManagerListener : public ::cppu::WeakImplHelper2< void setFrame( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame ); - //--------------------------------------------------------------------------------------------------------- + // XComponent - //--------------------------------------------------------------------------------------------------------- + virtual void SAL_CALL addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& aListener ) throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL dispose() throw( ::com::sun::star::uno::RuntimeException ); - //--------------------------------------------------------------------------------------------------------- + // XEventListener - //--------------------------------------------------------------------------------------------------------- + virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& aEvent ) throw( ::com::sun::star::uno::RuntimeException ); - //--------------------------------------------------------------------------------------------------------- + // XLayoutManagerEventListener - //--------------------------------------------------------------------------------------------------------- + virtual void SAL_CALL layoutEvent( const ::com::sun::star::lang::EventObject& aSource, ::sal_Int16 eLayoutEvent, const ::com::sun::star::uno::Any& aInfo ) throw (::com::sun::star::uno::RuntimeException); private: diff --git a/sfx2/source/inet/inettbc.cxx b/sfx2/source/inet/inettbc.cxx index 869a3c9f447a..f55430432ba1 100644 --- a/sfx2/source/inet/inettbc.cxx +++ b/sfx2/source/inet/inettbc.cxx @@ -55,9 +55,9 @@ using namespace ::com::sun::star::util; using namespace ::com::sun::star::frame; using namespace ::com::sun::star::task; -//*************************************************************************** + // SfxURLToolBoxControl_Impl -//*************************************************************************** + SFX_IMPL_TOOLBOX_CONTROL(SfxURLToolBoxControl_Impl,SfxStringItem) @@ -76,7 +76,7 @@ SvtURLBox* SfxURLToolBoxControl_Impl::GetURLBox() const return (SvtURLBox*)GetToolBox().GetItemWindow( GetId() ); } -//*************************************************************************** + void SfxURLToolBoxControl_Impl::OpenURL( const OUString& rName, sal_Bool /*bNew*/ ) const { @@ -192,7 +192,7 @@ IMPL_LINK_NOARG(SfxURLToolBoxControl_Impl, OpenHdl) return 1L; } -//*************************************************************************** + void SfxURLToolBoxControl_Impl::StateChanged ( diff --git a/sfx2/source/menu/mnuitem.cxx b/sfx2/source/menu/mnuitem.cxx index aba877d15448..56901f794d4d 100644 --- a/sfx2/source/menu/mnuitem.cxx +++ b/sfx2/source/menu/mnuitem.cxx @@ -66,7 +66,7 @@ using namespace ::com::sun::star::frame; using namespace ::com::sun::star::beans; using namespace ::com::sun::star::util; -//==================================================================== + // binds the instance to the specified id and assignes the title diff --git a/sfx2/source/menu/virtmenu.cxx b/sfx2/source/menu/virtmenu.cxx index c728b471fc9f..9309f6b94884 100644 --- a/sfx2/source/menu/virtmenu.cxx +++ b/sfx2/source/menu/virtmenu.cxx @@ -110,7 +110,7 @@ void SfxMenuImageControl_Impl::Update() } } -//========================================================================= + static Image RetrieveAddOnImage( Reference< com::sun::star::frame::XFrame >& rFrame, const OUString& aImageId, @@ -134,7 +134,7 @@ static Image RetrieveAddOnImage( Reference< com::sun::star::frame::XFrame >& rFr return aImage; } -//========================================================================= + /* This helper function checks whether a Slot-id in the current application status is visible or not. This relates to the application status to see @@ -153,7 +153,7 @@ sal_Bool IsItemHidden_Impl( sal_uInt16 nItemId, int bOleServer, int bMac ) ( nItemId == SID_EXITANDRETURN || nItemId == SID_UPDATEDOC ) ); } -//==================================================================== + void SfxVirtualMenu::Construct_Impl() { diff --git a/sfx2/source/notify/globalevents.cxx b/sfx2/source/notify/globalevents.cxx index c02bab054160..cc1715104837 100644 --- a/sfx2/source/notify/globalevents.cxx +++ b/sfx2/source/notify/globalevents.cxx @@ -78,7 +78,7 @@ public: css::uno::RuntimeException ); }; -//============================================================================= + //TODO: remove support of obsolete document::XEventBroadcaster/Listener class SfxGlobalEvents_Impl : public ModelCollectionMutexBase , public ::cppu::WeakImplHelper3< css::lang::XServiceInfo diff --git a/sfx2/source/sidebar/Sidebar.cxx b/sfx2/source/sidebar/Sidebar.cxx index 17ff2a2e1bc6..ae903455a6a9 100644 --- a/sfx2/source/sidebar/Sidebar.cxx +++ b/sfx2/source/sidebar/Sidebar.cxx @@ -40,7 +40,7 @@ void Sidebar::ShowPanel ( // - Make sure that the panel is visible and expanded after // the switch. // - Make sure to use a context that really shows the panel - // + // All that is not necessary for the current use cases so lets // keep it simple for the time being. pController->RequestSwitchToDeck(pPanelDescriptor->msDeckId); diff --git a/sfx2/source/toolbox/imgmgr.cxx b/sfx2/source/toolbox/imgmgr.cxx index cc18a8700fae..3546c1de2e6a 100644 --- a/sfx2/source/toolbox/imgmgr.cxx +++ b/sfx2/source/toolbox/imgmgr.cxx @@ -137,7 +137,7 @@ static sal_Int16 impl_convertBools( sal_Bool bLarge ) return nIndex; } -//========================================================================= + SfxImageManager_Impl::SfxImageManager_Impl( SfxModule* pModule ) : m_pModule(pModule) @@ -276,7 +276,7 @@ IMPL_LINK( SfxImageManager_Impl, SettingsChanged_Impl, VclWindowEvent*, pEvent) -//========================================================================= + SfxImageManager::SfxImageManager( SfxModule* pModule ) { diff --git a/sfx2/source/toolbox/tbxitem.cxx b/sfx2/source/toolbox/tbxitem.cxx index b13603ec1764..dd2f3d982f41 100644 --- a/sfx2/source/toolbox/tbxitem.cxx +++ b/sfx2/source/toolbox/tbxitem.cxx @@ -103,7 +103,7 @@ using namespace ::com::sun::star::util; using namespace ::com::sun::star::container; using namespace ::com::sun::star::ui; -//==================================================================== + SFX_IMPL_TOOLBOX_CONTROL_ARG(SfxToolBoxControl, SfxStringItem, sal_True); SFX_IMPL_TOOLBOX_CONTROL(SfxRecentFilesToolBoxControl, SfxStringItem); diff --git a/sfx2/source/view/ipclient.cxx b/sfx2/source/view/ipclient.cxx index 518bdc9888fc..6213c096c17e 100644 --- a/sfx2/source/view/ipclient.cxx +++ b/sfx2/source/view/ipclient.cxx @@ -66,7 +66,7 @@ using namespace com::sun::star; -//==================================================================== + // SfxEmbedResizeGuard class SfxBooleanFlagGuard { @@ -86,7 +86,7 @@ public: } }; -//==================================================================== + // SfxInPlaceClient_Impl @@ -603,7 +603,7 @@ IMPL_LINK_NOARG(SfxInPlaceClient_Impl, TimerHdl) } -//==================================================================== + // SfxInPlaceClient diff --git a/sfx2/source/view/sfxbasecontroller.cxx b/sfx2/source/view/sfxbasecontroller.cxx index 56634cd2a6e8..721a1a0d5efe 100644 --- a/sfx2/source/view/sfxbasecontroller.cxx +++ b/sfx2/source/view/sfxbasecontroller.cxx @@ -1470,7 +1470,7 @@ IMPL_LINK_NOARG ( SfxBaseController, CheckOutHandler ) } -//============================================================================= + Reference< frame::XTitle > SfxBaseController::impl_getTitleHelper () { SolarMutexGuard aGuard; @@ -1491,7 +1491,7 @@ Reference< frame::XTitle > SfxBaseController::impl_getTitleHelper () return m_pData->m_xTitleHelper; } -//============================================================================= + // frame::XTitle OUString SAL_CALL SfxBaseController::getTitle() throw (RuntimeException) @@ -1499,7 +1499,7 @@ OUString SAL_CALL SfxBaseController::getTitle() return impl_getTitleHelper()->getTitle (); } -//============================================================================= + // frame::XTitle void SAL_CALL SfxBaseController::setTitle(const OUString& sTitle) throw (RuntimeException) @@ -1507,7 +1507,7 @@ void SAL_CALL SfxBaseController::setTitle(const OUString& sTitle) impl_getTitleHelper()->setTitle (sTitle); } -//============================================================================= + // frame::XTitleChangeBroadcaster void SAL_CALL SfxBaseController::addTitleChangeListener(const Reference< frame::XTitleChangeListener >& xListener) throw (RuntimeException) @@ -1517,7 +1517,7 @@ void SAL_CALL SfxBaseController::addTitleChangeListener(const Reference< frame:: xBroadcaster->addTitleChangeListener (xListener); } -//============================================================================= + // frame::XTitleChangeBroadcaster void SAL_CALL SfxBaseController::removeTitleChangeListener(const Reference< frame::XTitleChangeListener >& xListener) throw (RuntimeException) diff --git a/sfx2/source/view/userinputinterception.cxx b/sfx2/source/view/userinputinterception.cxx index dc5d77905df3..327f40f429b2 100644 --- a/sfx2/source/view/userinputinterception.cxx +++ b/sfx2/source/view/userinputinterception.cxx @@ -28,10 +28,10 @@ #include <vcl/event.hxx> #include <vcl/window.hxx> -//........................................................................ + namespace sfx2 { -//........................................................................ + using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::XInterface; @@ -114,9 +114,9 @@ namespace sfx2 } - //==================================================================== + //= UserInputInterception - //==================================================================== + UserInputInterception::UserInputInterception( ::cppu::OWeakObject& _rControllerImpl, ::osl::Mutex& _rMutex ) :m_pData( new UserInputInterception_Data( _rControllerImpl, _rMutex ) ) @@ -260,8 +260,8 @@ namespace sfx2 return bHandled; } -//........................................................................ + } // namespace sfx2 -//........................................................................ + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sfx2/source/view/view.src b/sfx2/source/view/view.src index 136836eb20c5..b80b17c90182 100644 --- a/sfx2/source/view/view.src +++ b/sfx2/source/view/view.src @@ -64,7 +64,7 @@ String STR_PRINT_NEWORISIZE Text [ en-US ] = "The page size and orientation have been modified.\nWould you like to save the new settings in the\nactive document?" ; }; - // ----------------------------------------------------------------------- + InfoBox MSG_CANT_CLOSE { Message [ en-US ] = "The document cannot be closed because a\n print job is being carried out." ; diff --git a/sfx2/source/view/viewfrm.cxx b/sfx2/source/view/viewfrm.cxx index 607ce9474a79..1b659b53372c 100644 --- a/sfx2/source/view/viewfrm.cxx +++ b/sfx2/source/view/viewfrm.cxx @@ -1619,7 +1619,7 @@ void SfxViewFrame::DoAdjustPosSizePixel //! divide on Inner.../Outer... } } -//======================================================================== + bool SfxViewFrameItem::operator==( const SfxPoolItem &rItem ) const { diff --git a/sfx2/source/view/viewfrm2.cxx b/sfx2/source/view/viewfrm2.cxx index 8633f23d51b7..1b0e9820f4a0 100644 --- a/sfx2/source/view/viewfrm2.cxx +++ b/sfx2/source/view/viewfrm2.cxx @@ -76,7 +76,7 @@ void SfxFrameViewWindow_Impl::Resize() pFrame->Resize(); } -//======================================================================== + void SfxViewFrame::UpdateTitle() diff --git a/sfx2/source/view/viewsh.cxx b/sfx2/source/view/viewsh.cxx index 1416c0fe5d2f..56614448414b 100644 --- a/sfx2/source/view/viewsh.cxx +++ b/sfx2/source/view/viewsh.cxx @@ -84,13 +84,13 @@ using namespace ::com::sun::star::beans; using namespace ::com::sun::star::util; using namespace ::cppu; -//========================================================================= + DBG_NAME(SfxViewShell) #define SfxViewShell #include "sfxslots.hxx" -//========================================================================= + class SfxClipboardChangeListener : public ::cppu::WeakImplHelper1< datatransfer::clipboard::XClipboardListener > @@ -215,7 +215,7 @@ void SAL_CALL SfxClipboardChangeListener::changedContents( const datatransfer::c Application::PostUserEvent( STATIC_LINK( 0, SfxClipboardChangeListener, AsyncExecuteHdl_Impl ), pInfo ); } -//========================================================================= + static OUString RetrieveLabelFromCommand( const OUString& rCommandURL, @@ -275,7 +275,7 @@ static OUString RetrieveLabelFromCommand( return aLabel; } -//========================================================================= + SfxViewShell_Impl::SfxViewShell_Impl(sal_uInt16 const nFlags) : aInterceptorContainer( aMutex ) , m_bControllerSet(false) @@ -292,7 +292,7 @@ SfxViewShell_Impl::SfxViewShell_Impl(sal_uInt16 const nFlags) , m_pAccExec(0) {} -//========================================================================= + SFX_IMPL_INTERFACE(SfxViewShell,SfxShell,SfxResId(0)) { } |