summaryrefslogtreecommitdiff
path: root/framework/source
diff options
context:
space:
mode:
authorThomas Arnhold <thomas@arnhold.org>2012-08-08 13:53:08 +0200
committerThomas Arnhold <thomas@arnhold.org>2012-08-08 13:53:54 +0200
commit2beba8f93e7991372dd45351c92c50f7850dc46a (patch)
tree15dfae00223ccc7fdbfe2e06a3d931b97fded890 /framework/source
parent49ad17e2b1aef65fad357b9c540ab36189233dd3 (diff)
reduce ascii noise and useless comments
Change-Id: I317058e3b25cebb7c1d89361636261c5f16a84d4
Diffstat (limited to 'framework/source')
-rw-r--r--framework/source/accelerators/acceleratorconfiguration.cxx2
-rw-r--r--framework/source/accelerators/documentacceleratorconfiguration.cxx2
-rw-r--r--framework/source/accelerators/globalacceleratorconfiguration.cxx2
-rw-r--r--framework/source/accelerators/keymapping.cxx1
-rw-r--r--framework/source/accelerators/moduleacceleratorconfiguration.cxx2
-rw-r--r--framework/source/accelerators/presethandler.cxx4
-rw-r--r--framework/source/accelerators/storageholder.cxx4
-rw-r--r--framework/source/classes/droptargetlistener.cxx4
-rw-r--r--framework/source/classes/framecontainer.cxx16
-rw-r--r--framework/source/classes/menumanager.cxx4
-rw-r--r--framework/source/classes/taskcreator.cxx16
-rw-r--r--framework/source/dispatch/closedispatcher.cxx4
-rw-r--r--framework/source/dispatch/dispatchinformationprovider.cxx7
-rw-r--r--framework/source/dispatch/interceptionhelper.cxx8
-rw-r--r--framework/source/dispatch/mailtodispatcher.cxx16
-rw-r--r--framework/source/dispatch/menudispatcher.cxx15
-rw-r--r--framework/source/dispatch/oxt_handler.cxx23
-rw-r--r--framework/source/dispatch/popupmenudispatcher.cxx15
-rw-r--r--framework/source/dispatch/servicehandler.cxx16
-rw-r--r--framework/source/dispatch/startmoduledispatcher.cxx4
-rw-r--r--framework/source/dispatch/systemexec.cxx16
-rw-r--r--framework/source/dispatch/windowcommanddispatch.cxx2
-rw-r--r--framework/source/fwe/classes/addonmenu.cxx3
-rw-r--r--framework/source/fwe/classes/addonsoptions.cxx8
-rw-r--r--framework/source/fwe/classes/bmkmenu.cxx4
-rw-r--r--framework/source/fwe/classes/framelistanalyzer.cxx19
-rw-r--r--framework/source/fwe/helper/titlehelper.cxx2
-rw-r--r--framework/source/fwe/interaction/preventduplicateinteraction.cxx15
-rw-r--r--framework/source/fwe/xml/menuconfiguration.cxx4
-rw-r--r--framework/source/fwe/xml/statusbarconfiguration.cxx4
-rw-r--r--framework/source/fwe/xml/statusbardocumenthandler.cxx4
-rw-r--r--framework/source/fwe/xml/toolboxconfiguration.cxx4
-rw-r--r--framework/source/fwe/xml/toolboxdocumenthandler.cxx4
-rw-r--r--framework/source/fwe/xml/toolboxlayoutdocumenthandler.cxx4
-rw-r--r--framework/source/fwi/classes/propertysethelper.cxx5
-rw-r--r--framework/source/fwi/classes/protocolhandlercache.cxx13
-rw-r--r--framework/source/fwi/jobs/configaccess.cxx13
-rw-r--r--framework/source/fwi/jobs/jobconst.cxx11
-rw-r--r--framework/source/fwi/threadhelp/lockhelper.cxx12
-rw-r--r--framework/source/fwi/threadhelp/transactionmanager.cxx20
-rw-r--r--framework/source/helper/dockingareadefaultacceptor.cxx16
-rw-r--r--framework/source/helper/ocomponentaccess.cxx16
-rw-r--r--framework/source/helper/ocomponentenumeration.cxx16
-rw-r--r--framework/source/helper/oframes.cxx16
-rw-r--r--framework/source/helper/persistentwindowstate.cxx4
-rw-r--r--framework/source/helper/statusindicator.cxx4
-rw-r--r--framework/source/helper/statusindicatorfactory.cxx4
-rw-r--r--framework/source/helper/tagwindowasmodified.cxx4
-rw-r--r--framework/source/helper/titlebarupdate.cxx3
-rw-r--r--framework/source/helper/vclstatusindicator.cxx4
-rw-r--r--framework/source/helper/wakeupthread.cxx4
-rw-r--r--framework/source/inc/accelerators/presethandler.hxx8
-rw-r--r--framework/source/inc/accelerators/storageholder.hxx3
-rw-r--r--framework/source/inc/dispatch/loaddispatcher.hxx9
-rw-r--r--framework/source/inc/dispatch/windowcommanddispatch.hxx9
-rw-r--r--framework/source/inc/loadenv/actionlockguard.hxx4
-rw-r--r--framework/source/inc/loadenv/loadenv.hxx2
-rw-r--r--framework/source/inc/loadenv/loadenvexception.hxx10
-rw-r--r--framework/source/inc/loadenv/targethelper.hxx8
-rw-r--r--framework/source/inc/pattern/configuration.hxx9
-rw-r--r--framework/source/inc/pattern/frame.hxx2
-rw-r--r--framework/source/inc/pattern/window.hxx2
-rw-r--r--framework/source/interaction/quietinteraction.cxx13
-rw-r--r--framework/source/jobs/helponstartup.cxx4
-rw-r--r--framework/source/jobs/job.cxx12
-rw-r--r--framework/source/jobs/jobdata.cxx8
-rw-r--r--framework/source/jobs/jobdispatch.cxx12
-rw-r--r--framework/source/jobs/jobexecutor.cxx12
-rw-r--r--framework/source/jobs/jobresult.cxx14
-rw-r--r--framework/source/jobs/joburl.cxx13
-rw-r--r--framework/source/jobs/shelljob.cxx4
-rw-r--r--framework/source/layoutmanager/helpers.cxx1
-rw-r--r--framework/source/layoutmanager/uielement.cxx4
-rw-r--r--framework/source/loadenv/loadenv.cxx3
-rw-r--r--framework/source/recording/dispatchrecordersupplier.cxx19
-rw-r--r--framework/source/services/dispatchhelper.cxx12
-rw-r--r--framework/source/services/license.cxx16
-rw-r--r--framework/source/services/mediatypedetectionhelper.cxx8
-rw-r--r--framework/source/services/pathsettings.cxx4
-rw-r--r--framework/source/services/sessionlistener.cxx13
-rw-r--r--framework/source/services/tabwindowservice.cxx12
-rw-r--r--framework/source/services/uriabbreviation.cxx4
-rw-r--r--framework/source/services/urltransformer.cxx16
-rw-r--r--framework/source/uielement/menubarmanager.cxx4
-rw-r--r--framework/source/uielement/progressbarwrapper.cxx16
-rw-r--r--framework/source/xml/acceleratorconfigurationreader.cxx2
-rw-r--r--framework/source/xml/acceleratorconfigurationwriter.cxx3
-rw-r--r--framework/source/xml/imagesconfiguration.cxx4
-rw-r--r--framework/source/xml/imagesdocumenthandler.cxx4
89 files changed, 5 insertions, 721 deletions
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;