diff options
337 files changed, 16 insertions, 2139 deletions
diff --git a/UnoControls/inc/basecontainercontrol.hxx b/UnoControls/inc/basecontainercontrol.hxx index 78d0dbc0f341..18c51694009e 100644 --- a/UnoControls/inc/basecontainercontrol.hxx +++ b/UnoControls/inc/basecontainercontrol.hxx @@ -50,10 +50,6 @@ struct IMPL_ControlInfo ::rtl::OUString sName ; }; -//____________________________________________________________________________________________________________ -// classes -//____________________________________________________________________________________________________________ - class BaseContainerControl : public ::com::sun::star::awt::XControlModel , public ::com::sun::star::awt::XControlContainer , public BaseControl diff --git a/UnoControls/inc/basecontrol.hxx b/UnoControls/inc/basecontrol.hxx index 9ec160cc6519..68d90e201805 100644 --- a/UnoControls/inc/basecontrol.hxx +++ b/UnoControls/inc/basecontrol.hxx @@ -112,10 +112,6 @@ struct IMPL_MutexContainer ::osl::Mutex m_aMutex ; }; -//____________________________________________________________________________________________________________ -// classes -//____________________________________________________________________________________________________________ - class BaseControl : public ::com::sun::star::lang::XServiceInfo , public ::com::sun::star::awt::XPaintListener , public ::com::sun::star::awt::XWindowListener diff --git a/UnoControls/source/base/basecontrol.cxx b/UnoControls/source/base/basecontrol.cxx index e600fd0713ba..f8e63f27457e 100644 --- a/UnoControls/source/base/basecontrol.cxx +++ b/UnoControls/source/base/basecontrol.cxx @@ -39,10 +39,6 @@ using namespace ::com::sun::star::awt ; namespace unocontrols{ -//____________________________________________________________________________________________________________ -// defines -//____________________________________________________________________________________________________________ - #define DEFAULT_PMULTIPLEXER NULL #define DEFAULT_X 0 #define DEFAULT_Y 0 diff --git a/UnoControls/source/controls/progressbar.cxx b/UnoControls/source/controls/progressbar.cxx index 0b2487c42415..aff0ff069907 100644 --- a/UnoControls/source/controls/progressbar.cxx +++ b/UnoControls/source/controls/progressbar.cxx @@ -29,10 +29,6 @@ #include <math.h> #include <limits.h> -//____________________________________________________________________________________________________________ -// namespace -//____________________________________________________________________________________________________________ - using namespace ::cppu ; using namespace ::osl ; using namespace ::rtl ; diff --git a/UnoControls/source/controls/progressmonitor.cxx b/UnoControls/source/controls/progressmonitor.cxx index b034f12df241..8b3f3c24aa05 100644 --- a/UnoControls/source/controls/progressmonitor.cxx +++ b/UnoControls/source/controls/progressmonitor.cxx @@ -31,10 +31,6 @@ #include "progressbar.hxx" -//____________________________________________________________________________________________________________ -// namespace -//____________________________________________________________________________________________________________ - using namespace ::cppu ; using namespace ::osl ; using namespace ::rtl ; diff --git a/UnoControls/source/controls/statusindicator.cxx b/UnoControls/source/controls/statusindicator.cxx index 2602407e4220..87d44a2a2395 100644 --- a/UnoControls/source/controls/statusindicator.cxx +++ b/UnoControls/source/controls/statusindicator.cxx @@ -25,10 +25,6 @@ #include "progressbar.hxx" -//____________________________________________________________________________________________________________ -// namespace -//____________________________________________________________________________________________________________ - using namespace ::cppu ; using namespace ::osl ; using namespace ::rtl ; diff --git a/UnoControls/source/inc/OConnectionPointContainerHelper.hxx b/UnoControls/source/inc/OConnectionPointContainerHelper.hxx index c3f60ad47eb5..09cce7499fc5 100644 --- a/UnoControls/source/inc/OConnectionPointContainerHelper.hxx +++ b/UnoControls/source/inc/OConnectionPointContainerHelper.hxx @@ -32,10 +32,6 @@ namespace unocontrols{ //______________________________________________________________________________________________________________ -// defines -//______________________________________________________________________________________________________________ - -//______________________________________________________________________________________________________________ // class declaration OConnectionPointContainerHelper //______________________________________________________________________________________________________________ diff --git a/UnoControls/source/inc/OConnectionPointHelper.hxx b/UnoControls/source/inc/OConnectionPointHelper.hxx index 94256e3dd29b..2307e1e402d2 100644 --- a/UnoControls/source/inc/OConnectionPointHelper.hxx +++ b/UnoControls/source/inc/OConnectionPointHelper.hxx @@ -34,10 +34,6 @@ namespace unocontrols{ //______________________________________________________________________________________________________________ -// defines -//______________________________________________________________________________________________________________ - -//______________________________________________________________________________________________________________ // class declaration OConnectionPointHelper //______________________________________________________________________________________________________________ diff --git a/UnoControls/source/inc/framecontrol.hxx b/UnoControls/source/inc/framecontrol.hxx index 52db066d325f..a729de6d2a3f 100644 --- a/UnoControls/source/inc/framecontrol.hxx +++ b/UnoControls/source/inc/framecontrol.hxx @@ -39,10 +39,6 @@ namespace unocontrols{ -//______________________________________________________________________________________________________________ -// defines -//______________________________________________________________________________________________________________ - #define SERVICENAME_FRAMECONTROL "com.sun.star.frame.FrameControl" #define IMPLEMENTATIONNAME_FRAMECONTROL "stardiv.UnoControls.FrameControl" #define PROPERTYNAME_LOADERARGUMENTS "LoaderArguments" diff --git a/UnoControls/source/inc/progressbar.hxx b/UnoControls/source/inc/progressbar.hxx index c71841118d0d..7bd2d6f1cff7 100644 --- a/UnoControls/source/inc/progressbar.hxx +++ b/UnoControls/source/inc/progressbar.hxx @@ -31,10 +31,6 @@ namespace unocontrols{ -//____________________________________________________________________________________________________________ -// defines -//____________________________________________________________________________________________________________ - #define SERVICENAME_PROGRESSBAR "com.sun.star.awt.XProgressBar" #define IMPLEMENTATIONNAME_PROGRESSBAR "stardiv.UnoControls.ProgressBar" #define PROGRESSBAR_FREESPACE 4 @@ -49,10 +45,6 @@ namespace unocontrols{ #define PROGRESSBAR_LINECOLOR_BRIGHT TRGB_COLORDATA( 0x00, 0xFF, 0xFF, 0xFF ) // white #define PROGRESSBAR_LINECOLOR_SHADOW TRGB_COLORDATA( 0x00, 0x00, 0x00, 0x00 ) // black -//____________________________________________________________________________________________________________ -// classes -//____________________________________________________________________________________________________________ - class ProgressBar : public ::com::sun::star::awt::XControlModel , public ::com::sun::star::awt::XProgressBar , public BaseControl diff --git a/UnoControls/source/inc/progressmonitor.hxx b/UnoControls/source/inc/progressmonitor.hxx index 6d72c4b37a13..822512ac4c0b 100644 --- a/UnoControls/source/inc/progressmonitor.hxx +++ b/UnoControls/source/inc/progressmonitor.hxx @@ -63,16 +63,8 @@ #include "basecontainercontrol.hxx" -//____________________________________________________________________________________________________________ -// namespace -//____________________________________________________________________________________________________________ - namespace unocontrols{ -//____________________________________________________________________________________________________________ -// defines -//____________________________________________________________________________________________________________ - #define SERVICENAME_PROGRESSMONITOR "com.sun.star.awt.XProgressMonitor" #define IMPLEMENTATIONNAME_PROGRESSMONITOR "stardiv.UnoControls.ProgressMonitor" #define PROGRESSMONITOR_FREEBORDER 10 // border around and between the controls diff --git a/UnoControls/source/inc/statusindicator.hxx b/UnoControls/source/inc/statusindicator.hxx index 50f212a6f5cf..6850bc04618f 100644 --- a/UnoControls/source/inc/statusindicator.hxx +++ b/UnoControls/source/inc/statusindicator.hxx @@ -32,16 +32,8 @@ #include "basecontainercontrol.hxx" -//____________________________________________________________________________________________________________ -// namespace -//____________________________________________________________________________________________________________ - namespace unocontrols{ -//____________________________________________________________________________________________________________ -// defines -//____________________________________________________________________________________________________________ - #define SERVICENAME_STATUSINDICATOR "com.sun.star.task.XStatusIndicator" #define IMPLEMENTATIONNAME_STATUSINDICATOR "stardiv.UnoControls.StatusIndicator" #define STATUSINDICATOR_FREEBORDER 5 // border around and between the controls diff --git a/avmedia/source/framework/soundhandler.cxx b/avmedia/source/framework/soundhandler.cxx index f16448698f29..6d35f88ca191 100644 --- a/avmedia/source/framework/soundhandler.cxx +++ b/avmedia/source/framework/soundhandler.cxx @@ -39,24 +39,8 @@ #include <cppuhelper/typeprovider.hxx> #include <cppuhelper/factory.hxx> -//_________________________________________________________________________________________________________________ -// namespace -//_________________________________________________________________________________________________________________ - namespace avmedia{ -//_________________________________________________________________________________________________________________ -// non exported const -//_________________________________________________________________________________________________________________ - -//_________________________________________________________________________________________________________________ -// non exported definitions -//_________________________________________________________________________________________________________________ - -//_________________________________________________________________________________________________________________ -// declarations -//_________________________________________________________________________________________________________________ - //***************************************************************************************************************** // XInterface, XTypeProvider, XServiceInfo //***************************************************************************************************************** diff --git a/avmedia/source/framework/soundhandler.hxx b/avmedia/source/framework/soundhandler.hxx index b48d61947996..5fd9a4a5e34e 100644 --- a/avmedia/source/framework/soundhandler.hxx +++ b/avmedia/source/framework/soundhandler.hxx @@ -51,20 +51,8 @@ namespace css = ::com::sun::star; -//_________________________________________________________________________________________________________________ -// namespace -//_________________________________________________________________________________________________________________ - namespace avmedia{ -//_________________________________________________________________________________________________________________ -// exported const -//_________________________________________________________________________________________________________________ - -//_________________________________________________________________________________________________________________ -// exported definitions -//_________________________________________________________________________________________________________________ - struct ThreadHelpBase { public: diff --git a/basegfx/source/polygon/b2dpolygoncutandtouch.cxx b/basegfx/source/polygon/b2dpolygoncutandtouch.cxx index 83fddfebe5d7..58f6b92be5af 100644 --- a/basegfx/source/polygon/b2dpolygoncutandtouch.cxx +++ b/basegfx/source/polygon/b2dpolygoncutandtouch.cxx @@ -39,8 +39,6 @@ #include <vector> #include <algorithm> -////////////////////////////////////////////////////////////////////////////// -// defines #define SUBDIVIDE_FOR_CUT_TEST_COUNT (50) diff --git a/comphelper/inc/comphelper/configurationhelper.hxx b/comphelper/inc/comphelper/configurationhelper.hxx index ec4e17a0f41a..706e1b762912 100644 --- a/comphelper/inc/comphelper/configurationhelper.hxx +++ b/comphelper/inc/comphelper/configurationhelper.hxx @@ -44,8 +44,6 @@ namespace comphelper{ -//_______________________________________________ -// definitions //----------------------------------------------- class COMPHELPER_DLLPUBLIC ConfigurationHelper diff --git a/comphelper/inc/comphelper/locale.hxx b/comphelper/inc/comphelper/locale.hxx index 8cfbb5e0c29b..0a86079d290c 100644 --- a/comphelper/inc/comphelper/locale.hxx +++ b/comphelper/inc/comphelper/locale.hxx @@ -24,14 +24,8 @@ #include <rtl/ustring.hxx> #include "comphelper/comphelperdllapi.h" -//_______________________________________________ -// namespace - namespace comphelper{ -//_______________________________________________ -// definitions - /** @short A Locale object represents a specific geographical, political, or cultural region. @descr This Locale class can be used to: @@ -41,9 +35,6 @@ namespace comphelper{ */ class COMPHELPER_DLLPUBLIC Locale { - //------------------------------------------- - // const - public: /** @short seperates LANGUAGE and COUNTRY part of an ISO formated Locale. */ diff --git a/comphelper/inc/comphelper/mediadescriptor.hxx b/comphelper/inc/comphelper/mediadescriptor.hxx index cc70de0c5eed..e1b14a6ba243 100644 --- a/comphelper/inc/comphelper/mediadescriptor.hxx +++ b/comphelper/inc/comphelper/mediadescriptor.hxx @@ -28,14 +28,8 @@ namespace com { namespace sun { namespace star { namespace io { class XInputStream; } } } } -//_______________________________________________ -// namespace - namespace comphelper{ -//_______________________________________________ -// definitions - /** @short can be used to work with a <type scope="::com::sun::star::document">MediaDescriptor</type> struct. @@ -48,8 +42,6 @@ namespace comphelper{ */ class COMPHELPER_DLLPUBLIC MediaDescriptor : public SequenceAsHashMap { - //------------------------------------------- - // const public: //--------------------------------------- diff --git a/comphelper/inc/comphelper/numberedcollection.hxx b/comphelper/inc/comphelper/numberedcollection.hxx index 128152f0eab6..d2ea6b892f17 100644 --- a/comphelper/inc/comphelper/numberedcollection.hxx +++ b/comphelper/inc/comphelper/numberedcollection.hxx @@ -34,8 +34,6 @@ #include <vector> #include <boost/unordered_map.hpp> -//_______________________________________________ -// namespace namespace comphelper{ @@ -45,8 +43,6 @@ namespace comphelper{ #define css ::com::sun::star #endif -//_______________________________________________ -// definitions /** @short defines a collection of UNO components, where every component will get it's own unique number. diff --git a/comphelper/inc/comphelper/sequenceashashmap.hxx b/comphelper/inc/comphelper/sequenceashashmap.hxx index a697cf55994b..356512708357 100644 --- a/comphelper/inc/comphelper/sequenceashashmap.hxx +++ b/comphelper/inc/comphelper/sequenceashashmap.hxx @@ -30,13 +30,9 @@ #include <com/sun/star/beans/IllegalTypeException.hpp> #include "comphelper/comphelperdllapi.h" -//_______________________________________________ -// namespace namespace comphelper{ -//_______________________________________________ -// definitions /** @short Implements a stl hash map on top of some specialized sequence from type PropertyValue diff --git a/comphelper/inc/comphelper/sequenceasvector.hxx b/comphelper/inc/comphelper/sequenceasvector.hxx index 3f63fb9c6613..88c757315c3e 100644 --- a/comphelper/inc/comphelper/sequenceasvector.hxx +++ b/comphelper/inc/comphelper/sequenceasvector.hxx @@ -26,13 +26,9 @@ #include <com/sun/star/beans/IllegalTypeException.hpp> -//_______________________________________________ -// namespace namespace comphelper{ -//_______________________________________________ -// definitions /** @short Implements a stl vector on top of any uno sequence. diff --git a/comphelper/inc/comphelper/stillreadwriteinteraction.hxx b/comphelper/inc/comphelper/stillreadwriteinteraction.hxx index 2e060bf7cacd..c6d62e8da9e2 100644 --- a/comphelper/inc/comphelper/stillreadwriteinteraction.hxx +++ b/comphelper/inc/comphelper/stillreadwriteinteraction.hxx @@ -26,8 +26,6 @@ #include "comphelper/comphelperdllapi.h" -//_______________________________________________ -// namespace namespace comphelper{ class COMPHELPER_DLLPUBLIC StillReadWriteInteraction : public ::ucbhelper::InterceptedInteraction diff --git a/comphelper/source/misc/configurationhelper.cxx b/comphelper/source/misc/configurationhelper.cxx index 6dc055037c8c..1ace6f28ebcf 100644 --- a/comphelper/source/misc/configurationhelper.cxx +++ b/comphelper/source/misc/configurationhelper.cxx @@ -25,15 +25,11 @@ #include <com/sun/star/container/XNameContainer.hpp> #include <com/sun/star/lang/XSingleServiceFactory.hpp> -//_______________________________________________ -// namespace namespace comphelper{ namespace css = ::com::sun::star; -//_______________________________________________ -// definitions //----------------------------------------------- css::uno::Reference< css::uno::XInterface > ConfigurationHelper::openConfig(const css::uno::Reference< css::lang::XMultiServiceFactory > xSMGR , diff --git a/comphelper/source/misc/locale.cxx b/comphelper/source/misc/locale.cxx index 2bf4c35bb11a..9bfea805a02e 100644 --- a/comphelper/source/misc/locale.cxx +++ b/comphelper/source/misc/locale.cxx @@ -21,8 +21,6 @@ #include <rtl/ustrbuf.hxx> -//_______________________________________________ -// namespace namespace comphelper{ diff --git a/comphelper/source/misc/mediadescriptor.cxx b/comphelper/source/misc/mediadescriptor.cxx index cf15e244ded4..095ba80e828d 100644 --- a/comphelper/source/misc/mediadescriptor.cxx +++ b/comphelper/source/misc/mediadescriptor.cxx @@ -47,15 +47,11 @@ #include <rtl/ustrbuf.hxx> -//_______________________________________________ -// namespace namespace comphelper{ namespace css = ::com::sun::star; -//_______________________________________________ -// definitions const ::rtl::OUString& MediaDescriptor::PROP_ABORTED() { diff --git a/comphelper/source/misc/numberedcollection.cxx b/comphelper/source/misc/numberedcollection.cxx index 89b375576605..0bba81e73fd8 100644 --- a/comphelper/source/misc/numberedcollection.cxx +++ b/comphelper/source/misc/numberedcollection.cxx @@ -22,15 +22,11 @@ #include <com/sun/star/frame/UntitledNumbersConst.hpp> -//_______________________________________________ -// namespace namespace comphelper{ namespace css = ::com::sun::star; -//_______________________________________________ -// definitions static const char ERRMSG_INVALID_COMPONENT_PARAM[] = "NULL as component reference not allowed."; diff --git a/comphelper/source/misc/sequenceashashmap.cxx b/comphelper/source/misc/sequenceashashmap.cxx index d7e87baca6ec..3760b3cb1752 100644 --- a/comphelper/source/misc/sequenceashashmap.cxx +++ b/comphelper/source/misc/sequenceashashmap.cxx @@ -19,15 +19,11 @@ #include <comphelper/sequenceashashmap.hxx> -//_______________________________________________ -// namespace namespace comphelper{ namespace css = ::com::sun::star; -//_______________________________________________ -// definitions SequenceAsHashMap::SequenceAsHashMap() : SequenceAsHashMapBase() diff --git a/cui/source/customize/acccfg.cxx b/cui/source/customize/acccfg.cxx index a727e41b6698..a9c5da44d742 100644 --- a/cui/source/customize/acccfg.cxx +++ b/cui/source/customize/acccfg.cxx @@ -86,8 +86,6 @@ using namespace com::sun::star; -//----------------------------------------------- -// definitions //----------------------------------------------- static ::rtl::OUString SERVICE_STORAGEFACTORY (RTL_CONSTASCII_USTRINGPARAM("com.sun.star.embed.StorageFactory" )); diff --git a/desktop/source/inc/exithelper.hxx b/desktop/source/inc/exithelper.hxx index 9d4490f609a9..6343bfd6d872 100644 --- a/desktop/source/inc/exithelper.hxx +++ b/desktop/source/inc/exithelper.hxx @@ -29,8 +29,6 @@ namespace desktop */ class ExitHelper { - //------------------------------------------------------------------------- - // const public: //--------------------------------------------------------------------- diff --git a/drawinglayer/inc/drawinglayer/attribute/fillgradientattribute.hxx b/drawinglayer/inc/drawinglayer/attribute/fillgradientattribute.hxx index 330a5c795660..1a4dac4a3e04 100644 --- a/drawinglayer/inc/drawinglayer/attribute/fillgradientattribute.hxx +++ b/drawinglayer/inc/drawinglayer/attribute/fillgradientattribute.hxx @@ -46,8 +46,6 @@ namespace drawinglayer { namespace attribute { class ImpFillGradientAttribute; }} -////////////////////////////////////////////////////////////////////////////// -// declarations namespace drawinglayer { diff --git a/drawinglayer/inc/drawinglayer/attribute/fillhatchattribute.hxx b/drawinglayer/inc/drawinglayer/attribute/fillhatchattribute.hxx index e647e1f199e0..ec996eb06f1c 100644 --- a/drawinglayer/inc/drawinglayer/attribute/fillhatchattribute.hxx +++ b/drawinglayer/inc/drawinglayer/attribute/fillhatchattribute.hxx @@ -46,8 +46,6 @@ namespace drawinglayer { namespace attribute { class ImpFillHatchAttribute; }} -////////////////////////////////////////////////////////////////////////////// -// declarations namespace drawinglayer { diff --git a/dtrans/source/cnttype/mcnttfactory.cxx b/dtrans/source/cnttype/mcnttfactory.cxx index 38f1fb782e1e..e232cb462639 100644 --- a/dtrans/source/cnttype/mcnttfactory.cxx +++ b/dtrans/source/cnttype/mcnttfactory.cxx @@ -21,10 +21,6 @@ #include "mcnttfactory.hxx" #include "mcnttype.hxx" -//------------------------------------------------------------------------ -// defines -//------------------------------------------------------------------------ - #define MIMECONTENTTYPEFACTORY_IMPL_NAME "com.sun.star.datatransfer.MimeCntTypeFactory" //------------------------------------------------------------------------ diff --git a/dtrans/source/cnttype/mcnttfactory.hxx b/dtrans/source/cnttype/mcnttfactory.hxx index 1a3dcf848f2c..a64f89033043 100644 --- a/dtrans/source/cnttype/mcnttfactory.hxx +++ b/dtrans/source/cnttype/mcnttfactory.hxx @@ -27,14 +27,6 @@ #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/datatransfer/XMimeContentTypeFactory.hpp> -//------------------------------------------------------------------------ -// defines -//------------------------------------------------------------------------ - -//------------------------------------------------------------------------ -// deklarations -//------------------------------------------------------------------------ - class CMimeContentTypeFactory : public cppu::WeakImplHelper2< com::sun::star::datatransfer::XMimeContentTypeFactory, \ com::sun::star::lang::XServiceInfo > diff --git a/dtrans/source/cnttype/mcnttype.hxx b/dtrans/source/cnttype/mcnttype.hxx index 09b2fddd4496..b3f65e16df50 100644 --- a/dtrans/source/cnttype/mcnttype.hxx +++ b/dtrans/source/cnttype/mcnttype.hxx @@ -29,10 +29,6 @@ #include <map> -//------------------------------------------------------------------------ -// deklarations -//------------------------------------------------------------------------ - class CMimeContentType : public cppu::WeakImplHelper1< com::sun::star::datatransfer::XMimeContentType > { diff --git a/dtrans/source/inc/DtObjFactory.hxx b/dtrans/source/inc/DtObjFactory.hxx index 4fa8c798ea05..6d5a221d6ed6 100644 --- a/dtrans/source/inc/DtObjFactory.hxx +++ b/dtrans/source/inc/DtObjFactory.hxx @@ -26,10 +26,6 @@ #include <systools/win32/comtools.hxx> -//------------------------------------------------------------------------ -// deklarations -//------------------------------------------------------------------------ - class CDTransObjFactory { public: diff --git a/dtrans/source/win32/clipb/APNDataObject.hxx b/dtrans/source/win32/clipb/APNDataObject.hxx index d25141e65d95..279cd832b1dc 100644 --- a/dtrans/source/win32/clipb/APNDataObject.hxx +++ b/dtrans/source/win32/clipb/APNDataObject.hxx @@ -21,10 +21,6 @@ #ifndef _APNDATAOBJECT_HXX_ #define _APNDATAOBJECT_HXX_ -//------------------------------------------------------------------------ -// deklarations -//------------------------------------------------------------------------ - /* an APartment Neutral dataobject wrapper; this wrapper of a IDataObject pointer can be used from any apartment without RPC_E_WRONG_THREAD diff --git a/dtrans/source/win32/clipb/MtaOleClipb.cxx b/dtrans/source/win32/clipb/MtaOleClipb.cxx index aec56cbd1009..de3bc4ee186c 100644 --- a/dtrans/source/win32/clipb/MtaOleClipb.cxx +++ b/dtrans/source/win32/clipb/MtaOleClipb.cxx @@ -61,10 +61,6 @@ using osl::Mutex; using osl::MutexGuard; using osl::ClearableMutexGuard; -//---------------------------------------------------------------- -// defines -//---------------------------------------------------------------- - namespace /* private */ { char CLIPSRV_DLL_NAME[] = "sysdtrans.dll"; diff --git a/dtrans/source/win32/clipb/WinClipbImpl.cxx b/dtrans/source/win32/clipb/WinClipbImpl.cxx index faeb993502db..841d601bbcbc 100644 --- a/dtrans/source/win32/clipb/WinClipbImpl.cxx +++ b/dtrans/source/win32/clipb/WinClipbImpl.cxx @@ -52,10 +52,6 @@ using namespace com::sun::star::datatransfer::clipboard::RenderingCapabilities; using ::rtl::OUString; -//------------------------------------------------------------------------ -// deklarations -//------------------------------------------------------------------------ - // definition of static members CWinClipbImpl* CWinClipbImpl::s_pCWinClipbImpl = NULL; osl::Mutex CWinClipbImpl::s_aMutex; diff --git a/dtrans/source/win32/clipb/WinClipboard.cxx b/dtrans/source/win32/clipb/WinClipboard.cxx index d5111f270f8c..4514e299358b 100644 --- a/dtrans/source/win32/clipb/WinClipboard.cxx +++ b/dtrans/source/win32/clipb/WinClipboard.cxx @@ -39,10 +39,6 @@ using namespace com::sun::star::lang; using ::rtl::OUString; -//------------------------------------------------------------------------ -// defines -//------------------------------------------------------------------------ - #define WINCLIPBOARD_IMPL_NAME "com.sun.star.datatransfer.clipboard.ClipboardW32" //------------------------------------------------------------------------ diff --git a/dtrans/source/win32/dtobj/APNDataObject.cxx b/dtrans/source/win32/dtobj/APNDataObject.cxx index 53e67a733e95..eefa2fe17cb8 100644 --- a/dtrans/source/win32/dtobj/APNDataObject.cxx +++ b/dtrans/source/win32/dtobj/APNDataObject.cxx @@ -28,10 +28,6 @@ #define __uuidof(I) IID_##I #endif -//------------------------------------------------------------------------ -// defines -//------------------------------------------------------------------------ - #define FREE_HGLOB_ON_RELEASE TRUE #define KEEP_HGLOB_ON_RELEASE FALSE diff --git a/dtrans/source/win32/dtobj/APNDataObject.hxx b/dtrans/source/win32/dtobj/APNDataObject.hxx index 3905086cd3b6..6ef90e16f068 100644 --- a/dtrans/source/win32/dtobj/APNDataObject.hxx +++ b/dtrans/source/win32/dtobj/APNDataObject.hxx @@ -23,10 +23,6 @@ #include <systools/win32/comtools.hxx> -//------------------------------------------------------------------------ -// deklarations -//------------------------------------------------------------------------ - /* an APartment Neutral dataobject wrapper; this wrapper of a IDataObject pointer can be used from any apartment without RPC_E_WRONG_THREAD diff --git a/dtrans/source/win32/dtobj/DOTransferable.hxx b/dtrans/source/win32/dtobj/DOTransferable.hxx index b19bda4b090c..2b423a5bb2a7 100644 --- a/dtrans/source/win32/dtobj/DOTransferable.hxx +++ b/dtrans/source/win32/dtobj/DOTransferable.hxx @@ -31,10 +31,6 @@ #include <systools/win32/comtools.hxx> -//------------------------------------------------------------------------ -// deklarations -//------------------------------------------------------------------------ - // forward class CDTransObjFactory; class CFormatEtc; diff --git a/dtrans/source/win32/dtobj/DTransHelper.hxx b/dtrans/source/win32/dtobj/DTransHelper.hxx index 209e504d9d4a..8f5a8956ccc5 100644 --- a/dtrans/source/win32/dtobj/DTransHelper.hxx +++ b/dtrans/source/win32/dtobj/DTransHelper.hxx @@ -30,20 +30,11 @@ #endif #include "../misc/WinClip.hxx" -//------------------------------------------------------------------------ -// defines -//------------------------------------------------------------------------ - #define AUTO_INIT TRUE #define NO_AUTO_INIT FALSE #define MEM_DESTROY_ON_RELEASE TRUE #define NO_MEM_DESTROY_ON_RELEASE FALSE -//------------------------------------------------------------------------ -// deklarations -//------------------------------------------------------------------------ - - //------------------------------------------------------------------------- // a helper class to manage a global memory area, the clients can write // into the global memory area and extract the handle to the global mem diff --git a/dtrans/source/win32/dtobj/DataFmtTransl.cxx b/dtrans/source/win32/dtobj/DataFmtTransl.cxx index cfbb5e169ded..a990b70f543f 100644 --- a/dtrans/source/win32/dtobj/DataFmtTransl.cxx +++ b/dtrans/source/win32/dtobj/DataFmtTransl.cxx @@ -53,10 +53,6 @@ using namespace com::sun::star::lang; using ::rtl::OUString; -//------------------------------------------------------------------------ -// const -//------------------------------------------------------------------------ - const Type CPPUTYPE_SALINT32 = getCppuType((sal_Int32*)0); const Type CPPUTYPE_SALINT8 = getCppuType((sal_Int8*)0); const Type CPPUTYPE_OUSTRING = getCppuType((OUString*)0); diff --git a/dtrans/source/win32/dtobj/MimeAttrib.hxx b/dtrans/source/win32/dtobj/MimeAttrib.hxx index 1bd0d31fc78b..1d5422e21d7f 100644 --- a/dtrans/source/win32/dtobj/MimeAttrib.hxx +++ b/dtrans/source/win32/dtobj/MimeAttrib.hxx @@ -23,10 +23,6 @@ #include <rtl/ustring.hxx> -//------------------------------------------------------------------------ -// deklarations -//------------------------------------------------------------------------ - const rtl::OUString TEXTPLAIN_PARAM_CHARSET("charset"); const rtl::OUString PRE_WINDOWS_CODEPAGE ("windows"); diff --git a/dtrans/source/win32/dtobj/TxtCnvtHlp.hxx b/dtrans/source/win32/dtobj/TxtCnvtHlp.hxx index 8b6d7663ad16..6ecd88e99b61 100644 --- a/dtrans/source/win32/dtobj/TxtCnvtHlp.hxx +++ b/dtrans/source/win32/dtobj/TxtCnvtHlp.hxx @@ -34,10 +34,6 @@ #pragma warning(pop) #endif -//------------------------------------------------------------------------ -// deklarations -//------------------------------------------------------------------------ - int MultiByteToWideCharEx( UINT cp_src, LPCSTR lpMultiByteString, sal_uInt32 lenStr, diff --git a/dtrans/source/win32/ftransl/ftransl.cxx b/dtrans/source/win32/ftransl/ftransl.cxx index 6ab60d385ad3..4f64f15311c4 100644 --- a/dtrans/source/win32/ftransl/ftransl.cxx +++ b/dtrans/source/win32/ftransl/ftransl.cxx @@ -32,10 +32,6 @@ #pragma warning(pop) #endif -//------------------------------------------------------------------------ -// defines -//------------------------------------------------------------------------ - #define IMPL_NAME "com.sun.star.datatransfer.DataFormatTranslator" #define MODULE_PRIVATE diff --git a/dtrans/source/win32/ftransl/ftransl.hxx b/dtrans/source/win32/ftransl/ftransl.hxx index 5c8df8ab6dc8..195dc52cb8e4 100644 --- a/dtrans/source/win32/ftransl/ftransl.hxx +++ b/dtrans/source/win32/ftransl/ftransl.hxx @@ -39,10 +39,6 @@ #pragma warning(pop) #endif -//------------------------------------------------------------------------ -// declarations -//------------------------------------------------------------------------ - struct FormatEntry { FormatEntry(); diff --git a/dtrans/source/win32/misc/ImplHelper.cxx b/dtrans/source/win32/misc/ImplHelper.cxx index c72c23c5a401..93f0ba198468 100644 --- a/dtrans/source/win32/misc/ImplHelper.cxx +++ b/dtrans/source/win32/misc/ImplHelper.cxx @@ -36,10 +36,6 @@ #include <vector> -//------------------------------------------------------------------------ -// defines -//------------------------------------------------------------------------ - #define FORMATETC_EXACT_MATCH 1 #define FORMATETC_PARTIAL_MATCH -1 #define FORMATETC_NO_MATCH 0 diff --git a/dtrans/source/win32/misc/ImplHelper.hxx b/dtrans/source/win32/misc/ImplHelper.hxx index 682aaf87d863..811849e332bf 100644 --- a/dtrans/source/win32/misc/ImplHelper.hxx +++ b/dtrans/source/win32/misc/ImplHelper.hxx @@ -32,10 +32,6 @@ #pragma warning(pop) #endif -//------------------------------------------------------------------------ -// deklarations -//------------------------------------------------------------------------ - // target device and formatetc helper void SAL_CALL DeleteTargetDevice(DVTARGETDEVICE* ptd); sal_Bool SAL_CALL CopyFormatEtc(LPFORMATETC petcDest, LPFORMATETC petcSrc); diff --git a/dtrans/source/win32/misc/WinClip.hxx b/dtrans/source/win32/misc/WinClip.hxx index 66cfd2922540..d447922c928a 100644 --- a/dtrans/source/win32/misc/WinClip.hxx +++ b/dtrans/source/win32/misc/WinClip.hxx @@ -23,10 +23,6 @@ #include <sal/types.h> -//------------------------------------------------------------------------ -// deklarations -//------------------------------------------------------------------------ - const sal_Int32 CF_INVALID = 0; #endif diff --git a/embeddedobj/test/Container1/EmbedContApp.java b/embeddedobj/test/Container1/EmbedContApp.java index 3b959c5048f0..737267a19a15 100644 --- a/embeddedobj/test/Container1/EmbedContApp.java +++ b/embeddedobj/test/Container1/EmbedContApp.java @@ -976,7 +976,6 @@ public class EmbedContApp extends Applet public void mouseExited( MouseEvent e ){}; public void mouseReleased( MouseEvent e ){}; - // classes class NewMenuItem extends MenuItem implements ActionListener // Menu New { public NewMenuItem() diff --git a/extensions/source/dbpilots/dbpresid.hrc b/extensions/source/dbpilots/dbpresid.hrc index 841bc3f5de0f..68ae28ef188e 100644 --- a/extensions/source/dbpilots/dbpresid.hrc +++ b/extensions/source/dbpilots/dbpresid.hrc @@ -204,8 +204,6 @@ #define IMG_TABLE 1 #define IMG_QUERY 3 -//======================================================================== -// defines #define WINDOW_SIZE_X 260 #define WINDOW_SIZE_Y 185 diff --git a/filter/source/config/cache/basecontainer.cxx b/filter/source/config/cache/basecontainer.cxx index 87685ee74d38..c7fdc8312047 100644 --- a/filter/source/config/cache/basecontainer.cxx +++ b/filter/source/config/cache/basecontainer.cxx @@ -36,8 +36,6 @@ #include <osl/diagnose.h> #include <rtl/instance.hxx> -//_______________________________________________ -// namespace #define LOAD_IMPLICIT @@ -46,8 +44,6 @@ namespace css = ::com::sun::star; namespace filter{ namespace config{ -//_______________________________________________ -// definitions namespace { diff --git a/filter/source/config/cache/basecontainer.hxx b/filter/source/config/cache/basecontainer.hxx index 8354b126b35f..dd07cc602170 100644 --- a/filter/source/config/cache/basecontainer.hxx +++ b/filter/source/config/cache/basecontainer.hxx @@ -42,14 +42,10 @@ #include <cppuhelper/weakref.hxx> #include <rtl/ustring.hxx> -//_______________________________________________ -// namespace namespace filter{ namespace config{ -//_______________________________________________ -// definitions //_______________________________________________ diff --git a/filter/source/config/cache/cacheitem.cxx b/filter/source/config/cache/cacheitem.cxx index 70108020886d..d323334ec60c 100644 --- a/filter/source/config/cache/cacheitem.cxx +++ b/filter/source/config/cache/cacheitem.cxx @@ -35,16 +35,12 @@ #include <com/sun/star/beans/PropertyValue.hpp> -//_______________________________________________ -// namespace namespace filter{ namespace config{ namespace css = ::com::sun::star; -//_______________________________________________ -// definitions diff --git a/filter/source/config/cache/cacheitem.hxx b/filter/source/config/cache/cacheitem.hxx index 975434c3125f..66742da7c7f2 100644 --- a/filter/source/config/cache/cacheitem.hxx +++ b/filter/source/config/cache/cacheitem.hxx @@ -40,16 +40,12 @@ #include <comphelper/sequenceashashmap.hxx> #include <osl/mutex.hxx> -//_______________________________________________ -// namespace namespace filter{ namespace config{ namespace css = ::com::sun::star; -//_______________________________________________ -// definitions /** @short Must be used as first derived base class to get a full initialized mutex member, diff --git a/filter/source/config/cache/cacheupdatelistener.cxx b/filter/source/config/cache/cacheupdatelistener.cxx index b7f794d451d5..03fb98ee3b12 100644 --- a/filter/source/config/cache/cacheupdatelistener.cxx +++ b/filter/source/config/cache/cacheupdatelistener.cxx @@ -36,16 +36,12 @@ #include <unotools/configpaths.hxx> #include <rtl/ustring.hxx> -//_______________________________________________ -// namespace namespace filter{ namespace config{ namespace css = ::com::sun::star; -//_______________________________________________ -// definitions diff --git a/filter/source/config/cache/cacheupdatelistener.hxx b/filter/source/config/cache/cacheupdatelistener.hxx index 0c51f30fe14a..ba0d60b0b784 100644 --- a/filter/source/config/cache/cacheupdatelistener.hxx +++ b/filter/source/config/cache/cacheupdatelistener.hxx @@ -35,14 +35,10 @@ #include <salhelper/singletonref.hxx> #include <cppuhelper/implbase1.hxx> -//_______________________________________________ -// namespace namespace filter{ namespace config{ -//_______________________________________________ -// definitions //_______________________________________________ diff --git a/filter/source/config/cache/configflush.cxx b/filter/source/config/cache/configflush.cxx index d8ef4321463a..95b66c7a0299 100644 --- a/filter/source/config/cache/configflush.cxx +++ b/filter/source/config/cache/configflush.cxx @@ -32,16 +32,12 @@ #include <osl/diagnose.h> -//_______________________________________________ -// namespace namespace css = ::com::sun::star; namespace filter{ namespace config{ -//_______________________________________________ -// definitions //----------------------------------------------- ConfigFlush::ConfigFlush(const css::uno::Reference< css::lang::XMultiServiceFactory >& xSMGR) diff --git a/filter/source/config/cache/configflush.hxx b/filter/source/config/cache/configflush.hxx index 8bbe26619b5d..df1c3b12740a 100644 --- a/filter/source/config/cache/configflush.hxx +++ b/filter/source/config/cache/configflush.hxx @@ -25,14 +25,10 @@ #include <cppuhelper/interfacecontainer.h> #include <cppuhelper/implbase1.hxx> -//_______________________________________________ -// namespace namespace filter{ namespace config{ -//_______________________________________________ -// definitions //_______________________________________________ diff --git a/filter/source/config/cache/contenthandlerfactory.cxx b/filter/source/config/cache/contenthandlerfactory.cxx index 2aa7fcd50a16..6f357b6942bd 100644 --- a/filter/source/config/cache/contenthandlerfactory.cxx +++ b/filter/source/config/cache/contenthandlerfactory.cxx @@ -36,16 +36,12 @@ #include <com/sun/star/lang/XInitialization.hpp> #include <comphelper/enumhelper.hxx> -//_______________________________________________ -// namespace namespace filter{ namespace config{ namespace css = ::com::sun::star; -//_______________________________________________ -// definitions diff --git a/filter/source/config/cache/contenthandlerfactory.hxx b/filter/source/config/cache/contenthandlerfactory.hxx index 891bb61ae2e5..4f37e73022fa 100644 --- a/filter/source/config/cache/contenthandlerfactory.hxx +++ b/filter/source/config/cache/contenthandlerfactory.hxx @@ -25,16 +25,12 @@ #include <com/sun/star/lang/XSingleServiceFactory.hpp> #include <cppuhelper/implbase1.hxx> -//_______________________________________________ -// namespace namespace filter{ namespace config{ namespace css = ::com::sun::star; -//_______________________________________________ -// definitions //_______________________________________________ diff --git a/filter/source/config/cache/filtercache.cxx b/filter/source/config/cache/filtercache.cxx index bbb879e5d239..bab9201f4d7f 100644 --- a/filter/source/config/cache/filtercache.cxx +++ b/filter/source/config/cache/filtercache.cxx @@ -61,16 +61,12 @@ #include <comphelper/configurationhelper.hxx> -//_______________________________________________ -// namespace namespace filter{ namespace config{ namespace css = ::com::sun::star; -//_______________________________________________ -// definitions // Error message in case filter config seems to be corrupted. // Note: Dont tell user something about "setup -repair"! diff --git a/filter/source/config/cache/filtercache.hxx b/filter/source/config/cache/filtercache.hxx index 11b2265c8e38..e47fe7430ab8 100644 --- a/filter/source/config/cache/filtercache.hxx +++ b/filter/source/config/cache/filtercache.hxx @@ -43,16 +43,12 @@ #include <rtl/ref.hxx> #include <rtl/ustring.hxx> -//_______________________________________________ -// namespace namespace filter{ namespace config{ class CacheUpdateListener; -//_______________________________________________ -// definitions //_______________________________________________ diff --git a/filter/source/config/cache/filterfactory.cxx b/filter/source/config/cache/filterfactory.cxx index bcd0a70dbdf2..cb09da6c94ad 100644 --- a/filter/source/config/cache/filterfactory.cxx +++ b/filter/source/config/cache/filterfactory.cxx @@ -37,16 +37,12 @@ #include <comphelper/configurationhelper.hxx> #include <rtl/ustrbuf.hxx> -//_______________________________________________ -// namespace namespace filter{ namespace config{ namespace css = ::com::sun::star; -//_______________________________________________ -// definitions /** @short can be used to query for filters related to its application module. */ diff --git a/filter/source/config/cache/filterfactory.hxx b/filter/source/config/cache/filterfactory.hxx index 7dd9f34629b6..6e912eb032e4 100644 --- a/filter/source/config/cache/filterfactory.hxx +++ b/filter/source/config/cache/filterfactory.hxx @@ -26,16 +26,12 @@ #include <com/sun/star/lang/XSingleServiceFactory.hpp> #include <cppuhelper/implbase1.hxx> -//_______________________________________________ -// namespace namespace filter{ namespace config{ namespace css = ::com::sun::star; -//_______________________________________________ -// definitions //_______________________________________________ diff --git a/filter/source/config/cache/frameloaderfactory.cxx b/filter/source/config/cache/frameloaderfactory.cxx index 38f15cec445c..12a91870d007 100644 --- a/filter/source/config/cache/frameloaderfactory.cxx +++ b/filter/source/config/cache/frameloaderfactory.cxx @@ -35,16 +35,12 @@ #include <com/sun/star/lang/XInitialization.hpp> #include <comphelper/enumhelper.hxx> -//_______________________________________________ -// namespace namespace filter{ namespace config{ namespace css = ::com::sun::star; -//_______________________________________________ -// definitions diff --git a/filter/source/config/cache/frameloaderfactory.hxx b/filter/source/config/cache/frameloaderfactory.hxx index 391ad347e37a..c1fc76c50f50 100644 --- a/filter/source/config/cache/frameloaderfactory.hxx +++ b/filter/source/config/cache/frameloaderfactory.hxx @@ -25,16 +25,12 @@ #include <com/sun/star/lang/XSingleServiceFactory.hpp> #include <cppuhelper/implbase1.hxx> -//_______________________________________________ -// namespace namespace filter{ namespace config{ namespace css = ::com::sun::star; -//_______________________________________________ -// definitions //_______________________________________________ diff --git a/filter/source/config/cache/lateinitlistener.cxx b/filter/source/config/cache/lateinitlistener.cxx index 4a4cddb52821..78bb3ec92104 100644 --- a/filter/source/config/cache/lateinitlistener.cxx +++ b/filter/source/config/cache/lateinitlistener.cxx @@ -34,16 +34,12 @@ #include "lateinitlistener.hxx" #include "lateinitthread.hxx" -//_______________________________________________ -// namespace namespace filter{ namespace config{ namespace css = ::com::sun::star; -//_______________________________________________ -// definitions diff --git a/filter/source/config/cache/lateinitlistener.hxx b/filter/source/config/cache/lateinitlistener.hxx index 22c5a1c255a4..2549dfbdc9f1 100644 --- a/filter/source/config/cache/lateinitlistener.hxx +++ b/filter/source/config/cache/lateinitlistener.hxx @@ -27,14 +27,10 @@ #include <com/sun/star/document/XEventBroadcaster.hpp> #include <cppuhelper/implbase1.hxx> -//_______________________________________________ -// namespace namespace filter{ namespace config{ -//_______________________________________________ -// definitions //_______________________________________________ diff --git a/filter/source/config/cache/querytokenizer.cxx b/filter/source/config/cache/querytokenizer.cxx index 86839a3892c8..c66eba767c9a 100644 --- a/filter/source/config/cache/querytokenizer.cxx +++ b/filter/source/config/cache/querytokenizer.cxx @@ -29,13 +29,10 @@ #include "querytokenizer.hxx" -// namespace namespace filter{ namespace config{ -//_______________________________________________ -// definitions diff --git a/filter/source/config/cache/querytokenizer.hxx b/filter/source/config/cache/querytokenizer.hxx index ee8d7ad0be30..3793b94c1480 100644 --- a/filter/source/config/cache/querytokenizer.hxx +++ b/filter/source/config/cache/querytokenizer.hxx @@ -32,14 +32,10 @@ #include <boost/unordered_map.hpp> #include <rtl/ustring.hxx> -//_______________________________________________ -// namespace namespace filter{ namespace config{ -//_______________________________________________ -// definitions /** @short It can be used to split any query string (which can be used at the related interface <type scope="com::sun::star::container">XContainerQuery</type>) diff --git a/filter/source/config/cache/registration.cxx b/filter/source/config/cache/registration.cxx index f74d704dc651..17967f4c2b3b 100644 --- a/filter/source/config/cache/registration.cxx +++ b/filter/source/config/cache/registration.cxx @@ -36,14 +36,10 @@ #include "frameloaderfactory.hxx" #include "configflush.hxx" -//_______________________________________________ -// namespace namespace filter{ namespace config{ -//_______________________________________________ -// definitions extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL filterconfig1_component_getFactory( const sal_Char* pImplementationName, diff --git a/filter/source/config/cache/typedetection.cxx b/filter/source/config/cache/typedetection.cxx index aa22089539fc..51badc95ab7d 100644 --- a/filter/source/config/cache/typedetection.cxx +++ b/filter/source/config/cache/typedetection.cxx @@ -43,8 +43,6 @@ #include <unotools/localfilehelper.hxx> #include <comphelper/componentcontext.hxx> -//_______________________________________________ -// namespace namespace filter{ namespace config{ diff --git a/filter/source/config/cache/typedetection.hxx b/filter/source/config/cache/typedetection.hxx index ad0ef61906bb..97a2252a49f2 100644 --- a/filter/source/config/cache/typedetection.hxx +++ b/filter/source/config/cache/typedetection.hxx @@ -34,15 +34,11 @@ #include <comphelper/mediadescriptor.hxx> #include <cppuhelper/implbase1.hxx> -//_______________________________________________ -// namespace namespace filter{ namespace config { namespace css = ::com::sun::star; -//_______________________________________________ -// definitions //_______________________________________________ diff --git a/filter/source/config/tools/split/Splitter.java b/filter/source/config/tools/split/Splitter.java index d1ac91f3a775..88607f07d08f 100644 --- a/filter/source/config/tools/split/Splitter.java +++ b/filter/source/config/tools/split/Splitter.java @@ -35,9 +35,6 @@ import com.sun.star.filter.config.tools.utils.*; public class Splitter { //___________________________________________ - // const - - //___________________________________________ // member /** contains all real member of this instance. diff --git a/forms/source/component/ListBox.cxx b/forms/source/component/ListBox.cxx index f152d5a1951b..495df87f4346 100644 --- a/forms/source/component/ListBox.cxx +++ b/forms/source/component/ListBox.cxx @@ -437,7 +437,7 @@ namespace frm // Note that this is the only reliable way, since one of the properties is implemented // by ourself, and one is implemented by the aggregate, we cannot rely on any particular // results when setting them both - too many undocumented behavior in all the involved - // classes + } } diff --git a/fpicker/source/aqua/FPServiceInfo.hxx b/fpicker/source/aqua/FPServiceInfo.hxx index c1b64c8714e0..ad42d07fe735 100644 --- a/fpicker/source/aqua/FPServiceInfo.hxx +++ b/fpicker/source/aqua/FPServiceInfo.hxx @@ -20,10 +20,6 @@ #ifndef _FPSERVICEINFO_HXX_ #define _FPSERVICEINFO_HXX_ -//------------------------------------------------------------------------ -// defines -//------------------------------------------------------------------------ - // the service names #define FILE_PICKER_SERVICE_NAME "com.sun.star.ui.dialogs.AquaFilePicker" #define FOLDER_PICKER_SERVICE_NAME "com.sun.star.ui.dialogs.AquaFolderPicker" diff --git a/fpicker/source/aqua/resourceprovider.hxx b/fpicker/source/aqua/resourceprovider.hxx index 4fdb6adc1256..4a3d63227919 100644 --- a/fpicker/source/aqua/resourceprovider.hxx +++ b/fpicker/source/aqua/resourceprovider.hxx @@ -34,10 +34,6 @@ #define FILE_PICKER_FILE_TYPE 504 #define FILE_PICKER_OVERWRITE 505 -//------------------------------------------------------------------------ -// declarations -//------------------------------------------------------------------------ - class CResourceProvider_Impl; class CResourceProvider diff --git a/fpicker/source/win32/filepicker/FPServiceInfo.hxx b/fpicker/source/win32/filepicker/FPServiceInfo.hxx index f6188bc45ad6..01b1bbf2f866 100644 --- a/fpicker/source/win32/filepicker/FPServiceInfo.hxx +++ b/fpicker/source/win32/filepicker/FPServiceInfo.hxx @@ -21,10 +21,6 @@ #ifndef _FPSERVICEINFO_HXX_ #define _FPSERVICEINFO_HXX_ -//------------------------------------------------------------------------ -// defines -//------------------------------------------------------------------------ - // the service name is a description of a set of // interfaces (is the same as component categories in COM) diff --git a/fpicker/source/win32/filepicker/FilePicker.cxx b/fpicker/source/win32/filepicker/FilePicker.cxx index f7828100f761..cc6691e8b1ad 100644 --- a/fpicker/source/win32/filepicker/FilePicker.cxx +++ b/fpicker/source/win32/filepicker/FilePicker.cxx @@ -41,10 +41,6 @@ using namespace com::sun::star; using namespace ::com::sun::star::ui::dialogs; using namespace ::com::sun::star::ui::dialogs::TemplateDescription; -//------------------------------------------------------------------------ -// defines -//------------------------------------------------------------------------ - #define FILE_PICKER_DLL_NAME TEXT("fps.dll") //------------------------------------------------------------------------ diff --git a/fpicker/source/win32/filepicker/IVistaFilePickerInternalNotify.hxx b/fpicker/source/win32/filepicker/IVistaFilePickerInternalNotify.hxx index 98724d45fa19..2800b63202a8 100644 --- a/fpicker/source/win32/filepicker/IVistaFilePickerInternalNotify.hxx +++ b/fpicker/source/win32/filepicker/IVistaFilePickerInternalNotify.hxx @@ -28,10 +28,6 @@ #include <shobjidl.h> -//----------------------------------------------------------------------------- -// namespace -//----------------------------------------------------------------------------- - #ifdef css #error "Clash on using CSS as namespace define." #else diff --git a/fpicker/source/win32/filepicker/PreviewCtrl.cxx b/fpicker/source/win32/filepicker/PreviewCtrl.cxx index c09c13c14c74..43eee4a49672 100644 --- a/fpicker/source/win32/filepicker/PreviewCtrl.cxx +++ b/fpicker/source/win32/filepicker/PreviewCtrl.cxx @@ -31,10 +31,6 @@ #include <ocidl.h> #include <olectl.h> -//------------------------------------------------------------------------ -// defines -//------------------------------------------------------------------------ - #define PREVIEWWND_CLASS_NAME TEXT("PreviewWnd###") #define HIMETRIC_INCH 2540 diff --git a/fpicker/source/win32/filepicker/VistaFilePicker.cxx b/fpicker/source/win32/filepicker/VistaFilePicker.cxx index aeec19768bea..f05aefc97f54 100644 --- a/fpicker/source/win32/filepicker/VistaFilePicker.cxx +++ b/fpicker/source/win32/filepicker/VistaFilePicker.cxx @@ -61,10 +61,6 @@ namespace fpicker{ namespace win32{ namespace vista{ -//------------------------------------------------------------------------ -// defines -//------------------------------------------------------------------------ - #define FILE_PICKER_DLL_NAME TEXT("fps.dll") //------------------------------------------------------------------------ diff --git a/fpicker/source/win32/filepicker/VistaFilePicker.hxx b/fpicker/source/win32/filepicker/VistaFilePicker.hxx index 206dbdc2dd2a..86a2784d3f47 100644 --- a/fpicker/source/win32/filepicker/VistaFilePicker.hxx +++ b/fpicker/source/win32/filepicker/VistaFilePicker.hxx @@ -40,10 +40,6 @@ #include <cppuhelper/basemutex.hxx> #include <rtl/ustring.hxx> -//----------------------------------------------------------------------------- -// namespace -//----------------------------------------------------------------------------- - namespace css = ::com::sun::star; namespace fpicker{ diff --git a/fpicker/source/win32/filepicker/VistaFilePickerEventHandler.cxx b/fpicker/source/win32/filepicker/VistaFilePickerEventHandler.cxx index 0ae95f21464e..4fe1926074b3 100644 --- a/fpicker/source/win32/filepicker/VistaFilePickerEventHandler.cxx +++ b/fpicker/source/win32/filepicker/VistaFilePickerEventHandler.cxx @@ -47,10 +47,6 @@ namespace fpicker{ namespace win32{ namespace vista{ -//------------------------------------------------------------------------ -// defines -//------------------------------------------------------------------------ - //----------------------------------------------------------------------------------------- VistaFilePickerEventHandler::VistaFilePickerEventHandler(IVistaFilePickerInternalNotify* pInternalNotify) : m_nRefCount (0 ) diff --git a/fpicker/source/win32/filepicker/VistaFilePickerEventHandler.hxx b/fpicker/source/win32/filepicker/VistaFilePickerEventHandler.hxx index eaf4f949ff79..851346d581b3 100644 --- a/fpicker/source/win32/filepicker/VistaFilePickerEventHandler.hxx +++ b/fpicker/source/win32/filepicker/VistaFilePickerEventHandler.hxx @@ -40,10 +40,6 @@ #include <cppuhelper/interfacecontainer.h> #include <osl/interlck.h> -//----------------------------------------------------------------------------- -// namespace -//----------------------------------------------------------------------------- - namespace css = ::com::sun::star; namespace fpicker{ diff --git a/fpicker/source/win32/filepicker/VistaFilePickerImpl.cxx b/fpicker/source/win32/filepicker/VistaFilePickerImpl.cxx index faf010bbc967..d3d1689ae217 100644 --- a/fpicker/source/win32/filepicker/VistaFilePickerImpl.cxx +++ b/fpicker/source/win32/filepicker/VistaFilePickerImpl.cxx @@ -51,10 +51,6 @@ HWND choose_parent_window() return hwnd_parent; } -//----------------------------------------------------------------------------- -// namespace -//----------------------------------------------------------------------------- - namespace fpicker{ namespace win32{ namespace vista{ diff --git a/fpicker/source/win32/filepicker/VistaFilePickerImpl.hxx b/fpicker/source/win32/filepicker/VistaFilePickerImpl.hxx index 1d5ef1a4e559..364ed66acccc 100644 --- a/fpicker/source/win32/filepicker/VistaFilePickerImpl.hxx +++ b/fpicker/source/win32/filepicker/VistaFilePickerImpl.hxx @@ -54,10 +54,6 @@ #include <osl/conditn.hxx> #include <rtl/ustring.hxx> -//----------------------------------------------------------------------------- -// namespace -//----------------------------------------------------------------------------- - namespace css = ::com::sun::star; namespace fpicker{ diff --git a/fpicker/source/win32/filepicker/WinFileOpenImpl.hxx b/fpicker/source/win32/filepicker/WinFileOpenImpl.hxx index c3d7a0bdcfe3..d74b3eeead3f 100644 --- a/fpicker/source/win32/filepicker/WinFileOpenImpl.hxx +++ b/fpicker/source/win32/filepicker/WinFileOpenImpl.hxx @@ -37,10 +37,6 @@ #include <vector> #include <osl/conditn.hxx> -//------------------------------------------------------------------------ -// deklarations -//------------------------------------------------------------------------ - // forward declaration class CFilePicker; class CFilePickerState; diff --git a/fpicker/source/win32/filepicker/asyncrequests.cxx b/fpicker/source/win32/filepicker/asyncrequests.cxx index 69bbd05e6e61..8ceea5198186 100644 --- a/fpicker/source/win32/filepicker/asyncrequests.cxx +++ b/fpicker/source/win32/filepicker/asyncrequests.cxx @@ -21,10 +21,6 @@ #include <vcl/svapp.hxx> #include <osl/mutex.hxx> -//----------------------------------------------------------------------------- -// namespace -//----------------------------------------------------------------------------- - namespace fpicker{ namespace win32{ namespace vista{ diff --git a/fpicker/source/win32/filepicker/asyncrequests.hxx b/fpicker/source/win32/filepicker/asyncrequests.hxx index 50067779a17c..6e3fc5233220 100644 --- a/fpicker/source/win32/filepicker/asyncrequests.hxx +++ b/fpicker/source/win32/filepicker/asyncrequests.hxx @@ -28,10 +28,6 @@ #include <queue> #include <boost/shared_ptr.hpp> -//----------------------------------------------------------------------------- -// namespace -//----------------------------------------------------------------------------- - namespace css = ::com::sun::star; namespace fpicker{ diff --git a/fpicker/source/win32/filepicker/controlaccess.hxx b/fpicker/source/win32/filepicker/controlaccess.hxx index a0a47ee78b39..ee990f6e2cb6 100644 --- a/fpicker/source/win32/filepicker/controlaccess.hxx +++ b/fpicker/source/win32/filepicker/controlaccess.hxx @@ -33,10 +33,6 @@ #endif #include <com/sun/star/uno/Any.hxx> -//------------------------------------------------------------------------ -// deklarations -//------------------------------------------------------------------------ - typedef void ( SAL_CALL *CTRL_SETVALUE_FUNCTION_T)( HWND, const ::com::sun::star::uno::Any&, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >&, sal_Int16 ); typedef ::com::sun::star::uno::Any ( SAL_CALL *CTRL_GETVALUE_FUNCTION_T )( HWND ); diff --git a/fpicker/source/win32/filepicker/dibpreview.cxx b/fpicker/source/win32/filepicker/dibpreview.cxx index fdaae96ee131..e019fd0aac42 100644 --- a/fpicker/source/win32/filepicker/dibpreview.cxx +++ b/fpicker/source/win32/filepicker/dibpreview.cxx @@ -47,10 +47,6 @@ namespace /* private */ const LPCTSTR CURRENT_INSTANCE = TEXT("CurrInst"); }; -//------------------------------------------------------------------------ -// defines -//------------------------------------------------------------------------ - #define PREVIEWWND_CLASS_NAME TEXT("DIBPreviewWnd###") // means 3 pixel left and 3 pixel right diff --git a/fpicker/source/win32/filepicker/helppopupwindow.cxx b/fpicker/source/win32/filepicker/helppopupwindow.cxx index af7449d9e1e0..7b0ddf2262de 100644 --- a/fpicker/source/win32/filepicker/helppopupwindow.cxx +++ b/fpicker/source/win32/filepicker/helppopupwindow.cxx @@ -39,10 +39,6 @@ namespace /* private */ }; -//------------------------------------------------------------------------ -// defines -//------------------------------------------------------------------------ - #define HELPPOPUPWND_CLASS_NAME TEXT("hlppopupwnd###") const sal_Int32 MAX_CHARS_PER_LINE = 55; diff --git a/fpicker/source/win32/filepicker/vistatypes.h b/fpicker/source/win32/filepicker/vistatypes.h index 97cff510f34b..3f95918c336a 100644 --- a/fpicker/source/win32/filepicker/vistatypes.h +++ b/fpicker/source/win32/filepicker/vistatypes.h @@ -23,10 +23,6 @@ #include "comptr.hxx" #include <shobjidl.h> -//----------------------------------------------------------------------------- -// namespace -//----------------------------------------------------------------------------- - #ifdef css #error "Clash on using CSS as namespace define." #else diff --git a/fpicker/source/win32/folderpicker/FOPServiceInfo.hxx b/fpicker/source/win32/folderpicker/FOPServiceInfo.hxx index 42ae1d225132..14c06b91fadb 100644 --- a/fpicker/source/win32/folderpicker/FOPServiceInfo.hxx +++ b/fpicker/source/win32/folderpicker/FOPServiceInfo.hxx @@ -21,10 +21,6 @@ #ifndef _FOPSERVICEINFO_HXX_ #define _FOPSERVICEINFO_HXX_ -//------------------------------------------------------------------------ -// defines -//------------------------------------------------------------------------ - // the service name is a description of a set of // interfaces (is the same as component categories in COM) diff --git a/fpicker/source/win32/folderpicker/FolderPicker.cxx b/fpicker/source/win32/folderpicker/FolderPicker.cxx index a7e8f90a5369..953c50d665b3 100644 --- a/fpicker/source/win32/folderpicker/FolderPicker.cxx +++ b/fpicker/source/win32/folderpicker/FolderPicker.cxx @@ -41,10 +41,6 @@ using osl::MutexGuard; using namespace cppu; using namespace com::sun::star::ui::dialogs; -//------------------------------------------------------------------------ -// defines -//------------------------------------------------------------------------ - #define FOLDERPICKER_IMPL_NAME "com.sun.star.ui.dialogs.Win32FolderPicker" //------------------------------------------------------------------------ diff --git a/fpicker/source/win32/folderpicker/FopEvtDisp.hxx b/fpicker/source/win32/folderpicker/FopEvtDisp.hxx index b1c59b34a0db..240a9f336b4a 100644 --- a/fpicker/source/win32/folderpicker/FopEvtDisp.hxx +++ b/fpicker/source/win32/folderpicker/FopEvtDisp.hxx @@ -23,9 +23,6 @@ #include <com/sun/star/lang/EventObject.hpp> -//------------------------------------------------------------------------ -// deklarations -//------------------------------------------------------------------------ class CFOPEventDispatcher { public: diff --git a/fpicker/source/win32/folderpicker/WinFOPImpl.hxx b/fpicker/source/win32/folderpicker/WinFOPImpl.hxx index 8d362b4abc81..77abfa2e2efd 100644 --- a/fpicker/source/win32/folderpicker/WinFOPImpl.hxx +++ b/fpicker/source/win32/folderpicker/WinFOPImpl.hxx @@ -30,10 +30,6 @@ class CFolderPicker; -//------------------------------------------------------------------------ -// deklarations -//------------------------------------------------------------------------ - class CWinFolderPickerImpl : public CMtaFolderPicker { public: diff --git a/fpicker/source/win32/folderpicker/workbench/Test_fops.cxx b/fpicker/source/win32/folderpicker/workbench/Test_fops.cxx index 50f3ce521dea..de842138a70d 100644 --- a/fpicker/source/win32/folderpicker/workbench/Test_fops.cxx +++ b/fpicker/source/win32/folderpicker/workbench/Test_fops.cxx @@ -53,10 +53,6 @@ using namespace ::com::sun::star::lang ; using namespace ::com::sun::star::ui::dialogs; using namespace std ; -//-------------------------------------------------------------- -// defines -//-------------------------------------------------------------- - #define RDB_SYSPATH "D:\\Projects\\gsl\\sysui\\wntmsci7\\bin\\applicat.rdb" //-------------------------------------------------------------- diff --git a/fpicker/source/win32/misc/WinImplHelper.hxx b/fpicker/source/win32/misc/WinImplHelper.hxx index 41557b24f2f7..9c6a69ddab80 100644 --- a/fpicker/source/win32/misc/WinImplHelper.hxx +++ b/fpicker/source/win32/misc/WinImplHelper.hxx @@ -34,10 +34,6 @@ #include <com/sun/star/uno/Any.hxx> #include <com/sun/star/lang/IllegalArgumentException.hpp> -//------------------------------------------------------------------------ -// deklarations -//------------------------------------------------------------------------ - bool SAL_CALL IsWindowsVistaOrNewer(); // set actions diff --git a/fpicker/source/win32/misc/resourceprovider.hxx b/fpicker/source/win32/misc/resourceprovider.hxx index dbd1c2e84062..852b225bf30c 100644 --- a/fpicker/source/win32/misc/resourceprovider.hxx +++ b/fpicker/source/win32/misc/resourceprovider.hxx @@ -25,10 +25,6 @@ #include <rtl/ustring.hxx> -//------------------------------------------------------------------------ -// deklarations -//------------------------------------------------------------------------ - class CResourceProvider_Impl; class CResourceProvider diff --git a/framework/inc/classes/checkediterator.hxx b/framework/inc/classes/checkediterator.hxx index 8f9f062853e5..815707f7076a 100644 --- a/framework/inc/classes/checkediterator.hxx +++ b/framework/inc/classes/checkediterator.hxx @@ -26,20 +26,8 @@ #include <iterator> -//_________________________________________________________________________________________________________________ -// namespace -//_________________________________________________________________________________________________________________ - namespace framework{ -//_________________________________________________________________________________________________________________ -// exported const -//_________________________________________________________________________________________________________________ - -//_________________________________________________________________________________________________________________ -// exported definitions -//_________________________________________________________________________________________________________________ - /*-************************************************************************************************************//** @short implement a iterator which support 2 end states! @descr For our search methods we need a "walking" iterator object with special functionality! diff --git a/framework/inc/classes/converter.hxx b/framework/inc/classes/converter.hxx index e3394c791809..c8095523d9f5 100644 --- a/framework/inc/classes/converter.hxx +++ b/framework/inc/classes/converter.hxx @@ -39,20 +39,8 @@ #include <tools/datetime.hxx> #include <fwidllapi.h> -//_________________________________________________________________________________________________________________ -// namespace -//_________________________________________________________________________________________________________________ - namespace framework{ -//_________________________________________________________________________________________________________________ -// exported const -//_________________________________________________________________________________________________________________ - -//_________________________________________________________________________________________________________________ -// exported definitions -//_________________________________________________________________________________________________________________ - class FWI_DLLPUBLIC Converter { public: diff --git a/framework/inc/classes/filtercache.hxx b/framework/inc/classes/filtercache.hxx index 8922cfb096d1..248e651d9188 100644 --- a/framework/inc/classes/filtercache.hxx +++ b/framework/inc/classes/filtercache.hxx @@ -50,20 +50,8 @@ #endif #endif -//_________________________________________________________________________________________________________________ -// namespace -//_________________________________________________________________________________________________________________ - namespace framework{ -//_________________________________________________________________________________________________________________ -// exported const -//_________________________________________________________________________________________________________________ - -//_________________________________________________________________________________________________________________ -// exported definitions -//_________________________________________________________________________________________________________________ - /*-************************************************************************************************************//** @short cache for all filter and type information @descr Frameloader- and filterfactory need some informations about our current registered filters and types. diff --git a/framework/inc/classes/filtercachedata.hxx b/framework/inc/classes/filtercachedata.hxx index 437b509a7999..7811b5887f12 100644 --- a/framework/inc/classes/filtercachedata.hxx +++ b/framework/inc/classes/filtercachedata.hxx @@ -57,24 +57,12 @@ #include <rtl/ustring.hxx> #include <rtl/logfile.hxx> -//_________________________________________________________________________________________________________________ -// namespace -//_________________________________________________________________________________________________________________ - namespace framework{ -//_________________________________________________________________________________________________________________ -// exported const -//_________________________________________________________________________________________________________________ - #define DEFAULT_FILTERCACHE_VERSION 6 /// these implmentation of FilterCache support different version of TypeDetection.xml! This define the current set default one. #define DEFAULT_FILTERCACHE_MODE CONFIG_MODE_DELAYED_UPDATE | CONFIG_MODE_ALL_LOCALES /// ConfigItems could run in different modes: supported values are ... { CONFIG_MODE_IMMEDIATE_UPDATE, CONFIG_MODE_DELAYED_UPDATE, CONFIG_MODE_ALL_LOCALES } -//_________________________________________________________________________________________________________________ -// exported definitions -//_________________________________________________________________________________________________________________ - enum EModifyState { E_UNTOUCHED , diff --git a/framework/inc/classes/framecontainer.hxx b/framework/inc/classes/framecontainer.hxx index 66f25119d60c..7ce7750c83b0 100644 --- a/framework/inc/classes/framecontainer.hxx +++ b/framework/inc/classes/framecontainer.hxx @@ -50,20 +50,8 @@ #include <rtl/ustring.hxx> #include <vcl/evntpost.hxx> -//_________________________________________________________________________________________________________________ -// namespace -//_________________________________________________________________________________________________________________ - namespace framework{ -//_________________________________________________________________________________________________________________ -// exported const -//_________________________________________________________________________________________________________________ - -//_________________________________________________________________________________________________________________ -// exported definitions -//_________________________________________________________________________________________________________________ - typedef ::std::vector< css::uno::Reference< css::frame::XFrame > > TFrameContainer ; typedef TFrameContainer::iterator TFrameIterator ; typedef TFrameContainer::const_iterator TConstFrameIterator ; diff --git a/framework/inc/classes/propertysethelper.hxx b/framework/inc/classes/propertysethelper.hxx index a02113d0b95a..1a5476b5b163 100644 --- a/framework/inc/classes/propertysethelper.hxx +++ b/framework/inc/classes/propertysethelper.hxx @@ -35,8 +35,6 @@ #include <cppuhelper/weakref.hxx> #include <fwidllapi.h> -//_________________________________________________________________________________________________________________ -// namespace namespace framework{ diff --git a/framework/inc/classes/protocolhandlercache.hxx b/framework/inc/classes/protocolhandlercache.hxx index 4c008872f94b..44679db2231c 100644 --- a/framework/inc/classes/protocolhandlercache.hxx +++ b/framework/inc/classes/protocolhandlercache.hxx @@ -39,16 +39,8 @@ #include <rtl/ustring.hxx> #include <fwidllapi.h> -//_________________________________________________________________________________________________________________ -// namespace -//_________________________________________________________________________________________________________________ - namespace framework{ -//_________________________________________________________________________________________________________________ -// exported const -//_________________________________________________________________________________________________________________ - #define PACKAGENAME_PROTOCOLHANDLER DECLARE_ASCII("Office.ProtocolHandler" ) /// name of our configuration package #define CFG_PATH_SEPERATOR DECLARE_ASCII("/" ) /// separator for configuration paths diff --git a/framework/inc/classes/taskcreator.hxx b/framework/inc/classes/taskcreator.hxx index f2c8ab43e60f..92da1f14ece9 100644 --- a/framework/inc/classes/taskcreator.hxx +++ b/framework/inc/classes/taskcreator.hxx @@ -31,20 +31,8 @@ #include <com/sun/star/uno/Reference.hxx> #include <rtl/ustring.hxx> -//_________________________________________________________________________________________________________________ -// namespace -//_________________________________________________________________________________________________________________ - namespace framework{ -//_________________________________________________________________________________________________________________ -// exported const -//_________________________________________________________________________________________________________________ - -//_________________________________________________________________________________________________________________ -// exported definitions -//_________________________________________________________________________________________________________________ - /*-************************************************************************************************************//** @short a helper to create new tasks or sub frames for "_blank" or FrameSearchFlag::CREATE @descr There are different places to create new (task)frames. Its not easy to service this code! diff --git a/framework/inc/classes/wildcard.hxx b/framework/inc/classes/wildcard.hxx index 5321aec959a6..7c80170dbb17 100644 --- a/framework/inc/classes/wildcard.hxx +++ b/framework/inc/classes/wildcard.hxx @@ -24,20 +24,8 @@ #include <rtl/ustring.hxx> -//_________________________________________________________________________________________________________________ -// const -//_________________________________________________________________________________________________________________ - -//_________________________________________________________________________________________________________________ -// namespace -//_________________________________________________________________________________________________________________ - namespace framework{ -//_________________________________________________________________________________________________________________ -// declarations -//_________________________________________________________________________________________________________________ - /*-************************************************************************************************************//** @short implement wildcard-mechanism for unicode @descr This class can be used to get information about the matching of a pattern to a given text. diff --git a/framework/inc/dispatch/closedispatcher.hxx b/framework/inc/dispatch/closedispatcher.hxx index 88a0ad3452f0..fa5a7fd4ed2c 100644 --- a/framework/inc/dispatch/closedispatcher.hxx +++ b/framework/inc/dispatch/closedispatcher.hxx @@ -50,8 +50,6 @@ #include <cppuhelper/weak.hxx> #include <vcl/evntpost.hxx> -//_______________________________________________ -// namespace class SystemWindow; diff --git a/framework/inc/dispatch/dispatchinformationprovider.hxx b/framework/inc/dispatch/dispatchinformationprovider.hxx index 64acfd1a79d3..e8dc28db4c43 100644 --- a/framework/inc/dispatch/dispatchinformationprovider.hxx +++ b/framework/inc/dispatch/dispatchinformationprovider.hxx @@ -35,20 +35,8 @@ #include <cppuhelper/weak.hxx> #include <vcl/svapp.hxx> -//_________________________________________________________________________________________________________________ -// namespace -//_________________________________________________________________________________________________________________ - namespace framework{ -//_________________________________________________________________________________________________________________ -// exported const -//_________________________________________________________________________________________________________________ - -//_________________________________________________________________________________________________________________ -// exported definitions -//_________________________________________________________________________________________________________________ - /*-************************************************************************************************************//** @short a helper to merge dispatch informations of different sources together. *//*-*************************************************************************************************************/ diff --git a/framework/inc/dispatch/interceptionhelper.hxx b/framework/inc/dispatch/interceptionhelper.hxx index 7d6056a86cf3..9655706a9f5f 100644 --- a/framework/inc/dispatch/interceptionhelper.hxx +++ b/framework/inc/dispatch/interceptionhelper.hxx @@ -41,20 +41,8 @@ #include <deque> -//_________________________________________________________________________________________________________________ -// namespace -//_________________________________________________________________________________________________________________ - namespace framework{ -//_________________________________________________________________________________________________________________ -// exported const -//_________________________________________________________________________________________________________________ - -//_________________________________________________________ -// definitions -//_________________________________________________________ - /** @short implements a helper to support interception with additional functionality. @descr This helper implements the complete XDispatchProviderInterception interface with diff --git a/framework/inc/dispatch/mailtodispatcher.hxx b/framework/inc/dispatch/mailtodispatcher.hxx index c06b31faae1a..91acd5b837de 100644 --- a/framework/inc/dispatch/mailtodispatcher.hxx +++ b/framework/inc/dispatch/mailtodispatcher.hxx @@ -48,20 +48,8 @@ #include <cppuhelper/weak.hxx> -//_________________________________________________________________________________________________________________ -// namespace -//_________________________________________________________________________________________________________________ - namespace framework{ -//_________________________________________________________________________________________________________________ -// exported const -//_________________________________________________________________________________________________________________ - -//_________________________________________________________________________________________________________________ -// exported definitions -//_________________________________________________________________________________________________________________ - /** @short protocol handler for "mailto:" URLs @descr It's a special dispatch object which is used registered for "mailto:*" URLs and diff --git a/framework/inc/dispatch/menudispatcher.hxx b/framework/inc/dispatch/menudispatcher.hxx index 01d1e2d8372c..112bc15aed58 100644 --- a/framework/inc/dispatch/menudispatcher.hxx +++ b/framework/inc/dispatch/menudispatcher.hxx @@ -56,21 +56,8 @@ #include <cppuhelper/weakref.hxx> #include <cppuhelper/interfacecontainer.h> -//_________________________________________________________________________________________________________________ -// namespace -//_________________________________________________________________________________________________________________ - namespace framework{ - -//_________________________________________________________________________________________________________________ -// exported const -//_________________________________________________________________________________________________________________ - -//_________________________________________________________________________________________________________________ -// exported definitions -//_________________________________________________________________________________________________________________ - /*-************************************************************************************************************//** We must save informations about our listener and URL for listening. We implement this as a hashtable for strings. diff --git a/framework/inc/dispatch/oxt_handler.hxx b/framework/inc/dispatch/oxt_handler.hxx index 4659c564000e..3cee776b717c 100644 --- a/framework/inc/dispatch/oxt_handler.hxx +++ b/framework/inc/dispatch/oxt_handler.hxx @@ -41,20 +41,8 @@ #include <cppuhelper/weak.hxx> -//_________________________________________________________________________________________________________________ -// namespace -//_________________________________________________________________________________________________________________ - namespace framework{ -//_________________________________________________________________________________________________________________ -// exported const -//_________________________________________________________________________________________________________________ - -//_________________________________________________________________________________________________________________ -// exported definitions -//_________________________________________________________________________________________________________________ - /*-************************************************************************************************************//** @short handler to detect and play sounds ("wav" and "au" only!) @descr Register this implementation as a content handler to detect and/or play wav- and au-sounds. diff --git a/framework/inc/dispatch/popupmenudispatcher.hxx b/framework/inc/dispatch/popupmenudispatcher.hxx index 23741dd78c0c..b534a0797d13 100644 --- a/framework/inc/dispatch/popupmenudispatcher.hxx +++ b/framework/inc/dispatch/popupmenudispatcher.hxx @@ -49,21 +49,8 @@ #include <cppuhelper/weakref.hxx> #include <cppuhelper/interfacecontainer.h> -//_________________________________________________________________________________________________________________ -// namespace -//_________________________________________________________________________________________________________________ - namespace framework{ - -//_________________________________________________________________________________________________________________ -// exported const -//_________________________________________________________________________________________________________________ - -//_________________________________________________________________________________________________________________ -// exported definitions -//_________________________________________________________________________________________________________________ - /*-************************************************************************************************************//** We must save informations about our listener and URL for listening. We implement this as a hashtable for strings. diff --git a/framework/inc/dispatch/servicehandler.hxx b/framework/inc/dispatch/servicehandler.hxx index 78f15c1c1136..c4f3e072d416 100644 --- a/framework/inc/dispatch/servicehandler.hxx +++ b/framework/inc/dispatch/servicehandler.hxx @@ -48,20 +48,8 @@ #include <cppuhelper/weak.hxx> -//_________________________________________________________________________________________________________________ -// namespace -//_________________________________________________________________________________________________________________ - namespace framework{ -//_________________________________________________________________________________________________________________ -// exported const -//_________________________________________________________________________________________________________________ - -//_________________________________________________________________________________________________________________ -// exported definitions -//_________________________________________________________________________________________________________________ - /** @short protocol handler for "service:*" URLs @descr It's a special dispatch/provider object which is registered for such URL pattern and will diff --git a/framework/inc/dispatch/startmoduledispatcher.hxx b/framework/inc/dispatch/startmoduledispatcher.hxx index e8cbe9d1ba31..373c333eccbb 100644 --- a/framework/inc/dispatch/startmoduledispatcher.hxx +++ b/framework/inc/dispatch/startmoduledispatcher.hxx @@ -41,8 +41,6 @@ #include <cppuhelper/weak.hxx> #include <vcl/evntpost.hxx> -//_______________________________________________ -// namespace namespace framework{ diff --git a/framework/inc/dispatch/systemexec.hxx b/framework/inc/dispatch/systemexec.hxx index ed9539ec7701..3469e42a6b76 100644 --- a/framework/inc/dispatch/systemexec.hxx +++ b/framework/inc/dispatch/systemexec.hxx @@ -48,20 +48,8 @@ #include <cppuhelper/weak.hxx> -//_________________________________________________________________________________________________________________ -// namespace -//_________________________________________________________________________________________________________________ - namespace framework{ -//_________________________________________________________________________________________________________________ -// exported const -//_________________________________________________________________________________________________________________ - -//_________________________________________________________________________________________________________________ -// exported definitions -//_________________________________________________________________________________________________________________ - /** @short protocol handler for "systemexec:*" URLs @descr It's a special dispatch/provider object which is registered for such URL pattern and will diff --git a/framework/inc/dispatchcommands.h b/framework/inc/dispatchcommands.h index 50a5de3862d7..71a294cc212f 100644 --- a/framework/inc/dispatchcommands.h +++ b/framework/inc/dispatchcommands.h @@ -31,10 +31,6 @@ #include <macros/generic.hxx> -//_________________________________________________________________________________________________________________ -// namespace -//_________________________________________________________________________________________________________________ - namespace framework{ //_________________________________________________________________________________________________________________ diff --git a/framework/inc/framework/addonsoptions.hxx b/framework/inc/framework/addonsoptions.hxx index 0cf56e479e39..d84ee00c72ca 100644 --- a/framework/inc/framework/addonsoptions.hxx +++ b/framework/inc/framework/addonsoptions.hxx @@ -115,10 +115,6 @@ typedef ::std::vector< MergeToolbarInstruction > MergeToolbarInstructionContaine class AddonsOptions_Impl; -//_________________________________________________________________________________________________________________ -// declarations -//_________________________________________________________________________________________________________________ - /*-************************************************************************************************************//** @short collect informations about menu features @descr - diff --git a/framework/inc/framework/framelistanalyzer.hxx b/framework/inc/framework/framelistanalyzer.hxx index d992cfe3bdf4..9ff832c884ac 100644 --- a/framework/inc/framework/framelistanalyzer.hxx +++ b/framework/inc/framework/framelistanalyzer.hxx @@ -24,17 +24,8 @@ #include <framework/fwedllapi.h> -//_______________________________________________ -// namespace - namespace framework{ -//_______________________________________________ -// exported const - -//_______________________________________________ -// exported definitions - /** analyze and split the current available frame list of a given frames supplier into different parts. diff --git a/framework/inc/framework/iguard.hxx b/framework/inc/framework/iguard.hxx index 7a14aed6a248..cccbe9da4f8d 100644 --- a/framework/inc/framework/iguard.hxx +++ b/framework/inc/framework/iguard.hxx @@ -31,16 +31,8 @@ #include <sal/types.h> -//_________________________________________________________________________________________________________________ -// namespace -//_________________________________________________________________________________________________________________ - namespace framework{ -//_________________________________________________________________________________________________________________ -// declarations -//_________________________________________________________________________________________________________________ - /*-************************************************************************************************************//** @descr interface for guarding a lock *//*-*************************************************************************************************************/ diff --git a/framework/inc/framework/imutex.hxx b/framework/inc/framework/imutex.hxx index 2de825a357af..65a30545b77d 100644 --- a/framework/inc/framework/imutex.hxx +++ b/framework/inc/framework/imutex.hxx @@ -31,16 +31,8 @@ #include <sal/types.h> -//_________________________________________________________________________________________________________________ -// namespace -//_________________________________________________________________________________________________________________ - namespace framework{ -//_________________________________________________________________________________________________________________ -// declarations -//_________________________________________________________________________________________________________________ - /*-************************************************************************************************************//** @descr We need this interface to support using of different mutex implementations in a generic way. *//*-*************************************************************************************************************/ diff --git a/framework/inc/framework/preventduplicateinteraction.hxx b/framework/inc/framework/preventduplicateinteraction.hxx index 09a14ec41e69..7bfd6065bc96 100644 --- a/framework/inc/framework/preventduplicateinteraction.hxx +++ b/framework/inc/framework/preventduplicateinteraction.hxx @@ -39,22 +39,10 @@ #include <cppuhelper/implbase1.hxx> -//_________________________________________________________________________________________________________________ -// namespace -//_________________________________________________________________________________________________________________ - namespace css = ::com::sun::star; namespace framework{ -//_________________________________________________________________________________________________________________ -// exported const -//_________________________________________________________________________________________________________________ - -//_________________________________________________________________________________________________________________ -// exported definitions -//_________________________________________________________________________________________________________________ - /** @short Prevent us from showing the same interaction more then once during the same transaction. diff --git a/framework/inc/framework/titlehelper.hxx b/framework/inc/framework/titlehelper.hxx index 67746c91f538..959810b1d7c5 100644 --- a/framework/inc/framework/titlehelper.hxx +++ b/framework/inc/framework/titlehelper.hxx @@ -51,15 +51,11 @@ #include <boost/unordered_map.hpp> #include <framework/fwedllapi.h> -//_______________________________________________ -// namespace namespace css = ::com::sun::star; namespace framework{ -//_______________________________________________ -// definitions /** @short can be used as implementation helper of interface css.frame.XTitle diff --git a/framework/inc/general.h b/framework/inc/general.h index dafddfba082d..f131eacbb15b 100644 --- a/framework/inc/general.h +++ b/framework/inc/general.h @@ -38,8 +38,6 @@ #include <rtl/ustring.hxx> -//============================================================================= -// namespace //----------------------------------------------------------------------------- /** will make our code more readable if we can use such short name css instead diff --git a/framework/inc/helper/dockingareadefaultacceptor.hxx b/framework/inc/helper/dockingareadefaultacceptor.hxx index 6f062a8639d0..0fba699a3a1e 100644 --- a/framework/inc/helper/dockingareadefaultacceptor.hxx +++ b/framework/inc/helper/dockingareadefaultacceptor.hxx @@ -33,10 +33,6 @@ #include <cppuhelper/implbase1.hxx> #include <cppuhelper/weakref.hxx> -//_________________________________________________________________________________________________________________ -// namespace -//_________________________________________________________________________________________________________________ - namespace framework{ //_________________________________________________________________________________________________________________ diff --git a/framework/inc/helper/ocomponentaccess.hxx b/framework/inc/helper/ocomponentaccess.hxx index 45007f8e0e5d..7e836c49e0ee 100644 --- a/framework/inc/helper/ocomponentaccess.hxx +++ b/framework/inc/helper/ocomponentaccess.hxx @@ -37,20 +37,8 @@ #include <cppuhelper/implbase1.hxx> #include <cppuhelper/weakref.hxx> -//_________________________________________________________________________________________________________________ -// namespace -//_________________________________________________________________________________________________________________ - namespace framework{ -//_________________________________________________________________________________________________________________ -// exported const -//_________________________________________________________________________________________________________________ - -//_________________________________________________________________________________________________________________ -// exported definitions -//_________________________________________________________________________________________________________________ - /*-************************************************************************************************************//** @short implement XEnumerationAccess interface as helper to create many oneway enumeration of components @descr We share mutex and framecontainer with ouer owner and have full access to his child tasks. diff --git a/framework/inc/helper/ocomponentenumeration.hxx b/framework/inc/helper/ocomponentenumeration.hxx index a95642ea28f8..5d38371324ce 100644 --- a/framework/inc/helper/ocomponentenumeration.hxx +++ b/framework/inc/helper/ocomponentenumeration.hxx @@ -33,20 +33,8 @@ #include <cppuhelper/implbase2.hxx> -//_________________________________________________________________________________________________________________ -// namespace -//_________________________________________________________________________________________________________________ - namespace framework{ -//_________________________________________________________________________________________________________________ -// exported const -//_________________________________________________________________________________________________________________ - -//_________________________________________________________________________________________________________________ -// exported definitions -//_________________________________________________________________________________________________________________ - /*-************************************************************************************************************//** @short implement a helper for a oneway enumeration of components @descr You can step during this list only for one time! Its a snapshot. diff --git a/framework/inc/helper/oframes.hxx b/framework/inc/helper/oframes.hxx index 2cd37a127362..9e9e3e283418 100644 --- a/framework/inc/helper/oframes.hxx +++ b/framework/inc/helper/oframes.hxx @@ -44,20 +44,8 @@ #include <cppuhelper/implbase1.hxx> #include <cppuhelper/weakref.hxx> -//_________________________________________________________________________________________________________________ -// namespace -//_________________________________________________________________________________________________________________ - namespace framework{ -//_________________________________________________________________________________________________________________ -// exported const -//_________________________________________________________________________________________________________________ - -//_________________________________________________________________________________________________________________ -// exported definitions -//_________________________________________________________________________________________________________________ - /*-************************************************************************************************************//** @short implement XFrames, XIndexAccess and XElementAccess interfaces as helper for services @descr Use this class as helper for these interfaces. We share mutex and framecontainer with ouer owner. diff --git a/framework/inc/helper/persistentwindowstate.hxx b/framework/inc/helper/persistentwindowstate.hxx index a883b0fac223..86f63abeb17e 100644 --- a/framework/inc/helper/persistentwindowstate.hxx +++ b/framework/inc/helper/persistentwindowstate.hxx @@ -35,20 +35,8 @@ #include <unotools/moduleoptions.hxx> #include <cppuhelper/weak.hxx> -//_________________________________________________________________________________________________________________ -// const -//_________________________________________________________________________________________________________________ - -//_________________________________________________________________________________________________________________ -// namespace -//_________________________________________________________________________________________________________________ - namespace framework{ -//_________________________________________________________________________________________________________________ -// declarations -//_________________________________________________________________________________________________________________ - /*-************************************************************************************************************//** @short listener for closing document frames to make her window state persistent @descr It's a feature of our office. If a document window was created by ourself (and not from diff --git a/framework/inc/helper/statusindicator.hxx b/framework/inc/helper/statusindicator.hxx index cdef924d93d9..a2913eadc0d2 100644 --- a/framework/inc/helper/statusindicator.hxx +++ b/framework/inc/helper/statusindicator.hxx @@ -39,13 +39,9 @@ #include <cppuhelper/weak.hxx> #include <cppuhelper/weakref.hxx> -//_______________________________________________ -// namespace namespace framework{ -//_______________________________________________ -// definitions //_______________________________________________ /** diff --git a/framework/inc/helper/statusindicatorfactory.hxx b/framework/inc/helper/statusindicatorfactory.hxx index 51ea0eb44d5b..f16b0b6a28f4 100644 --- a/framework/inc/helper/statusindicatorfactory.hxx +++ b/framework/inc/helper/statusindicatorfactory.hxx @@ -67,13 +67,9 @@ #include <cppuhelper/weak.hxx> #include <osl/thread.hxx> -//_______________________________________________ -// namespace namespace framework{ -//_______________________________________________ -// definitions //=============================================== /** diff --git a/framework/inc/helper/tagwindowasmodified.hxx b/framework/inc/helper/tagwindowasmodified.hxx index 79ffeb21a103..3346a4972a08 100644 --- a/framework/inc/helper/tagwindowasmodified.hxx +++ b/framework/inc/helper/tagwindowasmodified.hxx @@ -35,20 +35,8 @@ #include <cppuhelper/weak.hxx> -//_________________________________________________________________________________________________________________ -// const -//_________________________________________________________________________________________________________________ - -//_________________________________________________________________________________________________________________ -// namespace -//_________________________________________________________________________________________________________________ - namespace framework{ -//_________________________________________________________________________________________________________________ -// declarations -//_________________________________________________________________________________________________________________ - /*-************************************************************************************************************//** @short listen for modify events on model and tag frame container window so it can react accordingly @descr Used e.g. by our MAC port where such state is shown seperately on some controls of the diff --git a/framework/inc/helper/titlebarupdate.hxx b/framework/inc/helper/titlebarupdate.hxx index 00c38a74d8be..7de74898284b 100644 --- a/framework/inc/helper/titlebarupdate.hxx +++ b/framework/inc/helper/titlebarupdate.hxx @@ -59,20 +59,8 @@ #include <rtl/ustrbuf.hxx> -//_________________________________________________________________________________________________________________ -// const -//_________________________________________________________________________________________________________________ - -//_________________________________________________________________________________________________________________ -// namespace -//_________________________________________________________________________________________________________________ - namespace framework{ -//_________________________________________________________________________________________________________________ -// declarations -//_________________________________________________________________________________________________________________ - /*-************************************************************************************************************//** @short helps our frame on setting title/icon on the titlebar (including updates) diff --git a/framework/inc/helper/vclstatusindicator.hxx b/framework/inc/helper/vclstatusindicator.hxx index a76c6be21ce5..83fc64654dbe 100644 --- a/framework/inc/helper/vclstatusindicator.hxx +++ b/framework/inc/helper/vclstatusindicator.hxx @@ -32,8 +32,6 @@ #include <cppuhelper/weak.hxx> #include <vcl/status.hxx> -//----------------------------------------------- -// namespace namespace framework { diff --git a/framework/inc/helper/wakeupthread.hxx b/framework/inc/helper/wakeupthread.hxx index 97b64440e57f..054108201294 100644 --- a/framework/inc/helper/wakeupthread.hxx +++ b/framework/inc/helper/wakeupthread.hxx @@ -39,13 +39,9 @@ #include <cppuhelper/weakref.hxx> #include <osl/thread.hxx> -//_______________________________________________ -// namespace namespace framework{ -//_______________________________________________ -// definitions //=============================================== /** @short implements a "sleeping" thread, which try to sleep diff --git a/framework/inc/interaction/quietinteraction.hxx b/framework/inc/interaction/quietinteraction.hxx index 829f531a0ca0..c9a731d63b06 100644 --- a/framework/inc/interaction/quietinteraction.hxx +++ b/framework/inc/interaction/quietinteraction.hxx @@ -30,20 +30,8 @@ #include <cppuhelper/weak.hxx> -//_________________________________________________________________________________________________________________ -// namespace -//_________________________________________________________________________________________________________________ - namespace framework{ -//_________________________________________________________________________________________________________________ -// exported const -//_________________________________________________________________________________________________________________ - -//_________________________________________________________________________________________________________________ -// exported definitions -//_________________________________________________________________________________________________________________ - /** @short handle interactions non visible @descr Sometimes it's neccessary to use a non visible interaction handler. diff --git a/framework/inc/jobs/configaccess.hxx b/framework/inc/jobs/configaccess.hxx index 2ba4b89769d0..30ef4f2a47d8 100644 --- a/framework/inc/jobs/configaccess.hxx +++ b/framework/inc/jobs/configaccess.hxx @@ -29,13 +29,8 @@ #include <rtl/ustring.hxx> #include <fwidllapi.h> -//_______________________________________ -// namespace - namespace framework{ -//_______________________________________ -// public const //_______________________________________ /** @@ -46,8 +41,7 @@ namespace framework{ */ class FWI_DLLPUBLIC ConfigAccess : public ThreadHelpBase { - //___________________________________ - // const + public: diff --git a/framework/inc/jobs/helponstartup.hxx b/framework/inc/jobs/helponstartup.hxx index d0e58fb862f6..86967201db69 100644 --- a/framework/inc/jobs/helponstartup.hxx +++ b/framework/inc/jobs/helponstartup.hxx @@ -33,13 +33,9 @@ #include <com/sun/star/container/XNameAccess.hpp> #include <com/sun/star/frame/XModuleManager.hpp> -//_______________________________________________ -// namespace namespace framework{ -//_______________________________________________ -// declarations //_______________________________________________ /** @short implements a job component, which handle the special diff --git a/framework/inc/jobs/job.hxx b/framework/inc/jobs/job.hxx index ac48d64809b7..cd03bff7c824 100644 --- a/framework/inc/jobs/job.hxx +++ b/framework/inc/jobs/job.hxx @@ -41,16 +41,11 @@ #include <cppuhelper/weak.hxx> #include <rtl/ustring.hxx> -//_______________________________________ -// namespace namespace framework{ -//_______________________________________ -// public const -//_______________________________________ -// definitions + /** @short it represent a job; execute it and control it's lifetime diff --git a/framework/inc/jobs/jobconst.hxx b/framework/inc/jobs/jobconst.hxx index ebf55719ac84..dc7bab828433 100644 --- a/framework/inc/jobs/jobconst.hxx +++ b/framework/inc/jobs/jobconst.hxx @@ -27,13 +27,9 @@ #include <rtl/ustring.hxx> #include <fwidllapi.h> -//_______________________________________ -// namespace namespace framework{ -//_______________________________________ -// public const //_______________________________________ /** diff --git a/framework/inc/jobs/jobdata.hxx b/framework/inc/jobs/jobdata.hxx index 86df0702f8dc..acb107d9d8ac 100644 --- a/framework/inc/jobs/jobdata.hxx +++ b/framework/inc/jobs/jobdata.hxx @@ -33,16 +33,10 @@ #include <rtl/ustring.hxx> -//_______________________________________ -// namespace - namespace framework{ -//_______________________________________ -// public const -//_______________________________________ -// definitions + /** @short holds all neccessary informations about a job and @@ -53,9 +47,6 @@ namespace framework{ */ class JobData : private ThreadHelpBase { - //___________________________________ - // const - public: /// specifies the root package and key to find registered jobs diff --git a/framework/inc/jobs/jobdispatch.hxx b/framework/inc/jobs/jobdispatch.hxx index 0eb800e292de..b3cc0143f062 100644 --- a/framework/inc/jobs/jobdispatch.hxx +++ b/framework/inc/jobs/jobdispatch.hxx @@ -48,13 +48,9 @@ #include <cppuhelper/weak.hxx> #include <rtl/ustring.hxx> -//_______________________________________ -// namespace namespace framework{ -//_______________________________________ -// public const //_______________________________________ /** diff --git a/framework/inc/jobs/jobexecutor.hxx b/framework/inc/jobs/jobexecutor.hxx index 6e05c893f333..a0ab8f387fac 100644 --- a/framework/inc/jobs/jobexecutor.hxx +++ b/framework/inc/jobs/jobexecutor.hxx @@ -49,13 +49,9 @@ #include <cppuhelper/weak.hxx> #include <rtl/ustring.hxx> -//_______________________________________ -// namespace namespace framework{ -//_______________________________________ -// public const //_______________________________________ /** diff --git a/framework/inc/jobs/jobresult.hxx b/framework/inc/jobs/jobresult.hxx index f6b6aef2dec7..ee122f1ff2f2 100644 --- a/framework/inc/jobs/jobresult.hxx +++ b/framework/inc/jobs/jobresult.hxx @@ -30,13 +30,9 @@ #include <rtl/ustring.hxx> -//_______________________________________ -// namespace namespace framework{ -//_______________________________________ -// public const //_______________________________________ /** diff --git a/framework/inc/jobs/joburl.hxx b/framework/inc/jobs/joburl.hxx index c1db8f8dc0e8..6849f408528e 100644 --- a/framework/inc/jobs/joburl.hxx +++ b/framework/inc/jobs/joburl.hxx @@ -27,13 +27,9 @@ #include <rtl/ustring.hxx> -//_______________________________________ -// namespace namespace framework{ -//_______________________________________ -// const #define JOBURL_PROTOCOL_STR "vnd.sun.star.job:" #define JOBURL_PROTOCOL_LEN 17 diff --git a/framework/inc/jobs/shelljob.hxx b/framework/inc/jobs/shelljob.hxx index e28bf201c5cd..3024aa4c2958 100644 --- a/framework/inc/jobs/shelljob.hxx +++ b/framework/inc/jobs/shelljob.hxx @@ -33,13 +33,9 @@ #include <com/sun/star/container/XNameAccess.hpp> #include <com/sun/star/frame/XModuleManager.hpp> -//_______________________________________________ -// namespace namespace framework{ -//_______________________________________________ -// declarations //_______________________________________________ /** @short implements a job component which can be used diff --git a/framework/inc/macros/registration.hxx b/framework/inc/macros/registration.hxx index a65fcbae5963..2916ddbd28df 100644 --- a/framework/inc/macros/registration.hxx +++ b/framework/inc/macros/registration.hxx @@ -34,10 +34,6 @@ #include <com/sun/star/lang/XSingleServiceFactory.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp> -//_________________________________________________________________________________________________________________ -// namespace -//_________________________________________________________________________________________________________________ - //namespace framework{ /*_________________________________________________________________________________________________________________ diff --git a/framework/inc/macros/xinterface.hxx b/framework/inc/macros/xinterface.hxx index 1a3d123ba3eb..c6d537567e8c 100644 --- a/framework/inc/macros/xinterface.hxx +++ b/framework/inc/macros/xinterface.hxx @@ -28,10 +28,6 @@ #include <cppuhelper/queryinterface.hxx> #include <rtl/ustring.hxx> -//_________________________________________________________________________________________________________________ -// namespace -//_________________________________________________________________________________________________________________ - namespace framework{ /*_________________________________________________________________________________________________________________ diff --git a/framework/inc/macros/xserviceinfo.hxx b/framework/inc/macros/xserviceinfo.hxx index 251b354b5134..7d9fa130a6d0 100644 --- a/framework/inc/macros/xserviceinfo.hxx +++ b/framework/inc/macros/xserviceinfo.hxx @@ -47,10 +47,6 @@ #include <rtl/ustring.hxx> #include <rtl/logfile.hxx> -//_________________________________________________________________________________________________________________ -// namespace -//_________________________________________________________________________________________________________________ - namespace framework{ /*_________________________________________________________________________________________________________________ diff --git a/framework/inc/macros/xtypeprovider.hxx b/framework/inc/macros/xtypeprovider.hxx index 4e52c1f8e0bb..3de533fc552e 100644 --- a/framework/inc/macros/xtypeprovider.hxx +++ b/framework/inc/macros/xtypeprovider.hxx @@ -31,10 +31,6 @@ #include <osl/mutex.hxx> #include <rtl/ustring.hxx> -//_________________________________________________________________________________________________________________ -// namespace -//_________________________________________________________________________________________________________________ - namespace framework{ /*_________________________________________________________________________________________________________________ diff --git a/framework/inc/properties.h b/framework/inc/properties.h index 12317aaf8124..8fd93dc80339 100644 --- a/framework/inc/properties.h +++ b/framework/inc/properties.h @@ -32,8 +32,6 @@ #include <macros/generic.hxx> #include <general.h> -//_______________________________________________ -// namespace namespace framework{ diff --git a/framework/inc/queries.h b/framework/inc/queries.h index 95228dd1dc95..bba7c18c31f5 100644 --- a/framework/inc/queries.h +++ b/framework/inc/queries.h @@ -26,16 +26,8 @@ #include <rtl/ustring.hxx> #include <rtl/ustrbuf.hxx> -//_________________________________________________________________________________________________________________ -// namespace -//_________________________________________________________________________________________________________________ - namespace framework{ -//_________________________________________________________________________________________________________________ -// const -//_________________________________________________________________________________________________________________ - /*-************************************************************************************************************//** @short These values describe our supported queries for type, filter ... properties. They are used by our FilterFactory or ouer TypeDetection to return diff --git a/framework/inc/recording/dispatchrecordersupplier.hxx b/framework/inc/recording/dispatchrecordersupplier.hxx index f3fa2025163b..67946b7c8446 100644 --- a/framework/inc/recording/dispatchrecordersupplier.hxx +++ b/framework/inc/recording/dispatchrecordersupplier.hxx @@ -20,9 +20,6 @@ #ifndef __FRAMEWORK_RECORDING_DISPATCHRECORDERSUPPLIER_HXX_ #define __FRAMEWORK_RECORDING_DISPATCHRECORDERSUPPLIER_HXX_ -//_________________________________________________________________________________________________________________ -// include own things - #include <threadhelp/threadhelpbase.hxx> #include <macros/xinterface.hxx> #include <macros/xtypeprovider.hxx> @@ -32,32 +29,16 @@ #include <general.h> #include <stdtypes.h> -//_________________________________________________________________________________________________________________ -// include interfaces #include <com/sun/star/lang/XTypeProvider.hpp> #include <com/sun/star/frame/XDispatchRecorderSupplier.hpp> - #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/util/URL.hpp> #include <com/sun/star/beans/PropertyValue.hpp> -//_________________________________________________________________________________________________________________ -// include other projects #include <cppuhelper/weak.hxx> -//_________________________________________________________________________________________________________________ -// namespace - namespace framework{ -//_________________________________________________________________________________________________________________ -// exported const - -//_________________________________________________________________________________________________________________ -// exported definitions - -//_______________________________________________ - /** @short implement a supplier for dispatch recorder @descr This supplier can be set on property "DispatchRecorderSupplier" on a frame. By using of this supplier and his internal XDispatchRecorder it's possible to diff --git a/framework/inc/services.h b/framework/inc/services.h index 41f517627402..1e2dcce488b2 100644 --- a/framework/inc/services.h +++ b/framework/inc/services.h @@ -22,10 +22,6 @@ #include <macros/generic.hxx> -//_________________________________________________________________________________________________________________ -// namespace -//_________________________________________________________________________________________________________________ - namespace framework{ //_________________________________________________________________________________________________________________ diff --git a/framework/inc/services/contenthandlerfactory.hxx b/framework/inc/services/contenthandlerfactory.hxx index 63c70dded704..4b81f7aa7c7b 100644 --- a/framework/inc/services/contenthandlerfactory.hxx +++ b/framework/inc/services/contenthandlerfactory.hxx @@ -45,20 +45,8 @@ #include <cppuhelper/interfacecontainer.hxx> #include <cppuhelper/weak.hxx> -//_________________________________________________________________________________________________________________ -// namespace -//_________________________________________________________________________________________________________________ - namespace framework{ -//_________________________________________________________________________________________________________________ -// exported const -//_________________________________________________________________________________________________________________ - -//_________________________________________________________________________________________________________________ -// exported definitions -//_________________________________________________________________________________________________________________ - /*-************************************************************************************************************//** @short factory to create handler-objects @descr These class can be used to create new handler for specified contents. diff --git a/framework/inc/services/desktop.hxx b/framework/inc/services/desktop.hxx index 653debe596f2..f9bc193f6edd 100644 --- a/framework/inc/services/desktop.hxx +++ b/framework/inc/services/desktop.hxx @@ -73,20 +73,8 @@ #include <comphelper/numberedcollection.hxx> -//_________________________________________________________________________________________________________________ -// namespace -//_________________________________________________________________________________________________________________ - namespace framework{ -//_________________________________________________________________________________________________________________ -// exported const -//_________________________________________________________________________________________________________________ - -//_________________________________________________________________________________________________________________ -// exported definitions -//_________________________________________________________________________________________________________________ - enum ELoadState { E_NOTSET , diff --git a/framework/inc/services/dispatchhelper.hxx b/framework/inc/services/dispatchhelper.hxx index 64d429c3f95b..7887ecea436e 100644 --- a/framework/inc/services/dispatchhelper.hxx +++ b/framework/inc/services/dispatchhelper.hxx @@ -36,17 +36,8 @@ #include <cppuhelper/implbase3.hxx> #include <osl/conditn.hxx> -//_______________________________________________ -// namespace - namespace framework{ -//_______________________________________________ -// exported const - -//_______________________________________________ -// exported definitions - /** @short implements an easy way for dispatches @descr Dispatches are splitted into different parts: diff --git a/framework/inc/services/frame.hxx b/framework/inc/services/frame.hxx index a4a8136b6eca..3ebc9ae90761 100644 --- a/framework/inc/services/frame.hxx +++ b/framework/inc/services/frame.hxx @@ -77,16 +77,8 @@ #include <cppuhelper/weak.hxx> #include <rtl/string.hxx> -//_________________________________________________________________________________________________________________ -// namespace -//_________________________________________________________________________________________________________________ - namespace framework{ -//_________________________________________________________________________________________________________________ -// exported const -//_________________________________________________________________________________________________________________ - // This enum can be used to set differnt active states of frames enum EActiveState { @@ -97,10 +89,6 @@ enum EActiveState class WindowCommandDispatch; -//_________________________________________________________________________________________________________________ -// exported definitions -//_________________________________________________________________________________________________________________ - /*-************************************************************************************************************//** @short implements a normal frame of hierarchy @descr An instance of these class can be a normal node in frame tree. A frame support influencing of his diff --git a/framework/inc/services/logindialog.hxx b/framework/inc/services/logindialog.hxx index 341e68ef3398..29f543ea1d5b 100644 --- a/framework/inc/services/logindialog.hxx +++ b/framework/inc/services/logindialog.hxx @@ -59,10 +59,6 @@ #include <vcl/button.hxx> #include <vcl/morebtn.hxx> -//_________________________________________________________________________________________________________________ -// namespace -//_________________________________________________________________________________________________________________ - namespace framework{ #define ANY ::com::sun::star::uno::Any @@ -86,10 +82,6 @@ namespace framework{ #define XFLUSHABLE ::com::sun::star::util::XFlushable #define XFLUSHLISTENER ::com::sun::star::util::XFlushListener -//_________________________________________________________________________________________________________________ -// exported const -//_________________________________________________________________________________________________________________ - #ifdef WNT #define ININAME DECLARE_ASCII("login.ini") #elif defined UNIX @@ -121,10 +113,6 @@ namespace framework{ #define SECTION_DEFAULTPORTS "DefaultPorts" #define SECTION_SERVERHISTORY "ServerHistory" -//_________________________________________________________________________________________________________________ -// exported definitions -//_________________________________________________________________________________________________________________ - struct tIMPL_DialogData { ::rtl::OUString sUserName ; diff --git a/framework/inc/services/mediatypedetectionhelper.hxx b/framework/inc/services/mediatypedetectionhelper.hxx index 5e0d2ef11bd1..c9e513db2e9c 100644 --- a/framework/inc/services/mediatypedetectionhelper.hxx +++ b/framework/inc/services/mediatypedetectionhelper.hxx @@ -36,10 +36,6 @@ namespace framework{ -//_________________________________________________________________________________________________________________ -// definitions -//_________________________________________________________________________________________________________________ - /*-************************************************************************************************************//** @short - @descr - diff --git a/framework/inc/services/sessionlistener.hxx b/framework/inc/services/sessionlistener.hxx index c6e5b40f9adb..f635949b139e 100644 --- a/framework/inc/services/sessionlistener.hxx +++ b/framework/inc/services/sessionlistener.hxx @@ -53,17 +53,8 @@ #include <cppuhelper/weak.hxx> #include <cppuhelper/interfacecontainer.h> -//_______________________________________________ -// namespace - namespace framework{ -//_______________________________________________ -// exported const - -//_______________________________________________ -// exported definitions - /// @HTML /** @short implements flat/deep detection of file/stream formats and provides further read/write access to the global office type configuration. diff --git a/framework/inc/services/tabwindowservice.hxx b/framework/inc/services/tabwindowservice.hxx index bd652ac01722..a17709e0d22e 100644 --- a/framework/inc/services/tabwindowservice.hxx +++ b/framework/inc/services/tabwindowservice.hxx @@ -52,20 +52,8 @@ #include <cppuhelper/weak.hxx> #include <vcl/window.hxx> -//_________________________________________________________________________________________________________________ -// namespace -//_________________________________________________________________________________________________________________ - namespace framework{ -//_________________________________________________________________________________________________________________ -// exported const -//_________________________________________________________________________________________________________________ - -//_________________________________________________________________________________________________________________ -// exported definitions -//_________________________________________________________________________________________________________________ - struct TTabPageInfo { public: diff --git a/framework/inc/services/urltransformer.hxx b/framework/inc/services/urltransformer.hxx index 562ef35442c7..884b96aef630 100644 --- a/framework/inc/services/urltransformer.hxx +++ b/framework/inc/services/urltransformer.hxx @@ -33,20 +33,8 @@ #include <cppuhelper/implbase2.hxx> -//_________________________________________________________________________________________________________________ -// namespace -//_________________________________________________________________________________________________________________ - namespace framework{ -//_________________________________________________________________________________________________________________ -// exported const -//_________________________________________________________________________________________________________________ - -//_________________________________________________________________________________________________________________ -// exported definitions -//_________________________________________________________________________________________________________________ - /*-************************************************************************************************************//** @short diff --git a/framework/inc/stdtypes.h b/framework/inc/stdtypes.h index 8c99c86d1643..a69f79243c51 100644 --- a/framework/inc/stdtypes.h +++ b/framework/inc/stdtypes.h @@ -43,16 +43,8 @@ #include <cppuhelper/interfacecontainer.hxx> #include <rtl/ustring.hxx> -//_________________________________________________________________________________________________________________ -// namespace -//_________________________________________________________________________________________________________________ - namespace framework{ -//_________________________________________________________________________________________________________________ -// definitions -//_________________________________________________________________________________________________________________ - /** Own hash functions used for stl-structures ... e.g. hash tables/maps ... */ diff --git a/framework/inc/threadhelp/fairrwlock.hxx b/framework/inc/threadhelp/fairrwlock.hxx index a8250d32efb1..4f6525392a9b 100644 --- a/framework/inc/threadhelp/fairrwlock.hxx +++ b/framework/inc/threadhelp/fairrwlock.hxx @@ -29,20 +29,8 @@ #include <osl/mutex.hxx> #include <osl/conditn.hxx> -//_________________________________________________________________________________________________________________ -// namespace -//_________________________________________________________________________________________________________________ - namespace framework{ -//_________________________________________________________________________________________________________________ -// const -//_________________________________________________________________________________________________________________ - -//_________________________________________________________________________________________________________________ -// declarations -//_________________________________________________________________________________________________________________ - /*-************************************************************************************************************//** @short implement a read/write lock with fairness between read/write accessors @descr These implementation never should used as base class! Use it as a member every time. diff --git a/framework/inc/threadhelp/gate.hxx b/framework/inc/threadhelp/gate.hxx index 3a41f781d38f..3fae0332c50f 100644 --- a/framework/inc/threadhelp/gate.hxx +++ b/framework/inc/threadhelp/gate.hxx @@ -26,20 +26,8 @@ #include <osl/mutex.hxx> #include <osl/conditn.hxx> -//_________________________________________________________________________________________________________________ -// namespace -//_________________________________________________________________________________________________________________ - namespace framework{ -//_________________________________________________________________________________________________________________ -// const -//_________________________________________________________________________________________________________________ - -//_________________________________________________________________________________________________________________ -// declarations -//_________________________________________________________________________________________________________________ - /*-************************************************************************************************************//** @short implement a gate to block multiple threads at same time or unblock all @descr A gate can be used as a negative-condition! You can open a "door" - wait() will not block ... diff --git a/framework/inc/threadhelp/igate.h b/framework/inc/threadhelp/igate.h index b7b0d7d01495..9d8469856230 100644 --- a/framework/inc/threadhelp/igate.h +++ b/framework/inc/threadhelp/igate.h @@ -31,16 +31,8 @@ #include <osl/time.h> -//_________________________________________________________________________________________________________________ -// namespace -//_________________________________________________________________________________________________________________ - namespace framework{ -//_________________________________________________________________________________________________________________ -// declarations -//_________________________________________________________________________________________________________________ - /*-************************************************************************************************************//** @descr We need this interface to support using of different gate implementations in a generic way. *//*-*************************************************************************************************************/ diff --git a/framework/inc/threadhelp/inoncopyable.h b/framework/inc/threadhelp/inoncopyable.h index 7929f1ad4464..681280f8d618 100644 --- a/framework/inc/threadhelp/inoncopyable.h +++ b/framework/inc/threadhelp/inoncopyable.h @@ -20,20 +20,8 @@ #ifndef __FRAMEWORK_THREADHELP_INONCOPYABLE_H_ #define __FRAMEWORK_THREADHELP_INONCOPYABLE_H_ -//_________________________________________________________________________________________________________________ -// namespace -//_________________________________________________________________________________________________________________ - namespace framework{ -//_________________________________________________________________________________________________________________ -// const -//_________________________________________________________________________________________________________________ - -//_________________________________________________________________________________________________________________ -// declarations -//_________________________________________________________________________________________________________________ - /*-************************************************************************************************************//** @descr Use this as one of your base classes to disable all possiblities to copy or assign one object to another one! diff --git a/framework/inc/threadhelp/irwlock.h b/framework/inc/threadhelp/irwlock.h index 27d6c04dbd9d..dab94edda12e 100644 --- a/framework/inc/threadhelp/irwlock.h +++ b/framework/inc/threadhelp/irwlock.h @@ -29,16 +29,8 @@ #ifndef __FRAMEWORK_THREADHELP_IRWLOCK_H_ #define __FRAMEWORK_THREADHELP_IRWLOCK_H_ -//_________________________________________________________________________________________________________________ -// namespace -//_________________________________________________________________________________________________________________ - namespace framework{ -//_________________________________________________________________________________________________________________ -// declarations -//_________________________________________________________________________________________________________________ - /*-************************************************************************************************************//** @descr A guard (specialy a write guard) support different internal working states. His lock can set for reading or writing/reading! Or he was unlocked by user ... diff --git a/framework/inc/threadhelp/itransactionmanager.h b/framework/inc/threadhelp/itransactionmanager.h index 305b480763d0..8e723f3e5292 100644 --- a/framework/inc/threadhelp/itransactionmanager.h +++ b/framework/inc/threadhelp/itransactionmanager.h @@ -33,16 +33,8 @@ #include <com/sun/star/uno/RuntimeException.hpp> #include <com/sun/star/lang/DisposedException.hpp> -//_________________________________________________________________________________________________________________ -// namespace -//_________________________________________________________________________________________________________________ - namespace framework{ -//_________________________________________________________________________________________________________________ -// declarations -//_________________________________________________________________________________________________________________ - /*-************************************************************************************************************//** @descr Describe different states of a feature of following implementation. During live time of an object different working states occure: diff --git a/framework/inc/threadhelp/lockhelper.hxx b/framework/inc/threadhelp/lockhelper.hxx index 70fb55cd75cb..fdc90a276b43 100644 --- a/framework/inc/threadhelp/lockhelper.hxx +++ b/framework/inc/threadhelp/lockhelper.hxx @@ -36,16 +36,9 @@ #include <osl/mutex.hxx> #include <fwidllapi.h> -//_________________________________________________________________________________________________________________ -// namespace -//_________________________________________________________________________________________________________________ namespace framework{ -//_________________________________________________________________________________________________________________ -// const -//_________________________________________________________________________________________________________________ - /*-************************************************************************************************************//** @descr If you use a lock or mutex as a member of your class and whish to use it earlier then other ones you should have a look on this implementation. You must use it as the first base class @@ -63,10 +56,6 @@ enum ELockType #define ENVVAR_LOCKTYPE DECLARE_ASCII("LOCKTYPE_FRAMEWORK") #define FALLBACK_LOCKTYPE E_SOLARMUTEX -//_________________________________________________________________________________________________________________ -// declarations -//_________________________________________________________________________________________________________________ - /*-************************************************************************************************************//** @short helper to set right lock in right situation @descr This helper support different types of locking: diff --git a/framework/inc/threadhelp/threadhelpbase.hxx b/framework/inc/threadhelp/threadhelpbase.hxx index 71435c1c4197..1164a788d33d 100644 --- a/framework/inc/threadhelp/threadhelpbase.hxx +++ b/framework/inc/threadhelp/threadhelpbase.hxx @@ -31,20 +31,8 @@ #include <threadhelp/lockhelper.hxx> -//_________________________________________________________________________________________________________________ -// namespace -//_________________________________________________________________________________________________________________ - namespace framework{ -//_________________________________________________________________________________________________________________ -// const -//_________________________________________________________________________________________________________________ - -//_________________________________________________________________________________________________________________ -// declarations -//_________________________________________________________________________________________________________________ - /*-************************************************************************************************************//** @short "baseclass" to make own classes threadsafe @descr Sometimes you must share your lock- or mutex member with any other baseclasses. diff --git a/framework/inc/threadhelp/transactionbase.hxx b/framework/inc/threadhelp/transactionbase.hxx index 6157a337db96..741c27d61854 100644 --- a/framework/inc/threadhelp/transactionbase.hxx +++ b/framework/inc/threadhelp/transactionbase.hxx @@ -22,20 +22,8 @@ #include <threadhelp/transactionmanager.hxx> -//_________________________________________________________________________________________________________________ -// namespace -//_________________________________________________________________________________________________________________ - namespace framework{ -//_________________________________________________________________________________________________________________ -// const -//_________________________________________________________________________________________________________________ - -//_________________________________________________________________________________________________________________ -// declarations -//_________________________________________________________________________________________________________________ - /*-************************************************************************************************************//** @short make it possible to instanciate a transacion manager as first member! @descr If you use a transaction manager as a member of your class and whish to use it earlier then other ones diff --git a/framework/inc/threadhelp/transactionguard.hxx b/framework/inc/threadhelp/transactionguard.hxx index 7f0dc7ff629b..887d63865e38 100644 --- a/framework/inc/threadhelp/transactionguard.hxx +++ b/framework/inc/threadhelp/transactionguard.hxx @@ -23,20 +23,8 @@ #include <threadhelp/inoncopyable.h> #include <threadhelp/itransactionmanager.h> -//_________________________________________________________________________________________________________________ -// namespace -//_________________________________________________________________________________________________________________ - namespace framework{ -//_________________________________________________________________________________________________________________ -// const -//_________________________________________________________________________________________________________________ - -//_________________________________________________________________________________________________________________ -// declarations -//_________________________________________________________________________________________________________________ - /*-************************************************************************************************************//** @short implement a guard to support non breakable transactions @descr If you whish to support non breakable method calls without lockingf any mutex, rw-lock or diff --git a/framework/inc/threadhelp/transactionmanager.hxx b/framework/inc/threadhelp/transactionmanager.hxx index e5b28d1e7871..661d61b9dfbf 100644 --- a/framework/inc/threadhelp/transactionmanager.hxx +++ b/framework/inc/threadhelp/transactionmanager.hxx @@ -33,20 +33,8 @@ #include <osl/mutex.hxx> #include <fwidllapi.h> -//_________________________________________________________________________________________________________________ -// namespace -//_________________________________________________________________________________________________________________ - namespace framework{ -//_________________________________________________________________________________________________________________ -// const -//_________________________________________________________________________________________________________________ - -//_________________________________________________________________________________________________________________ -// declarations -//_________________________________________________________________________________________________________________ - /*-************************************************************************************************************//** @short implement a transaction manager to support non breakable interface methods @descr Use it to support non breakable interface methods without using any thread diff --git a/framework/inc/uielement/progressbarwrapper.hxx b/framework/inc/uielement/progressbarwrapper.hxx index 8041138ad982..88c48325cbce 100644 --- a/framework/inc/uielement/progressbarwrapper.hxx +++ b/framework/inc/uielement/progressbarwrapper.hxx @@ -33,10 +33,6 @@ #include <cppuhelper/weak.hxx> #include <cppuhelper/weakref.hxx> -//_________________________________________________________________________________________________________________ -// namespace -//_________________________________________________________________________________________________________________ - namespace framework{ class ProgressBarWrapper : public UIElementWrapperBase diff --git a/framework/inc/uielement/uielement.hxx b/framework/inc/uielement/uielement.hxx index b462a5be6a2b..6a830e39b89e 100644 --- a/framework/inc/uielement/uielement.hxx +++ b/framework/inc/uielement/uielement.hxx @@ -37,10 +37,6 @@ #include <rtl/ustring.hxx> #include <vcl/toolbox.hxx> -//_________________________________________________________________________________________________________________ -// namespace -//_________________________________________________________________________________________________________________ - namespace framework { diff --git a/framework/inc/xml/imagesdocumenthandler.hxx b/framework/inc/xml/imagesdocumenthandler.hxx index 524c0978d343..0f7bad9aae6b 100644 --- a/framework/inc/xml/imagesdocumenthandler.hxx +++ b/framework/inc/xml/imagesdocumenthandler.hxx @@ -41,11 +41,6 @@ #include <boost/unordered_map.hpp> #include <stdtypes.h> - -//_________________________________________________________________________________________________________________ -// namespace -//_________________________________________________________________________________________________________________ - namespace framework{ //***************************************************************************************************************** diff --git a/framework/inc/xml/menudocumenthandler.hxx b/framework/inc/xml/menudocumenthandler.hxx index 0bee38d96e22..5750985795e1 100644 --- a/framework/inc/xml/menudocumenthandler.hxx +++ b/framework/inc/xml/menudocumenthandler.hxx @@ -42,10 +42,6 @@ #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <framework/fwedllapi.h> -//_________________________________________________________________________________________________________________ -// namespace -//_________________________________________________________________________________________________________________ - namespace framework{ class FWE_DLLPUBLIC ReadMenuDocumentHandlerBase : public ThreadHelpBase, // Struct for right initalization of mutex member! Must be first of baseclasses. diff --git a/framework/inc/xml/saxnamespacefilter.hxx b/framework/inc/xml/saxnamespacefilter.hxx index c842d1a892fb..2d9ef30fc615 100644 --- a/framework/inc/xml/saxnamespacefilter.hxx +++ b/framework/inc/xml/saxnamespacefilter.hxx @@ -39,10 +39,6 @@ #include <stack> #include <framework/fwedllapi.h> -//_________________________________________________________________________________________________________________ -// namespace -//_________________________________________________________________________________________________________________ - namespace framework { diff --git a/framework/inc/xml/statusbardocumenthandler.hxx b/framework/inc/xml/statusbardocumenthandler.hxx index 08e340f2b6d2..8c606d71c903 100644 --- a/framework/inc/xml/statusbardocumenthandler.hxx +++ b/framework/inc/xml/statusbardocumenthandler.hxx @@ -41,10 +41,6 @@ #include <stdtypes.h> #include <framework/fwedllapi.h> -//_________________________________________________________________________________________________________________ -// namespace -//_________________________________________________________________________________________________________________ - namespace framework{ //***************************************************************************************************************** diff --git a/framework/inc/xml/toolboxdocumenthandler.hxx b/framework/inc/xml/toolboxdocumenthandler.hxx index a8556bb62653..d41592f467bf 100644 --- a/framework/inc/xml/toolboxdocumenthandler.hxx +++ b/framework/inc/xml/toolboxdocumenthandler.hxx @@ -40,10 +40,6 @@ #include <stdtypes.h> #include <framework/fwedllapi.h> -//_________________________________________________________________________________________________________________ -// namespace -//_________________________________________________________________________________________________________________ - namespace framework{ //***************************************************************************************************************** diff --git a/framework/source/accelerators/acceleratorconfiguration.cxx b/framework/source/accelerators/acceleratorconfiguration.cxx index be9982f3a249..d8c0732b935b 100644 --- a/framework/source/accelerators/acceleratorconfiguration.cxx +++ b/framework/source/accelerators/acceleratorconfiguration.cxx @@ -62,8 +62,6 @@ #include <svtools/acceleratorexecute.hxx> #include <stdio.h> -//_______________________________________________ -// const namespace framework { diff --git a/framework/source/accelerators/documentacceleratorconfiguration.cxx b/framework/source/accelerators/documentacceleratorconfiguration.cxx index 25a3fefb84d8..62891400c8dc 100644 --- a/framework/source/accelerators/documentacceleratorconfiguration.cxx +++ b/framework/source/accelerators/documentacceleratorconfiguration.cxx @@ -54,8 +54,6 @@ #include <comphelper/sequenceashashmap.hxx> -//_______________________________________________ -// const namespace framework { diff --git a/framework/source/accelerators/globalacceleratorconfiguration.cxx b/framework/source/accelerators/globalacceleratorconfiguration.cxx index 3ee289eeb8f0..a32eb7cf6f24 100644 --- a/framework/source/accelerators/globalacceleratorconfiguration.cxx +++ b/framework/source/accelerators/globalacceleratorconfiguration.cxx @@ -45,8 +45,6 @@ #include <comphelper/locale.hxx> #include <comphelper/configurationhelper.hxx> -//_______________________________________________ -// const namespace framework { diff --git a/framework/source/accelerators/keymapping.cxx b/framework/source/accelerators/keymapping.cxx index 57ab6d816f65..501062cae965 100644 --- a/framework/source/accelerators/keymapping.cxx +++ b/framework/source/accelerators/keymapping.cxx @@ -32,7 +32,6 @@ #include <com/sun/star/awt/Key.hpp> -// namespace namespace framework { diff --git a/framework/source/accelerators/moduleacceleratorconfiguration.cxx b/framework/source/accelerators/moduleacceleratorconfiguration.cxx index 3d88f5d0a704..832eadb9df7a 100644 --- a/framework/source/accelerators/moduleacceleratorconfiguration.cxx +++ b/framework/source/accelerators/moduleacceleratorconfiguration.cxx @@ -50,8 +50,6 @@ #include <rtl/logfile.h> -//_______________________________________________ -// const namespace framework { diff --git a/framework/source/accelerators/presethandler.cxx b/framework/source/accelerators/presethandler.cxx index fa0d1f388046..f45713075a05 100644 --- a/framework/source/accelerators/presethandler.cxx +++ b/framework/source/accelerators/presethandler.cxx @@ -47,8 +47,6 @@ #include <cppuhelper/exc_hlp.hxx> #include <rtl/ustrbuf.hxx> -//_______________________________________________ -// const #define SUBSTORAGE_GLOBAL DECLARE_ASCII("global" ) #define SUBSTORAGE_MODULES DECLARE_ASCII("modules") @@ -67,8 +65,6 @@ static const ::sal_Int32 ID_CORRUPT_UICONFIG_SHARE = 1; static const ::sal_Int32 ID_CORRUPT_UICONFIG_USER = 2; static const ::sal_Int32 ID_CORRUPT_UICONFIG_GENERAL = 3; -//_______________________________________________ -// namespace namespace framework { diff --git a/framework/source/accelerators/storageholder.cxx b/framework/source/accelerators/storageholder.cxx index 1c73c56bce4f..fbb0986ec4e5 100644 --- a/framework/source/accelerators/storageholder.cxx +++ b/framework/source/accelerators/storageholder.cxx @@ -50,15 +50,11 @@ #include <comphelper/processfactory.hxx> -//=============================================== -// const #define PATH_SEPERATOR_ASCII "/" #define PATH_SEPERATOR_UNICODE ((sal_Unicode)'/') #define PATH_SEPERATOR ::rtl::OUString(PATH_SEPERATOR_ASCII) -//=============================================== -// namespace namespace framework { diff --git a/framework/source/classes/droptargetlistener.cxx b/framework/source/classes/droptargetlistener.cxx index e6cd4820922f..2e20817dd04c 100644 --- a/framework/source/classes/droptargetlistener.cxx +++ b/framework/source/classes/droptargetlistener.cxx @@ -47,10 +47,6 @@ #include <osl/file.hxx> #include <vcl/svapp.hxx> -//_________________________________________________________________________________________________________________ -// namespace -//_________________________________________________________________________________________________________________ - namespace framework { diff --git a/framework/source/classes/framecontainer.cxx b/framework/source/classes/framecontainer.cxx index f06be92c8415..93845a5a1baf 100644 --- a/framework/source/classes/framecontainer.cxx +++ b/framework/source/classes/framecontainer.cxx @@ -34,24 +34,8 @@ #include <vcl/svapp.hxx> -//_________________________________________________________________________________________________________________ -// namespace -//_________________________________________________________________________________________________________________ - namespace framework{ -//_________________________________________________________________________________________________________________ -// non exported const -//_________________________________________________________________________________________________________________ - -//_________________________________________________________________________________________________________________ -// non exported definitions -//_________________________________________________________________________________________________________________ - -//_________________________________________________________________________________________________________________ -// declarations -//_________________________________________________________________________________________________________________ - /**-*************************************************************************************************************** @short initialize an empty container @descr The container will be empty then - special features (e.g. the async quit mechanism) are disabled. diff --git a/framework/source/classes/menumanager.cxx b/framework/source/classes/menumanager.cxx index effb9680a6cd..99ad8b76a0c1 100644 --- a/framework/source/classes/menumanager.cxx +++ b/framework/source/classes/menumanager.cxx @@ -67,10 +67,6 @@ #include <osl/file.hxx> #include <cppuhelper/implbase1.hxx> -//_________________________________________________________________________________________________________________ -// namespace -//_________________________________________________________________________________________________________________ - using namespace ::cppu; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::util; diff --git a/framework/source/classes/taskcreator.cxx b/framework/source/classes/taskcreator.cxx index ff4f10a3895e..147f5f4eeb50 100644 --- a/framework/source/classes/taskcreator.cxx +++ b/framework/source/classes/taskcreator.cxx @@ -38,24 +38,8 @@ #include <comphelper/configurationhelper.hxx> #include <vcl/svapp.hxx> -//_________________________________________________________________________________________________________________ -// namespace -//_________________________________________________________________________________________________________________ - namespace framework{ -//_________________________________________________________________________________________________________________ -// non exported const -//_________________________________________________________________________________________________________________ - -//_________________________________________________________________________________________________________________ -// non exported definitions -//_________________________________________________________________________________________________________________ - -//_________________________________________________________________________________________________________________ -// declarations -//_________________________________________________________________________________________________________________ - /*-****************************************************************************************************//** @short initialize instance with neccessary informations @descr We need a valid uno service manager to create or instanciate new services. diff --git a/framework/source/dispatch/closedispatcher.cxx b/framework/source/dispatch/closedispatcher.cxx index 3f732d4110f0..7f9185ec32bc 100644 --- a/framework/source/dispatch/closedispatcher.cxx +++ b/framework/source/dispatch/closedispatcher.cxx @@ -49,8 +49,6 @@ #include <osl/mutex.hxx> #include <unotools/moduleoptions.hxx> -//_______________________________________________ -// namespace using namespace com::sun::star; @@ -65,8 +63,6 @@ const char URL_CLOSEDOC[] = ".uno:CloseDoc"; const char URL_CLOSEWIN[] = ".uno:CloseWin"; const char URL_CLOSEFRAME[] = ".uno:CloseFrame"; -//_______________________________________________ -// declarations DEFINE_XINTERFACE_4(CloseDispatcher , OWeakObject , diff --git a/framework/source/dispatch/dispatchinformationprovider.cxx b/framework/source/dispatch/dispatchinformationprovider.cxx index 4d1956502496..636ee55ed628 100644 --- a/framework/source/dispatch/dispatchinformationprovider.cxx +++ b/framework/source/dispatch/dispatchinformationprovider.cxx @@ -37,17 +37,10 @@ #include <comphelper/sequenceasvector.hxx> -//_________________________________________________________________________________________________________________ -// namespace -//_________________________________________________________________________________________________________________ - namespace framework{ namespace css = ::com::sun::star; -//_________________________________________________________________________________________________________________ -// declarations -//_________________________________________________________________________________________________________________ DEFINE_XINTERFACE_1(DispatchInformationProvider , OWeakObject , DIRECT_INTERFACE(css::frame::XDispatchInformationProvider)) diff --git a/framework/source/dispatch/interceptionhelper.cxx b/framework/source/dispatch/interceptionhelper.cxx index 5995f69c8af8..59a0a8c135d6 100644 --- a/framework/source/dispatch/interceptionhelper.cxx +++ b/framework/source/dispatch/interceptionhelper.cxx @@ -32,21 +32,13 @@ #include <vcl/svapp.hxx> -//_______________________________________________ -// namespace namespace framework{ -//_______________________________________________ -// non exported const sal_Bool InterceptionHelper::m_bPreferrFirstInterceptor = sal_True; -//_______________________________________________ -// non exported definitions -//_______________________________________________ -// declarations DEFINE_XINTERFACE_3(InterceptionHelper , OWeakObject , diff --git a/framework/source/dispatch/mailtodispatcher.cxx b/framework/source/dispatch/mailtodispatcher.cxx index 2f9f69089c09..903e33ce695c 100644 --- a/framework/source/dispatch/mailtodispatcher.cxx +++ b/framework/source/dispatch/mailtodispatcher.cxx @@ -37,28 +37,12 @@ #include <vcl/svapp.hxx> -//_________________________________________________________________________________________________________________ -// namespace -//_________________________________________________________________________________________________________________ - namespace framework{ -//_________________________________________________________________________________________________________________ -// non exported const -//_________________________________________________________________________________________________________________ - #define PROTOCOL_VALUE "mailto:" #define PROTOCOL_LENGTH 7 //_________________________________________________________________________________________________________________ -// non exported definitions -//_________________________________________________________________________________________________________________ - -//_________________________________________________________________________________________________________________ -// declarations -//_________________________________________________________________________________________________________________ - -//_________________________________________________________________________________________________________________ // XInterface, XTypeProvider, XServiceInfo DEFINE_XINTERFACE_5(MailToDispatcher , diff --git a/framework/source/dispatch/menudispatcher.cxx b/framework/source/dispatch/menudispatcher.cxx index 703c5bfbbc54..f5661d4ed4d7 100644 --- a/framework/source/dispatch/menudispatcher.cxx +++ b/framework/source/dispatch/menudispatcher.cxx @@ -55,10 +55,6 @@ #include <ucbhelper/content.hxx> -//_________________________________________________________________________________________________________________ -// namespace -//_________________________________________________________________________________________________________________ - namespace framework{ using namespace ::com::sun::star ; @@ -71,20 +67,9 @@ using namespace ::com::sun::star::uno ; using namespace ::com::sun::star::util ; using namespace ::cppu ; using ::rtl::OUString; -//_________________________________________________________________________________________________________________ -// non exported const -//_________________________________________________________________________________________________________________ const sal_uInt16 SLOTID_MDIWINDOWLIST = 5610; -//_________________________________________________________________________________________________________________ -// non exported definitions -//_________________________________________________________________________________________________________________ - -//_________________________________________________________________________________________________________________ -// declarations -//_________________________________________________________________________________________________________________ - //***************************************************************************************************************** // constructor //***************************************************************************************************************** diff --git a/framework/source/dispatch/oxt_handler.cxx b/framework/source/dispatch/oxt_handler.cxx index 8615a2497ca7..4b831e28851a 100644 --- a/framework/source/dispatch/oxt_handler.cxx +++ b/framework/source/dispatch/oxt_handler.cxx @@ -27,17 +27,11 @@ ************************************************************************/ #include <dispatch/oxt_handler.hxx> - #include <threadhelp/transactionguard.hxx> - #include <threadhelp/writeguard.hxx> - #include <threadhelp/readguard.hxx> - #include <macros/debug.hxx> - #include <services.h> - #include <comphelper/mediadescriptor.hxx> #include <com/sun/star/io/XInputStream.hpp> @@ -45,29 +39,12 @@ #include <com/sun/star/task/XJobExecutor.hpp> #include <comphelper/sequenceashashmap.hxx> - #include <rtl/ustrbuf.hxx> -//_________________________________________________________________________________________________________________ -// namespace -//_________________________________________________________________________________________________________________ - namespace framework{ -//_________________________________________________________________________________________________________________ -// non exported const -//_________________________________________________________________________________________________________________ - -//_________________________________________________________________________________________________________________ -// non exported definitions -//_________________________________________________________________________________________________________________ - #define UNISTRING(s) rtl::OUString(s) -//_________________________________________________________________________________________________________________ -// declarations -//_________________________________________________________________________________________________________________ - //***************************************************************************************************************** // XInterface, XTypeProvider, XServiceInfo //***************************************************************************************************************** diff --git a/framework/source/dispatch/popupmenudispatcher.cxx b/framework/source/dispatch/popupmenudispatcher.cxx index bfab7950ca55..9e7b210900fc 100644 --- a/framework/source/dispatch/popupmenudispatcher.cxx +++ b/framework/source/dispatch/popupmenudispatcher.cxx @@ -49,10 +49,6 @@ #include <rtl/ustrbuf.hxx> #include <vcl/svapp.hxx> -//_________________________________________________________________________________________________________________ -// namespace -//_________________________________________________________________________________________________________________ - namespace framework{ using namespace ::com::sun::star ; @@ -67,20 +63,9 @@ using namespace ::cppu ; using namespace ::osl ; using namespace ::rtl ; -//_________________________________________________________________________________________________________________ -// non exported const -//_________________________________________________________________________________________________________________ const char* PROTOCOL_VALUE = "vnd.sun.star.popup:"; const sal_Int32 PROTOCOL_LENGTH = 19; -//_________________________________________________________________________________________________________________ -// non exported definitions -//_________________________________________________________________________________________________________________ - -//_________________________________________________________________________________________________________________ -// declarations -//_________________________________________________________________________________________________________________ - //***************************************************************************************************************** // constructor //***************************************************************************************************************** diff --git a/framework/source/dispatch/servicehandler.cxx b/framework/source/dispatch/servicehandler.cxx index 3f46db6de266..2eacd8c8f96c 100644 --- a/framework/source/dispatch/servicehandler.cxx +++ b/framework/source/dispatch/servicehandler.cxx @@ -36,28 +36,12 @@ #include <vcl/svapp.hxx> -//_________________________________________________________________________________________________________________ -// namespace -//_________________________________________________________________________________________________________________ - namespace framework{ -//_________________________________________________________________________________________________________________ -// non exported const -//_________________________________________________________________________________________________________________ - #define PROTOCOL_VALUE "service:" #define PROTOCOL_LENGTH 8 //_________________________________________________________________________________________________________________ -// non exported definitions -//_________________________________________________________________________________________________________________ - -//_________________________________________________________________________________________________________________ -// declarations -//_________________________________________________________________________________________________________________ - -//_________________________________________________________________________________________________________________ // XInterface, XTypeProvider, XServiceInfo DEFINE_XINTERFACE_5(ServiceHandler , diff --git a/framework/source/dispatch/startmoduledispatcher.cxx b/framework/source/dispatch/startmoduledispatcher.cxx index 9bdbe11915ac..d24706d45ce7 100644 --- a/framework/source/dispatch/startmoduledispatcher.cxx +++ b/framework/source/dispatch/startmoduledispatcher.cxx @@ -51,8 +51,6 @@ #include <osl/mutex.hxx> #include <unotools/moduleoptions.hxx> -//_______________________________________________ -// namespace namespace framework{ @@ -61,8 +59,6 @@ namespace framework{ #endif namespace fpf = ::framework::pattern::frame; -//_______________________________________________ -// declarations DEFINE_XINTERFACE_4(StartModuleDispatcher , OWeakObject , diff --git a/framework/source/dispatch/systemexec.cxx b/framework/source/dispatch/systemexec.cxx index b57097432ded..4daeb89d1d35 100644 --- a/framework/source/dispatch/systemexec.cxx +++ b/framework/source/dispatch/systemexec.cxx @@ -40,28 +40,12 @@ #include <vcl/svapp.hxx> #include <comphelper/componentcontext.hxx> -//_________________________________________________________________________________________________________________ -// namespace -//_________________________________________________________________________________________________________________ - namespace framework{ -//_________________________________________________________________________________________________________________ -// non exported const -//_________________________________________________________________________________________________________________ - #define PROTOCOL_VALUE "systemexecute:" #define PROTOCOL_LENGTH 14 //_________________________________________________________________________________________________________________ -// non exported definitions -//_________________________________________________________________________________________________________________ - -//_________________________________________________________________________________________________________________ -// declarations -//_________________________________________________________________________________________________________________ - -//_________________________________________________________________________________________________________________ // XInterface, XTypeProvider, XServiceInfo DEFINE_XINTERFACE_5(SystemExec , diff --git a/framework/source/dispatch/windowcommanddispatch.cxx b/framework/source/dispatch/windowcommanddispatch.cxx index d1c15f315a39..a2cc3690489c 100644 --- a/framework/source/dispatch/windowcommanddispatch.cxx +++ b/framework/source/dispatch/windowcommanddispatch.cxx @@ -45,8 +45,6 @@ #include <toolkit/helper/vclunohelper.hxx> #include <rtl/logfile.hxx> -//_______________________________________________ -// namespace namespace framework{ diff --git a/framework/source/fwe/classes/addonmenu.cxx b/framework/source/fwe/classes/addonmenu.cxx index 250fc1620ab3..b73be4869302 100644 --- a/framework/source/fwe/classes/addonmenu.cxx +++ b/framework/source/fwe/classes/addonmenu.cxx @@ -42,9 +42,6 @@ #include <vcl/svapp.hxx> #include <svtools/menuoptions.hxx> #include <svl/solar.hrc> -//_________________________________________________________________________________________________________________ -// namespace -//_________________________________________________________________________________________________________________ using namespace ::com::sun::star::uno; using namespace ::com::sun::star::lang; diff --git a/framework/source/fwe/classes/addonsoptions.cxx b/framework/source/fwe/classes/addonsoptions.cxx index aadf95e3752f..c1789c81a313 100644 --- a/framework/source/fwe/classes/addonsoptions.cxx +++ b/framework/source/fwe/classes/addonsoptions.cxx @@ -57,10 +57,6 @@ using namespace ::com::sun::star::uno ; using namespace ::com::sun::star::beans ; using namespace ::com::sun::star::lang ; -//_________________________________________________________________________________________________________________ -// const -//_________________________________________________________________________________________________________________ - #define ROOTNODE_ADDONMENU ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Office.Addons" )) #define PATHDELIMITER ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/" )) #define SEPARATOR_URL_STR "private:separator" @@ -371,10 +367,6 @@ class AddonsOptions_Impl : public ConfigItem ToolbarMergingInstructions m_aCachedToolbarMergingInstructions; }; -//_________________________________________________________________________________________________________________ -// definitions -//_________________________________________________________________________________________________________________ - //***************************************************************************************************************** // constructor //***************************************************************************************************************** diff --git a/framework/source/fwe/classes/bmkmenu.cxx b/framework/source/fwe/classes/bmkmenu.cxx index 61c179049a58..c0ff1a5b60b2 100644 --- a/framework/source/fwe/classes/bmkmenu.cxx +++ b/framework/source/fwe/classes/bmkmenu.cxx @@ -47,10 +47,6 @@ #include <svtools/menuoptions.hxx> #include <rtl/logfile.hxx> -//_________________________________________________________________________________________________________________ -// namespace -//_________________________________________________________________________________________________________________ - using namespace ::comphelper; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::lang; diff --git a/framework/source/fwe/classes/framelistanalyzer.cxx b/framework/source/fwe/classes/framelistanalyzer.cxx index 3df2b0d07ad7..5aee045c1de8 100644 --- a/framework/source/fwe/classes/framelistanalyzer.cxx +++ b/framework/source/fwe/classes/framelistanalyzer.cxx @@ -26,7 +26,6 @@ * ************************************************************************/ - #include "framework/framelistanalyzer.hxx" #include <threadhelp/writeguard.hxx> @@ -43,22 +42,8 @@ #include <vcl/svapp.hxx> #include <tools/diagnose_ex.h> -//_______________________________________________ -// namespace - namespace framework{ -//_______________________________________________ -// non exported const - -//_______________________________________________ -// non exported definitions - -//_______________________________________________ -// declarations - -//_______________________________________________ - /** */ @@ -72,8 +57,6 @@ FrameListAnalyzer::FrameListAnalyzer( const css::uno::Reference< css::frame::XFr impl_analyze(); } -//_______________________________________________ - /** */ @@ -81,8 +64,6 @@ FrameListAnalyzer::~FrameListAnalyzer() { } -//_______________________________________________ - /** returns an analyzed list of all currently opened (top!) frames inside the desktop tree. We try to get a snapshot of all opened frames, which are part of the desktop frame container. diff --git a/framework/source/fwe/helper/titlehelper.cxx b/framework/source/fwe/helper/titlehelper.cxx index f95d2252276f..1782d3404a86 100644 --- a/framework/source/fwe/helper/titlehelper.cxx +++ b/framework/source/fwe/helper/titlehelper.cxx @@ -44,8 +44,6 @@ #include <osl/mutex.hxx> #include <tools/urlobj.hxx> -//_______________________________________________ -// namespace namespace framework{ diff --git a/framework/source/fwe/interaction/preventduplicateinteraction.cxx b/framework/source/fwe/interaction/preventduplicateinteraction.cxx index 29b06b3ff70b..59cf842e86d5 100644 --- a/framework/source/fwe/interaction/preventduplicateinteraction.cxx +++ b/framework/source/fwe/interaction/preventduplicateinteraction.cxx @@ -17,32 +17,17 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "framework/preventduplicateinteraction.hxx" #include <com/sun/star/task/XInteractionAbort.hpp> #include <com/sun/star/task/XInteractionRetry.hpp> -//_________________________________________________________________________________________________________________ -// namespace -//_________________________________________________________________________________________________________________ - namespace framework{ namespace css = ::com::sun::star; -//_________________________________________________________________________________________________________________ -// exported const -//_________________________________________________________________________________________________________________ - #define IMPLEMENTATIONNAME_UIINTERACTIONHANDLER ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.uui.UUIInteractionHandler")) -//_________________________________________________________________________________________________________________ -// exported definitions -//_________________________________________________________________________________________________________________ - -//_________________________________________________________________________________________________________________ - PreventDuplicateInteraction::PreventDuplicateInteraction(const css::uno::Reference< css::lang::XMultiServiceFactory >& xSMGR) : ThreadHelpBase2() , m_xSMGR(xSMGR) diff --git a/framework/source/fwe/xml/menuconfiguration.cxx b/framework/source/fwe/xml/menuconfiguration.cxx index 0c5463b9b119..fe522fe3de95 100644 --- a/framework/source/fwe/xml/menuconfiguration.cxx +++ b/framework/source/fwe/xml/menuconfiguration.cxx @@ -40,10 +40,6 @@ #include <com/sun/star/io/XActiveDataSource.hpp> #include <com/sun/star/frame/XFrame.hpp> -//_________________________________________________________________________________________________________________ -// namespace -//_________________________________________________________________________________________________________________ - using namespace ::com::sun::star::uno; using namespace ::com::sun::star::lang; using namespace ::com::sun::star::beans; diff --git a/framework/source/fwe/xml/statusbarconfiguration.cxx b/framework/source/fwe/xml/statusbarconfiguration.cxx index dac8637ba078..17e41e381b4f 100644 --- a/framework/source/fwe/xml/statusbarconfiguration.cxx +++ b/framework/source/fwe/xml/statusbarconfiguration.cxx @@ -40,10 +40,6 @@ #include <comphelper/processfactory.hxx> #include <unotools/streamwrap.hxx> -//_________________________________________________________________________________________________________________ -// namespace -//_________________________________________________________________________________________________________________ - using namespace ::com::sun::star::uno; using namespace ::com::sun::star::xml::sax; using namespace ::com::sun::star::lang; diff --git a/framework/source/fwe/xml/statusbardocumenthandler.cxx b/framework/source/fwe/xml/statusbardocumenthandler.cxx index 3b64e62b829d..04038e851562 100644 --- a/framework/source/fwe/xml/statusbardocumenthandler.cxx +++ b/framework/source/fwe/xml/statusbardocumenthandler.cxx @@ -43,10 +43,6 @@ #include <comphelper/attributelist.hxx> -//_________________________________________________________________________________________________________________ -// namespace -//_________________________________________________________________________________________________________________ - using namespace ::com::sun::star::uno; using namespace ::com::sun::star::beans; using namespace ::com::sun::star::xml::sax; diff --git a/framework/source/fwe/xml/toolboxconfiguration.cxx b/framework/source/fwe/xml/toolboxconfiguration.cxx index b2fefb42a633..13afba4cf8ea 100644 --- a/framework/source/fwe/xml/toolboxconfiguration.cxx +++ b/framework/source/fwe/xml/toolboxconfiguration.cxx @@ -40,10 +40,6 @@ #include <comphelper/processfactory.hxx> #include <unotools/streamwrap.hxx> -//_________________________________________________________________________________________________________________ -// namespace -//_________________________________________________________________________________________________________________ - using namespace ::com::sun::star::uno; using namespace ::com::sun::star::xml::sax; using namespace ::com::sun::star::lang; diff --git a/framework/source/fwe/xml/toolboxdocumenthandler.cxx b/framework/source/fwe/xml/toolboxdocumenthandler.cxx index b3a22ae507ad..e97d86cbf933 100644 --- a/framework/source/fwe/xml/toolboxdocumenthandler.cxx +++ b/framework/source/fwe/xml/toolboxdocumenthandler.cxx @@ -47,10 +47,6 @@ #include <comphelper/attributelist.hxx> -//_________________________________________________________________________________________________________________ -// namespace -//_________________________________________________________________________________________________________________ - using namespace ::com::sun::star::uno; using namespace ::com::sun::star::beans; using namespace ::com::sun::star::container; diff --git a/framework/source/fwe/xml/toolboxlayoutdocumenthandler.cxx b/framework/source/fwe/xml/toolboxlayoutdocumenthandler.cxx index dcfe37449bc6..3e04ede17ef6 100644 --- a/framework/source/fwe/xml/toolboxlayoutdocumenthandler.cxx +++ b/framework/source/fwe/xml/toolboxlayoutdocumenthandler.cxx @@ -30,8 +30,4 @@ #include <vcl/svapp.hxx> #include <vcl/toolbox.hxx> -//_________________________________________________________________________________________________________________ -// namespace -//_________________________________________________________________________________________________________________ - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/framework/source/fwi/classes/propertysethelper.cxx b/framework/source/fwi/classes/propertysethelper.cxx index aa0c1dd6c083..c8088cd0b295 100644 --- a/framework/source/fwi/classes/propertysethelper.cxx +++ b/framework/source/fwi/classes/propertysethelper.cxx @@ -32,13 +32,8 @@ #include <threadhelp/writeguard.hxx> -//_________________________________________________________________________________________________________________ -// namespace - namespace framework{ -//_________________________________________________________________________________________________________________ -// non exported definitions //----------------------------------------------------------------------------- PropertySetHelper::PropertySetHelper(const css::uno::Reference< css::lang::XMultiServiceFactory >& xSMGR , diff --git a/framework/source/fwi/classes/protocolhandlercache.cxx b/framework/source/fwi/classes/protocolhandlercache.cxx index 1fb153853e4d..4985e398d861 100644 --- a/framework/source/fwi/classes/protocolhandlercache.cxx +++ b/framework/source/fwi/classes/protocolhandlercache.cxx @@ -26,7 +26,6 @@ * ************************************************************************/ - /*TODO - change "singleton" behaviour by using new helper ::comhelper::SingletonRef - rename method exist() to existHandlerForURL() or similar one @@ -43,20 +42,8 @@ #include <unotools/configpaths.hxx> #include <rtl/ustrbuf.hxx> -//_________________________________________________________________________________________________________________ -// namespace -//_________________________________________________________________________________________________________________ - namespace framework{ -//_________________________________________________________________________________________________________________ -// non exported const -//_________________________________________________________________________________________________________________ - -//_________________________________________________________________________________________________________________ -// non exported definitions -//_________________________________________________________________________________________________________________ - /** @short overloaded index operator of hash map to support pattern key search @descr All keys inside this hash map are URL pattern which points to an uno diff --git a/framework/source/fwi/jobs/configaccess.cxx b/framework/source/fwi/jobs/configaccess.cxx index b0e139b50fc6..1e23ed32e243 100644 --- a/framework/source/fwi/jobs/configaccess.cxx +++ b/framework/source/fwi/jobs/configaccess.cxx @@ -42,21 +42,8 @@ #include <unotools/configpaths.hxx> #include <rtl/ustrbuf.hxx> -//________________________________ -// namespace - namespace framework{ -//________________________________ -// non exported const - -//________________________________ -// non exported definitions - -//________________________________ -// declarations - -//________________________________ /** @short open the configuration of this job @descr We open the configuration of this job only. Not the whole package or the whole diff --git a/framework/source/fwi/jobs/jobconst.cxx b/framework/source/fwi/jobs/jobconst.cxx index 97744b702e84..d3e1c0e73e3b 100644 --- a/framework/source/fwi/jobs/jobconst.cxx +++ b/framework/source/fwi/jobs/jobconst.cxx @@ -28,19 +28,8 @@ #include <jobs/jobconst.hxx> -// namespace - namespace framework{ -//________________________________ -// non exported const - -//________________________________ -// non exported definitions - -//________________________________ -// declarations - const ::rtl::OUString JobConst::ANSWER_DEACTIVATE_JOB() { static const ::rtl::OUString PROP(RTL_CONSTASCII_USTRINGPARAM("Deactivate")); diff --git a/framework/source/fwi/threadhelp/lockhelper.cxx b/framework/source/fwi/threadhelp/lockhelper.cxx index 46da6050c403..9d157541852b 100644 --- a/framework/source/fwi/threadhelp/lockhelper.cxx +++ b/framework/source/fwi/threadhelp/lockhelper.cxx @@ -35,20 +35,8 @@ #include <osl/process.h> -//_________________________________________________________________________________________________________________ -// namespace -//_________________________________________________________________________________________________________________ - namespace framework{ -//_________________________________________________________________________________________________________________ -// const -//_________________________________________________________________________________________________________________ - -//_________________________________________________________________________________________________________________ -// declarations -//_________________________________________________________________________________________________________________ - /*-************************************************************************************************************//** @short use ctor to initialize instance @descr We must initialize our member "m_eLockType". This value specify handling of locking. diff --git a/framework/source/fwi/threadhelp/transactionmanager.cxx b/framework/source/fwi/threadhelp/transactionmanager.cxx index 554a59c21ae3..c20a407fdcc7 100644 --- a/framework/source/fwi/threadhelp/transactionmanager.cxx +++ b/framework/source/fwi/threadhelp/transactionmanager.cxx @@ -26,28 +26,8 @@ #include <com/sun/star/lang/DisposedException.hpp> -//_________________________________________________________________________________________________________________ -// const -//_________________________________________________________________________________________________________________ - -//_________________________________________________________________________________________________________________ -// namespace -//_________________________________________________________________________________________________________________ - namespace framework{ -//_________________________________________________________________________________________________________________ -// non exported const -//_________________________________________________________________________________________________________________ - -//_________________________________________________________________________________________________________________ -// non exported declarations -//_________________________________________________________________________________________________________________ - -//_________________________________________________________________________________________________________________ -// definitions -//_________________________________________________________________________________________________________________ - /*-************************************************************************************************************//** @short standard ctor @descr Initialize instance with right start values for correct working. diff --git a/framework/source/helper/dockingareadefaultacceptor.cxx b/framework/source/helper/dockingareadefaultacceptor.cxx index 9c700fcb67bc..819ced8d45bc 100644 --- a/framework/source/helper/dockingareadefaultacceptor.cxx +++ b/framework/source/helper/dockingareadefaultacceptor.cxx @@ -35,10 +35,6 @@ #include <vcl/svapp.hxx> -//_________________________________________________________________________________________________________________ -// namespace -//_________________________________________________________________________________________________________________ - namespace framework{ using namespace ::com::sun::star::container ; @@ -48,18 +44,6 @@ using namespace ::com::sun::star::uno ; using namespace ::cppu ; using namespace ::osl ; -//_________________________________________________________________________________________________________________ -// non exported const -//_________________________________________________________________________________________________________________ - -//_________________________________________________________________________________________________________________ -// non exported definitions -//_________________________________________________________________________________________________________________ - -//_________________________________________________________________________________________________________________ -// declarations -//_________________________________________________________________________________________________________________ - //***************************************************************************************************************** // constructor //***************************************************************************************************************** diff --git a/framework/source/helper/ocomponentaccess.cxx b/framework/source/helper/ocomponentaccess.cxx index c08e6464a971..32cb0ac5bc98 100644 --- a/framework/source/helper/ocomponentaccess.cxx +++ b/framework/source/helper/ocomponentaccess.cxx @@ -26,10 +26,6 @@ #include <vcl/svapp.hxx> -//_________________________________________________________________________________________________________________ -// namespace -//_________________________________________________________________________________________________________________ - namespace framework{ using namespace ::com::sun::star::container ; @@ -40,18 +36,6 @@ using namespace ::cppu ; using namespace ::osl ; using namespace ::rtl ; -//_________________________________________________________________________________________________________________ -// non exported const -//_________________________________________________________________________________________________________________ - -//_________________________________________________________________________________________________________________ -// non exported definitions -//_________________________________________________________________________________________________________________ - -//_________________________________________________________________________________________________________________ -// declarations -//_________________________________________________________________________________________________________________ - //***************************************************************************************************************** // constructor //***************************************************************************************************************** diff --git a/framework/source/helper/ocomponentenumeration.cxx b/framework/source/helper/ocomponentenumeration.cxx index e8cceaf64762..67c66e2a48e9 100644 --- a/framework/source/helper/ocomponentenumeration.cxx +++ b/framework/source/helper/ocomponentenumeration.cxx @@ -23,10 +23,6 @@ #include <vcl/svapp.hxx> -//_________________________________________________________________________________________________________________ -// namespace -//_________________________________________________________________________________________________________________ - namespace framework{ using namespace ::com::sun::star::container ; @@ -36,18 +32,6 @@ using namespace ::cppu ; using namespace ::osl ; using namespace ::rtl ; -//_________________________________________________________________________________________________________________ -// non exported const -//_________________________________________________________________________________________________________________ - -//_________________________________________________________________________________________________________________ -// non exported definitions -//_________________________________________________________________________________________________________________ - -//_________________________________________________________________________________________________________________ -// declarations -//_________________________________________________________________________________________________________________ - //***************************************************************************************************************** // constructor //***************************************************************************************************************** diff --git a/framework/source/helper/oframes.cxx b/framework/source/helper/oframes.cxx index a01c22e2849c..49ae3341e544 100644 --- a/framework/source/helper/oframes.cxx +++ b/framework/source/helper/oframes.cxx @@ -35,10 +35,6 @@ #include <vcl/svapp.hxx> -//_________________________________________________________________________________________________________________ -// namespace -//_________________________________________________________________________________________________________________ - namespace framework{ using namespace ::com::sun::star::container ; @@ -51,18 +47,6 @@ using namespace ::std ; using rtl::OUString; -//_________________________________________________________________________________________________________________ -// non exported const -//_________________________________________________________________________________________________________________ - -//_________________________________________________________________________________________________________________ -// non exported definitions -//_________________________________________________________________________________________________________________ - -//_________________________________________________________________________________________________________________ -// declarations -//_________________________________________________________________________________________________________________ - //***************************************************************************************************************** // constructor //***************************************************************************************************************** diff --git a/framework/source/helper/persistentwindowstate.cxx b/framework/source/helper/persistentwindowstate.cxx index b64005a9b5ee..206deaa1187b 100644 --- a/framework/source/helper/persistentwindowstate.cxx +++ b/framework/source/helper/persistentwindowstate.cxx @@ -48,13 +48,9 @@ #include <vcl/wrkwin.hxx> #include <rtl/string.hxx> -//_________________________________________________________________________________________________________________ -// namespace namespace framework{ -//_________________________________________________________________________________________________________________ -// definitions //***************************************************************************************************************** // XInterface, XTypeProvider diff --git a/framework/source/helper/statusindicator.cxx b/framework/source/helper/statusindicator.cxx index 681035569259..970be61f5b3d 100644 --- a/framework/source/helper/statusindicator.cxx +++ b/framework/source/helper/statusindicator.cxx @@ -24,13 +24,9 @@ #include <threadhelp/readguard.hxx> #include <threadhelp/writeguard.hxx> -//_______________________________________________ -// namespace namespace framework{ -//_______________________________________________ -// declarations //*********************************************** // XInterface diff --git a/framework/source/helper/statusindicatorfactory.cxx b/framework/source/helper/statusindicatorfactory.cxx index 5cedd956d3c4..c24aabf68113 100644 --- a/framework/source/helper/statusindicatorfactory.cxx +++ b/framework/source/helper/statusindicatorfactory.cxx @@ -55,13 +55,9 @@ #include <vcl/svapp.hxx> #include <osl/mutex.hxx> -//----------------------------------------------- -// namespace namespace framework{ -//----------------------------------------------- -// definitions sal_Int32 StatusIndicatorFactory::m_nInReschedule = 0; /// static counter for rescheduling const char PROGRESS_RESOURCE[] = "private:resource/progressbar/progressbar"; diff --git a/framework/source/helper/tagwindowasmodified.cxx b/framework/source/helper/tagwindowasmodified.cxx index 5ad706a0ff3f..2653e2f1b089 100644 --- a/framework/source/helper/tagwindowasmodified.cxx +++ b/framework/source/helper/tagwindowasmodified.cxx @@ -38,13 +38,9 @@ #include <vcl/wrkwin.hxx> #include <tools/wintypes.hxx> -//_________________________________________________________________________________________________________________ -// namespace namespace framework{ -//_________________________________________________________________________________________________________________ -// definitions //***************************************************************************************************************** // XInterface, XTypeProvider diff --git a/framework/source/helper/titlebarupdate.cxx b/framework/source/helper/titlebarupdate.cxx index 6c4951a0de8c..2264a82ed545 100644 --- a/framework/source/helper/titlebarupdate.cxx +++ b/framework/source/helper/titlebarupdate.cxx @@ -55,14 +55,11 @@ #include <vcl/wrkwin.hxx> #include <tools/diagnose_ex.h> -// namespace namespace framework{ -// const static const ::sal_Int32 INVALID_ICON_ID = -1; static const ::sal_Int32 DEFAULT_ICON_ID = 0; -// definitions //***************************************************************************************************************** // XInterface, XTypeProvider diff --git a/framework/source/helper/vclstatusindicator.cxx b/framework/source/helper/vclstatusindicator.cxx index d070ad500a78..412eb5137a2b 100644 --- a/framework/source/helper/vclstatusindicator.cxx +++ b/framework/source/helper/vclstatusindicator.cxx @@ -34,13 +34,9 @@ #include <toolkit/unohlp.hxx> #include <vcl/svapp.hxx> -//----------------------------------------------- -// namespace namespace framework { -//----------------------------------------------- -// definitions //----------------------------------------------- DEFINE_XINTERFACE_1(VCLStatusIndicator , diff --git a/framework/source/helper/wakeupthread.cxx b/framework/source/helper/wakeupthread.cxx index 81a0e24a067e..6cf080495a09 100644 --- a/framework/source/helper/wakeupthread.cxx +++ b/framework/source/helper/wakeupthread.cxx @@ -24,13 +24,9 @@ #include <threadhelp/readguard.hxx> #include <threadhelp/writeguard.hxx> -//_______________________________________________ -// namespace namespace framework{ -//_______________________________________________ -// declarations //*********************************************** WakeUpThread::WakeUpThread(const css::uno::Reference< css::util::XUpdatable >& xListener) diff --git a/framework/source/inc/accelerators/presethandler.hxx b/framework/source/inc/accelerators/presethandler.hxx index 3254e0c2c0df..93498669cdd5 100644 --- a/framework/source/inc/accelerators/presethandler.hxx +++ b/framework/source/inc/accelerators/presethandler.hxx @@ -33,13 +33,8 @@ #include <salhelper/singletonref.hxx> #include <comphelper/locale.hxx> -//__________________________________________ -// definition - namespace framework { - -//__________________________________________ /** TODO document me @@ -57,8 +52,7 @@ namespace framework */ class PresetHandler : private ThreadHelpBase // attention! Must be the first base class to guarentee right initialize lock ... { - //------------------------------------------- - // const + public: diff --git a/framework/source/inc/accelerators/storageholder.hxx b/framework/source/inc/accelerators/storageholder.hxx index 63aacd3a4eee..17d04d5d7f19 100644 --- a/framework/source/inc/accelerators/storageholder.hxx +++ b/framework/source/inc/accelerators/storageholder.hxx @@ -38,15 +38,12 @@ #include <com/sun/star/lang/XMultiServiceFactory.hpp> -// namespace namespace css = ::com::sun::star; namespace framework { -//=============================================== -// definitions //----------------------------------------------- /** diff --git a/framework/source/inc/dispatch/loaddispatcher.hxx b/framework/source/inc/dispatch/loaddispatcher.hxx index fe38971322ec..41e033253515 100644 --- a/framework/source/inc/dispatch/loaddispatcher.hxx +++ b/framework/source/inc/dispatch/loaddispatcher.hxx @@ -27,19 +27,10 @@ #include <cppuhelper/implbase2.hxx> -//_______________________________________________ -// namespace - namespace framework{ namespace css = ::com::sun::star; -//_______________________________________________ -// exported const - -//_______________________________________________ -// exported definitions - /** @short implements a dispatch object which can be used to load non-visible components (by using the mechanism of ContentHandler) or visible-components (by using the mechanism of FrameLoader). diff --git a/framework/source/inc/dispatch/windowcommanddispatch.hxx b/framework/source/inc/dispatch/windowcommanddispatch.hxx index fd2fa7e7f609..7e9b8f5be96a 100644 --- a/framework/source/inc/dispatch/windowcommanddispatch.hxx +++ b/framework/source/inc/dispatch/windowcommanddispatch.hxx @@ -39,19 +39,10 @@ #include <cppuhelper/implbase1.hxx> #include <tools/link.hxx> -//_______________________________________________ -// namespace - namespace framework{ namespace css = ::com::sun::star; -//_______________________________________________ -// exported const - -//_______________________________________________ -// exported definitions - /** @short internal helper to bind e.g. MAC-Menu events to our internal dispatch API. @descr On e.g. MAC platform system menus are merged together with some fix entries as diff --git a/framework/source/inc/loadenv/actionlockguard.hxx b/framework/source/inc/loadenv/actionlockguard.hxx index e080e6d91848..9ccde9e57f95 100644 --- a/framework/source/inc/loadenv/actionlockguard.hxx +++ b/framework/source/inc/loadenv/actionlockguard.hxx @@ -26,8 +26,6 @@ #include <com/sun/star/document/XActionLockable.hpp> -//_______________________________________________ -// namespace namespace framework{ @@ -35,8 +33,6 @@ namespace framework{ namespace css = ::com::sun::star; #endif -//_______________________________________________ -// definitions /** @short implements a guard, which can use the interface <type scope="com::sun::star::document">XActionLockable</type>. diff --git a/framework/source/inc/loadenv/loadenv.hxx b/framework/source/inc/loadenv/loadenv.hxx index 10a57715c011..f5cf3090fc76 100644 --- a/framework/source/inc/loadenv/loadenv.hxx +++ b/framework/source/inc/loadenv/loadenv.hxx @@ -49,8 +49,6 @@ #include <comphelper/sequenceashashmap.hxx> #include <cppuhelper/implbase2.hxx> -//_______________________________________________ -// namespace namespace framework { diff --git a/framework/source/inc/loadenv/loadenvexception.hxx b/framework/source/inc/loadenv/loadenvexception.hxx index b44a96fe080c..15fa125a0243 100644 --- a/framework/source/inc/loadenv/loadenvexception.hxx +++ b/framework/source/inc/loadenv/loadenvexception.hxx @@ -29,24 +29,17 @@ #ifndef __FRAMEWORK_LOADENV_LOADENVEXCEPTION_HXX_ #define __FRAMEWORK_LOADENV_LOADENVEXCEPTION_HXX_ - #include <com/sun/star/uno/Any.h> #include <com/sun/star/uno/Exception.hpp> #include <rtl/string.hxx> -//_______________________________________________ -// namespace - namespace framework{ #ifndef css // conflict with define :-( namespace css = ::com::sun::star; #endif -//_______________________________________________ -// definitions - /** @short specify an exception, which can be used inside the load environment only. @@ -57,8 +50,7 @@ namespace css = ::com::sun::star; */ class LoadEnvException { - //___________________________________________ - // const + public: diff --git a/framework/source/inc/loadenv/targethelper.hxx b/framework/source/inc/loadenv/targethelper.hxx index f1abe245a12e..05ad51beeb91 100644 --- a/framework/source/inc/loadenv/targethelper.hxx +++ b/framework/source/inc/loadenv/targethelper.hxx @@ -23,14 +23,9 @@ #include <sal/types.h> #include <rtl/ustring.hxx> #include <targets.h> -//_______________________________________________ -// namespace namespace framework{ -//_______________________________________________ -// definitions - /** @short can be used to detect, if a target name (used e.g. for XFrame.findFrame()) has a special meaning or can be used as normal frame name (e.g. for XFrame.setName()). @@ -38,8 +33,7 @@ namespace framework{ */ class TargetHelper { - //___________________________________________ - // const + public: diff --git a/framework/source/inc/pattern/configuration.hxx b/framework/source/inc/pattern/configuration.hxx index 110f4d2e1744..f39d5922328b 100644 --- a/framework/source/inc/pattern/configuration.hxx +++ b/framework/source/inc/pattern/configuration.hxx @@ -41,9 +41,6 @@ #include <rtl/ustrbuf.hxx> -//_______________________________________________ -// namespaces - #ifndef css namespace css = ::com::sun::star; #endif @@ -52,14 +49,10 @@ namespace framework{ namespace pattern{ namespace configuration{ -//_______________________________________________ -// definitions - //----------------------------------------------- class ConfigurationHelper { - //------------------------------------------- - // const + public: //--------------------------------------- diff --git a/framework/source/inc/pattern/frame.hxx b/framework/source/inc/pattern/frame.hxx index 5163733fb1c1..5a51422abe72 100644 --- a/framework/source/inc/pattern/frame.hxx +++ b/framework/source/inc/pattern/frame.hxx @@ -39,8 +39,6 @@ namespace framework{ namespace pattern{ namespace frame{ -//_______________________________________________ -// definitions //----------------------------------------------- inline css::uno::Reference< css::frame::XModel > extractFrameModel(const css::uno::Reference< css::frame::XFrame >& xFrame) diff --git a/framework/source/inc/pattern/window.hxx b/framework/source/inc/pattern/window.hxx index b5cbd52bf585..25ef69a232b5 100644 --- a/framework/source/inc/pattern/window.hxx +++ b/framework/source/inc/pattern/window.hxx @@ -51,8 +51,6 @@ namespace css = ::com::sun::star; namespace framework{ -//_______________________________________________ -// definitions class WindowHelper { diff --git a/framework/source/interaction/quietinteraction.cxx b/framework/source/interaction/quietinteraction.cxx index fc7c29a6c0e9..388805bd1b7d 100644 --- a/framework/source/interaction/quietinteraction.cxx +++ b/framework/source/interaction/quietinteraction.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "interaction/quietinteraction.hxx" #include <threadhelp/readguard.hxx> @@ -41,20 +40,8 @@ #include <tools/errinf.hxx> #endif -//_________________________________________________________________________________________________________________ -// namespace -//_________________________________________________________________________________________________________________ - namespace framework{ -//_________________________________________________________________________________________________________________ -// exported const -//_________________________________________________________________________________________________________________ - -//_________________________________________________________________________________________________________________ -// exported definitions -//_________________________________________________________________________________________________________________ - DEFINE_XINTERFACE_2( QuietInteraction , OWeakObject , DIRECT_INTERFACE(css::lang::XTypeProvider ) , diff --git a/framework/source/jobs/helponstartup.cxx b/framework/source/jobs/helponstartup.cxx index d0bc8b225855..017cc4a140d9 100644 --- a/framework/source/jobs/helponstartup.cxx +++ b/framework/source/jobs/helponstartup.cxx @@ -49,13 +49,9 @@ #include <com/sun/star/frame/XFramesSupplier.hpp> #include <com/sun/star/frame/XDesktop.hpp> -//_______________________________________________ -// namespace namespace framework{ -//_______________________________________________ -// definitions // path to module config static ::rtl::OUString CFG_PACKAGE_MODULES ("/org.openoffice.Setup/Office/Factories"); diff --git a/framework/source/jobs/job.cxx b/framework/source/jobs/job.cxx index e1c9dd9afaea..7d7b6317d7f2 100644 --- a/framework/source/jobs/job.cxx +++ b/framework/source/jobs/job.cxx @@ -41,20 +41,8 @@ #include <rtl/ustrbuf.hxx> #include <vcl/svapp.hxx> -//________________________________ -// namespace - namespace framework{ -//________________________________ -// non exported const - -//________________________________ -// non exported definitions - -//________________________________ -// declarations - DEFINE_XINTERFACE_4( Job , OWeakObject , DIRECT_INTERFACE(css::lang::XTypeProvider ), diff --git a/framework/source/jobs/jobdata.cxx b/framework/source/jobs/jobdata.cxx index a078d04f2e63..6195d0c18b31 100644 --- a/framework/source/jobs/jobdata.cxx +++ b/framework/source/jobs/jobdata.cxx @@ -43,13 +43,9 @@ #include <rtl/ustrbuf.hxx> #include <vcl/svapp.hxx> -//________________________________ -// namespace namespace framework{ -//________________________________ -// exported const const sal_Char* JobData::JOBCFG_ROOT = "/org.openoffice.Office.Jobs/Jobs/" ; const sal_Char* JobData::JOBCFG_PROP_SERVICE = "Service" ; @@ -74,11 +70,7 @@ const sal_Char* JobData::PROP_MODEL = "Model" const sal_Char* JobData::PROP_SERVICE = "Service" ; const sal_Char* JobData::PROP_CONTEXT = "Context" ; -//________________________________ -// non exported definitions -//________________________________ -// declarations //________________________________ /** diff --git a/framework/source/jobs/jobdispatch.cxx b/framework/source/jobs/jobdispatch.cxx index 1aaa113db18f..fd0b5eee53fd 100644 --- a/framework/source/jobs/jobdispatch.cxx +++ b/framework/source/jobs/jobdispatch.cxx @@ -43,20 +43,8 @@ #include <rtl/ustrbuf.hxx> #include <vcl/svapp.hxx> -//________________________________ -// namespace - namespace framework{ -//________________________________ -// non exported const - -//________________________________ -// non exported definitions - -//________________________________ -// declarations - DEFINE_XINTERFACE_6( JobDispatch , OWeakObject , DIRECT_INTERFACE(css::lang::XTypeProvider ), diff --git a/framework/source/jobs/jobexecutor.cxx b/framework/source/jobs/jobexecutor.cxx index 6c23a775f40d..0963d58c50b7 100644 --- a/framework/source/jobs/jobexecutor.cxx +++ b/framework/source/jobs/jobexecutor.cxx @@ -49,20 +49,8 @@ #include <rtl/logfile.hxx> -//________________________________ -// namespace - namespace framework{ -//________________________________ -// non exported const - -//________________________________ -// non exported definitions - -//________________________________ -// declarations - DEFINE_XINTERFACE_6( JobExecutor , OWeakObject , DIRECT_INTERFACE(css::lang::XTypeProvider ), diff --git a/framework/source/jobs/jobresult.cxx b/framework/source/jobs/jobresult.cxx index 78b84dcefa9f..f79fcbdb5d57 100644 --- a/framework/source/jobs/jobresult.cxx +++ b/framework/source/jobs/jobresult.cxx @@ -24,26 +24,12 @@ #include <general.h> #include <services.h> - #include <rtl/ustrbuf.hxx> #include <vcl/svapp.hxx> #include <comphelper/sequenceashashmap.hxx> -//________________________________ -// namespace - namespace framework{ -//________________________________ -// non exported const - -//________________________________ -// non exported definitions - -//________________________________ -// declarations - -//________________________________ /** @short standard dtor @descr It does nothing else ... diff --git a/framework/source/jobs/joburl.cxx b/framework/source/jobs/joburl.cxx index 38a91d71eb1d..fb5bfc9a0040 100644 --- a/framework/source/jobs/joburl.cxx +++ b/framework/source/jobs/joburl.cxx @@ -34,21 +34,8 @@ #include <rtl/ustrbuf.hxx> #include <vcl/svapp.hxx> -//________________________________ -// namespace - namespace framework{ -//________________________________ -// non exported const - -//________________________________ -// non exported definitions - -//________________________________ -// declarations - -//________________________________ /** @short special ctor @descr It initialize this new instance with a (hopyfully) valid job URL. diff --git a/framework/source/jobs/shelljob.cxx b/framework/source/jobs/shelljob.cxx index a4c073b527cc..ca941607cbf2 100644 --- a/framework/source/jobs/shelljob.cxx +++ b/framework/source/jobs/shelljob.cxx @@ -51,13 +51,9 @@ #include <com/sun/star/util/PathSubstitution.hpp> #include <com/sun/star/util/XStringSubstitution.hpp> -//_______________________________________________ -// namespace namespace framework{ -//_______________________________________________ -// definitions /** address job configuration inside argument set provided on method execute(). */ static const ::rtl::OUString PROP_JOBCONFIG("JobConfig"); diff --git a/framework/source/layoutmanager/helpers.cxx b/framework/source/layoutmanager/helpers.cxx index edd8de5d0680..064407a8bb90 100644 --- a/framework/source/layoutmanager/helpers.cxx +++ b/framework/source/layoutmanager/helpers.cxx @@ -42,7 +42,6 @@ #include <vcl/svapp.hxx> #include <toolkit/unohlp.hxx> -// namespace using namespace com::sun::star; namespace framework diff --git a/framework/source/layoutmanager/uielement.cxx b/framework/source/layoutmanager/uielement.cxx index dda8e5cd9d2d..785a795824dd 100644 --- a/framework/source/layoutmanager/uielement.cxx +++ b/framework/source/layoutmanager/uielement.cxx @@ -30,10 +30,6 @@ #include <com/sun/star/ui/DockingArea.hpp> -//_________________________________________________________________________________________________________________ -// namespace -//_________________________________________________________________________________________________________________ - using namespace ::com::sun::star; namespace framework diff --git a/framework/source/loadenv/loadenv.cxx b/framework/source/loadenv/loadenv.cxx index 952070474a7a..02a8c7a3f487 100644 --- a/framework/source/loadenv/loadenv.cxx +++ b/framework/source/loadenv/loadenv.cxx @@ -91,7 +91,6 @@ const char PROP_TYPES[] = "Types"; const char PROP_NAME[] = "Name"; -// namespace namespace framework{ @@ -100,8 +99,6 @@ namespace framework{ namespace css = ::com::sun::star; #endif -//_______________________________________________ -// declarations class LoadEnvListener : private ThreadHelpBase , public ::cppu::WeakImplHelper2< css::frame::XLoadEventListener , diff --git a/framework/source/recording/dispatchrecordersupplier.cxx b/framework/source/recording/dispatchrecordersupplier.cxx index c9c21df84418..164b6370b7c1 100644 --- a/framework/source/recording/dispatchrecordersupplier.cxx +++ b/framework/source/recording/dispatchrecordersupplier.cxx @@ -17,36 +17,17 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - -//_________________________________________________________________________________________________________________ -// include own things #include <recording/dispatchrecordersupplier.hxx> #include <threadhelp/writeguard.hxx> #include <threadhelp/readguard.hxx> #include <services.h> -//_________________________________________________________________________________________________________________ -// include interfaces #include <com/sun/star/frame/XRecordableDispatch.hpp> -//_________________________________________________________________________________________________________________ -// include other projects #include <vcl/svapp.hxx> -//_________________________________________________________________________________________________________________ -// namespace - namespace framework{ -//_________________________________________________________________________________________________________________ -// non exported const - -//_________________________________________________________________________________________________________________ -// non exported definitions - -//_________________________________________________________________________________________________________________ -// declarations - //***************************************************************************************************************** // XInterface, XTypeProvider //***************************************************************************************************************** diff --git a/framework/source/services/dispatchhelper.cxx b/framework/source/services/dispatchhelper.cxx index 27721a345b55..c1ffd4b299aa 100644 --- a/framework/source/services/dispatchhelper.cxx +++ b/framework/source/services/dispatchhelper.cxx @@ -37,21 +37,9 @@ #include <comphelper/componentcontext.hxx> -//_______________________________________________ -// namespace - namespace framework{ //_______________________________________________ -// non exported const - -//_______________________________________________ -// non exported definitions - -//_______________________________________________ -// declarations - -//_______________________________________________ // XInterface, XTypeProvider, XServiceInfo DEFINE_XSERVICEINFO_MULTISERVICE(DispatchHelper , diff --git a/framework/source/services/license.cxx b/framework/source/services/license.cxx index 3fc13c543bfe..6dff1bf129e3 100644 --- a/framework/source/services/license.cxx +++ b/framework/source/services/license.cxx @@ -58,10 +58,6 @@ #include <osl/file.hxx> #include <osl/time.h> -//_________________________________________________________________________________________________________________ -// namespace -//_________________________________________________________________________________________________________________ - namespace framework{ using namespace utl; using namespace ::osl ; @@ -72,10 +68,6 @@ using namespace ::com::sun::star::lang ; using namespace ::com::sun::star::util ; using namespace ::com::sun::star::frame ; -//_________________________________________________________________________________________________________________ -// non exported const -//_________________________________________________________________________________________________________________ - // license file name static const char *szLicensePath = "/share/readme"; #ifdef UNX @@ -86,14 +78,6 @@ static const char *szWNTLicenseName = "/license"; static const char *szWNTLicenseExt = ".txt"; #endif -//_________________________________________________________________________________________________________________ -// non exported definitions -//_________________________________________________________________________________________________________________ - -//_________________________________________________________________________________________________________________ -// declarations -//_________________________________________________________________________________________________________________ - //***************************************************************************************************************** // constructor //***************************************************************************************************************** diff --git a/framework/source/services/mediatypedetectionhelper.cxx b/framework/source/services/mediatypedetectionhelper.cxx index 4f3d43915ac3..efe7097d50bf 100644 --- a/framework/source/services/mediatypedetectionhelper.cxx +++ b/framework/source/services/mediatypedetectionhelper.cxx @@ -32,20 +32,12 @@ #include <tools/string.hxx> #include <rtl/logfile.hxx> -//_________________________________________________________________________________________________________________ -// namespace -//_________________________________________________________________________________________________________________ - namespace framework { using namespace ::com::sun::star ; using namespace ::rtl ; -//_________________________________________________________________________________________________________________ -// declarations -//_________________________________________________________________________________________________________________ - //***************************************************************************************************************** // constructor //***************************************************************************************************************** diff --git a/framework/source/services/pathsettings.cxx b/framework/source/services/pathsettings.cxx index a9de0ac2e417..db550bf58967 100644 --- a/framework/source/services/pathsettings.cxx +++ b/framework/source/services/pathsettings.cxx @@ -55,8 +55,6 @@ #include <fwkdllapi.h> -// ______________________________________________ -// non exported const #define CFGPROP_USERPATHS rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("UserPaths")) #define CFGPROP_WRITEPATH rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("WritePath")) @@ -84,8 +82,6 @@ sal_Int32 impl_getPropGroup(sal_Int32 nID) return (nID % IDGROUP_COUNT); } -// ______________________________________________ -// namespace namespace framework { diff --git a/framework/source/services/sessionlistener.cxx b/framework/source/services/sessionlistener.cxx index 8bc3ff7bbe8d..cd9b2f9218f6 100644 --- a/framework/source/services/sessionlistener.cxx +++ b/framework/source/services/sessionlistener.cxx @@ -35,7 +35,6 @@ #include <osl/thread.h> - #include <vcl/svapp.hxx> #include <unotools/tempfile.hxx> #include <com/sun/star/lang/XSingleServiceFactory.hpp> @@ -67,8 +66,6 @@ #include <com/sun/star/uno/Sequence.hxx> -// namespace - using namespace com::sun::star::uno; using namespace com::sun::star::util; using namespace com::sun::star::frame; @@ -78,16 +75,8 @@ using namespace com::sun::star::container; using ::rtl::OUString; using ::rtl::OString; -namespace framework{ -//_______________________________________________ -// non exported const - -//_______________________________________________ -// non exported definitions - -//_______________________________________________ -// declarations +namespace framework{ //*********************************************** // XInterface, XTypeProvider, XServiceInfo diff --git a/framework/source/services/tabwindowservice.cxx b/framework/source/services/tabwindowservice.cxx index 6ea5dd16edbd..cecb6d145c15 100644 --- a/framework/source/services/tabwindowservice.cxx +++ b/framework/source/services/tabwindowservice.cxx @@ -39,20 +39,8 @@ #include <rtl/ustrbuf.hxx> #include <vcl/svapp.hxx> -//_________________________________________________________________________________________________________________ -// namespace -//_________________________________________________________________________________________________________________ - namespace framework{ -//_________________________________________________________________________________________________________________ -// non exported definitions -//_________________________________________________________________________________________________________________ - -//_________________________________________________________________________________________________________________ -// declarations -//_________________________________________________________________________________________________________________ - //***************************************************************************************************************** // css::uno::XInterface, XTypeProvider, XServiceInfo //***************************************************************************************************************** diff --git a/framework/source/services/uriabbreviation.cxx b/framework/source/services/uriabbreviation.cxx index 06e98e1eb053..67f3c1df1d10 100644 --- a/framework/source/services/uriabbreviation.cxx +++ b/framework/source/services/uriabbreviation.cxx @@ -35,10 +35,6 @@ namespace framework namespace css = ::com::sun::star; -//_________________________________________________________________________________________________________________ -// declarations -//_________________________________________________________________________________________________________________ - //***************************************************************************************************************** // XInterface, XTypeProvider, XServiceInfo //***************************************************************************************************************** diff --git a/framework/source/services/urltransformer.cxx b/framework/source/services/urltransformer.cxx index 7a7c73088513..b09b306c492a 100644 --- a/framework/source/services/urltransformer.cxx +++ b/framework/source/services/urltransformer.cxx @@ -35,10 +35,6 @@ #include <rtl/ustrbuf.hxx> #include <vcl/svapp.hxx> -//_________________________________________________________________________________________________________________ -// namespace -//_________________________________________________________________________________________________________________ - namespace framework{ using namespace ::osl ; @@ -47,18 +43,6 @@ using namespace ::com::sun::star::uno ; using namespace ::com::sun::star::lang ; using namespace ::com::sun::star::util ; -//_________________________________________________________________________________________________________________ -// non exported const -//_________________________________________________________________________________________________________________ - -//_________________________________________________________________________________________________________________ -// non exported definitions -//_________________________________________________________________________________________________________________ - -//_________________________________________________________________________________________________________________ -// declarations -//_________________________________________________________________________________________________________________ - //***************************************************************************************************************** // constructor //***************************************************************************************************************** diff --git a/framework/source/uielement/menubarmanager.cxx b/framework/source/uielement/menubarmanager.cxx index 3d8bc974d3af..29385281684e 100644 --- a/framework/source/uielement/menubarmanager.cxx +++ b/framework/source/uielement/menubarmanager.cxx @@ -94,10 +94,6 @@ struct SystemMenuData long hMenu; }; -//_________________________________________________________________________________________________________________ -// namespace -//_________________________________________________________________________________________________________________ - using namespace ::cppu; using namespace ::com::sun::star; using namespace ::com::sun::star::uno; diff --git a/framework/source/uielement/progressbarwrapper.cxx b/framework/source/uielement/progressbarwrapper.cxx index 906147ea13fe..fe7a9b89dd44 100644 --- a/framework/source/uielement/progressbarwrapper.cxx +++ b/framework/source/uielement/progressbarwrapper.cxx @@ -26,7 +26,6 @@ * ************************************************************************/ - #include <uielement/progressbarwrapper.hxx> #include <helper/statusindicator.hxx> @@ -39,25 +38,10 @@ #include <vcl/svapp.hxx> #include <toolkit/helper/vclunohelper.hxx> -//_________________________________________________________________________________________________________________ -// namespace -//_________________________________________________________________________________________________________________ using namespace ::com::sun::star; namespace framework{ -//_________________________________________________________________________________________________________________ -// non exported const -//_________________________________________________________________________________________________________________ - -//_________________________________________________________________________________________________________________ -// non exported definitions -//_________________________________________________________________________________________________________________ - -//_________________________________________________________________________________________________________________ -// declarations -//_________________________________________________________________________________________________________________ - ProgressBarWrapper::ProgressBarWrapper() : UIElementWrapperBase( ::com::sun::star::ui::UIElementType::PROGRESSBAR ) , m_bOwnsInstance( sal_False ) diff --git a/framework/source/xml/acceleratorconfigurationreader.cxx b/framework/source/xml/acceleratorconfigurationreader.cxx index 934181f8b4d7..5b927e3bf614 100644 --- a/framework/source/xml/acceleratorconfigurationreader.cxx +++ b/framework/source/xml/acceleratorconfigurationreader.cxx @@ -39,8 +39,6 @@ #include <vcl/svapp.hxx> #include <rtl/ustrbuf.hxx> -//_______________________________________________ -// namespace namespace framework{ diff --git a/framework/source/xml/acceleratorconfigurationwriter.cxx b/framework/source/xml/acceleratorconfigurationwriter.cxx index aaef32458ebc..6b70c48ea1fc 100644 --- a/framework/source/xml/acceleratorconfigurationwriter.cxx +++ b/framework/source/xml/acceleratorconfigurationwriter.cxx @@ -41,9 +41,6 @@ #include <comphelper/attributelist.hxx> -//_______________________________________________ -// namespace - namespace framework{ diff --git a/framework/source/xml/imagesconfiguration.cxx b/framework/source/xml/imagesconfiguration.cxx index 40a61e3a0d4b..b583605cec63 100644 --- a/framework/source/xml/imagesconfiguration.cxx +++ b/framework/source/xml/imagesconfiguration.cxx @@ -41,10 +41,6 @@ #include <comphelper/processfactory.hxx> #include <unotools/streamwrap.hxx> -//_________________________________________________________________________________________________________________ -// namespace -//_________________________________________________________________________________________________________________ - using namespace ::com::sun::star::uno; using namespace ::com::sun::star::xml::sax; using namespace ::com::sun::star::lang; diff --git a/framework/source/xml/imagesdocumenthandler.cxx b/framework/source/xml/imagesdocumenthandler.cxx index e5c393b6ba5f..befe79c9fda0 100644 --- a/framework/source/xml/imagesdocumenthandler.cxx +++ b/framework/source/xml/imagesdocumenthandler.cxx @@ -41,10 +41,6 @@ #include <comphelper/attributelist.hxx> -//_________________________________________________________________________________________________________________ -// namespace -//_________________________________________________________________________________________________________________ - using namespace ::com::sun::star::uno; using namespace ::com::sun::star::xml::sax; diff --git a/l10ntools/source/filter/merge/FCFGMerge.java b/l10ntools/source/filter/merge/FCFGMerge.java index fc2637e34b7c..ce3d510be48d 100644 --- a/l10ntools/source/filter/merge/FCFGMerge.java +++ b/l10ntools/source/filter/merge/FCFGMerge.java @@ -18,15 +18,11 @@ package com.sun.star.filter.config.tools.merge; -//_______________________________________________ - import java.lang.*; import java.util.*; import java.io.*; import com.sun.star.filter.config.tools.utils.*; -//_______________________________________________ - /** * Its a simple command line tool, which can merge different XML fragments * together. Such fragments must exist as files on disk, will be moved into @@ -36,9 +32,6 @@ import com.sun.star.filter.config.tools.utils.*; */ public class FCFGMerge { - //___________________________________________ - // const - private static final java.lang.String CFGFILE = "com/sun/star/filter/config/tools/merge/FCFGMerge.cfg"; private static final java.lang.String PROP_LOGLEVEL = "loglevel"; diff --git a/l10ntools/source/filter/merge/Merger.java b/l10ntools/source/filter/merge/Merger.java index 3502d670282e..26204f11db56 100644 --- a/l10ntools/source/filter/merge/Merger.java +++ b/l10ntools/source/filter/merge/Merger.java @@ -17,24 +17,17 @@ */ package com.sun.star.filter.config.tools.merge; -//_______________________________________________ - import java.lang.*; import java.util.*; import java.io.*; import com.sun.star.filter.config.tools.utils.*; -//_______________________________________________ - /** can merge different xml fragments together. * * */ public class Merger { - //___________________________________________ - // const - private static final java.lang.String PROP_XMLVERSION = "xmlversion" ; // <= global cfg file private static final java.lang.String PROP_XMLENCODING = "xmlencoding" ; // <= global cfg file private static final java.lang.String PROP_XMLPATH = "xmlpath" ; // <= global cfg file diff --git a/l10ntools/source/filter/utils/Cache.java b/l10ntools/source/filter/utils/Cache.java index d3ad7dbc6211..744481d1ef52 100644 --- a/l10ntools/source/filter/utils/Cache.java +++ b/l10ntools/source/filter/utils/Cache.java @@ -36,8 +36,7 @@ import java.io.*; */ public class Cache { - //___________________________________________ - // public const + /** identifies a file type item of this cache. */ public static final int E_TYPE = 0; diff --git a/l10ntools/source/filter/utils/Logger.java b/l10ntools/source/filter/utils/Logger.java index 425f2a24c420..2b206b351e8a 100644 --- a/l10ntools/source/filter/utils/Logger.java +++ b/l10ntools/source/filter/utils/Logger.java @@ -18,15 +18,9 @@ package com.sun.star.filter.config.tools.utils; -//_______________________________________________ -// imports - import java.lang.*; import java.util.*; -//_______________________________________________ -// definition - /** can be used to print out some debug messages * and group it into warnings/errors or info statements. * @@ -34,9 +28,6 @@ import java.util.*; */ public class Logger { - //___________________________________________ - // const - /** only error message will be shown. */ public static final int LEVEL_ERRORS = 1; diff --git a/l10ntools/source/filter/utils/XMLHelper.java b/l10ntools/source/filter/utils/XMLHelper.java index 2dc4d5c65596..390a6e59af95 100644 --- a/l10ntools/source/filter/utils/XMLHelper.java +++ b/l10ntools/source/filter/utils/XMLHelper.java @@ -35,8 +35,7 @@ import java.io.*; */ public class XMLHelper { - //___________________________________________ - // public const + /** its a possible value of the xml attribute "oor:type" and identify an integer type. */ public static final java.lang.String XMLTYPE_INTEGER = "xs:int"; diff --git a/odk/examples/DevelopersGuide/Components/Addons/JobsAddon/AsyncJob.java b/odk/examples/DevelopersGuide/Components/Addons/JobsAddon/AsyncJob.java index 790a52d46fb1..6b53ece9d3c9 100644 --- a/odk/examples/DevelopersGuide/Components/Addons/JobsAddon/AsyncJob.java +++ b/odk/examples/DevelopersGuide/Components/Addons/JobsAddon/AsyncJob.java @@ -32,8 +32,6 @@ * *************************************************************************/ -//_______________________________________________ -// imports import com.sun.star.uno.XComponentContext; import com.sun.star.lib.uno.helper.Factory; import com.sun.star.lib.uno.helper.WeakBase; @@ -45,9 +43,6 @@ import com.sun.star.uno.*; import java.lang.*; import javax.swing.*; -//_______________________________________________ -// implementation - /** it implements a simple job component. * * Such jobs are executable in different ways: @@ -58,8 +53,6 @@ import javax.swing.*; */ public class AsyncJob extends WeakBase implements XServiceInfo, XAsyncJob { - //___________________________________________ - // const public final XComponentContext m_xCmpCtx; /** the const list of supported uno service names. */ diff --git a/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/CustomizeView.java b/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/CustomizeView.java index f71260aeab15..1f88a25ecb57 100644 --- a/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/CustomizeView.java +++ b/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/CustomizeView.java @@ -31,7 +31,6 @@ * USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * *************************************************************************/ -// __________ Imports __________ import com.sun.star.uno.UnoRuntime; @@ -41,8 +40,6 @@ import java.lang.String; import java.awt.event.*; import java.awt.*; -// __________ Implementation __________ - /** * Makes it possible to change some states of currently loaded * document (e.g. enable/disable menubar, toolbar, objectbar) @@ -52,9 +49,6 @@ import java.awt.*; public class CustomizeView extends JPanel implements IShutdownListener { - // ____________________ - // const - /** * These const URL's describe feature for toggling some properties of loaded document. * Dispatch it with the corresponding parameter to the frame. diff --git a/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/AsciiFilter/AsciiReplaceFilter.java b/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/AsciiFilter/AsciiReplaceFilter.java index 475fb4963dbc..9a8bad5e183c 100644 --- a/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/AsciiFilter/AsciiReplaceFilter.java +++ b/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/AsciiFilter/AsciiReplaceFilter.java @@ -75,9 +75,6 @@ import com.sun.star.lang.IllegalArgumentException; public class AsciiReplaceFilter { - - - public static class _AsciiReplaceFilter extends WeakBase implements XInitialization , XServiceInfo , @@ -86,8 +83,7 @@ public class AsciiReplaceFilter XExporter , XFilter { - //______________________________ - // const + // the supported service names, the first one being the service name of the component itself public static final String[] m_serviceNames = { "com.sun.star.comp.ansifilter.AsciiReplaceFilter" , "com.sun.star.document.ImportFilter", "com.sun.star.document.ExportFilter" }; diff --git a/odk/examples/java/EmbedDocument/Container1/EmbedContApp.java b/odk/examples/java/EmbedDocument/Container1/EmbedContApp.java index bed7cdb078ef..63ad80f0e0b8 100644 --- a/odk/examples/java/EmbedDocument/Container1/EmbedContApp.java +++ b/odk/examples/java/EmbedDocument/Container1/EmbedContApp.java @@ -254,7 +254,6 @@ public class EmbedContApp extends Applet implements MouseListener, XEmbeddedClie // for now nothing to do } - // classes class NewMenuItem extends MenuItem implements ActionListener // Menu New { public NewMenuItem() diff --git a/sal/qa/osl/process/osl_process_child.cxx b/sal/qa/osl/process/osl_process_child.cxx index 1cb8f142a5ae..b6c8da6c6ece 100644 --- a/sal/qa/osl/process/osl_process_child.cxx +++ b/sal/qa/osl/process/osl_process_child.cxx @@ -58,7 +58,7 @@ #endif //######################################## -// defines + #ifdef WNT # define SLEEP(t) (Sleep((t)*1000)) diff --git a/salhelper/inc/salhelper/singletonref.hxx b/salhelper/inc/salhelper/singletonref.hxx index 62cd36bd0b0c..a602e50cc4bf 100644 --- a/salhelper/inc/salhelper/singletonref.hxx +++ b/salhelper/inc/salhelper/singletonref.hxx @@ -25,13 +25,9 @@ #include "osl/diagnose.h" #include "osl/getglobalmutex.hxx" -//_______________________________________________ -// namespace namespace salhelper{ -//_______________________________________________ -// definitions /** @short template for implementing singleton classes. diff --git a/salhelper/source/timer.cxx b/salhelper/source/timer.cxx index 8d1d5f68d3b6..944d07d27862 100644 --- a/salhelper/source/timer.cxx +++ b/salhelper/source/timer.cxx @@ -237,8 +237,7 @@ TTimeValue Timer::getRemainingTime() const ///////////////////////////////////////////////////////////////////////////// // // Timer manager -// -namespace + { // Synchronize access to TimerManager struct theTimerManagerMutex : public rtl::Static< osl::Mutex, theTimerManagerMutex> {}; diff --git a/sfx2/inc/sfx2/bindings.hxx b/sfx2/inc/sfx2/bindings.hxx index c32a6b2ea0d7..a13497566aa0 100644 --- a/sfx2/inc/sfx2/bindings.hxx +++ b/sfx2/inc/sfx2/bindings.hxx @@ -58,10 +58,6 @@ class SfxUnoControllerItem; typedef std::vector<SfxUnoControllerItem*> SfxUnoControllerArr_Impl; -//________________________________________________________________________________________________________________ -// defines -//________________________________________________________________________________________________________________ - #define SFX_CALLMODE_SLOT 0x00 // sync/async from Slot #define SFX_CALLMODE_SYNCHRON 0x01 // synchronously in the same Stackframe #define SFX_CALLMODE_ASYNCHRON 0x02 // asynchronously via AppEvent diff --git a/sfx2/inc/sfx2/sfxbasecontroller.hxx b/sfx2/inc/sfx2/sfxbasecontroller.hxx index c1e86e413bb4..aa142f3c69f9 100644 --- a/sfx2/inc/sfx2/sfxbasecontroller.hxx +++ b/sfx2/inc/sfx2/sfxbasecontroller.hxx @@ -48,10 +48,6 @@ #include <sfx2/viewsh.hxx> #include <sfx2/sfxuno.hxx> -//________________________________________________________________________________________________________ -// defines -//________________________________________________________________________________________________________ - // Some defines to write better code :-) #define REFERENCE ::com::sun::star::uno::Reference #define ANY ::com::sun::star::uno::Any diff --git a/sfx2/inc/sfx2/sfxbasemodel.hxx b/sfx2/inc/sfx2/sfxbasemodel.hxx index 621836f89b6b..0fae6b8c766d 100644 --- a/sfx2/inc/sfx2/sfxbasemodel.hxx +++ b/sfx2/inc/sfx2/sfxbasemodel.hxx @@ -95,10 +95,6 @@ #include <svl/lstner.hxx> -//________________________________________________________________________________________________________ -// defines -//________________________________________________________________________________________________________ - // Some defines to write better code :-) #define XCHILD ::com::sun::star::container::XChild #define XNAMECONTAINER ::com::sun::star::container::XNameContainer @@ -168,10 +164,6 @@ #define XTITLECHANGEBROADCASTER ::com::sun::star::frame::XTitleChangeBroadcaster #define XUNTITLEDNUMBERS ::com::sun::star::frame::XUntitledNumbers -//________________________________________________________________________________________________________ -// namespace -//________________________________________________________________________________________________________ - namespace css = ::com::sun::star; //________________________________________________________________________________________________________ diff --git a/sfx2/source/bastyp/fltlst.cxx b/sfx2/source/bastyp/fltlst.cxx index cb14f1f73014..2cc0b74f3741 100644 --- a/sfx2/source/bastyp/fltlst.cxx +++ b/sfx2/source/bastyp/fltlst.cxx @@ -66,12 +66,6 @@ class SfxRefreshListener : public ::cppu::WeakImplHelper1<com::sun::star::util:: } }; - - -//***************************************************************************************************************** -// definitions -//***************************************************************************************************************** - /*-************************************************************************************************************//** @short ctor @descr These initialize an instance of a SfxFilterListener class. Created object listen automaticly diff --git a/shell/source/cmdmail/cmdmailentry.cxx b/shell/source/cmdmail/cmdmailentry.cxx index f601284f41fa..b0e45feaafb5 100644 --- a/shell/source/cmdmail/cmdmailentry.cxx +++ b/shell/source/cmdmail/cmdmailentry.cxx @@ -43,10 +43,6 @@ using namespace ::com::sun::star::registry ; using namespace ::cppu ; using com::sun::star::system::XSimpleMailClientSupplier; -//----------------------------------------------------------------------- -// defines -//----------------------------------------------------------------------- - #define COMP_SERVICE_NAME "com.sun.star.system.SimpleCommandMail" #define COMP_IMPL_NAME "com.sun.star.comp.system.SimpleCommandMail" diff --git a/shell/source/cmdmail/cmdmailsuppl.cxx b/shell/source/cmdmail/cmdmailsuppl.cxx index f21584b2f488..f1deab7cb6f9 100644 --- a/shell/source/cmdmail/cmdmailsuppl.cxx +++ b/shell/source/cmdmail/cmdmailsuppl.cxx @@ -67,10 +67,6 @@ using namespace com::sun::star::system::SimpleMailClientFlags; using namespace com::sun::star::uno; using namespace com::sun::star::lang; -//------------------------------------------------------------------------ -// defines -//------------------------------------------------------------------------ - #define COMP_IMPL_NAME "com.sun.star.comp.system.SimpleCommandMail2" //------------------------------------------------------------------------ diff --git a/shell/source/unix/exec/shellexec.cxx b/shell/source/unix/exec/shellexec.cxx index 2bc97e838753..2fc52001cb6b 100644 --- a/shell/source/unix/exec/shellexec.cxx +++ b/shell/source/unix/exec/shellexec.cxx @@ -65,10 +65,6 @@ using namespace ::com::sun::star::lang; using namespace ::com::sun::star::system::SystemShellExecuteFlags; using namespace cppu; -//------------------------------------------------------------------------ -// defines -//------------------------------------------------------------------------ - #define SHELLEXEC_IMPL_NAME "com.sun.star.comp.system.SystemShellExecute2" //------------------------------------------------------------------------ diff --git a/shell/source/unix/exec/shellexecentry.cxx b/shell/source/unix/exec/shellexecentry.cxx index ee986e07d8c8..684acfe5f036 100644 --- a/shell/source/unix/exec/shellexecentry.cxx +++ b/shell/source/unix/exec/shellexecentry.cxx @@ -41,10 +41,6 @@ using namespace ::com::sun::star::registry; using namespace ::cppu; using com::sun::star::system::XSystemShellExecute; -//----------------------------------------------------------------------- -// defines -//----------------------------------------------------------------------- - #define SHELLEXEC_SERVICE_NAME "com.sun.star.system.SystemShellExecute" #define SHELLEXEC_IMPL_NAME "com.sun.star.comp.system.SystemShellExecute" diff --git a/shell/source/win32/SysShExec.cxx b/shell/source/win32/SysShExec.cxx index 90fe47d455a2..81f19546a09a 100644 --- a/shell/source/win32/SysShExec.cxx +++ b/shell/source/win32/SysShExec.cxx @@ -64,10 +64,6 @@ using com::sun::star::system::SystemShellExecuteException; using namespace ::com::sun::star::system::SystemShellExecuteFlags; using namespace cppu; -//------------------------------------------------------------------------ -// defines -//------------------------------------------------------------------------ - #define SYSSHEXEC_IMPL_NAME "com.sun.star.sys.shell.SystemShellExecute" //------------------------------------------------------------------------ diff --git a/shell/source/win32/SysShentry.cxx b/shell/source/win32/SysShentry.cxx index 8e40fb14ead9..e5a61bb25d04 100644 --- a/shell/source/win32/SysShentry.cxx +++ b/shell/source/win32/SysShentry.cxx @@ -43,10 +43,6 @@ using namespace ::com::sun::star::registry ; using namespace ::cppu ; using com::sun::star::system::XSystemShellExecute; -//----------------------------------------------------------------------- -// defines -//----------------------------------------------------------------------- - #define SYSSHEXEC_SERVICE_NAME "com.sun.star.system.SystemShellExecute" #define SYSSHEXEC_IMPL_NAME "com.sun.star.system.SystemShellExecute" diff --git a/shell/source/win32/simplemail/smplmailentry.cxx b/shell/source/win32/simplemail/smplmailentry.cxx index 374971e21ddb..df3774a79345 100644 --- a/shell/source/win32/simplemail/smplmailentry.cxx +++ b/shell/source/win32/simplemail/smplmailentry.cxx @@ -43,10 +43,6 @@ using namespace ::com::sun::star::registry ; using namespace ::cppu ; using com::sun::star::system::XSimpleMailClientSupplier; -//----------------------------------------------------------------------- -// defines -//----------------------------------------------------------------------- - #define COMP_SERVICE_NAME "com.sun.star.system.SimpleSystemMail" #define COMP_IMPL_NAME "com.sun.star.system.SimpleSystemMail" diff --git a/shell/source/win32/workbench/TestProxySet.cxx b/shell/source/win32/workbench/TestProxySet.cxx index b5b4204d311e..77eac7d982e6 100644 --- a/shell/source/win32/workbench/TestProxySet.cxx +++ b/shell/source/win32/workbench/TestProxySet.cxx @@ -59,10 +59,6 @@ using namespace ::com::sun::star::lang ; using namespace std ; using namespace com::sun::star::system; -//-------------------------------------------------------------- -// defines -//-------------------------------------------------------------- - #ifdef WNT #define RDB_SYSPATH "D:\\Projects\\gsl\\shell\\wntmsci7\\bin\\applicat.rdb" diff --git a/shell/source/win32/workbench/TestSmplMail.cxx b/shell/source/win32/workbench/TestSmplMail.cxx index 0ef670e2485d..b59563ddf2be 100644 --- a/shell/source/win32/workbench/TestSmplMail.cxx +++ b/shell/source/win32/workbench/TestSmplMail.cxx @@ -57,10 +57,6 @@ using namespace ::com::sun::star::lang ; using namespace std ; using namespace com::sun::star::system; -//-------------------------------------------------------------- -// defines -//-------------------------------------------------------------- - #define RDB_SYSPATH "D:\\Projects\\gsl\\shell\\wntmsci7\\bin\\applicat.rdb" //-------------------------------------------------------------- diff --git a/shell/source/win32/workbench/TestSysShExec.cxx b/shell/source/win32/workbench/TestSysShExec.cxx index 9946a5d1f428..99d08e0188ee 100644 --- a/shell/source/win32/workbench/TestSysShExec.cxx +++ b/shell/source/win32/workbench/TestSysShExec.cxx @@ -61,10 +61,6 @@ using namespace ::com::sun::star::lang ; using namespace std ; using namespace com::sun::star::system; -//-------------------------------------------------------------- -// defines -//-------------------------------------------------------------- - #define RDB_SYSPATH "D:\\Projects\\gsl\\shell\\wntmsci7\\bin\\applicat.rdb" //-------------------------------------------------------------- diff --git a/stoc/test/testcorefl.cxx b/stoc/test/testcorefl.cxx index 5e2b53962210..4a1313ffd762 100644 --- a/stoc/test/testcorefl.cxx +++ b/stoc/test/testcorefl.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <sal/main.h> #include <osl/diagnose.h> @@ -42,7 +41,6 @@ #include <stdio.h> - using namespace cppu; using namespace osl; using namespace ModuleA; @@ -61,7 +59,6 @@ using ::rtl::OUString; using ::rtl::OUStringToOString; using ::rtl::OString; - //================================================================================================== class OInterfaceA : public WeakImplHelper1< XInterfaceA > { @@ -95,7 +92,7 @@ static sal_Bool test_corefl( const Reference< XIdlReflection > & xRefl ) OSL_ENSURE(xRefl->forName(OUString("ModuleA.StructA"))->getName() == OUString("ModuleA.StructA"), "test_RegCoreReflection(): error 2b"); OSL_ENSURE(xRefl->forName(OUString("ModuleA.ExceptionB"))->getTypeClass() == TypeClass_EXCEPTION, "test_RegCoreReflection(): error 2c"); OSL_ENSURE(xRefl->forName(OUString("ModuleA.ModuleB.EnumA")).is(), "test_RegCoreReflection(): error 2e"); - // const + OSL_ENSURE(*(const sal_Bool *)xHNameAccess->getByHierarchicalName(OUString("ModuleC.aConstBoolean")).getValue() == aConstBoolean, "test_RegCoreReflection(): error 4c"); OSL_ENSURE(*(const sal_Int8 *)xHNameAccess->getByHierarchicalName(OUString("ModuleC.aConstByte")).getValue() == aConstByte, "test_RegCoreReflection(): error 4e"); diff --git a/svl/source/config/itemholder2.cxx b/svl/source/config/itemholder2.cxx index 82c8ad0d0b15..96f75247cef1 100644 --- a/svl/source/config/itemholder2.cxx +++ b/svl/source/config/itemholder2.cxx @@ -35,8 +35,6 @@ namespace css = ::com::sun::star; -//----------------------------------------------- -// declarations //----------------------------------------------- ItemHolder2::ItemHolder2() diff --git a/svl/source/config/itemholder2.hxx b/svl/source/config/itemholder2.hxx index 5c98b5d11dd8..d8b43bde8ece 100644 --- a/svl/source/config/itemholder2.hxx +++ b/svl/source/config/itemholder2.hxx @@ -29,8 +29,6 @@ namespace css = ::com::sun::star; -//----------------------------------------------- -// definitions class ItemHolder2 : private ItemHolderMutexBase , public ::cppu::WeakImplHelper1< css::lang::XEventListener > diff --git a/svtools/inc/svtools/acceleratorexecute.hxx b/svtools/inc/svtools/acceleratorexecute.hxx index 55fca03968e7..a99e3331ad5a 100644 --- a/svtools/inc/svtools/acceleratorexecute.hxx +++ b/svtools/inc/svtools/acceleratorexecute.hxx @@ -44,16 +44,12 @@ #include <vcl/evntpost.hxx> #include <osl/mutex.h> -//=============================================== -// namespace namespace css = ::com::sun::star; namespace svt { -//=============================================== -// definitions struct TMutexInit { diff --git a/svtools/inc/svtools/optionsdrawinglayer.hxx b/svtools/inc/svtools/optionsdrawinglayer.hxx index 9dadcbdcc619..5b5959a47d83 100644 --- a/svtools/inc/svtools/optionsdrawinglayer.hxx +++ b/svtools/inc/svtools/optionsdrawinglayer.hxx @@ -48,10 +48,6 @@ class SvtOptionsDrawinglayer_Impl; -//_________________________________________________________________________________________________________________ -// declarations -//_________________________________________________________________________________________________________________ - /*-************************************************************************************************************//** @short collect informations about startup features @descr - diff --git a/svtools/source/config/itemholder2.cxx b/svtools/source/config/itemholder2.cxx index 99d7919f8df7..14d7c950a74b 100644 --- a/svtools/source/config/itemholder2.cxx +++ b/svtools/source/config/itemholder2.cxx @@ -50,8 +50,6 @@ namespace css = ::com::sun::star; -//----------------------------------------------- -// declarations namespace svtools { //----------------------------------------------- diff --git a/svtools/source/config/itemholder2.hxx b/svtools/source/config/itemholder2.hxx index dead1fd51623..9e89140127de 100644 --- a/svtools/source/config/itemholder2.hxx +++ b/svtools/source/config/itemholder2.hxx @@ -39,8 +39,7 @@ namespace css = ::com::sun::star; namespace svtools { -//----------------------------------------------- -// definitions + class ItemHolder2 : private ItemHolderMutexBase , public ::cppu::WeakImplHelper1< css::lang::XEventListener > diff --git a/svtools/source/config/menuoptions.cxx b/svtools/source/config/menuoptions.cxx index 8d2ee21b8185..b40833edb01d 100644 --- a/svtools/source/config/menuoptions.cxx +++ b/svtools/source/config/menuoptions.cxx @@ -49,10 +49,6 @@ using namespace ::rtl ; using namespace ::osl ; using namespace ::com::sun::star::uno ; -//_________________________________________________________________________________________________________________ -// const -//_________________________________________________________________________________________________________________ - #define ROOTNODE_MENU OUString(RTL_CONSTASCII_USTRINGPARAM("Office.Common/View/Menu" )) #define DEFAULT_DONTHIDEDISABLEDENTRIES sal_False #define DEFAULT_FOLLOWMOUSE sal_True @@ -214,10 +210,6 @@ class SvtMenuOptions_Impl : public ConfigItem static Sequence< OUString > impl_GetPropertyNames(); }; -//_________________________________________________________________________________________________________________ -// definitions -//_________________________________________________________________________________________________________________ - //***************************************************************************************************************** // constructor //***************************************************************************************************************** diff --git a/svtools/source/config/optionsdrawinglayer.cxx b/svtools/source/config/optionsdrawinglayer.cxx index 33d1c2075e6e..8ba235035ca7 100644 --- a/svtools/source/config/optionsdrawinglayer.cxx +++ b/svtools/source/config/optionsdrawinglayer.cxx @@ -49,10 +49,6 @@ using namespace ::rtl ; using namespace ::osl ; using namespace ::com::sun::star::uno ; -//_________________________________________________________________________________________________________________ -// const -//_________________________________________________________________________________________________________________ - #define ROOTNODE_START OUString(RTL_CONSTASCII_USTRINGPARAM("Office.Common/Drawinglayer" )) #define DEFAULT_OVERLAYBUFFER sal_True #define DEFAULT_PAINTBUFFER sal_True @@ -296,10 +292,6 @@ private: bool m_bAllowAAChecked : 1; }; -//_________________________________________________________________________________________________________________ -// definitions -//_________________________________________________________________________________________________________________ - //***************************************************************************************************************** // constructor //***************************************************************************************************************** diff --git a/svtools/source/config/test/test.cxx b/svtools/source/config/test/test.cxx index d67ee1fbc3e5..5449bf5f0c3d 100644 --- a/svtools/source/config/test/test.cxx +++ b/svtools/source/config/test/test.cxx @@ -59,14 +59,6 @@ #include <vcl/msgbox.hxx> #include <stdio.h> -//_________________________________________________________________________________________________________________ -// const -//_________________________________________________________________________________________________________________ - -//_________________________________________________________________________________________________________________ -// namespace -//_________________________________________________________________________________________________________________ - using namespace ::rtl ; using namespace ::osl ; using namespace ::comphelper ; @@ -75,16 +67,8 @@ using namespace ::com::sun::star::lang ; using namespace ::com::sun::star::beans ; using namespace ::com::sun::star::registry ; -//_________________________________________________________________________________________________________________ -// defines -//_________________________________________________________________________________________________________________ - #define ASCII( STEXT ) OUString( RTL_CONSTASCII_USTRINGPARAM( STEXT )) -//_________________________________________________________________________________________________________________ -// declarations -//_________________________________________________________________________________________________________________ - class TestApplication : public Application { //************************************************************************************************************* diff --git a/svtools/source/misc/acceleratorexecute.cxx b/svtools/source/misc/acceleratorexecute.cxx index 950c41b44904..14d54251e0cb 100644 --- a/svtools/source/misc/acceleratorexecute.cxx +++ b/svtools/source/misc/acceleratorexecute.cxx @@ -46,16 +46,12 @@ #include <vcl/svapp.hxx> #include <osl/mutex.hxx> -//=============================================== -// namespace namespace css = ::com::sun::star; namespace svt { -//=============================================== -// definitions //----------------------------------------------- class SVT_DLLPRIVATE AsyncAccelExec diff --git a/svx/source/dialog/docrecovery.cxx b/svx/source/dialog/docrecovery.cxx index 3dc92291e767..f6e7ad5d47b3 100644 --- a/svx/source/dialog/docrecovery.cxx +++ b/svx/source/dialog/docrecovery.cxx @@ -65,8 +65,6 @@ #include <unotools/pathoptions.hxx> #include <unotools/localfilehelper.hxx> -//=============================================== -// namespace namespace svx{ namespace DocRecovery{ diff --git a/svx/source/inc/docrecovery.hxx b/svx/source/inc/docrecovery.hxx index 1daee038f223..fe0254aed368 100644 --- a/svx/source/inc/docrecovery.hxx +++ b/svx/source/inc/docrecovery.hxx @@ -45,8 +45,6 @@ #include <com/sun/star/frame/XDispatch.hpp> #include <com/sun/star/lang/XComponent.hpp> -//=============================================== -// const #define RECOVERY_CMDPART_PROTOCOL rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "vnd.sun.star.autorecovery:")) @@ -91,8 +89,6 @@ #define DLG_RET_BACK 100 #define DLG_RET_OK_AUTOLUNCH 101 -//=============================================== -// namespace namespace css = ::com::sun::star; diff --git a/svx/source/inc/recoveryui.hxx b/svx/source/inc/recoveryui.hxx index 51c8d67c53b9..4ec8ddc94873 100644 --- a/svx/source/inc/recoveryui.hxx +++ b/svx/source/inc/recoveryui.hxx @@ -28,8 +28,6 @@ #include <vcl/window.hxx> #include "docrecovery.hxx" -//=============================================== -// namespace namespace svx { @@ -38,8 +36,6 @@ namespace svx namespace css = ::com::sun::star; namespace svxdr = ::svx::DocRecovery; -//=============================================== -// declarations class RecoveryUI : public ::cppu::WeakImplHelper2< css::lang::XServiceInfo , css::frame::XSynchronousDispatch > // => XDispatch! diff --git a/svx/source/unodraw/recoveryui.cxx b/svx/source/unodraw/recoveryui.cxx index d8c84fd75397..27e81e929888 100644 --- a/svx/source/unodraw/recoveryui.cxx +++ b/svx/source/unodraw/recoveryui.cxx @@ -39,14 +39,10 @@ #include <boost/scoped_ptr.hpp> -//=============================================== -// const #define IMPLEMENTATIONNAME_RECOVERYUI ::rtl::OUString("com.sun.star.comp.svx.RecoveryUI") #define SERVICENAME_RECOVERYUI ::rtl::OUString("com.sun.star.dialog.RecoveryUI") -//=============================================== -// namespace namespace svx { diff --git a/sysui/source/win32/misc/WinImplHelper.hxx b/sysui/source/win32/misc/WinImplHelper.hxx index aef5413b41b4..331dbc12d003 100644 --- a/sysui/source/win32/misc/WinImplHelper.hxx +++ b/sysui/source/win32/misc/WinImplHelper.hxx @@ -29,10 +29,6 @@ #include <com/sun/star/uno/Any.hxx> #include <com/sun/star/lang/IllegalArgumentException.hpp> -//------------------------------------------------------------------------ -// deklarations -//------------------------------------------------------------------------ - sal_Bool SAL_CALL IsWin2000( ); // set actions diff --git a/sysui/source/win32/misc/resourceprovider.hxx b/sysui/source/win32/misc/resourceprovider.hxx index 4adc97dd7d90..33f1b4f5e47f 100644 --- a/sysui/source/win32/misc/resourceprovider.hxx +++ b/sysui/source/win32/misc/resourceprovider.hxx @@ -25,10 +25,6 @@ #include <rtl/ustring> -//------------------------------------------------------------------------ -// deklarations -//------------------------------------------------------------------------ - class CResourceProvider_Impl; class CResourceProvider diff --git a/ucbhelper/inc/ucbhelper/interceptedinteraction.hxx b/ucbhelper/inc/ucbhelper/interceptedinteraction.hxx index 2c087b503f4e..44013b131cc0 100644 --- a/ucbhelper/inc/ucbhelper/interceptedinteraction.hxx +++ b/ucbhelper/inc/ucbhelper/interceptedinteraction.hxx @@ -28,13 +28,9 @@ #include <cppuhelper/implbase1.hxx> #include "ucbhelper/ucbhelperdllapi.h" -//_______________________________________________ -// namespace namespace ucbhelper{ -//_______________________________________________ -// definitions /** @short it wraps any other interaction handler and intercept its handle() requests. diff --git a/ucbhelper/source/client/interceptedinteraction.cxx b/ucbhelper/source/client/interceptedinteraction.cxx index 6be3f3159503..ee48a9e8be7f 100644 --- a/ucbhelper/source/client/interceptedinteraction.cxx +++ b/ucbhelper/source/client/interceptedinteraction.cxx @@ -19,14 +19,11 @@ #include <ucbhelper/interceptedinteraction.hxx> -// namespace namespace ucbhelper{ namespace css = ::com::sun::star; -//_______________________________________________ -// definitions InterceptedInteraction::InterceptedInteraction() { diff --git a/unotools/inc/unotools/compatibility.hxx b/unotools/inc/unotools/compatibility.hxx index 8a47c8c69354..b6a5d6041e60 100644 --- a/unotools/inc/unotools/compatibility.hxx +++ b/unotools/inc/unotools/compatibility.hxx @@ -78,10 +78,6 @@ enum CompatibilityOptions class SvtCompatibilityOptions_Impl; -//_________________________________________________________________________________________________________________ -// declarations -//_________________________________________________________________________________________________________________ - /*-************************************************************************************************************//** @short collect informations about dynamic menus @descr Make it possible to configure dynamic menu structures of menus like "new" or "wizard". diff --git a/unotools/inc/unotools/itemholderbase.hxx b/unotools/inc/unotools/itemholderbase.hxx index 7315281bb28b..25af236d60fd 100644 --- a/unotools/inc/unotools/itemholderbase.hxx +++ b/unotools/inc/unotools/itemholderbase.hxx @@ -25,8 +25,6 @@ namespace utl { namespace detail { class Options; } } -//----------------------------------------------- -// definitions struct ItemHolderMutexBase { diff --git a/unotools/inc/unotools/viewoptions.hxx b/unotools/inc/unotools/viewoptions.hxx index 6a6dd03f4a69..2dbfdd485a38 100644 --- a/unotools/inc/unotools/viewoptions.hxx +++ b/unotools/inc/unotools/viewoptions.hxx @@ -35,10 +35,6 @@ class SvtViewOptionsBase_Impl; -//_________________________________________________________________________________________________________________ -// declarations -//_________________________________________________________________________________________________________________ - /*-************************************************************************************************************//** @descr Use these enum values to specify right list in configuration in which your view data are saved. *//*-*************************************************************************************************************/ diff --git a/unotools/inc/unotools/workingsetoptions.hxx b/unotools/inc/unotools/workingsetoptions.hxx index 80b9a9251d73..bf9a1c833bcd 100644 --- a/unotools/inc/unotools/workingsetoptions.hxx +++ b/unotools/inc/unotools/workingsetoptions.hxx @@ -38,10 +38,6 @@ class SvtWorkingSetOptions_Impl; -//_________________________________________________________________________________________________________________ -// declarations -//_________________________________________________________________________________________________________________ - /*-************************************************************************************************************//** @short collect informations about security features @descr - diff --git a/unotools/source/config/compatibility.cxx b/unotools/source/config/compatibility.cxx index 88f6fcfa126f..8278137c61bb 100644 --- a/unotools/source/config/compatibility.cxx +++ b/unotools/source/config/compatibility.cxx @@ -42,10 +42,6 @@ using namespace ::osl; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::beans; -//_________________________________________________________________________________________________________________ -// const -//_________________________________________________________________________________________________________________ - #define ROOTNODE_OPTIONS OUString( RTL_CONSTASCII_USTRINGPARAM( "Office.Compatibility/" ) ) #define PATHDELIMITER OUString( RTL_CONSTASCII_USTRINGPARAM( "/" ) ) #define SETNODE_ALLFILEFORMATS OUString( RTL_CONSTASCII_USTRINGPARAM( "AllFileFormats" ) ) @@ -361,10 +357,6 @@ class SvtCompatibilityOptions_Impl : public ConfigItem SvtCompatibilityEntry m_aDefOptions; }; -//_________________________________________________________________________________________________________________ -// definitions -//_________________________________________________________________________________________________________________ - //***************************************************************************************************************** // constructor //***************************************************************************************************************** diff --git a/unotools/source/config/internaloptions.cxx b/unotools/source/config/internaloptions.cxx index 71f1c952c43e..34c6bf0eae1c 100644 --- a/unotools/source/config/internaloptions.cxx +++ b/unotools/source/config/internaloptions.cxx @@ -41,10 +41,6 @@ using namespace ::std ; using namespace ::com::sun::star::uno ; using namespace ::com::sun::star::beans ; -//_________________________________________________________________________________________________________________ -// const -//_________________________________________________________________________________________________________________ - #define ROOTNODE_INTERNAL OUString(RTL_CONSTASCII_USTRINGPARAM("Office.Common/Internal" )) #define DEFAULT_SLOTCFG sal_False #define DEFAULT_SENDCRASHMAIL sal_False @@ -178,10 +174,6 @@ class SvtInternalOptions_Impl : public ConfigItem Sequence< OUString > impl_GetPropertyNames(); }; -//_________________________________________________________________________________________________________________ -// definitions -//_________________________________________________________________________________________________________________ - //***************************************************************************************************************** // constructor //***************************************************************************************************************** diff --git a/unotools/source/config/itemholder1.cxx b/unotools/source/config/itemholder1.cxx index 9ac0eee6833c..1d2b90ede043 100644 --- a/unotools/source/config/itemholder1.cxx +++ b/unotools/source/config/itemholder1.cxx @@ -57,8 +57,6 @@ namespace css = ::com::sun::star; -//----------------------------------------------- -// declarations //----------------------------------------------- ItemHolder1::ItemHolder1() diff --git a/unotools/source/config/itemholder1.hxx b/unotools/source/config/itemholder1.hxx index 390502530c46..5133f777edc1 100644 --- a/unotools/source/config/itemholder1.hxx +++ b/unotools/source/config/itemholder1.hxx @@ -29,8 +29,6 @@ namespace css = ::com::sun::star; -//----------------------------------------------- -// definitions class ItemHolder1 : private ItemHolderMutexBase , public ::cppu::WeakImplHelper1< css::lang::XEventListener > diff --git a/unotools/source/config/moduleoptions.cxx b/unotools/source/config/moduleoptions.cxx index 6d7a86917958..98667f5dc243 100644 --- a/unotools/source/config/moduleoptions.cxx +++ b/unotools/source/config/moduleoptions.cxx @@ -49,10 +49,6 @@ namespace css = ::com::sun::star; #endif -//_________________________________________________________________________________________________________________ -// const -//_________________________________________________________________________________________________________________ - /*-************************************************************************************************************//** @descr These values are used to define neccessary keys from our configuration management to support all functionality of these implementation. @@ -376,10 +372,6 @@ class SvtModuleOptions_Impl : public ::utl::ConfigItem SvtModuleOptions* m_pOutsideClass; }; -//_________________________________________________________________________________________________________________ -// definitions -//_________________________________________________________________________________________________________________ - /*-************************************************************************************************************//** @short default ctor @descr We open our configuration here and read all neccessary values from it. diff --git a/unotools/source/config/printwarningoptions.cxx b/unotools/source/config/printwarningoptions.cxx index 6b2c70ec6598..2e0152913820 100644 --- a/unotools/source/config/printwarningoptions.cxx +++ b/unotools/source/config/printwarningoptions.cxx @@ -36,10 +36,6 @@ using namespace ::rtl ; using namespace ::osl ; using namespace ::com::sun::star::uno ; -//_________________________________________________________________________________________________________________ -// const -//_________________________________________________________________________________________________________________ - #define ROOTNODE_START OUString(RTL_CONSTASCII_USTRINGPARAM("Office.Common/Print")) #define PROPERTYNAME_PAPERSIZE OUString(RTL_CONSTASCII_USTRINGPARAM("Warning/PaperSize")) @@ -111,10 +107,6 @@ private: sal_Bool m_bModifyDocumentOnPrintingAllowed; }; -//_________________________________________________________________________________________________________________ -// definitions -//_________________________________________________________________________________________________________________ - //***************************************************************************************************************** // constructor //***************************************************************************************************************** diff --git a/unotools/source/config/securityoptions.cxx b/unotools/source/config/securityoptions.cxx index dce81eccad6f..1df26b19455a 100644 --- a/unotools/source/config/securityoptions.cxx +++ b/unotools/source/config/securityoptions.cxx @@ -43,10 +43,6 @@ using namespace ::rtl ; using namespace ::osl ; using namespace ::com::sun::star::uno ; -//_________________________________________________________________________________________________________________ -// const -//_________________________________________________________________________________________________________________ - #define ROOTNODE_SECURITY OUString(RTL_CONSTASCII_USTRINGPARAM("Office.Common/Security/Scripting")) #define DEFAULT_SECUREURL Sequence< OUString >() #define DEFAULT_TRUSTEDAUTHORS Sequence< SvtSecurityOptions::Certificate >() @@ -260,10 +256,6 @@ private: void SetBasicMode ( EBasicSecurityMode eMode ) ; }; -//_________________________________________________________________________________________________________________ -// definitions -//_________________________________________________________________________________________________________________ - //***************************************************************************************************************** // constructor //***************************************************************************************************************** diff --git a/unotools/source/config/viewoptions.cxx b/unotools/source/config/viewoptions.cxx index de2289a5f087..faf59372bf4f 100644 --- a/unotools/source/config/viewoptions.cxx +++ b/unotools/source/config/viewoptions.cxx @@ -38,10 +38,6 @@ namespace css = ::com::sun::star; -//_________________________________________________________________________________________________________________ -// const -//_________________________________________________________________________________________________________________ - #ifdef CONST_ASCII #error "Who define CONST_ASCII before! I use it to create const ascii strings ..." #else @@ -768,10 +764,6 @@ css::uno::Reference< css::uno::XInterface > SvtViewOptionsBase_Impl::impl_getSet return xNode; } -//_________________________________________________________________________________________________________________ -// definitions -//_________________________________________________________________________________________________________________ - //***************************************************************************************************************** // constructor //***************************************************************************************************************** diff --git a/unotools/source/config/workingsetoptions.cxx b/unotools/source/config/workingsetoptions.cxx index ef2cb56dcf03..1c8d7452fc88 100644 --- a/unotools/source/config/workingsetoptions.cxx +++ b/unotools/source/config/workingsetoptions.cxx @@ -36,10 +36,6 @@ using namespace ::rtl ; using namespace ::osl ; using namespace ::com::sun::star::uno ; -//_________________________________________________________________________________________________________________ -// const -//_________________________________________________________________________________________________________________ - #define ROOTNODE_WORKINGSET OUString(RTL_CONSTASCII_USTRINGPARAM("Office.Common/WorkingSet")) #define DEFAULT_WINDOWLIST Sequence< OUString >() @@ -133,10 +129,6 @@ class SvtWorkingSetOptions_Impl : public ConfigItem Sequence< OUString > m_seqWindowList ; }; -//_________________________________________________________________________________________________________________ -// definitions -//_________________________________________________________________________________________________________________ - //***************************************************************************************************************** // constructor //***************************************************************************************************************** diff --git a/uui/source/fltdlg.hxx b/uui/source/fltdlg.hxx index de79c89a6469..a156fb2fd58c 100644 --- a/uui/source/fltdlg.hxx +++ b/uui/source/fltdlg.hxx @@ -31,17 +31,9 @@ #include <vector> -//_________________________________________________________________________________________________________________ -// namespace -//_________________________________________________________________________________________________________________ - namespace uui { -//_________________________________________________________________________________________________________________ -// definitions -//_________________________________________________________________________________________________________________ - struct FilterNamePair { String sInternal; |