diff options
Diffstat (limited to 'framework/inc')
85 files changed, 3 insertions, 699 deletions
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{ //***************************************************************************************************************** |