diff options
| author | Tor Lillqvist <tml@collabora.com> | 2014-04-06 19:05:49 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tml@collabora.com> | 2014-04-06 19:37:48 +0300 |
| commit | 951ed199f1a47c02dad3dc899b9804b4574a151d (patch) | |
| tree | d8f82a3afa345351ce6a4a206424c6f2bd2aed46 /framework/inc | |
| parent | be616c26f990d651c752be201e29e2b89ba17f2a (diff) | |
Kill superfluous vertical whitespace
Change-Id: Ia1bb2b40c74efb17e655dd6f00d7ba48c16c65ae
Diffstat (limited to 'framework/inc')
79 files changed, 0 insertions, 536 deletions
diff --git a/framework/inc/acceleratorconst.h b/framework/inc/acceleratorconst.h index 6fdc4de405e8..c3ce35c34382 100644 --- a/framework/inc/acceleratorconst.h +++ b/framework/inc/acceleratorconst.h @@ -22,7 +22,6 @@ #include <general.h> - namespace framework{ #define DOCTYPE_ACCELERATORS DECLARE_ASCII("<!DOCTYPE accel:acceleratorlist PUBLIC \"-//OpenOffice.org//DTD OfficeDocument 1.0//EN\" \"accelerator.dtd\">") diff --git a/framework/inc/classes/actiontriggercontainer.hxx b/framework/inc/classes/actiontriggercontainer.hxx index 873c2c7225ae..9a728a8d7ecd 100644 --- a/framework/inc/classes/actiontriggercontainer.hxx +++ b/framework/inc/classes/actiontriggercontainer.hxx @@ -29,7 +29,6 @@ #define SERVICENAME_ACTIONTRIGGERCONTAINER "com.sun.star.ui.ActionTriggerContainer" #define IMPLEMENTATIONNAME_ACTIONTRIGGERCONTAINER "com.sun.star.comp.ui.ActionTriggerContainer" - namespace framework { diff --git a/framework/inc/classes/actiontriggerpropertyset.hxx b/framework/inc/classes/actiontriggerpropertyset.hxx index ac55d00cbd58..ab2558ce4388 100644 --- a/framework/inc/classes/actiontriggerpropertyset.hxx +++ b/framework/inc/classes/actiontriggerpropertyset.hxx @@ -74,7 +74,6 @@ class ActionTriggerPropertySet : private cppu::BaseMutex, const com::sun::star::uno::Any& aValue ) throw( com::sun::star::lang::IllegalArgumentException ) SAL_OVERRIDE; - virtual void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const com::sun::star::uno::Any& aValue ) throw( com::sun::star::uno::Exception, std::exception ) SAL_OVERRIDE; @@ -88,10 +87,8 @@ class ActionTriggerPropertySet : private cppu::BaseMutex, static const com::sun::star::uno::Sequence< com::sun::star::beans::Property > impl_getStaticPropertyDescriptor(); - // helper - sal_Bool impl_tryToChangeProperty( const OUString& aCurrentValue , const com::sun::star::uno::Any& aNewValue , com::sun::star::uno::Any& aOldValue , @@ -107,10 +104,8 @@ class ActionTriggerPropertySet : private cppu::BaseMutex, com::sun::star::uno::Any& aOldValue , com::sun::star::uno::Any& aConvertedValue ) throw( com::sun::star::lang::IllegalArgumentException ); - // members - OUString m_aCommandURL; OUString m_aHelpURL; OUString m_aText; diff --git a/framework/inc/classes/actiontriggerseparatorpropertyset.hxx b/framework/inc/classes/actiontriggerseparatorpropertyset.hxx index ddbe89f62631..a70084c5d2d4 100644 --- a/framework/inc/classes/actiontriggerseparatorpropertyset.hxx +++ b/framework/inc/classes/actiontriggerseparatorpropertyset.hxx @@ -33,7 +33,6 @@ #define SERVICENAME_ACTIONTRIGGERSEPARATOR "com.sun.star.ui.ActionTriggerSeparator" #define IMPLEMENTATIONNAME_ACTIONTRIGGERSEPARATOR "com.sun.star.comp.ui.ActionTriggerSeparator" - namespace framework { @@ -73,7 +72,6 @@ class ActionTriggerSeparatorPropertySet : private cppu::BaseMutex, const com::sun::star::uno::Any& aValue ) throw( com::sun::star::lang::IllegalArgumentException ) SAL_OVERRIDE; - virtual void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const com::sun::star::uno::Any& aValue ) throw( com::sun::star::uno::Exception, std::exception ) SAL_OVERRIDE; @@ -87,19 +85,15 @@ class ActionTriggerSeparatorPropertySet : private cppu::BaseMutex, static const com::sun::star::uno::Sequence< com::sun::star::beans::Property > impl_getStaticPropertyDescriptor(); - // helper - sal_Bool impl_tryToChangeProperty( sal_Int16 aCurrentValue , const com::sun::star::uno::Any& aNewValue , com::sun::star::uno::Any& aOldValue , com::sun::star::uno::Any& aConvertedValue ) throw( com::sun::star::lang::IllegalArgumentException ); - // members - sal_Int16 m_nSeparatorType; }; diff --git a/framework/inc/classes/checkediterator.hxx b/framework/inc/classes/checkediterator.hxx index f207e651c177..5a4d1dbb4ffe 100644 --- a/framework/inc/classes/checkediterator.hxx +++ b/framework/inc/classes/checkediterator.hxx @@ -50,13 +50,10 @@ class CheckedIterator // public methods - public: - // constructor / destructor - /*-**************************************************************************************************** @short standard constructor @descr Set default values on members. @@ -77,10 +74,8 @@ class CheckedIterator { } - // interface methods - /*-**************************************************************************************************** @short initialize instance with valid container @descr Set new container at an instance of this class. The other member will set automaticly! @@ -285,10 +280,8 @@ class CheckedIterator return m_pPosition; } - // private member - private: // These enum defines our four states for an iterator position in curent container. diff --git a/framework/inc/classes/filtercache.hxx b/framework/inc/classes/filtercache.hxx index 60ce7f3bfdca..16aa3a430df9 100644 --- a/framework/inc/classes/filtercache.hxx +++ b/framework/inc/classes/filtercache.hxx @@ -65,16 +65,12 @@ class FilterCache : private TransactionBase { public: - // public methods - public: - // constructor / destructor - FilterCache( sal_Int32 nVersion = DEFAULT_FILTERCACHE_VERSION, sal_Int16 nMode = DEFAULT_FILTERCACHE_MODE ); @@ -310,7 +306,6 @@ class FilterCache : private TransactionBase sal_Bool validateAndRepairLoader(); sal_Bool validateAndRepairHandler(); - // private variables private: diff --git a/framework/inc/classes/filtercachedata.hxx b/framework/inc/classes/filtercachedata.hxx index da7bf36671af..246b53428274 100644 --- a/framework/inc/classes/filtercachedata.hxx +++ b/framework/inc/classes/filtercachedata.hxx @@ -65,7 +65,6 @@ enum EFilterPackage E_ADDITIONAL }; - // These struct define a type, which present the type of a file. // He is used for easy filter detection without file stream detection! // The internal name is the keyname of an item with these structure in our hash map or our configuration set! @@ -83,7 +82,6 @@ struct FileType inline FileType& operator= ( const FileType& rCopy ) { return impl_copy( rCopy ); } inline void free ( ) { impl_clear(); } - // private methods private: @@ -113,7 +111,6 @@ struct FileType return (*this); } - // public member public: @@ -128,7 +125,6 @@ struct FileType OUStringList lExtensions ; }; - // These struct describe a filter which is registered for one type. // He hold information about services which present the document himself (like a item) and a filter service which // filter a file in these document. @@ -147,7 +143,6 @@ struct Filter inline Filter& operator= ( const Filter& rCopy ) { return impl_copy( rCopy ); } inline void free ( ) { impl_clear(); } - // private methods private: @@ -183,7 +178,6 @@ struct Filter return (*this); } - // public member public: @@ -201,7 +195,6 @@ struct Filter OUString sTemplateName ; }; - // Programmer can register his own services for an content detection of different types. // The implementation or service name of these is the keyname of an item with these structure // in our hash map or our configuration set! @@ -219,7 +212,6 @@ struct Detector inline Detector& operator= ( const Detector& rCopy ) { return impl_copy( rCopy ); } inline void free ( ) { impl_clear(); } - // private methods private: @@ -237,7 +229,6 @@ struct Detector return (*this); } - // public member public: @@ -246,7 +237,6 @@ struct Detector OUStringList lTypes ; }; - // Programmer can register his own services for loading documents in a frame. // The implementation or service name of these is the keyname of an item with these structure // in our hash map or our configuration set! @@ -264,7 +254,6 @@ struct Loader inline Loader& operator= ( const Loader& rCopy ) { return impl_copy( rCopy ); } inline void free ( ) { impl_clear(); } - // private methods private: @@ -284,7 +273,6 @@ struct Loader return (*this); } - // public member public: @@ -294,7 +282,6 @@ struct Loader OUStringList lTypes ; }; - // Programmer can register his own services to handle a FileType and intercept dispatches. // Don't forget: It's not a FrameLoader - it's a ContentHandler! (normaly without any UI) @@ -311,7 +298,6 @@ struct ContentHandler inline ContentHandler& operator= ( const ContentHandler& rCopy ) { return impl_copy( rCopy ); } inline void free ( ) { impl_clear(); } - // private methods private: @@ -329,7 +315,6 @@ struct ContentHandler return (*this); } - // public member public: @@ -338,7 +323,6 @@ struct ContentHandler OUStringList lTypes ; }; - // We need different hash maps for different tables of our configuration management. // Follow maps convert <names> to <properties> of type, filter, detector, loader ... // and could be used in a generic way @@ -364,14 +348,12 @@ class SetNodeHash : public ::boost::unordered_map< OUString , lRemovedItems.free(); } - // Append changed, added or removed items to special lists // Necessary for saving changes void appendChange( const OUString& sName , EModifyState eState ); - // member public: @@ -380,7 +362,6 @@ class SetNodeHash : public ::boost::unordered_map< OUString , OUStringList lRemovedItems ; }; - // Use these hashes to implement different tables which assign types to frame loader or detect services. // It's an optimism to find registered services faster! // The preferred hash maps file extensions to preferred types to find these ones faster. @@ -399,7 +380,6 @@ class PerformanceHash : public ::boost::unordered_map< OUString PerformanceHash().swap( *this ); } - // normaly a complete string must match our hash key values ... // But sometimes we need a search by using these key values as pattern! // The in/out parameter "pStepper" is used to return a pointer to found element in hash ... @@ -434,7 +414,6 @@ class PerformanceHash : public ::boost::unordered_map< OUString } }; - // Define easy usable types typedef SetNodeHash< FileType > FileTypeHash ; @@ -451,7 +430,6 @@ typedef CheckedIterator< PerformanceHash > CheckedPerfo typedef ::std::vector< FilterHash::const_iterator > FilterQuery ; - // Use private static data container to hold all values of configuration! class DataContainer @@ -626,7 +604,6 @@ class FilterCFGAccess : public ::utl::ConfigItem void setProductName ( OUStringHashMap& lUINames ); void resetProductName ( OUStringHashMap& lUINames ); - // internal helper private: @@ -648,7 +625,6 @@ class FilterCFGAccess : public ::utl::ConfigItem void impl_saveLoaders ( DataContainer& rData ); void impl_saveContentHandlers ( DataContainer& rData ); - // debug checks private: @@ -658,7 +634,6 @@ class FilterCFGAccess : public ::utl::ConfigItem static sal_Bool implcp_read ( const DataContainer& rData ); static sal_Bool implcp_write( const DataContainer& rData ); - // member private: diff --git a/framework/inc/classes/framecontainer.hxx b/framework/inc/classes/framecontainer.hxx index bb300756df44..c95af80b88c2 100644 --- a/framework/inc/classes/framecontainer.hxx +++ b/framework/inc/classes/framecontainer.hxx @@ -67,7 +67,6 @@ class FrameContainer /// one container item can be the current active frame. Its necessary for Desktop or Frame implementation. css::uno::Reference< css::frame::XFrame > m_xActiveFrame; - // interface public: diff --git a/framework/inc/classes/menumanager.hxx b/framework/inc/classes/menumanager.hxx index dc0ba2959f83..549948e53128 100644 --- a/framework/inc/classes/menumanager.hxx +++ b/framework/inc/classes/menumanager.hxx @@ -87,7 +87,6 @@ class MenuManager : public ::cppu::WeakImplHelper1< css::frame::XStatusListener void AddMenu(PopupMenu* _pPopupMenu,const OUString& _sItemCommand,sal_uInt16 _nItemId,sal_Bool _bDelete,sal_Bool _bDeleteChildren); sal_uInt16 FillItemCommand(OUString& _rItemCommand, Menu* _pMenu,sal_uInt16 _nIndex) const; - struct MenuItemHandler { MenuItemHandler( sal_uInt16 aItemId, MenuManager* pManager, css::uno::Reference< css::frame::XDispatch >& rDispatch ) : diff --git a/framework/inc/classes/propertysethelper.hxx b/framework/inc/classes/propertysethelper.hxx index 1599fed513fc..2dadf978f1e0 100644 --- a/framework/inc/classes/propertysethelper.hxx +++ b/framework/inc/classes/propertysethelper.hxx @@ -32,11 +32,8 @@ #include <cppuhelper/weakref.hxx> #include <fwidllapi.h> - namespace framework{ - - /** supports the API XPropertySet and XPropertySetInfo. * * It must be used as baseclass. The internal list of supported @@ -55,7 +52,6 @@ class FWI_DLLPUBLIC PropertySetHelper : public css::beans::XPropertySet typedef BaseHash< css::beans::Property > TPropInfoHash; - /* member */ protected: @@ -71,11 +67,9 @@ class FWI_DLLPUBLIC PropertySetHelper : public css::beans::XPropertySet TransactionManager& m_rTransactionManager; - /* native interface */ public: - /** initialize new instance of this helper. * * @param pExternalTransactionManager @@ -90,12 +84,10 @@ class FWI_DLLPUBLIC PropertySetHelper : public css::beans::XPropertySet TransactionManager* pExternalTransactionManager , sal_Bool bReleaseLockOnCall ); - /** free all needed memory. */ virtual ~PropertySetHelper(); - /** set a new owner for this helper. * * This owner is used as source for all broadcasted events. @@ -103,7 +95,6 @@ class FWI_DLLPUBLIC PropertySetHelper : public css::beans::XPropertySet */ void impl_setPropertyChangeBroadcaster(const css::uno::Reference< css::uno::XInterface >& xBroadcaster); - /** add a new property info to the set of supported ones. * * @param aProperty @@ -121,7 +112,6 @@ class FWI_DLLPUBLIC PropertySetHelper : public css::beans::XPropertySet throw(css::beans::PropertyExistException, css::uno::Exception ); - /** remove an existing property info from the set of supported ones. * * @param sProperty @@ -134,7 +124,6 @@ class FWI_DLLPUBLIC PropertySetHelper : public css::beans::XPropertySet throw(css::beans::UnknownPropertyException, css::uno::Exception ); - /** mark the object as "useable for working" or "dead". * * This correspond to the lifetime handling implemented by the base class TransactionBase. @@ -144,7 +133,6 @@ class FWI_DLLPUBLIC PropertySetHelper : public css::beans::XPropertySet virtual void SAL_CALL impl_enablePropertySet(); virtual void SAL_CALL impl_disablePropertySet(); - /** */ virtual void SAL_CALL impl_setPropertyValue(const OUString& sProperty, @@ -154,7 +142,6 @@ class FWI_DLLPUBLIC PropertySetHelper : public css::beans::XPropertySet virtual css::uno::Any SAL_CALL impl_getPropertyValue(const OUString& sProperty, sal_Int32 nHandle ) = 0; - /* uno interface */ public: @@ -210,7 +197,6 @@ class FWI_DLLPUBLIC PropertySetHelper : public css::beans::XPropertySet virtual sal_Bool SAL_CALL hasPropertyByName(const OUString& sName) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - /* internal helper */ private: diff --git a/framework/inc/classes/protocolhandlercache.hxx b/framework/inc/classes/protocolhandlercache.hxx index 315b89e0b9d0..9070e15ffff2 100644 --- a/framework/inc/classes/protocolhandlercache.hxx +++ b/framework/inc/classes/protocolhandlercache.hxx @@ -38,8 +38,6 @@ namespace framework{ #define SETNAME_HANDLER DECLARE_ASCII("HandlerSet" ) /// name of configuration set inside package #define PROPERTY_PROTOCOLS DECLARE_ASCII("Protocols" ) /// properties of a protocol handler - - /** Programmer can register his own services to handle different protocols. Don't forget: It doesn't mean "handling of documents" ... these services could handle protocols ... @@ -58,8 +56,6 @@ struct FWI_DLLPUBLIC ProtocolHandler OUStringList m_lProtocols; }; - - /** This hash use registered pattern of all protocol handlers as keys and provide her uno implementation names as value. Overloading of the index operator makes it possible @@ -73,15 +69,11 @@ class FWI_DLLPUBLIC PatternHash : public BaseHash< OUString > PatternHash::iterator findPatternKey( const OUString& sURL ); }; - - /** This hash holds protocol handler structs by her names. */ typedef BaseHash< ProtocolHandler > HandlerHash; - - /** @short this hash makes it easy to find a protocol handler by using his uno implementation name. @descr It holds two lists of information: @@ -128,8 +120,6 @@ class FWI_DLLPUBLIC HandlerCache void takeOver(HandlerHash* pHandler, PatternHash* pPattern); }; - - /** @short implements configuration access for handler configuration @descr We use the ConfigItem mechanism to read/write values from/to configuration. diff --git a/framework/inc/classes/rootactiontriggercontainer.hxx b/framework/inc/classes/rootactiontriggercontainer.hxx index 38546b43cf7c..16705d1ea640 100644 --- a/framework/inc/classes/rootactiontriggercontainer.hxx +++ b/framework/inc/classes/rootactiontriggercontainer.hxx @@ -31,7 +31,6 @@ #define IMPLEMENTATIONNAME_ROOTACTIONTRIGGERCONTAINER "com.sun.star.comp.ui.RootActionTriggerContainer" - namespace framework { diff --git a/framework/inc/classes/taskcreator.hxx b/framework/inc/classes/taskcreator.hxx index f0aac5d46acf..d8631b876e76 100644 --- a/framework/inc/classes/taskcreator.hxx +++ b/framework/inc/classes/taskcreator.hxx @@ -48,7 +48,6 @@ class TaskCreator css::uno::Reference< css::uno::XComponentContext > m_xContext; - // interface public: @@ -58,7 +57,6 @@ class TaskCreator css::uno::Reference< css::frame::XFrame > createTask( const OUString& sName , sal_Bool bVisible ); - // helper private: diff --git a/framework/inc/classes/wildcard.hxx b/framework/inc/classes/wildcard.hxx index ee6217f11271..f50f16df06be 100644 --- a/framework/inc/classes/wildcard.hxx +++ b/framework/inc/classes/wildcard.hxx @@ -42,13 +42,10 @@ class Wildcard // public methods - public: - // constructor / destructor - /*-**************************************************************************************************** @short standard ctor @descr We do nothing here. @@ -77,10 +74,8 @@ class Wildcard virtual ~Wildcard(); - // interface - /*-**************************************************************************************************** @short try to find an agreement between given text and searchpattern @descr You can use wildcards in pattern only! diff --git a/framework/inc/dispatch/closedispatcher.hxx b/framework/inc/dispatch/closedispatcher.hxx index 97235519173c..0ac4621f8da7 100644 --- a/framework/inc/dispatch/closedispatcher.hxx +++ b/framework/inc/dispatch/closedispatcher.hxx @@ -39,12 +39,10 @@ #include <cppuhelper/implbase2.hxx> #include <vcl/evntpost.hxx> - class SystemWindow; namespace framework{ - /** @short helper to dispatch the URLs ".uno:CloseDoc"/".uno:CloseWin"/".uno:CloseFrame" to close a frame/document or the whole application implicitly in case it was the last frame @@ -64,7 +62,6 @@ class CloseDispatcher : public ::cppu::WeakImplHelper2< private: - /** @short describe, which request must be done here. @descr The incoming URLs {.uno:CloseDoc/CloseWin and CloseFrame can be classified so and checked later performant.}*/ @@ -75,54 +72,44 @@ class CloseDispatcher : public ::cppu::WeakImplHelper2< E_CLOSE_WIN }; - // member private: - /** @short reference to an uno service manager, which can be used to create own needed uno resources. */ css::uno::Reference< css::uno::XComponentContext > m_xContext; - /** @short reference to the target frame, which should be closed by this dispatch. */ css::uno::WeakReference< css::frame::XFrame > m_xCloseFrame; - /** @short used for asynchronous callbacks within the main thread. @descr Internally we work asynchronous. Because our callis are not aware, that her request can kill its own environment ... */ ::vcl::EventPoster m_aAsyncCallback; - /** @short used inside asyncronous callback to decide, which operation must be executed. */ EOperation m_eOperation; - /** @short for asynchronous operations we must hold us self alive! */ css::uno::Reference< css::uno::XInterface > m_xSelfHold; - /** @short list of registered status listener */ osl::Mutex m_mutex; ListenerHash m_lStatusListener; - /** @short holded alive for internally asynchronous operations! */ css::uno::Reference< css::frame::XDispatchResultListener > m_xResultListener; SystemWindow* m_pSysWindow; - // native interface public: - /** @short connect a new CloseDispatcher instance to its frame. @descr One CloseDispatcher instance is bound to onw frame only. That makes an implementation (e.g. of listener support) @@ -142,22 +129,18 @@ class CloseDispatcher : public ::cppu::WeakImplHelper2< const css::uno::Reference< css::frame::XFrame >& xFrame , const OUString& sTarget); - /** @short does nothing real. */ virtual ~CloseDispatcher(); - // uno interface public: - // XNotifyingDispatch virtual void SAL_CALL dispatchWithNotification( const css::util::URL& aURL , const css::uno::Sequence< css::beans::PropertyValue >& lArguments, const css::uno::Reference< css::frame::XDispatchResultListener >& xListener ) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - // XDispatch virtual void SAL_CALL dispatch ( const css::util::URL& aURL , const css::uno::Sequence< css::beans::PropertyValue >& lArguments) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; @@ -166,17 +149,14 @@ class CloseDispatcher : public ::cppu::WeakImplHelper2< virtual void SAL_CALL removeStatusListener( const css::uno::Reference< css::frame::XStatusListener >& xListener , const css::util::URL& aURL ) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - // XDispatchInformationProvider virtual css::uno::Sequence< sal_Int16 > SAL_CALL getSupportedCommandGroups ( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual css::uno::Sequence< css::frame::DispatchInformation > SAL_CALL getConfigurableDispatchInformation( sal_Int16 nCommandGroup ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - // internal helper private: - /** @short a callback for asynchronous started operations. @descr As already mentione, we make internally all operations @@ -185,7 +165,6 @@ class CloseDispatcher : public ::cppu::WeakImplHelper2< */ DECL_LINK( impl_asyncCallback, void* ); - /** @short prepare m_xCloseFrame so it should be closeable without problems. @descr Thats needed to be shure, that the document cant disagree @@ -211,7 +190,6 @@ class CloseDispatcher : public ::cppu::WeakImplHelper2< sal_Bool bCloseAllOtherViewsToo, sal_Bool& bControllerSuspended ); - /** @short close the member m_xCloseFrame. @descr This method does not look for any document @@ -228,7 +206,6 @@ class CloseDispatcher : public ::cppu::WeakImplHelper2< */ sal_Bool implts_closeFrame(); - /** @short set the special BackingComponent (now StartModule) as new component of our m_xCloseFrame. @@ -237,7 +214,6 @@ class CloseDispatcher : public ::cppu::WeakImplHelper2< */ sal_Bool implts_establishBackingMode(); - /** @short calls XDesktop->terminate(). @descr No office code has to be called @@ -251,7 +227,6 @@ class CloseDispatcher : public ::cppu::WeakImplHelper2< */ sal_Bool implts_terminateApplication(); - /** @short notify a DispatchResultListener. @descr We check the listener reference before we use it. @@ -271,7 +246,6 @@ class CloseDispatcher : public ::cppu::WeakImplHelper2< sal_Int16 nState , const css::uno::Any& aResult ); - /** @short try to find the right target frame where this close request must be really done. diff --git a/framework/inc/dispatch/dispatchinformationprovider.hxx b/framework/inc/dispatch/dispatchinformationprovider.hxx index b6e0db104d5b..0dd129a2e1be 100644 --- a/framework/inc/dispatch/dispatchinformationprovider.hxx +++ b/framework/inc/dispatch/dispatchinformationprovider.hxx @@ -47,7 +47,6 @@ class DispatchInformationProvider : public ::cppu::WeakImplHelper1< css::frame: css::uno::Reference< css::uno::XComponentContext > m_xContext; css::uno::WeakReference< css::frame::XFrame > m_xFrame; - // interface public: @@ -62,7 +61,6 @@ class DispatchInformationProvider : public ::cppu::WeakImplHelper1< css::frame: virtual css::uno::Sequence< css::frame::DispatchInformation > SAL_CALL getConfigurableDispatchInformation(sal_Int16 nCommandGroup) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - // helper private: diff --git a/framework/inc/dispatch/interceptionhelper.hxx b/framework/inc/dispatch/interceptionhelper.hxx index 16f1c6078c3b..06a7c79c9123 100644 --- a/framework/inc/dispatch/interceptionhelper.hxx +++ b/framework/inc/dispatch/interceptionhelper.hxx @@ -70,8 +70,6 @@ class InterceptionHelper : public ::cppu::WeakImplHelper3< css::uno::Sequence< OUString > lURLPattern; }; - - /** @short implements a list of items of type InterceptorInfo, and provides some special functions on it. @@ -82,8 +80,6 @@ class InterceptionHelper : public ::cppu::WeakImplHelper3< { public: - - /** @short search for an interceptor inside this list using it's reference. @param xInterceptor @@ -104,8 +100,6 @@ class InterceptionHelper : public ::cppu::WeakImplHelper3< return end(); } - - /** @short search for an interceptor inside this list using it's reference. @param xInterceptor @@ -133,7 +127,6 @@ class InterceptionHelper : public ::cppu::WeakImplHelper3< } }; - // member private: @@ -154,13 +147,10 @@ class InterceptionHelper : public ::cppu::WeakImplHelper3< The last or the first registered one. */ static sal_Bool m_bPreferrFirstInterceptor; - // native interface public: - - /** @short creates a new interception helper instance. @param xOwner @@ -174,8 +164,6 @@ class InterceptionHelper : public ::cppu::WeakImplHelper3< protected: - - /** @short standard destructor. @descr This method destruct an instance of this class and clear some member. @@ -184,12 +172,10 @@ class InterceptionHelper : public ::cppu::WeakImplHelper3< */ virtual ~InterceptionHelper(); - // uno interface public: - // XDispatchProvider /** @short query for a dispatch, which implements the requested feature. @@ -217,7 +203,6 @@ class InterceptionHelper : public ::cppu::WeakImplHelper3< sal_Int32 nSearchFlags ) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - // XDispatchProvider /** @short implements an optimized queryDispatch() for remote. @@ -234,7 +219,6 @@ class InterceptionHelper : public ::cppu::WeakImplHelper3< virtual css::uno::Sequence< css::uno::Reference< css::frame::XDispatch > > SAL_CALL queryDispatches(const css::uno::Sequence< css::frame::DispatchDescriptor >& lDescriptor) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - // XDispatchProviderInterception /** @short register an interceptor. @@ -253,7 +237,6 @@ class InterceptionHelper : public ::cppu::WeakImplHelper3< virtual void SAL_CALL registerDispatchProviderInterceptor(const css::uno::Reference< css::frame::XDispatchProviderInterceptor >& xInterceptor) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - // XDispatchProviderInterception /** @short release an interceptor. @@ -268,7 +251,6 @@ class InterceptionHelper : public ::cppu::WeakImplHelper3< */ virtual void SAL_CALL releaseDispatchProviderInterceptor( const css::uno::Reference< css::frame::XDispatchProviderInterceptor >& xInterceptor ) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - // XEventListener /** @short Is called from our owner frame, in case he will be disposed. diff --git a/framework/inc/dispatch/mailtodispatcher.hxx b/framework/inc/dispatch/mailtodispatcher.hxx index 888613c572ab..000011ae9ec7 100644 --- a/framework/inc/dispatch/mailtodispatcher.hxx +++ b/framework/inc/dispatch/mailtodispatcher.hxx @@ -37,7 +37,6 @@ #include <cppuhelper/implbase3.hxx> - namespace framework{ /** diff --git a/framework/inc/dispatch/menudispatcher.hxx b/framework/inc/dispatch/menudispatcher.hxx index 344a653759b2..5460f5f63cc1 100644 --- a/framework/inc/dispatch/menudispatcher.hxx +++ b/framework/inc/dispatch/menudispatcher.hxx @@ -55,7 +55,6 @@ namespace framework{ typedef ::cppu::OMultiTypeInterfaceContainerHelperVar< OUString , OUStringHash > IMPL_ListenerHashContainer; - /*-************************************************************************************************************ @short helper for desktop only(!) to create new tasks on demand for dispatches @descr Use this class as member only! Never use it as baseclass. @@ -77,13 +76,10 @@ class MenuDispatcher : public ::cppu::WeakImplHelper2< // public methods - public: - // constructor / destructor - /*-**************************************************************************************************** @short standard ctor @descr These initialize a new instance of ths class with needed information for work. @@ -100,10 +96,8 @@ class MenuDispatcher : public ::cppu::WeakImplHelper2< MenuDispatcher( const css::uno::Reference< css::uno::XComponentContext >& rxContext , const css::uno::Reference< css::frame::XFrame >& xOwner ); - // XDispatch - /*-**************************************************************************************************** @short dispatch URL with arguments @descr Every dispatch create a new task. If load of URL failed task will deleted automaticly! @@ -154,17 +148,12 @@ class MenuDispatcher : public ::cppu::WeakImplHelper2< virtual void SAL_CALL removeStatusListener( const css::uno::Reference< css::frame::XStatusListener >& xControl, const css::util::URL& aURL ) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - - // XFrameActionListener - virtual void SAL_CALL frameAction( const css::frame::FrameActionEvent& aEvent ) throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - // XEventListener - /*-**************************************************************************************************** @short dispose current instance @descr If service helper isn't required any longer call this method to release all used resources. @@ -179,10 +168,8 @@ class MenuDispatcher : public ::cppu::WeakImplHelper2< void SAL_CALL disposing( const css::lang::EventObject& aEvent ) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - // protected methods - protected: /*-**************************************************************************************************** @@ -201,10 +188,8 @@ class MenuDispatcher : public ::cppu::WeakImplHelper2< virtual ~MenuDispatcher(); - // private methods - private: /*-**************************************************************************************************** @@ -235,11 +220,9 @@ class MenuDispatcher : public ::cppu::WeakImplHelper2< void impl_setAccelerators( Menu* pMenu, const Accelerator& aAccel ); - // variables // (should be private everyway!) - private: css::uno::WeakReference< css::frame::XFrame > m_xOwnerWeak ; /// css::uno::WeakReference to owner (Don't use a hard css::uno::Reference. Owner can't delete us then!) diff --git a/framework/inc/dispatch/oxt_handler.hxx b/framework/inc/dispatch/oxt_handler.hxx index aa9ceb2a45e6..505097c91446 100644 --- a/framework/inc/dispatch/oxt_handler.hxx +++ b/framework/inc/dispatch/oxt_handler.hxx @@ -38,7 +38,6 @@ #include <cppuhelper/implbase3.hxx> - namespace framework{ /*-************************************************************************************************************ @@ -62,25 +61,21 @@ class Oxt_Handler : public ::cppu::WeakImplHelper3< public: - // constructor / destructor Oxt_Handler( const css::uno::Reference< css::lang::XMultiServiceFactory >& xFactory ); virtual ~Oxt_Handler( ); - // XInterface, XTypeProvider, XServiceInfo DECLARE_XSERVICEINFO - // XNotifyingDispatch virtual void SAL_CALL dispatchWithNotification(const css::util::URL& aURL , const css::uno::Sequence< css::beans::PropertyValue >& lArguments, const css::uno::Reference< css::frame::XDispatchResultListener >& xListener ) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - // XDispatch virtual void SAL_CALL dispatch ( const css::util::URL& aURL , @@ -91,7 +86,6 @@ class Oxt_Handler : public ::cppu::WeakImplHelper3< virtual void SAL_CALL removeStatusListener ( const css::uno::Reference< css::frame::XStatusListener >& /*xListener*/ , const css::util::URL& /*aURL*/ ) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE {}; - // XExtendedFilterDetection virtual OUString SAL_CALL detect ( css::uno::Sequence< css::beans::PropertyValue >& lDescriptor ) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; @@ -99,12 +93,10 @@ class Oxt_Handler : public ::cppu::WeakImplHelper3< protected: - // private methods private: - // variables // (should be private everyway!) diff --git a/framework/inc/dispatch/popupmenudispatcher.hxx b/framework/inc/dispatch/popupmenudispatcher.hxx index 4d388a8627d6..71d2d45ab9e4 100644 --- a/framework/inc/dispatch/popupmenudispatcher.hxx +++ b/framework/inc/dispatch/popupmenudispatcher.hxx @@ -57,7 +57,6 @@ namespace framework{ typedef ::cppu::OMultiTypeInterfaceContainerHelperVar< OUString , OUStringHash > IMPL_ListenerHashContainer; - /*-************************************************************************************************************ @short helper for desktop only(!) to create new tasks on demand for dispatches @descr Use this class as member only! Never use it as baseclass. @@ -114,7 +113,6 @@ class PopupMenuDispatcher : public ::cppu::WeakImplHelper5< virtual void SAL_CALL removeStatusListener( const css::uno::Reference< css::frame::XStatusListener >& xControl, const css::util::URL& aURL ) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - // XFrameActionListener virtual void SAL_CALL frameAction( const css::frame::FrameActionEvent& aEvent ) throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; diff --git a/framework/inc/dispatch/startmoduledispatcher.hxx b/framework/inc/dispatch/startmoduledispatcher.hxx index 6f054d6d5586..5bbc3d0e01c7 100644 --- a/framework/inc/dispatch/startmoduledispatcher.hxx +++ b/framework/inc/dispatch/startmoduledispatcher.hxx @@ -40,10 +40,8 @@ #include <cppuhelper/implbase2.hxx> #include <vcl/evntpost.hxx> - namespace framework{ - /** @short helper to handle all URLs related to the StartModule */ @@ -56,31 +54,25 @@ class StartModuleDispatcher : public ::cppu::WeakImplHelper2< private: - /** @short reference to an uno service manager, which can be used to create own needed uno resources. */ css::uno::Reference< css::uno::XComponentContext > m_xContext; - /** @short our "context" frame. */ css::uno::WeakReference< css::frame::XFrame > m_xOwner; - /** @short the original queryDispatch() target. */ OUString m_sDispatchTarget; - /** @short list of registered status listener */ osl::Mutex m_mutex; ListenerHash m_lStatusListener; - // native interface public: - /** @short connect a new StartModuleDispatcher instance to its "owner frame". @descr Such "owner frame" is used as context for all related operations. @@ -99,24 +91,18 @@ class StartModuleDispatcher : public ::cppu::WeakImplHelper2< const css::uno::Reference< css::frame::XFrame >& xFrame , const OUString& sTarget); - /** @short does nothing real. */ virtual ~StartModuleDispatcher(); - // uno interface public: - - - // XNotifyingDispatch virtual void SAL_CALL dispatchWithNotification( const css::util::URL& aURL , const css::uno::Sequence< css::beans::PropertyValue >& lArguments, const css::uno::Reference< css::frame::XDispatchResultListener >& xListener ) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - // XDispatch virtual void SAL_CALL dispatch ( const css::util::URL& aURL , const css::uno::Sequence< css::beans::PropertyValue >& lArguments) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; @@ -125,22 +111,18 @@ class StartModuleDispatcher : public ::cppu::WeakImplHelper2< virtual void SAL_CALL removeStatusListener( const css::uno::Reference< css::frame::XStatusListener >& xListener , const css::util::URL& aURL ) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - // XDispatchInformationProvider virtual css::uno::Sequence< sal_Int16 > SAL_CALL getSupportedCommandGroups ( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual css::uno::Sequence< css::frame::DispatchInformation > SAL_CALL getConfigurableDispatchInformation( sal_Int16 nCommandGroup ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - // internal helper private: - /** @short check if StartModule can be shown. */ sal_Bool implts_isBackingModePossible(); - /** @short open the special BackingComponent (now StartModule) @return [bool] @@ -148,7 +130,6 @@ class StartModuleDispatcher : public ::cppu::WeakImplHelper2< */ sal_Bool implts_establishBackingMode(); - /** @short notify a DispatchResultListener. @descr We check the listener reference before we use it. diff --git a/framework/inc/dispatchcommands.h b/framework/inc/dispatchcommands.h index 3f923191bbcb..d19af3bccffe 100644 --- a/framework/inc/dispatchcommands.h +++ b/framework/inc/dispatchcommands.h @@ -24,8 +24,6 @@ namespace framework{ - - #define CMD_UNO_SHOWSTARTMODULE ".uno:ShowStartModule" } // namespace framework diff --git a/framework/inc/helper/dockingareadefaultacceptor.hxx b/framework/inc/helper/dockingareadefaultacceptor.hxx index 1c456d85f3f2..d906333d5813 100644 --- a/framework/inc/helper/dockingareadefaultacceptor.hxx +++ b/framework/inc/helper/dockingareadefaultacceptor.hxx @@ -33,17 +33,12 @@ namespace framework{ - - - class DockingAreaDefaultAcceptor : public ::cppu::WeakImplHelper1< ::com::sun::star::ui::XDockingAreaAcceptor > { public: - // constructor / destructor - /*-**************************************************************************************************** @short constructor to initialize this instance @descr A docking area acceptor @@ -62,20 +57,15 @@ class DockingAreaDefaultAcceptor : public ::cppu::WeakImplHelper1< ::com::s DockingAreaDefaultAcceptor( const css::uno::Reference< css::frame::XFrame >& xOwner ); virtual ~DockingAreaDefaultAcceptor(); - // XDockingAreaAcceptor - virtual css::uno::Reference< css::awt::XWindow > SAL_CALL getContainerWindow() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Bool SAL_CALL requestDockingAreaSpace( const css::awt::Rectangle& RequestedSpace ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL setDockingAreaSpace( const css::awt::Rectangle& BorderSpace ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - - // variables // (should be private everyway!) - private: css::uno::WeakReference< css::frame::XFrame > m_xOwner ; /// weak reference to our frame object! diff --git a/framework/inc/helper/mischelper.hxx b/framework/inc/helper/mischelper.hxx index 510543d02127..a8548b38d2ee 100644 --- a/framework/inc/helper/mischelper.hxx +++ b/framework/inc/helper/mischelper.hxx @@ -40,13 +40,11 @@ class SvtLanguageTable; - // flags for script types in use within selection #define LS_SCRIPT_LATIN 0x0001 #define LS_SCRIPT_ASIAN 0x0002 #define LS_SCRIPT_COMPLEX 0x0004 - namespace framework { @@ -83,7 +81,6 @@ enum LangMenuIDs MID_LANG_PARA_MORE, }; - inline bool IsScriptTypeMatchingToLanguage( sal_Int16 nScriptType, LanguageType nLang ) { return 0 != (nScriptType & SvtLanguageOptions::GetScriptTypeOfLanguage( nLang )); @@ -315,7 +312,6 @@ class WeakDocumentEventListener : public ::cppu::WeakImplHelper1<com::sun::star: } }; - } // namespace framework #endif // INCLUDED_FRAMEWORK_INC_HELPER_MISCHELPER_HXX diff --git a/framework/inc/helper/ocomponentaccess.hxx b/framework/inc/helper/ocomponentaccess.hxx index ad65fc9b6caa..c5f7293a3d7a 100644 --- a/framework/inc/helper/ocomponentaccess.hxx +++ b/framework/inc/helper/ocomponentaccess.hxx @@ -59,13 +59,10 @@ class OComponentAccess : public ::cppu::WeakImplHelper1< ::com::sun::star::co // public methods - public: - // constructor / destructor - /*-**************************************************************************************************** @short constructor to initialize this instance @descr A desktop will create an enumeration-access-object. An enumeration is a oneway-list and a @@ -83,10 +80,8 @@ class OComponentAccess : public ::cppu::WeakImplHelper1< ::com::sun::star::co OComponentAccess( const css::uno::Reference< css::frame::XDesktop >& xOwner ); - // XEnumerationAccess - /*-**************************************************************************************************** @short create a new enumeration of components @descr You can call this method to get a new snapshot from all components of all tasks of the desktop as an enumeration. @@ -104,10 +99,8 @@ class OComponentAccess : public ::cppu::WeakImplHelper1< ::com::sun::star::co virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - // XElementAccess - /*-**************************************************************************************************** @short get the type of elements in enumeration @descr - @@ -138,10 +131,8 @@ class OComponentAccess : public ::cppu::WeakImplHelper1< ::com::sun::star::co virtual sal_Bool SAL_CALL hasElements() throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - // protected methods - protected: /*-**************************************************************************************************** @@ -161,10 +152,8 @@ class OComponentAccess : public ::cppu::WeakImplHelper1< ::com::sun::star::co virtual ~OComponentAccess(); - // private methods - private: /*-**************************************************************************************************** @@ -198,11 +187,9 @@ class OComponentAccess : public ::cppu::WeakImplHelper1< ::com::sun::star::co css::uno::Reference< css::lang::XComponent > impl_getFrameComponent( const css::uno::Reference< css::frame::XFrame >& xFrame ) const; - // debug methods // (should be private everyway!) - /*-**************************************************************************************************** @short debug-method to check incoming parameter of some other mehods of this class @descr The following methods are used to check parameters for other methods @@ -221,11 +208,9 @@ class OComponentAccess : public ::cppu::WeakImplHelper1< ::com::sun::star::co static sal_Bool impldbg_checkParameter_OComponentAccessCtor( const css::uno::Reference< css::frame::XDesktop >& xOwner ); - // variables // (should be private everyway!) - private: css::uno::WeakReference< css::frame::XDesktop > m_xOwner ; /// weak reference to the desktop object! diff --git a/framework/inc/helper/ocomponentenumeration.hxx b/framework/inc/helper/ocomponentenumeration.hxx index 174ba93b9e8a..03ae18a9838c 100644 --- a/framework/inc/helper/ocomponentenumeration.hxx +++ b/framework/inc/helper/ocomponentenumeration.hxx @@ -55,13 +55,10 @@ class OComponentEnumeration : public ::cppu::WeakImplHelper2< ::com::sun::star // public methods - public: - // constructor / destructor - /*-**************************************************************************************************** @short constructor to initialize this enumeration @descr An enumeration is a list with oneway-access! You can get every member only for one time. @@ -77,10 +74,8 @@ class OComponentEnumeration : public ::cppu::WeakImplHelper2< ::com::sun::star OComponentEnumeration( const css::uno::Sequence< css::uno::Reference< css::lang::XComponent > >& seqComponents ); - // XEventListener - /*-**************************************************************************************************** @short last chance to release all references and free memory @descr This method is called, if the enumeration is used completely and has no more elements. @@ -96,10 +91,8 @@ class OComponentEnumeration : public ::cppu::WeakImplHelper2< ::com::sun::star virtual void SAL_CALL disposing( const css::lang::EventObject& aEvent ) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - // XEnumeration - /*-**************************************************************************************************** @short check count of accessible elements of enumeration @descr You can call this method to get information about accessible elements in future. @@ -133,10 +126,8 @@ class OComponentEnumeration : public ::cppu::WeakImplHelper2< ::com::sun::star css::lang::WrappedTargetException , css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - // protected methods - protected: /*-**************************************************************************************************** @@ -175,17 +166,13 @@ class OComponentEnumeration : public ::cppu::WeakImplHelper2< ::com::sun::star virtual void impl_resetObject(); - // private methods - private: - // debug methods // (should be private everyway!) - /*-**************************************************************************************************** @short debug-method to check incoming parameter of some other mehods of this class @descr The following methods are used to check parameters for other methods @@ -205,11 +192,9 @@ class OComponentEnumeration : public ::cppu::WeakImplHelper2< ::com::sun::star static sal_Bool impldbg_checkParameter_OComponentEnumerationCtor ( const css::uno::Sequence< css::uno::Reference< css::lang::XComponent > >& seqComponents ); static sal_Bool impldbg_checkParameter_disposing ( const css::lang::EventObject& aEvent ); - // variables // (should be private everyway!) - private: sal_uInt32 m_nPosition ; /// current position in enumeration diff --git a/framework/inc/helper/persistentwindowstate.hxx b/framework/inc/helper/persistentwindowstate.hxx index 4b1c8f21bf02..439e46d8e6df 100644 --- a/framework/inc/helper/persistentwindowstate.hxx +++ b/framework/inc/helper/persistentwindowstate.hxx @@ -70,33 +70,27 @@ class PersistentWindowState : public ::cppu::WeakImplHelper2< /// we call SetWindowState one times only for the same frame! sal_Bool m_bWindowStateAlreadySet; - // interface public: - // ctor/dtor PersistentWindowState(const css::uno::Reference< css::uno::XComponentContext >& xContext); virtual ~PersistentWindowState( ); - // XInitialization virtual void SAL_CALL initialize(const css::uno::Sequence< css::uno::Any >& lArguments) throw(css::uno::Exception , css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - // XFrameActionListener virtual void SAL_CALL frameAction(const css::frame::FrameActionEvent& aEvent) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - // XEventListener virtual void SAL_CALL disposing(const css::lang::EventObject& aEvent) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - // helper private: @@ -116,7 +110,6 @@ class PersistentWindowState : public ::cppu::WeakImplHelper2< static OUString implst_identifyModule(const css::uno::Reference< css::uno::XComponentContext >& rxContext, const css::uno::Reference< css::frame::XFrame >& xFrame); - /** @short retrieve the window state from the configuration. @param rxContext @@ -132,7 +125,6 @@ class PersistentWindowState : public ::cppu::WeakImplHelper2< static OUString implst_getWindowStateFromConfig(const css::uno::Reference< css::uno::XComponentContext >& rxContext , const OUString& sModuleName); - /** @short retrieve the window state from the container window. @param xWindow @@ -145,7 +137,6 @@ class PersistentWindowState : public ::cppu::WeakImplHelper2< */ static OUString implst_getWindowStateFromWindow(const css::uno::Reference< css::awt::XWindow >& xWindow); - /** @short restore the position and size on the container window. @param rxContext @@ -162,7 +153,6 @@ class PersistentWindowState : public ::cppu::WeakImplHelper2< const OUString& sModuleName , const OUString& sWindowState ); - /** @short restore the position and size on the container window. @param xWindow diff --git a/framework/inc/helper/statusindicator.hxx b/framework/inc/helper/statusindicator.hxx index d0cf193f38d4..e8928e2d9b0e 100644 --- a/framework/inc/helper/statusindicator.hxx +++ b/framework/inc/helper/statusindicator.hxx @@ -20,7 +20,6 @@ #ifndef INCLUDED_FRAMEWORK_INC_HELPER_STATUSINDICATOR_HXX #define INCLUDED_FRAMEWORK_INC_HELPER_STATUSINDICATOR_HXX - // include files of own module #include <helper/statusindicatorfactory.hxx> @@ -28,20 +27,15 @@ #include <macros/xtypeprovider.hxx> #include <macros/generic.hxx> - // include UNO interfaces #include <com/sun/star/task/XStatusIndicator.hpp> - // include all others #include <cppuhelper/implbase1.hxx> #include <cppuhelper/weakref.hxx> - namespace framework{ - - /** @short implement a status indicator object @@ -74,11 +68,9 @@ class StatusIndicator : public ::cppu::WeakImplHelper1< css::task::XStatusIndic */ css::uno::WeakReference< css::task::XStatusIndicatorFactory > m_xFactory; - // c++ interface public: - /** @short initialize new instance of this class. @param pFactory @@ -86,16 +78,13 @@ class StatusIndicator : public ::cppu::WeakImplHelper1< css::task::XStatusIndic */ StatusIndicator(StatusIndicatorFactory* pFactory); - /** @short does nothing real .... */ virtual ~StatusIndicator(); - // uno interface public: - // XStatusIndicator virtual void SAL_CALL start(const OUString& sText , sal_Int32 nRange) diff --git a/framework/inc/helper/statusindicatorfactory.hxx b/framework/inc/helper/statusindicatorfactory.hxx index 0d172c28688b..1e5d6d5eccaf 100644 --- a/framework/inc/helper/statusindicatorfactory.hxx +++ b/framework/inc/helper/statusindicatorfactory.hxx @@ -24,7 +24,6 @@ // with solaris headers ... #include <vector> - // include files of own module #include <helper/wakeupthread.hxx> #include <macros/xinterface.hxx> @@ -33,7 +32,6 @@ #include <macros/generic.hxx> #include <general.h> - // include uno interfaces #include <com/sun/star/lang/XTypeProvider.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> @@ -54,11 +52,8 @@ #include <cppuhelper/implbase4.hxx> #include <osl/thread.hxx> - namespace framework{ - - /** @descr This struct hold some information about all currently running progress proccesses. Because the can be used on a stack, we must cache her states but must paint only @@ -83,11 +78,9 @@ struct IndicatorInfo /** @short the last set value for this indicator */ sal_Int32 m_nValue; - // interface public: - /** @short initialize new instance of this class @param xIndicator @@ -109,7 +102,6 @@ struct IndicatorInfo m_nValue = 0 ; } - /** @short Don't forget to free used references! */ ~IndicatorInfo() @@ -117,7 +109,6 @@ struct IndicatorInfo m_xIndicator.clear(); } - /** @short Used to locate an info struct inside a stl structure ... @descr The indicator object itself is used as key. Its values @@ -130,11 +121,9 @@ struct IndicatorInfo } }; - /** @descr Define a lits of child indicator objects and her data. */ typedef ::std::vector< IndicatorInfo > IndicatorStack; - /** @short implement a factory service to create new status indicator objects @descr Internally it uses: @@ -201,7 +190,6 @@ class StatusIndicatorFactory : public ::cppu::WeakImplHelper4< /** prevent recursive calling of Application::Reschedule(). */ static sal_Int32 m_nInReschedule; - // interface public: @@ -227,23 +215,19 @@ class StatusIndicatorFactory : public ::cppu::WeakImplHelper4< return aSeq; } - // XInitialization virtual void SAL_CALL initialize(const css::uno::Sequence< css::uno::Any >& lArguments) throw(css::uno::Exception , css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - // XStatusIndicatorFactory virtual css::uno::Reference< css::task::XStatusIndicator > SAL_CALL createStatusIndicator() throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - // XUpdatable virtual void SAL_CALL update() throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - // similar (XStatusIndicator) virtual void start(const css::uno::Reference< css::task::XStatusIndicator >& xChild, const OUString& sText , @@ -259,21 +243,18 @@ class StatusIndicatorFactory : public ::cppu::WeakImplHelper4< virtual void SAL_CALL setValue(const css::uno::Reference< css::task::XStatusIndicator >& xChild, sal_Int32 nValue); - // specials protected: virtual ~StatusIndicatorFactory(); - // helper private: /** @short show the parent window of this progress ... if it's allowed to do so. - @descr By default we show the parent window automaticly if this progress is used. If that isn't a valid operation, the user of this diff --git a/framework/inc/helper/tagwindowasmodified.hxx b/framework/inc/helper/tagwindowasmodified.hxx index c6847213cdd1..a9feec641e63 100644 --- a/framework/inc/helper/tagwindowasmodified.hxx +++ b/framework/inc/helper/tagwindowasmodified.hxx @@ -65,43 +65,35 @@ class TagWindowAsModified : public ::cppu::WeakImplHelper3< /// we list on the model for modify events css::uno::WeakReference< css::frame::XModel > m_xModel; - // interface public: - // ctor/dtor TagWindowAsModified(); virtual ~TagWindowAsModified( ); - // XInterface, XTypeProvider - // XInitialization virtual void SAL_CALL initialize(const css::uno::Sequence< css::uno::Any >& lArguments) throw(css::uno::Exception , css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - // XModifyListener virtual void SAL_CALL modified(const css::lang::EventObject& aEvent) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - // XFrameActionListener virtual void SAL_CALL frameAction(const css::frame::FrameActionEvent& aEvent) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - // XEventListener virtual void SAL_CALL disposing(const css::lang::EventObject& aEvent) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; private: - // @todo document me void impl_update(const css::uno::Reference< css::frame::XFrame >& xFrame); diff --git a/framework/inc/helper/titlebarupdate.hxx b/framework/inc/helper/titlebarupdate.hxx index 9782c14e7dcb..b62a881bb5c8 100644 --- a/framework/inc/helper/titlebarupdate.hxx +++ b/framework/inc/helper/titlebarupdate.hxx @@ -62,7 +62,6 @@ class TitleBarUpdate : public ::cppu::WeakImplHelper3< ::sal_Int32 nIcon; }; - // member private: @@ -73,46 +72,37 @@ class TitleBarUpdate : public ::cppu::WeakImplHelper3< /// reference to the frame which was created by the office himself css::uno::WeakReference< css::frame::XFrame > m_xFrame; - // interface public: - // ctor/dtor TitleBarUpdate(const css::uno::Reference< css::uno::XComponentContext >& xContext); virtual ~TitleBarUpdate( ); - // XInterface, XTypeProvider - // XInitialization virtual void SAL_CALL initialize(const css::uno::Sequence< css::uno::Any >& lArguments) throw(css::uno::Exception , css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - // XFrameActionListener virtual void SAL_CALL frameAction(const css::frame::FrameActionEvent& aEvent) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - // XTitleChangeListener virtual void SAL_CALL titleChanged(const css::frame::TitleChangedEvent& aEvent) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - // XEventListener virtual void SAL_CALL disposing(const css::lang::EventObject& aEvent) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - // helper private: - /** @short identify the application module, which is used behind the component of our frame. @@ -130,7 +120,6 @@ class TitleBarUpdate : public ::cppu::WeakImplHelper3< sal_Bool implst_getModuleInfo(const css::uno::Reference< css::frame::XFrame >& xFrame, TModuleInfo& rInfo ); - /** @short set a new icon and title on the title bar of our connected frame window. @descr It does not check if an update is really needed. That has to be done outside. @@ -139,7 +128,6 @@ class TitleBarUpdate : public ::cppu::WeakImplHelper3< */ void impl_forceUpdate(); - /** @short identify the current component (inside the connected frame) and set the right module icon on the title bar. @@ -149,7 +137,6 @@ class TitleBarUpdate : public ::cppu::WeakImplHelper3< */ void impl_updateIcon(const css::uno::Reference< css::frame::XFrame >& xFrame); - /** @short gets the current title from the frame and set it on the window. @param xFrame diff --git a/framework/inc/helper/uiconfigelementwrapperbase.hxx b/framework/inc/helper/uiconfigelementwrapperbase.hxx index 9113189524c8..970317f90a45 100644 --- a/framework/inc/helper/uiconfigelementwrapperbase.hxx +++ b/framework/inc/helper/uiconfigelementwrapperbase.hxx @@ -103,7 +103,6 @@ class UIConfigElementWrapperBase : private cppu::BaseMutex, using cppu::OPropertySetHelper::disposing; virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& aEvent ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - // protected methods protected: diff --git a/framework/inc/helper/uielementwrapperbase.hxx b/framework/inc/helper/uielementwrapperbase.hxx index e5d49be7a3cc..bf631c26977d 100644 --- a/framework/inc/helper/uielementwrapperbase.hxx +++ b/framework/inc/helper/uielementwrapperbase.hxx @@ -83,7 +83,6 @@ class UIElementWrapperBase : private cppu::BaseMutex, virtual ::sal_Int16 SAL_CALL getType() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL getRealInterface() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE = 0; - // protected methods protected: diff --git a/framework/inc/helper/vclstatusindicator.hxx b/framework/inc/helper/vclstatusindicator.hxx index c0584eb6ec6a..c2102089b99a 100644 --- a/framework/inc/helper/vclstatusindicator.hxx +++ b/framework/inc/helper/vclstatusindicator.hxx @@ -31,10 +31,8 @@ #include <cppuhelper/implbase1.hxx> #include <vcl/status.hxx> - namespace framework { - // declaration class VCLStatusIndicator : public ::cppu::WeakImplHelper1< css::task::XStatusIndicator > @@ -65,7 +63,6 @@ class VCLStatusIndicator : public ::cppu::WeakImplHelper1< css::task::XStatusIn /** knows the current value of the progress. */ sal_Int32 m_nValue; - // interface public: @@ -93,7 +90,6 @@ class VCLStatusIndicator : public ::cppu::WeakImplHelper1< css::task::XStatusIn virtual void SAL_CALL setValue(sal_Int32 nValue) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - // helper private: diff --git a/framework/inc/helper/wakeupthread.hxx b/framework/inc/helper/wakeupthread.hxx index 20f5cb1a08a3..b2f1cb1cbad8 100644 --- a/framework/inc/helper/wakeupthread.hxx +++ b/framework/inc/helper/wakeupthread.hxx @@ -20,28 +20,22 @@ #ifndef INCLUDED_FRAMEWORK_INC_HELPER_WAKEUPTHREAD_HXX #define INCLUDED_FRAMEWORK_INC_HELPER_WAKEUPTHREAD_HXX - // include files of own module #include <macros/generic.hxx> #include <general.h> - // include UNO interfaces #include <com/sun/star/util/XUpdatable.hpp> - // include all others #include <cppuhelper/weakref.hxx> #include <osl/thread.hxx> - namespace framework{ - - /** @short implements a "sleeping" thread, which try to sleep without a using cpu consumption :-) */ class WakeUpThread : public ::osl::Thread @@ -54,7 +48,6 @@ class WakeUpThread : public ::osl::Thread waked up. */ css::uno::WeakReference< css::util::XUpdatable > m_xListener; - // interface public: diff --git a/framework/inc/jobs/configaccess.hxx b/framework/inc/jobs/configaccess.hxx index be5b464b6257..bcc01ca7bbfe 100644 --- a/framework/inc/jobs/configaccess.hxx +++ b/framework/inc/jobs/configaccess.hxx @@ -30,8 +30,6 @@ namespace framework{ - - /** @short implements a simple configuration access @descr Sometimes it's better to have direct config access @@ -41,7 +39,6 @@ namespace framework{ class FWI_DLLPUBLIC ConfigAccess { - public: /** represent the possible modes of the internal wrapped configuration access */ @@ -55,7 +52,6 @@ class FWI_DLLPUBLIC ConfigAccess E_READWRITE }; - // member private: @@ -76,7 +72,6 @@ class FWI_DLLPUBLIC ConfigAccess /** represent the current open mode */ EOpenMode m_eMode; - // native interface methods public: diff --git a/framework/inc/jobs/helponstartup.hxx b/framework/inc/jobs/helponstartup.hxx index 9ca1e81d8376..7234a236b385 100644 --- a/framework/inc/jobs/helponstartup.hxx +++ b/framework/inc/jobs/helponstartup.hxx @@ -33,11 +33,8 @@ #include <com/sun/star/frame/XDesktop2.hpp> #include <com/sun/star/frame/XModuleManager2.hpp> - namespace framework{ - - /** @short implements a job component, which handle the special feature to show a suitable help page for every (visible!) loaded document. @@ -54,35 +51,28 @@ class HelpOnStartup : public ::cppu::WeakImplHelper3< ::com::sun::star::lang::XS /** @short reference to an uno service manager. */ css::uno::Reference< css::uno::XComponentContext > m_xContext; - /** @short such module manager is used to classify new opened documents. */ css::uno::Reference< css::frame::XModuleManager2 > m_xModuleManager; - /** @short is needed to locate a might open help frame. */ css::uno::Reference< css::frame::XDesktop2 > m_xDesktop; - /** @short provides read access to the underlying configuration. */ css::uno::Reference< css::container::XNameAccess > m_xConfig; - /** @short knows the current locale of this office session, which is needed to build complete help URLs. */ OUString m_sLocale; - /** @short knows the current operating system of this office session, which is needed to build complete help URLs. */ OUString m_sSystem; - // native interface public: - /** @short create new instance of this class. @param xContext @@ -91,7 +81,6 @@ class HelpOnStartup : public ::cppu::WeakImplHelper3< ::com::sun::star::lang::XS */ HelpOnStartup(const css::uno::Reference< css::uno::XComponentContext >& xContext); - /** @short does nothing real ... @descr But it should exists as virtual function, @@ -100,11 +89,9 @@ class HelpOnStartup : public ::cppu::WeakImplHelper3< ::com::sun::star::lang::XS */ virtual ~HelpOnStartup(); - // uno interface public: - // css.lang.XServiceInfo DECLARE_XSERVICEINFO @@ -118,11 +105,9 @@ class HelpOnStartup : public ::cppu::WeakImplHelper3< ::com::sun::star::lang::XS virtual void SAL_CALL disposing(const css::lang::EventObject& aEvent) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - // helper private: - /** @short analyze the given job arguments, try to locate a model reference and try to classify this model. @@ -138,7 +123,6 @@ class HelpOnStartup : public ::cppu::WeakImplHelper3< ::com::sun::star::lang::XS */ OUString its_getModuleIdFromEnv(const css::uno::Sequence< css::beans::NamedValue >& lArguments); - /** @short tries to locate the open help module and return the url of the currently shown help content. @@ -150,7 +134,6 @@ class HelpOnStartup : public ::cppu::WeakImplHelper3< ::com::sun::star::lang::XS */ OUString its_getCurrentHelpURL(); - /** @short checks if the given help url match to a default help url of any office module. @@ -163,7 +146,6 @@ class HelpOnStartup : public ::cppu::WeakImplHelper3< ::com::sun::star::lang::XS */ sal_Bool its_isHelpUrlADefaultOne(const OUString& sHelpURL); - /** @short checks, if the help module should be shown automaticly for the currently opened office module. @@ -180,7 +162,6 @@ class HelpOnStartup : public ::cppu::WeakImplHelper3< ::com::sun::star::lang::XS */ OUString its_checkIfHelpEnabledAndGetURL(const OUString& sModule); - /** @short create a help URL for the given parameters. @param sBaseURL diff --git a/framework/inc/jobs/job.hxx b/framework/inc/jobs/job.hxx index f586128fa834..6cbc8bbc069e 100644 --- a/framework/inc/jobs/job.hxx +++ b/framework/inc/jobs/job.hxx @@ -40,12 +40,8 @@ #include <osl/conditn.hxx> #include <rtl/ustring.hxx> - namespace framework{ - - - /** @short it represent a job; execute it and control it's lifetime @@ -75,7 +71,6 @@ class Job : public ::cppu::WeakImplHelper3< E_DISPOSED }; - // member private: @@ -168,7 +163,6 @@ class Job : public ::cppu::WeakImplHelper3< */ ERunState m_eRunState; - // native interface public: @@ -192,12 +186,10 @@ class Job : public ::cppu::WeakImplHelper3< void impl_startListening ( ); void impl_stopListening ( ); - // uno interface public: - // XJobListener virtual void SAL_CALL jobFinished( const css::uno::Reference< css::task::XAsyncJob >& xJob, const css::uno::Any& aResult ) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; diff --git a/framework/inc/jobs/jobconst.hxx b/framework/inc/jobs/jobconst.hxx index 0b3b302a2e4f..7356ebb40fb1 100644 --- a/framework/inc/jobs/jobconst.hxx +++ b/framework/inc/jobs/jobconst.hxx @@ -23,15 +23,11 @@ #include <stdtypes.h> #include <general.h> - #include <rtl/ustring.hxx> #include <fwidllapi.h> - namespace framework{ - - /** @short defines all constant values used within a job environment. diff --git a/framework/inc/jobs/jobdata.hxx b/framework/inc/jobs/jobdata.hxx index 583635473def..4bbf0fa7186b 100644 --- a/framework/inc/jobs/jobdata.hxx +++ b/framework/inc/jobs/jobdata.hxx @@ -34,9 +34,6 @@ namespace framework{ - - - /** @short holds all necessary information about a job and handle it's configuration (if any exist!) @@ -101,7 +98,6 @@ class JobData {} }; - // member private: @@ -178,7 +174,6 @@ class JobData */ JobResult m_aLastExecutionResult; - // native interface public: @@ -216,7 +211,6 @@ class JobData const OUString& sEvent , ::comphelper::SequenceAsVector< JobData::TJob2DocEventBinding >& lJobs ); - // private helper private: diff --git a/framework/inc/jobs/jobresult.hxx b/framework/inc/jobs/jobresult.hxx index d5790a3f5eaf..064bf5c7b159 100644 --- a/framework/inc/jobs/jobresult.hxx +++ b/framework/inc/jobs/jobresult.hxx @@ -28,11 +28,8 @@ #include <rtl/ustring.hxx> - namespace framework{ - - /** @short represent a result of a finished job execution @descr Such result instance transport all neccessarry @@ -62,7 +59,6 @@ class JobResult E_DISPATCHRESULT = 4 }; - // member private: @@ -104,7 +100,6 @@ class JobResult */ css::frame::DispatchResultEvent m_aDispatchResult; - // native interface public: diff --git a/framework/inc/jobs/joburl.hxx b/framework/inc/jobs/joburl.hxx index df6dfe828885..1312967ad109 100644 --- a/framework/inc/jobs/joburl.hxx +++ b/framework/inc/jobs/joburl.hxx @@ -25,10 +25,8 @@ #include <rtl/ustring.hxx> - namespace framework{ - #define JOBURL_PROTOCOL_STR "vnd.sun.star.job:" #define JOBURL_PROTOCOL_LEN 17 @@ -44,7 +42,6 @@ namespace framework{ #define JOBURL_PART_SEPARATOR ';' #define JOBURL_PARTARGS_SEPARATOR ',' - /** @short can be used to parse, validate and work with job URL's @descr Job URLs are specified by the following syntax: @@ -76,7 +73,6 @@ class JobURL E_SERVICE = 4 }; - // types private: @@ -102,7 +98,6 @@ class JobURL /** holds the service arguments */ OUString m_sServiceArgs; - // native interface public: @@ -113,7 +108,6 @@ class JobURL sal_Bool getAlias ( OUString& sAlias ) const; sal_Bool getService ( OUString& sService ) const; - // private helper private: @@ -124,7 +118,6 @@ class JobURL OUString& rPartValue , OUString& rPartArguments ); - // debug methods! #ifdef ENABLE_COMPONENT_SELF_CHECK diff --git a/framework/inc/jobs/shelljob.hxx b/framework/inc/jobs/shelljob.hxx index 71d37d8905cb..328591d3a46e 100644 --- a/framework/inc/jobs/shelljob.hxx +++ b/framework/inc/jobs/shelljob.hxx @@ -32,11 +32,8 @@ #include <com/sun/star/container/XNameAccess.hpp> #include <com/sun/star/frame/XModuleManager.hpp> - namespace framework{ - - /** @short implements a job component which can be used to execute system shell commands. @@ -54,15 +51,12 @@ class ShellJob : public ::cppu::WeakImplHelper2< ::com::sun::star::lang::XServic // member private: - /** @short reference to an uno service manager. */ css::uno::Reference< css::uno::XComponentContext > m_xContext; - // native interface public: - /** @short create new instance of this class. @param xContext @@ -71,7 +65,6 @@ class ShellJob : public ::cppu::WeakImplHelper2< ::com::sun::star::lang::XServic */ ShellJob(const css::uno::Reference< css::uno::XComponentContext >& xContext); - /** @short does nothing real ... @descr But it should exists as virtual function, @@ -80,11 +73,9 @@ class ShellJob : public ::cppu::WeakImplHelper2< ::com::sun::star::lang::XServic */ virtual ~ShellJob(); - // uno interface public: - // css.lang.XServiceInfo DECLARE_XSERVICEINFO @@ -94,11 +85,9 @@ class ShellJob : public ::cppu::WeakImplHelper2< ::com::sun::star::lang::XServic css::uno::Exception , css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - // helper private: - /** generate a return value for method execute() which will force deactivation of this job for further requests. @@ -106,7 +95,6 @@ class ShellJob : public ::cppu::WeakImplHelper2< ::com::sun::star::lang::XServic */ static css::uno::Any impl_generateAnswer4Deactivation(); - /** substitute all might existing placeholder variables within the configured command. @@ -122,7 +110,6 @@ class ShellJob : public ::cppu::WeakImplHelper2< ::com::sun::star::lang::XServic */ OUString impl_substituteCommandVariables(const OUString& sCommand); - /** executes the command. @param sCommand diff --git a/framework/inc/macros/generic.hxx b/framework/inc/macros/generic.hxx index ee99f0ed834b..d8ab361e9866 100644 --- a/framework/inc/macros/generic.hxx +++ b/framework/inc/macros/generic.hxx @@ -23,10 +23,8 @@ #include <rtl/ustring.hxx> #include <rtl/textenc.h> - // generic macros - /*_________________________________________________________________________________________________________________ DECLARE_ASCII( SASCIIVALUE ) diff --git a/framework/inc/macros/registration.hxx b/framework/inc/macros/registration.hxx index 2dff57de9543..fa2b6afb2492 100644 --- a/framework/inc/macros/registration.hxx +++ b/framework/inc/macros/registration.hxx @@ -20,7 +20,6 @@ #ifndef INCLUDED_FRAMEWORK_INC_MACROS_REGISTRATION_HXX #define INCLUDED_FRAMEWORK_INC_MACROS_REGISTRATION_HXX - #include <com/sun/star/lang/XSingleServiceFactory.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp> @@ -36,7 +35,6 @@ _________________________________________________________________________________________________________________*/ - // public // use it as parameter for COMPONENT_GETFACTORY( IFFACTORIES ) @@ -50,7 +48,6 @@ ________________________________________________________________________________ xFactory = CLASS::impl_createFactory( xServiceManager ); \ } - // public // define method to instanciate new services diff --git a/framework/inc/macros/xinterface.hxx b/framework/inc/macros/xinterface.hxx index 20dc382c6274..4651e6721be0 100644 --- a/framework/inc/macros/xinterface.hxx +++ b/framework/inc/macros/xinterface.hxx @@ -45,7 +45,6 @@ namespace framework{ _________________________________________________________________________________________________________________*/ - // private // implementation of XInterface::aquire() // XInterface::release() @@ -63,7 +62,6 @@ ________________________________________________________________________________ BASECLASS::release(); \ } - // private // implementation of XInterface::queryInterface() without any other interfaces! @@ -76,7 +74,6 @@ ________________________________________________________________________________ return BASECLASS::queryInterface( aType ); \ } - // private // implementation of XInterface::queryInterface() with max. 12 other interfaces! @@ -97,7 +94,6 @@ ________________________________________________________________________________ return aReturn; \ } - // private // implementation of XInterface::queryInterface() with more then 12 other interfaces! @@ -124,7 +120,6 @@ ________________________________________________________________________________ return aReturn; \ } - // private // complete implementation of XInterface for different use cases @@ -140,7 +135,6 @@ ________________________________________________________________________________ PRIVATE_DEFINE_XINTERFACE_AQUIRE_RELEASE( CLASS, BASECLASS ) \ PRIVATE_DEFINE_XINTERFACE_QUERYINTERFACE_LARGE( CLASS, BASECLASS, INTERFACES_FIRST, INTERFACES_SECOND ) - // private // help macros to replace INTERFACES in queryInterface() [see before] @@ -195,11 +189,9 @@ ________________________________________________________________________________ PRIVATE_DEFINE_INTERFACE_10( INTERFACE1, INTERFACE2, INTERFACE3, INTERFACE4, INTERFACE5, INTERFACE6, INTERFACE7, INTERFACE8, INTERFACE9, INTERFACE10 ), \ INTERFACE11 - // public // help macros for follow XInterface definitions - // Use it as parameter for DEFINE_XINTERFACE_X(), if you CAN use an interface directly in queryInterface()! #define DIRECT_INTERFACE( INTERFACE ) \ static_cast< INTERFACE* >( this ) @@ -209,7 +201,6 @@ ________________________________________________________________________________ #define DERIVED_INTERFACE( BASEINTERFACE, DERIVEDINTERFACE ) \ static_cast< BASEINTERFACE* >( static_cast< DERIVEDINTERFACE* >( this ) ) - // public // declaration of XInterface @@ -218,11 +209,9 @@ ________________________________________________________________________________ virtual void SAL_CALL acquire ( ) throw() SAL_OVERRIDE; \ virtual void SAL_CALL release ( ) throw() SAL_OVERRIDE; - // public // implementation of XInterface - // implementation of XInterface with 0 additional interface for queryInterface() #define DEFINE_XINTERFACE_0( CLASS, BASECLASS ) \ PRIVATE_DEFINE_XINTERFACE_PURE ( CLASS, \ diff --git a/framework/inc/macros/xtypeprovider.hxx b/framework/inc/macros/xtypeprovider.hxx index 8b4f91e979df..cf8fcf6a628f 100644 --- a/framework/inc/macros/xtypeprovider.hxx +++ b/framework/inc/macros/xtypeprovider.hxx @@ -49,7 +49,6 @@ namespace framework{ _________________________________________________________________________________________________________________*/ - // private // implementation of XTypeProvider::getImplementationId() @@ -59,7 +58,6 @@ ________________________________________________________________________________ return css::uno::Sequence<sal_Int8>(); \ } - // private // implementation of XTypeProvider::getTypes() with max. 12 interfaces! @@ -89,7 +87,6 @@ ________________________________________________________________________________ return pTypeCollection->getTypes(); \ } - // private // implementation of XTypeProvider::getTypes() with more then 12 interfaces! @@ -141,7 +138,6 @@ ________________________________________________________________________________ return *pTypeCollection; \ } - // private // implementation of XTypeProvider::getTypes() with using max. 12 interfaces + baseclass! @@ -192,7 +188,6 @@ ________________________________________________________________________________ return *pTypeCollection; \ } - // private // help macros to replace TYPES in getTypes() [see before] @@ -243,7 +238,6 @@ ________________________________________________________________________________ PRIVATE_DEFINE_TYPE_11( TYPE1, TYPE2, TYPE3, TYPE4, TYPE5, TYPE6, TYPE7, TYPE8, TYPE9, TYPE10, TYPE11 ), \ ::getCppuType(( const ::com::sun::star::uno::Reference< TYPE12 >*)NULL ) - // private // complete implementation of XTypeProvider @@ -263,7 +257,6 @@ ________________________________________________________________________________ PRIVATE_DEFINE_XTYPEPROVIDER_GETIMPLEMENTATIONID( CLASS ) \ PRIVATE_DEFINE_XTYPEPROVIDER_GETTYPES_BASECLASS( CLASS, BASECLASS, TYPES ) - // public // declaration of XTypeProvider @@ -271,7 +264,6 @@ ________________________________________________________________________________ virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes () throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;\ virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - // public // implementation of XTypeProvider diff --git a/framework/inc/properties.h b/framework/inc/properties.h index 22c74b2e8b64..ea547aeed256 100644 --- a/framework/inc/properties.h +++ b/framework/inc/properties.h @@ -23,10 +23,8 @@ #include <macros/generic.hxx> #include <general.h> - namespace framework{ - /** properties for "Frame" class */ #define FRAME_PROPNAME_ASCII_DISPATCHRECORDERSUPPLIER "DispatchRecorderSupplier" @@ -52,7 +50,6 @@ namespace framework{ #define FRAME_PROPCOUNT 5 - /** properties for "Desktop" class */ #define DESKTOP_PROPNAME_ASCII_ACTIVEFRAME "ActiveFrame" @@ -78,7 +75,6 @@ namespace framework{ #define DESKTOP_PROPCOUNT 5 - /** properties for "PathSettings" class */ #define PATHSETTINGS_PROPNAME_ASCII_ADDIN "Addin" @@ -161,7 +157,6 @@ namespace framework{ #define PATHSETTINGS_PROPCOUNT 24 - /** properties for "LayoutManager" class */ #define LAYOUTMANAGER_PROPNAME_ASCII_MENUBARCLOSER "MenuBarCloser" @@ -185,7 +180,6 @@ namespace framework{ #define LAYOUTMANAGER_PROPHANDLE_LOCKCOUNT 4 #define LAYOUTMANAGER_PROPHANDLE_PRESERVE_CONTENT_SIZE 5 - /** properties for "UICommandDescription" class */ #define UICOMMANDDESCRIPTION_NAMEACCESS_COMMANDIMAGELIST "private:resource/image/commandimagelist" #define UICOMMANDDESCRIPTION_NAMEACCESS_COMMANDROTATEIMAGELIST "private:resource/image/commandrotateimagelist" @@ -199,7 +193,6 @@ namespace framework{ #define UICOMMANDDESCRIPTION_PROPERTIES_IMAGE_ROTATED 4 #define UICOMMANDDESCRIPTION_PROPERTIES_TOGGLEBUTTON 8 - /** properties for "AutoRecovery" class */ #define AUTORECOVERY_PROPNAME_ASCII_EXISTS_RECOVERYDATA "ExistsRecoveryData" @@ -216,14 +209,12 @@ namespace framework{ #define AUTORECOVERY_PROPCOUNT 3 - /** properties for Filter config */ #define FILTER_PROPNAME_ASCII_DOCUMENTSERVICE "DocumentService" #define FILTER_PROPNAME_DOCUMENTSERVICE OUString( FILTER_PROPNAME_ASCII_DOCUMENTSERVICE ) - /** properties for office module config (Setup.xcu) */ #define OFFICEFACTORY_PROPNAME_ASCII_WINDOWATTRIBUTES "ooSetupFactoryWindowAttributes" @@ -234,7 +225,6 @@ namespace framework{ #define OFFICEFACTORY_PROPNAME_UINAME OUString( OFFICEFACTORY_PROPNAME_ASCII_UINAME ) #define OFFICEFACTORY_PROPNAME_ICON OUString( OFFICEFACTORY_PROPNAME_ASCII_ICON ) - /** properties for tab window (old) */ #define TABWINDOW_PROPNAME_ASCII_PARENTWINDOW "ParentWindow" #define TABWINDOW_PROPNAME_ASCII_TOPWINDOW "TopWindow" @@ -248,15 +238,12 @@ namespace framework{ #define TABWINDOWSERVICE_PROPHANDLE_WINDOW 0 #define TABWINDOWSERVICE_PROPCOUNT 1 - /** provides some helper methods to implement property sets. */ class PropHelper { public: - - /** checks if given property will be changed by this settings. * We compare the content of the given any values. If they are different we return sal_True - sal_False otherwise. * diff --git a/framework/inc/protocols.h b/framework/inc/protocols.h index 197dd8db9160..982dd7c08c00 100644 --- a/framework/inc/protocols.h +++ b/framework/inc/protocols.h @@ -26,7 +26,6 @@ namespace framework{ - /** some protocols must be checked during loading or dispatching URLs manually It can be necessary to decide, if a URL represent a non visible content or @@ -58,7 +57,6 @@ class ProtocolCheck { public: - /** enums for well known protocols */ @@ -77,7 +75,6 @@ class ProtocolCheck E_NEWS }; - /** it checks, if the given URL string match one of the well known protocols. It returns the right enum value. @@ -120,7 +117,6 @@ class ProtocolCheck return E_UNKNOWN_PROTOCOL; } - /** it checks if given URL match the required protocol only It should be used instead of specifyProtocol() if only this question diff --git a/framework/inc/queries.h b/framework/inc/queries.h index 6dc16be91c64..15d456647c83 100644 --- a/framework/inc/queries.h +++ b/framework/inc/queries.h @@ -89,7 +89,6 @@ class QueryBuilder resetAll(); } - // returns full query as copy of internal set values OUString getQuery() @@ -99,7 +98,6 @@ class QueryBuilder return sCopy.makeStringAndClear(); } - // set new or change existing base query part void setBase( const OUString& sBase ) @@ -107,7 +105,6 @@ class QueryBuilder m_sBase = sBase; } - // add new parameter (with optional value) to param list void addParam( const OUString& sParam, const OUString& sValue = OUString() ) @@ -121,7 +118,6 @@ class QueryBuilder } } - // forget all setted params and start with empty ones // Attention: base of query isn't changed! @@ -131,7 +127,6 @@ class QueryBuilder m_sParams.ensureCapacity( 256 ); } - // start with new empty query void resetAll() @@ -153,7 +148,6 @@ class QueryAnalyzer { public: - // it's will not perform to compare strings as query type ... // so we convert it into these enum values. // default = E_ALL! @@ -172,7 +166,6 @@ class QueryAnalyzer E_GRAPHICS }; - // these are valid values for param "sort_prop". // other ones are not supported! // default = E_NAME @@ -183,7 +176,6 @@ class QueryAnalyzer E_UINAME }; - // analyze given query and split it into his different parts; <base>:<param1>:<param2=value>... QueryAnalyzer(const OUString& sQuery) @@ -320,13 +312,11 @@ class QueryAnalyzer } } - // return type of query. User can decide then, which action should be started. // For faster work we converted query string into corresponding enum value! EQuery getQueryType() const { return m_eQuery; } - // access to additional parameter values // Methods return default of really set values! @@ -338,7 +328,6 @@ class QueryAnalyzer sal_Bool getUseOrder () const { return m_bUseOrder ; } sal_Bool getDefaultFirst () const { return m_bDefaultFirst ; } - // this method checks if given string match any supported query. // (ignore additional parameters!) diff --git a/framework/inc/recording/dispatchrecordersupplier.hxx b/framework/inc/recording/dispatchrecordersupplier.hxx index e85e57e122da..f49ca0cdd431 100644 --- a/framework/inc/recording/dispatchrecordersupplier.hxx +++ b/framework/inc/recording/dispatchrecordersupplier.hxx @@ -53,7 +53,6 @@ class DispatchRecorderSupplier : public ::cppu::WeakImplHelper2< private: - /** provided dispatch recorder of this supplier instance @life Is controled from outside. Because this variable is setted @@ -62,17 +61,14 @@ class DispatchRecorderSupplier : public ::cppu::WeakImplHelper2< */ css::uno::Reference< css::frame::XDispatchRecorder > m_xDispatchRecorder; - // uno interface public: - // XInterface, XTypeProvider, XServiceInfo DECLARE_XSERVICEINFO - // XDispatchRecorderSupplier virtual void SAL_CALL setDispatchRecorder( const css::uno::Reference< css::frame::XDispatchRecorder >& xRecorder ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; @@ -81,7 +77,6 @@ class DispatchRecorderSupplier : public ::cppu::WeakImplHelper2< const css::uno::Sequence< css::beans::PropertyValue >& lArguments , const css::uno::Reference< css::frame::XDispatch >& xDispatcher ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - // native interface public: diff --git a/framework/inc/services.h b/framework/inc/services.h index f7ccaadefcde..673228c710c3 100644 --- a/framework/inc/services.h +++ b/framework/inc/services.h @@ -24,10 +24,8 @@ namespace framework{ - // used servicenames by framework - #define SERVICENAME_FILTERFACTORY DECLARE_ASCII("com.sun.star.document.FilterFactory" ) #define SERVICENAME_CFGUPDATEACCESS DECLARE_ASCII("com.sun.star.configuration.ConfigurationUpdateAccess") // provides read/write access to the configuration #define SERVICENAME_CFGREADACCESS DECLARE_ASCII("com.sun.star.configuration.ConfigurationAccess" ) // provides readonly access to the configuration @@ -47,10 +45,8 @@ namespace framework{ #define SERVICENAME_STRINGABBREVIATION DECLARE_ASCII("com.sun.star.util.UriAbbreviation" ) #define SERVICENAME_TABWINDOWSERVICE DECLARE_ASCII("com.sun.star.ui.dialogs.TabContainerWindow" ) - // used implementationnames by framework - #define IMPLEMENTATIONNAME_DESKTOP DECLARE_ASCII("com.sun.star.comp.framework.Desktop" ) #define IMPLEMENTATIONNAME_URLTRANSFORMER DECLARE_ASCII("com.sun.star.comp.framework.URLTransformer" ) #define IMPLEMENTATIONNAME_MEDIATYPEDETECTIONHELPER DECLARE_ASCII("com.sun.star.comp.framework.MediaTypeDetectionHelper") diff --git a/framework/inc/services/desktop.hxx b/framework/inc/services/desktop.hxx index b519ee530cfd..eb5bccab234c 100644 --- a/framework/inc/services/desktop.hxx +++ b/framework/inc/services/desktop.hxx @@ -104,7 +104,6 @@ class Desktop : private cppu::BaseMutex, // internal used types, const etcpp. private: - /** used temporary to know which listener was already called or not. */ typedef ::std::vector< css::uno::Reference< css::frame::XTerminateListener > > TTerminateListenerList; @@ -137,7 +136,6 @@ class Desktop : private cppu::BaseMutex, // XTypeProvider virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - /** @interface XDesktop @@ -169,7 +167,6 @@ class Desktop : private cppu::BaseMutex, virtual sal_Bool SAL_CALL terminate() throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - /** @interface XDesktop @@ -192,7 +189,6 @@ class Desktop : private cppu::BaseMutex, virtual void SAL_CALL addTerminateListener( const css::uno::Reference< css::frame::XTerminateListener >& xListener ) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - /** @interface XDesktop @@ -322,7 +318,6 @@ class Desktop : private cppu::BaseMutex, virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper ( ) SAL_OVERRIDE; virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo ( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - // private methods private: @@ -330,7 +325,6 @@ class Desktop : private cppu::BaseMutex, css::uno::Reference< css::lang::XComponent > impl_getFrameComponent ( const css::uno::Reference< css::frame::XFrame >& xFrame ) const; static const css::uno::Sequence< css::beans::Property > impl_getStaticPropertyDescriptor( ); - /** calls queryTermination() on every registered termination listener. * * Note: Only normal termination listener (registered in list m_aListenerContainer @@ -351,7 +345,6 @@ class Desktop : private cppu::BaseMutex, void impl_sendQueryTerminationEvent(TTerminateListenerList& lCalledListener, sal_Bool& bVeto ); - /** calls cancelTermination() on every termination listener * where queryTermination() was called before. * @@ -367,7 +360,6 @@ class Desktop : private cppu::BaseMutex, */ void impl_sendCancelTerminationEvent(const TTerminateListenerList& lCalledListener); - /** calls notifyTermination() on every registered termination listener. * * Note: Only normal termination listener (registered in list m_aListenerContainer @@ -376,7 +368,6 @@ class Desktop : private cppu::BaseMutex, */ void impl_sendNotifyTerminationEvent(); - /** try to close all open frames. * * Iterates over all child frames and try to close them. @@ -394,7 +385,6 @@ class Desktop : private cppu::BaseMutex, */ sal_Bool impl_closeFrames(sal_Bool bAllowUI); - // debug methods // (should be private everytime!) @@ -406,7 +396,6 @@ class Desktop : private cppu::BaseMutex, sal_Bool m_bIsTerminated ; /// check flag to protect us against dispose before terminate! /// see dispose() for further information! - // variables // (should be private everytime!) @@ -426,13 +415,11 @@ class Desktop : private cppu::BaseMutex, OUString m_sTitle ; css::uno::Reference< css::frame::XDispatchRecorderSupplier > m_xDispatchRecorderSupplier ; - /** special terminate listener to close pipe and block external requests * during/after termination process is/was running */ css::uno::Reference< css::frame::XTerminateListener > m_xPipeTerminator; - /** special terminate listener shown inside system tray (quick starter) * Will hinder the office on shutdown ... but wish to allow closing * of open documents. And because thats different to a normal terminate listener @@ -440,7 +427,6 @@ class Desktop : private cppu::BaseMutex, */ css::uno::Reference< css::frame::XTerminateListener > m_xQuickLauncher; - /** special terminate listener which loads images asynchronous for current open documents. * Because internally it uses blocking system APIs ... it cant be guaranteed that * running jobs can be cancelled successfully if the corressponding document will be closed ... @@ -450,7 +436,6 @@ class Desktop : private cppu::BaseMutex, */ css::uno::Reference< css::frame::XTerminateListener > m_xSWThreadManager; - /** special terminate listener shuting down the SfxApplication. * Because these desktop instance closes documents and informs listener * only ... it does not really shutdown the whole application. diff --git a/framework/inc/services/dispatchhelper.hxx b/framework/inc/services/dispatchhelper.hxx index 2513fe2ccd51..3210bf1ccf43 100644 --- a/framework/inc/services/dispatchhelper.hxx +++ b/framework/inc/services/dispatchhelper.hxx @@ -48,7 +48,6 @@ namespace framework{ class DispatchHelper : public ::cppu::WeakImplHelper3< ::com::sun::star::lang::XServiceInfo,::com::sun::star::frame::XDispatchHelper,::com::sun::star::frame::XDispatchResultListener > { - // member private: @@ -66,23 +65,19 @@ class DispatchHelper : public ::cppu::WeakImplHelper3< ::com::sun::star::lang::X css::uno::Reference< css::uno::XInterface > m_xBroadcaster; - // interface public: - // ctor/dtor DispatchHelper( const css::uno::Reference< css::uno::XComponentContext >& xContext ); virtual ~DispatchHelper( ); - // XInterface, XTypeProvider, XServiceInfo DECLARE_XSERVICEINFO - // XDispatchHelper virtual css::uno::Any SAL_CALL executeDispatch( const css::uno::Reference< css::frame::XDispatchProvider >& xDispatchProvider , @@ -92,13 +87,11 @@ class DispatchHelper : public ::cppu::WeakImplHelper3< ::com::sun::star::lang::X const css::uno::Sequence< css::beans::PropertyValue >& lArguments ) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - // XDispatchResultListener virtual void SAL_CALL dispatchFinished( const css::frame::DispatchResultEvent& aResult ) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - // XEventListener virtual void SAL_CALL disposing( const css::lang::EventObject& aEvent ) diff --git a/framework/inc/services/layoutmanager.hxx b/framework/inc/services/layoutmanager.hxx index d1bbb2aa4bba..469fa4605fa2 100644 --- a/framework/inc/services/layoutmanager.hxx +++ b/framework/inc/services/layoutmanager.hxx @@ -107,7 +107,6 @@ namespace framework return aSeq; } - // XLayoutManager virtual void SAL_CALL attachFrame( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& Frame ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL reset() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; @@ -147,7 +146,6 @@ namespace framework throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL removeMergedMenuBar( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - // XWindowListener virtual void SAL_CALL windowResized( const css::awt::WindowEvent& aEvent ) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual void SAL_CALL windowMoved( const css::awt::WindowEvent& aEvent ) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; @@ -161,7 +159,6 @@ namespace framework using cppu::OPropertySetHelper::disposing; virtual void SAL_CALL disposing( const css::lang::EventObject& aEvent ) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - // XUIConfigurationListener virtual void SAL_CALL elementInserted( const ::com::sun::star::ui::ConfigurationEvent& Event ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL elementRemoved( const ::com::sun::star::ui::ConfigurationEvent& Event ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; @@ -174,7 +171,6 @@ namespace framework DECL_LINK(MenuBarClose, void *); DECL_LINK( WindowEventListener, VclSimpleEvent* ); - // ILayoutNotifications virtual void requestLayout( Hint eHint ) SAL_OVERRIDE; @@ -192,8 +188,6 @@ namespace framework // helper - - // menu bar void impl_clearUpMenuBar(); @@ -201,13 +195,11 @@ namespace framework void implts_updateMenuBarClose(); sal_Bool implts_resetMenuBar(); - // locking void implts_lock(); sal_Bool implts_unlock(); - // query ::com::sun::star::uno::Reference< ::com::sun::star::ui::XUIElement > implts_findElement( const OUString& aName ); @@ -266,7 +258,6 @@ namespace framework DECL_LINK( OptionsChanged, void* ); DECL_LINK( SettingsChanged, void* ); - // OPropertySetHelper virtual sal_Bool SAL_CALL convertFastPropertyValue ( com::sun::star::uno::Any& aConvertedValue , diff --git a/framework/inc/services/mediatypedetectionhelper.hxx b/framework/inc/services/mediatypedetectionhelper.hxx index 5cf65e33cc71..d5ba2b6df3cd 100644 --- a/framework/inc/services/mediatypedetectionhelper.hxx +++ b/framework/inc/services/mediatypedetectionhelper.hxx @@ -32,7 +32,6 @@ // namespaces - namespace framework{ /*-************************************************************************************************************ @@ -53,13 +52,10 @@ class MediaTypeDetectionHelper : public ::cppu::WeakImplHelper2< ::com::sun:: // public methods - public: - // constructor / destructor - /*-**************************************************************************************************** @short standard ctor @descr These initialize a new instance of this class with all needed information for work. @@ -88,16 +84,12 @@ class MediaTypeDetectionHelper : public ::cppu::WeakImplHelper2< ::com::sun:: virtual ~MediaTypeDetectionHelper(); - // XInterface, XTypeProvider, XServiceInfo - DECLARE_XSERVICEINFO - // XStringMapping - /*-**************************************************************************************************** @short - @descr - @@ -113,11 +105,9 @@ class MediaTypeDetectionHelper : public ::cppu::WeakImplHelper2< ::com::sun:: virtual sal_Bool SAL_CALL mapStrings(css::uno::Sequence< OUString >& seqParameter) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - // variables // should be private every time - private: css::uno::Reference< css::lang::XMultiServiceFactory > m_xFactory; /// reference to global servicemanager diff --git a/framework/inc/stdtypes.h b/framework/inc/stdtypes.h index 463d8abdba30..9accf59e5340 100644 --- a/framework/inc/stdtypes.h +++ b/framework/inc/stdtypes.h @@ -79,8 +79,6 @@ struct KeyEventEqualsFunc } }; - - /** Basic string list based on a std::vector() It implements some additional funtionality which can be useful but @@ -114,8 +112,6 @@ class OUStringList : public ::comphelper::SequenceAsVector< OUString > } }; - - /** Basic string queue based on a std::queue() It implements some additional funtionality which can be useful but @@ -123,8 +119,6 @@ class OUStringList : public ::comphelper::SequenceAsVector< OUString > */ typedef ::std::queue< OUString > OUStringQueue; - - /** Basic hash based on a boost::unordered_map() which provides key=[OUString] and value=[template type] pairs It implements some additional funtionality which can be useful but @@ -145,16 +139,12 @@ class BaseHash : public ::boost::unordered_map< OUString , } }; - - /** Basic OUString hash. Key and values are OUStrings. */ typedef BaseHash< OUString > OUStringHashMap; - - /** It can be used to map names (e.g. of properties) to her corresponding handles. Our helper class OPropertySetHelper works optimized with handles but sometimes we have only a property name. @@ -162,8 +152,6 @@ typedef BaseHash< OUString > OUStringHashMap; */ typedef BaseHash< sal_Int32 > NameToHandleHash; - - /** Sometimes we need this template to implement listener container ... and we need it at different positions ... diff --git a/framework/inc/tabwin/tabwindow.hxx b/framework/inc/tabwin/tabwindow.hxx index a48bd4bf5522..9f601da976f3 100644 --- a/framework/inc/tabwin/tabwindow.hxx +++ b/framework/inc/tabwin/tabwindow.hxx @@ -72,7 +72,6 @@ class TabWindow : public ::com::sun::star::lang::XTypeProvider , using ::cppu::OPropertySetHelper::disposing; using ::cppu::OPropertySetHelper::getFastPropertyValue; - // XInitialization virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; @@ -91,7 +90,6 @@ class TabWindow : public ::com::sun::star::lang::XTypeProvider , virtual void SAL_CALL addTabListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XTabListener >& Listener ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL removeTabListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XTabListener >& Listener ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - // XEventListener virtual void SAL_CALL disposing( const css::lang::EventObject& aEvent ) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; diff --git a/framework/inc/targets.h b/framework/inc/targets.h index 0d7fdf26b28d..d574e9058cce 100644 --- a/framework/inc/targets.h +++ b/framework/inc/targets.h @@ -24,10 +24,8 @@ namespace framework{ - // Values for special frame search ... sTargetFrameName of findFrame() or queryDispatch() or loadComponentFromURL() - #define SPECIALTARGET_ASCII_SELF "_self" // The frame himself is searched. #define SPECIALTARGET_ASCII_PARENT "_parent" // The direct parent frame is searched. #define SPECIALTARGET_ASCII_TOP "_top" // Search at ouer parents for the first task (if any exist) or a frame without a parent. diff --git a/framework/inc/threadhelp/gate.hxx b/framework/inc/threadhelp/gate.hxx index b4e9ab02bc2f..a6b9d04a64da 100644 --- a/framework/inc/threadhelp/gate.hxx +++ b/framework/inc/threadhelp/gate.hxx @@ -199,7 +199,6 @@ class Gate : public IGate return bSuccessful; } - // private member private: diff --git a/framework/inc/threadhelp/transactionguard.hxx b/framework/inc/threadhelp/transactionguard.hxx index 1a74e979de43..02ff6f1a27a1 100644 --- a/framework/inc/threadhelp/transactionguard.hxx +++ b/framework/inc/threadhelp/transactionguard.hxx @@ -122,7 +122,6 @@ class TransactionGuard : private boost::noncopyable } } - // private methods private: @@ -141,7 +140,6 @@ class TransactionGuard : private boost::noncopyable *//*-*****************************************************************************************************/ TransactionGuard(); - // private member private: diff --git a/framework/inc/threadhelp/transactionmanager.hxx b/framework/inc/threadhelp/transactionmanager.hxx index 68faa51aeca1..31fd6c4200b8 100644 --- a/framework/inc/threadhelp/transactionmanager.hxx +++ b/framework/inc/threadhelp/transactionmanager.hxx @@ -63,14 +63,12 @@ class FWI_DLLPUBLIC TransactionManager : public ITransactionManager virtual void registerTransaction ( EExceptionMode eMode, ERejectReason& eReason ) throw( css::uno::RuntimeException, css::lang::DisposedException ) SAL_OVERRIDE; virtual void unregisterTransaction ( ) throw( css::uno::RuntimeException, css::lang::DisposedException ) SAL_OVERRIDE; - // private methods private: void impl_throwExceptions( EExceptionMode eMode, ERejectReason eReason ) const throw( css::uno::RuntimeException, css::lang::DisposedException ); - // private member private: diff --git a/framework/inc/uiconfiguration/imagemanager.hxx b/framework/inc/uiconfiguration/imagemanager.hxx index d3a6b09b0974..9ad1c4531498 100644 --- a/framework/inc/uiconfiguration/imagemanager.hxx +++ b/framework/inc/uiconfiguration/imagemanager.hxx @@ -20,7 +20,6 @@ #ifndef INCLUDED_FRAMEWORK_INC_UICONFIGURATION_IMAGEMANAGER_HXX #define INCLUDED_FRAMEWORK_INC_UICONFIGURATION_IMAGEMANAGER_HXX - #include <boost/unordered_map.hpp> #include <memory> diff --git a/framework/inc/uiconfiguration/moduleimagemanager.hxx b/framework/inc/uiconfiguration/moduleimagemanager.hxx index 7923ad8bf4ca..5afe454847b1 100644 --- a/framework/inc/uiconfiguration/moduleimagemanager.hxx +++ b/framework/inc/uiconfiguration/moduleimagemanager.hxx @@ -20,7 +20,6 @@ #ifndef INCLUDED_FRAMEWORK_INC_UICONFIGURATION_MODULEIMAGEMANAGER_HXX #define INCLUDED_FRAMEWORK_INC_UICONFIGURATION_MODULEIMAGEMANAGER_HXX - /** Attention: stl headers must(!) be included at first. Otherwise it can make trouble with solaris headers ... */ diff --git a/framework/inc/uielement/itemcontainer.hxx b/framework/inc/uielement/itemcontainer.hxx index 62a4f97b8df0..1bbc3b25620e 100644 --- a/framework/inc/uielement/itemcontainer.hxx +++ b/framework/inc/uielement/itemcontainer.hxx @@ -48,7 +48,6 @@ class FWI_DLLPUBLIC ItemContainer : public ::cppu::WeakImplHelper1< ::com::sun ItemContainer( const com::sun::star::uno::Reference< com::sun::star::container::XIndexAccess >& rItemAccessContainer, const ShareableMutex& rMutex ); virtual ~ItemContainer(); - // XInterface, XTypeProvider // XUnoTunnel diff --git a/framework/inc/uielement/menubarmanager.hxx b/framework/inc/uielement/menubarmanager.hxx index 6992fa4b108a..0861ff160f08 100644 --- a/framework/inc/uielement/menubarmanager.hxx +++ b/framework/inc/uielement/menubarmanager.hxx @@ -170,8 +170,6 @@ class MenuBarManager : public com::sun::star::frame::XStatusListener private: - - void Destroy(); struct MenuItemHandler diff --git a/framework/inc/uielement/menubarwrapper.hxx b/framework/inc/uielement/menubarwrapper.hxx index 3b1e5e6fa103..e686edd0a5f9 100644 --- a/framework/inc/uielement/menubarwrapper.hxx +++ b/framework/inc/uielement/menubarwrapper.hxx @@ -43,7 +43,6 @@ class MenuBarWrapper : public UIConfigElementWrapperBase, const com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >& xContext ); virtual ~MenuBarWrapper(); - // XInterface, XTypeProvider FWK_DECLARE_XINTERFACE diff --git a/framework/inc/uielement/progressbarwrapper.hxx b/framework/inc/uielement/progressbarwrapper.hxx index 500e2c08e391..ac690ee250e1 100644 --- a/framework/inc/uielement/progressbarwrapper.hxx +++ b/framework/inc/uielement/progressbarwrapper.hxx @@ -66,7 +66,6 @@ class ProgressBarWrapper : public UIElementWrapperBase // XUIElement virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL getRealInterface() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - // variables // (should be private everyway!) diff --git a/framework/inc/uielement/rootitemcontainer.hxx b/framework/inc/uielement/rootitemcontainer.hxx index eed0c1eb1efd..838c307a52e0 100644 --- a/framework/inc/uielement/rootitemcontainer.hxx +++ b/framework/inc/uielement/rootitemcontainer.hxx @@ -61,7 +61,6 @@ class RootItemContainer : private cppu::BaseMutex, FWI_DLLPUBLIC RootItemContainer( const com::sun::star::uno::Reference< com::sun::star::container::XIndexAccess >& rItemAccessContainer ); virtual FWI_DLLPUBLIC ~RootItemContainer(); - // XInterface virtual void SAL_CALL acquire() throw () SAL_OVERRIDE { OWeakObject::acquire(); } diff --git a/framework/inc/uielement/statusindicatorinterfacewrapper.hxx b/framework/inc/uielement/statusindicatorinterfacewrapper.hxx index 1680ccf0010b..02a54b7bdc73 100644 --- a/framework/inc/uielement/statusindicatorinterfacewrapper.hxx +++ b/framework/inc/uielement/statusindicatorinterfacewrapper.hxx @@ -42,7 +42,6 @@ class StatusIndicatorInterfaceWrapper : public ::cppu::WeakImplHelper1< ::com: StatusIndicatorInterfaceWrapper( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent >& rStatusIndicatorImpl ); virtual ~StatusIndicatorInterfaceWrapper(); - // XStatusIndicator virtual void SAL_CALL start ( const OUString& sText , diff --git a/framework/inc/uielement/toolbarwrapper.hxx b/framework/inc/uielement/toolbarwrapper.hxx index a10628a43b36..292baddfbd86 100644 --- a/framework/inc/uielement/toolbarwrapper.hxx +++ b/framework/inc/uielement/toolbarwrapper.hxx @@ -66,7 +66,6 @@ class ToolBarWrapper : public ::com::sun::star::ui::XUIFunctionListener, using cppu::OPropertySetHelper::disposing; virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& aEvent ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - // protected methods protected: diff --git a/framework/inc/uifactory/factoryconfiguration.hxx b/framework/inc/uifactory/factoryconfiguration.hxx index c2c17ecca5c8..ffdc8368cb75 100644 --- a/framework/inc/uifactory/factoryconfiguration.hxx +++ b/framework/inc/uifactory/factoryconfiguration.hxx @@ -34,14 +34,11 @@ #include <cppuhelper/implbase1.hxx> #include <rtl/ustring.hxx> - // Namespace - namespace framework { - // Configuration access class for PopupMenuControllerFactory implementation class ConfigurationAccess_ControllerFactory : // interfaces diff --git a/framework/inc/xml/acceleratorconfigurationreader.hxx b/framework/inc/xml/acceleratorconfigurationreader.hxx index 9aa2751080d9..58dc386f7220 100644 --- a/framework/inc/xml/acceleratorconfigurationreader.hxx +++ b/framework/inc/xml/acceleratorconfigurationreader.hxx @@ -42,7 +42,6 @@ class AcceleratorConfigurationReader : public ::cppu::WeakImplHelper1< css::xml: private: - /** @short classification of XML elements. */ enum EXMLElement { @@ -50,7 +49,6 @@ class AcceleratorConfigurationReader : public ::cppu::WeakImplHelper1< css::xml: E_ELEMENT_ITEM }; - /** @short classification of XML attributes. */ enum EXMLAttribute { @@ -62,7 +60,6 @@ class AcceleratorConfigurationReader : public ::cppu::WeakImplHelper1< css::xml: E_ATTRIBUTE_URL }; - /** @short some namespace defines */ enum EAcceleratorXMLNamespace { @@ -70,31 +67,25 @@ class AcceleratorConfigurationReader : public ::cppu::WeakImplHelper1< css::xml: E_NAMESPACE_XLINK }; - // member private: - /** @short needed to read the xml configuration. */ css::uno::Reference< css::xml::sax::XDocumentHandler > m_xReader; - /** @short reference to the outside container, where this reader/writer must work on. */ AcceleratorCache& m_rContainer; - /** @short used to detect if an accelerator list occurs recursive inside xml. */ sal_Bool m_bInsideAcceleratorList; - /** @short used to detect if an accelerator item occurs recursive inside xml. */ sal_Bool m_bInsideAcceleratorItem; - /** @short is used to map key codes to its string representation. @@ -103,7 +94,6 @@ class AcceleratorConfigurationReader : public ::cppu::WeakImplHelper1< css::xml: alive forever ...*/ ::salhelper::SingletonRef< KeyMapping > m_rKeyMapping; - /** @short provide information about the parsing state. @descr We use it to find out the line and column, where @@ -111,12 +101,10 @@ class AcceleratorConfigurationReader : public ::cppu::WeakImplHelper1< css::xml: */ css::uno::Reference< css::xml::sax::XLocator > m_xLocator; - // interface public: - /** @short connect this new reader/writer instance to an outside container, which should be used flushed to the underlying XML configuration or @@ -127,11 +115,9 @@ class AcceleratorConfigurationReader : public ::cppu::WeakImplHelper1< css::xml: */ AcceleratorConfigurationReader(AcceleratorCache& rContainer); - /** @short does nothing real ... */ virtual ~AcceleratorConfigurationReader(); - // XDocumentHandler virtual void SAL_CALL startDocument() throw(css::xml::sax::SAXException, @@ -167,20 +153,16 @@ class AcceleratorConfigurationReader : public ::cppu::WeakImplHelper1< css::xml: throw(css::xml::sax::SAXException, css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - // helper private: - /** TODO document me */ static EXMLElement implst_classifyElement(const OUString& sElement); - /** TODO document me */ static EXMLAttribute implst_classifyAttribute(const OUString& sAttribute); - /** TODO document me */ OUString implts_getErrorLineString(); }; diff --git a/framework/inc/xml/acceleratorconfigurationwriter.hxx b/framework/inc/xml/acceleratorconfigurationwriter.hxx index c6c48d1cb727..a5813c149cfa 100644 --- a/framework/inc/xml/acceleratorconfigurationwriter.hxx +++ b/framework/inc/xml/acceleratorconfigurationwriter.hxx @@ -38,16 +38,13 @@ class AcceleratorConfigurationWriter private: - /** @short needed to write the xml configuration. */ css::uno::Reference< css::xml::sax::XDocumentHandler > m_xConfig; - /** @short reference to the outside container, where this writer must work on. */ const AcceleratorCache& m_rContainer; - /** @short is used to map key codes to its string representation. @@ -56,12 +53,10 @@ class AcceleratorConfigurationWriter alive forever ...*/ ::salhelper::SingletonRef< KeyMapping > m_rKeyMapping; - // interface public: - /** @short connect this new writer instance to an outside container, which should be flushed to the underlying XML configuration. @@ -75,20 +70,16 @@ class AcceleratorConfigurationWriter AcceleratorConfigurationWriter(const AcceleratorCache& rContainer, const css::uno::Reference< css::xml::sax::XDocumentHandler >& xConfig ); - /** @short does nothing real ... */ virtual ~AcceleratorConfigurationWriter(); - /** @short TODO */ virtual void flush(); - // helper private: - /** @short TODO */ void impl_ts_writeKeyCommandPair(const css::awt::KeyEvent& aKey , const OUString& sCommand, diff --git a/framework/inc/xml/imagesdocumenthandler.hxx b/framework/inc/xml/imagesdocumenthandler.hxx index 9aefa2ca7359..90ae3272bc71 100644 --- a/framework/inc/xml/imagesdocumenthandler.hxx +++ b/framework/inc/xml/imagesdocumenthandler.hxx @@ -33,7 +33,6 @@ namespace framework{ - // Hash code function for using in all hash maps of follow implementation. class OReadImagesDocumentHandler : public ::cppu::WeakImplHelper1< ::com::sun::star::xml::sax::XDocumentHandler > diff --git a/framework/inc/xml/menudocumenthandler.hxx b/framework/inc/xml/menudocumenthandler.hxx index 32cf0969a9a2..1f0afbec15a9 100644 --- a/framework/inc/xml/menudocumenthandler.hxx +++ b/framework/inc/xml/menudocumenthandler.hxx @@ -96,7 +96,6 @@ class FWE_DLLPUBLIC ReadMenuDocumentHandlerBase : ::com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue > m_aItemProp; }; - class FWE_DLLPUBLIC OReadMenuDocumentHandler : public ReadMenuDocumentHandlerBase { public: @@ -134,7 +133,6 @@ class FWE_DLLPUBLIC OReadMenuDocumentHandler : public ReadMenuDocumentHandlerBas com::sun::star::uno::Reference< ::com::sun::star::lang::XSingleComponentFactory > m_xContainerFactory; }; // OReadMenuDocumentHandler - class FWE_DLLPUBLIC OReadMenuBarHandler : public ReadMenuDocumentHandlerBase { public: @@ -173,7 +171,6 @@ class FWE_DLLPUBLIC OReadMenuBarHandler : public ReadMenuDocumentHandlerBase com::sun::star::uno::Reference< ::com::sun::star::lang::XSingleComponentFactory > m_xContainerFactory; }; // OReadMenuBarHandler - class FWE_DLLPUBLIC OReadMenuHandler : public ReadMenuDocumentHandlerBase { public: @@ -211,7 +208,6 @@ class FWE_DLLPUBLIC OReadMenuHandler : public ReadMenuDocumentHandlerBase com::sun::star::uno::Reference< ::com::sun::star::lang::XSingleComponentFactory > m_xContainerFactory; }; // OReadMenuHandler - class FWE_DLLPUBLIC OReadMenuPopupHandler : public ReadMenuDocumentHandlerBase { public: @@ -254,7 +250,6 @@ class FWE_DLLPUBLIC OReadMenuPopupHandler : public ReadMenuDocumentHandlerBase NextElementClose m_nNextElementExpected; }; // OReadMenuPopupHandler - class FWE_DLLPUBLIC OWriteMenuDocumentHandler { public: diff --git a/framework/inc/xml/statusbardocumenthandler.hxx b/framework/inc/xml/statusbardocumenthandler.hxx index 334abea61309..41b1b1cc63d7 100644 --- a/framework/inc/xml/statusbardocumenthandler.hxx +++ b/framework/inc/xml/statusbardocumenthandler.hxx @@ -33,7 +33,6 @@ namespace framework{ - // Hash code function for using in all hash maps of follow implementation. class FWE_DLLPUBLIC OReadStatusBarDocumentHandler : diff --git a/framework/inc/xml/toolboxdocumenthandler.hxx b/framework/inc/xml/toolboxdocumenthandler.hxx index c8be949a8907..99596ed6dafe 100644 --- a/framework/inc/xml/toolboxdocumenthandler.hxx +++ b/framework/inc/xml/toolboxdocumenthandler.hxx @@ -32,7 +32,6 @@ namespace framework{ - // Hash code function for using in all hash maps of follow implementation. class FWE_DLLPUBLIC OReadToolBoxDocumentHandler : @@ -150,7 +149,6 @@ class FWE_DLLPUBLIC OReadToolBoxDocumentHandler : OUString m_aCommandURL; }; - class FWE_DLLPUBLIC OWriteToolBoxDocumentHandler { public: |