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 | |
| parent | be616c26f990d651c752be201e29e2b89ba17f2a (diff) | |
Kill superfluous vertical whitespace
Change-Id: Ia1bb2b40c74efb17e655dd6f00d7ba48c16c65ae
237 files changed, 0 insertions, 2438 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: diff --git a/framework/source/accelerators/acceleratorcache.cxx b/framework/source/accelerators/acceleratorcache.cxx index bdbbdb676444..61c8289bc066 100644 --- a/framework/source/accelerators/acceleratorcache.cxx +++ b/framework/source/accelerators/acceleratorcache.cxx @@ -30,26 +30,22 @@ namespace framework { - AcceleratorCache::AcceleratorCache() { } - AcceleratorCache::AcceleratorCache(const AcceleratorCache& rCopy) { m_lCommand2Keys = rCopy.m_lCommand2Keys; m_lKey2Commands = rCopy.m_lKey2Commands; } - AcceleratorCache::~AcceleratorCache() { // Dont save anything automaticly here. // The user has to do that explicitly! } - void AcceleratorCache::takeOver(const AcceleratorCache& rCopy) { SolarMutexGuard g; @@ -57,28 +53,24 @@ void AcceleratorCache::takeOver(const AcceleratorCache& rCopy) m_lKey2Commands = rCopy.m_lKey2Commands; } - AcceleratorCache& AcceleratorCache::operator=(const AcceleratorCache& rCopy) { takeOver(rCopy); return *this; } - sal_Bool AcceleratorCache::hasKey(const css::awt::KeyEvent& aKey) const { SolarMutexGuard g; return (m_lKey2Commands.find(aKey) != m_lKey2Commands.end()); } - sal_Bool AcceleratorCache::hasCommand(const OUString& sCommand) const { SolarMutexGuard g; return (m_lCommand2Keys.find(sCommand) != m_lCommand2Keys.end()); } - AcceleratorCache::TKeyList AcceleratorCache::getAllKeys() const { SolarMutexGuard g; @@ -97,7 +89,6 @@ AcceleratorCache::TKeyList AcceleratorCache::getAllKeys() const return lKeys; } - void AcceleratorCache::setKeyCommandPair(const css::awt::KeyEvent& aKey , const OUString& sCommand) { @@ -111,7 +102,6 @@ void AcceleratorCache::setKeyCommandPair(const css::awt::KeyEvent& aKey , rKeyList.push_back(aKey); } - AcceleratorCache::TKeyList AcceleratorCache::getKeysByCommand(const OUString& sCommand) const { SolarMutexGuard g; @@ -122,7 +112,6 @@ AcceleratorCache::TKeyList AcceleratorCache::getKeysByCommand(const OUString& sC return pCommand->second; } - OUString AcceleratorCache::getCommandByKey(const css::awt::KeyEvent& aKey) const { SolarMutexGuard g; @@ -133,7 +122,6 @@ OUString AcceleratorCache::getCommandByKey(const css::awt::KeyEvent& aKey) const return pKey->second; } - void AcceleratorCache::removeKey(const css::awt::KeyEvent& aKey) { SolarMutexGuard g; @@ -156,7 +144,6 @@ void AcceleratorCache::removeKey(const css::awt::KeyEvent& aKey) m_lCommand2Keys.erase(sCommand); } - void AcceleratorCache::removeCommand(const OUString& sCommand) { SolarMutexGuard g; diff --git a/framework/source/accelerators/acceleratorconfiguration.cxx b/framework/source/accelerators/acceleratorconfiguration.cxx index 9f0f25144df8..b8b72c510935 100644 --- a/framework/source/accelerators/acceleratorconfiguration.cxx +++ b/framework/source/accelerators/acceleratorconfiguration.cxx @@ -70,7 +70,6 @@ namespace framework return sKeyBuffer.makeStringAndClear(); } - XMLBasedAcceleratorConfiguration::XMLBasedAcceleratorConfiguration(const css::uno::Reference< css::uno::XComponentContext >& xContext) : m_xContext (xContext ) , m_aPresetHandler(xContext ) @@ -78,13 +77,11 @@ XMLBasedAcceleratorConfiguration::XMLBasedAcceleratorConfiguration(const css::un { } - XMLBasedAcceleratorConfiguration::~XMLBasedAcceleratorConfiguration() { SAL_WARN_IF(m_pWriteCache, "fwk", "XMLBasedAcceleratorConfiguration::~XMLBasedAcceleratorConfiguration(): Changes not flushed. Ignore it ..."); } - css::uno::Sequence< css::awt::KeyEvent > SAL_CALL XMLBasedAcceleratorConfiguration::getAllKeyEvents() throw(css::uno::RuntimeException, std::exception) { @@ -94,7 +91,6 @@ css::uno::Sequence< css::awt::KeyEvent > SAL_CALL XMLBasedAcceleratorConfigurati return lKeys.getAsConstList(); } - OUString SAL_CALL XMLBasedAcceleratorConfiguration::getCommandByKeyEvent(const css::awt::KeyEvent& aKeyEvent) throw(css::container::NoSuchElementException, css::uno::RuntimeException, std::exception ) @@ -108,7 +104,6 @@ OUString SAL_CALL XMLBasedAcceleratorConfiguration::getCommandByKeyEvent(const c return rCache.getCommandByKey(aKeyEvent); } - void SAL_CALL XMLBasedAcceleratorConfiguration::setKeyEvent(const css::awt::KeyEvent& aKeyEvent, const OUString& sCommand ) throw(css::lang::IllegalArgumentException, @@ -136,7 +131,6 @@ void SAL_CALL XMLBasedAcceleratorConfiguration::setKeyEvent(const css::awt::KeyE rCache.setKeyCommandPair(aKeyEvent, sCommand); } - void SAL_CALL XMLBasedAcceleratorConfiguration::removeKeyEvent(const css::awt::KeyEvent& aKeyEvent) throw(css::container::NoSuchElementException, css::uno::RuntimeException, std::exception ) @@ -150,7 +144,6 @@ throw(css::container::NoSuchElementException, rCache.removeKey(aKeyEvent); } - css::uno::Sequence< css::awt::KeyEvent > SAL_CALL XMLBasedAcceleratorConfiguration::getKeyEventsByCommand(const OUString& sCommand) throw(css::lang::IllegalArgumentException , css::container::NoSuchElementException, @@ -173,7 +166,6 @@ css::uno::Sequence< css::awt::KeyEvent > SAL_CALL XMLBasedAcceleratorConfigurati return lKeys.getAsConstList(); } - css::uno::Sequence< css::uno::Any > SAL_CALL XMLBasedAcceleratorConfiguration::getPreferredKeyEventsForCommandList(const css::uno::Sequence< OUString >& lCommandList) throw(css::lang::IllegalArgumentException , css::uno::RuntimeException, std::exception ) @@ -208,7 +200,6 @@ css::uno::Sequence< css::uno::Any > SAL_CALL XMLBasedAcceleratorConfiguration::g return lPreferredOnes; } - void SAL_CALL XMLBasedAcceleratorConfiguration::removeCommandFromAllKeyEvents(const OUString& sCommand) throw(css::lang::IllegalArgumentException , css::container::NoSuchElementException, @@ -229,7 +220,6 @@ void SAL_CALL XMLBasedAcceleratorConfiguration::removeCommandFromAllKeyEvents(co rCache.removeCommand(sCommand); } - void SAL_CALL XMLBasedAcceleratorConfiguration::reload() throw(css::uno::Exception , css::uno::RuntimeException, std::exception) @@ -272,7 +262,6 @@ void SAL_CALL XMLBasedAcceleratorConfiguration::reload() } } - void SAL_CALL XMLBasedAcceleratorConfiguration::store() throw(css::uno::Exception , css::uno::RuntimeException, std::exception) @@ -300,7 +289,6 @@ void SAL_CALL XMLBasedAcceleratorConfiguration::store() m_aPresetHandler.commitUserChanges(); } - void SAL_CALL XMLBasedAcceleratorConfiguration::storeToStorage(const css::uno::Reference< css::embed::XStorage >& xStorage) throw(css::uno::Exception , css::uno::RuntimeException, std::exception) @@ -324,7 +312,6 @@ void SAL_CALL XMLBasedAcceleratorConfiguration::storeToStorage(const css::uno::R // TODO inform listener about success, so it can flush the root and sub storage of this stream! } - sal_Bool SAL_CALL XMLBasedAcceleratorConfiguration::isModified() throw(css::uno::RuntimeException, std::exception) { @@ -332,7 +319,6 @@ sal_Bool SAL_CALL XMLBasedAcceleratorConfiguration::isModified() return (m_pWriteCache != 0); } - sal_Bool SAL_CALL XMLBasedAcceleratorConfiguration::isReadOnly() throw(css::uno::RuntimeException, std::exception) { @@ -348,14 +334,12 @@ sal_Bool SAL_CALL XMLBasedAcceleratorConfiguration::isReadOnly() return !(xOut.is()); } - void SAL_CALL XMLBasedAcceleratorConfiguration::setStorage(const css::uno::Reference< css::embed::XStorage >& /*xStorage*/) throw(css::uno::RuntimeException, std::exception) { SAL_INFO("fwk", "XMLBasedAcceleratorConfiguration::setStorage(): implement this HACK .-)"); } - sal_Bool SAL_CALL XMLBasedAcceleratorConfiguration::hasStorage() throw(css::uno::RuntimeException, std::exception) { @@ -363,21 +347,18 @@ sal_Bool SAL_CALL XMLBasedAcceleratorConfiguration::hasStorage() return sal_False; } - void SAL_CALL XMLBasedAcceleratorConfiguration::addConfigurationListener(const css::uno::Reference< css::ui::XUIConfigurationListener >& /*xListener*/) throw(css::uno::RuntimeException, std::exception) { SAL_INFO("fwk", "XMLBasedAcceleratorConfiguration::addConfigurationListener(): implement me"); } - void SAL_CALL XMLBasedAcceleratorConfiguration::removeConfigurationListener(const css::uno::Reference< css::ui::XUIConfigurationListener >& /*xListener*/) throw(css::uno::RuntimeException, std::exception) { SAL_INFO("fwk", "XMLBasedAcceleratorConfiguration::removeConfigurationListener(): implement me"); } - void SAL_CALL XMLBasedAcceleratorConfiguration::reset() throw(css::uno::RuntimeException, std::exception) { @@ -389,28 +370,24 @@ throw(css::uno::RuntimeException, std::exception) reload(); } - void SAL_CALL XMLBasedAcceleratorConfiguration::addResetListener(const css::uno::Reference< css::form::XResetListener >& /*xListener*/) throw(css::uno::RuntimeException, std::exception) { SAL_INFO("fwk", "XMLBasedAcceleratorConfiguration::addResetListener(): implement me"); } - void SAL_CALL XMLBasedAcceleratorConfiguration::removeResetListener(const css::uno::Reference< css::form::XResetListener >& /*xListener*/) throw(css::uno::RuntimeException, std::exception) { SAL_INFO("fwk", "XMLBasedAcceleratorConfiguration::removeResetListener(): implement me"); } - // IStorageListener void XMLBasedAcceleratorConfiguration::changesOccurred(const OUString& /*sPath*/) { reload(); } - void XMLBasedAcceleratorConfiguration::impl_ts_load(const css::uno::Reference< css::io::XInputStream >& xStream) { css::uno::Reference< css::uno::XComponentContext > xContext; @@ -452,7 +429,6 @@ void XMLBasedAcceleratorConfiguration::impl_ts_load(const css::uno::Reference< c xParser->parseStream(aSource); } - void XMLBasedAcceleratorConfiguration::impl_ts_save(const css::uno::Reference< css::io::XOutputStream >& xStream) { sal_Bool bChanged; @@ -498,7 +474,6 @@ void XMLBasedAcceleratorConfiguration::impl_ts_save(const css::uno::Reference< c } } - AcceleratorCache& XMLBasedAcceleratorConfiguration::impl_getCFG(sal_Bool bWriteAccessRequested) { SolarMutexGuard g; @@ -521,7 +496,6 @@ AcceleratorCache& XMLBasedAcceleratorConfiguration::impl_getCFG(sal_Bool bWriteA return m_aReadCache; } - OUString XMLBasedAcceleratorConfiguration::impl_ts_getLocale() const { OUString sISOLocale = officecfg::Setup::L10N::ooLocale::get(); @@ -537,7 +511,6 @@ OUString XMLBasedAcceleratorConfiguration::impl_ts_getLocale() const * *******************************************************************************/ - XCUBasedAcceleratorConfiguration::XCUBasedAcceleratorConfiguration(const css::uno::Reference< css::uno::XComponentContext >& xContext) : m_xContext (xContext ) , m_pPrimaryWriteCache(0 ) @@ -549,12 +522,10 @@ XCUBasedAcceleratorConfiguration::XCUBasedAcceleratorConfiguration(const css::un css::uno::UNO_QUERY ); } - XCUBasedAcceleratorConfiguration::~XCUBasedAcceleratorConfiguration() { } - css::uno::Sequence< css::awt::KeyEvent > SAL_CALL XCUBasedAcceleratorConfiguration::getAllKeyEvents() throw(css::uno::RuntimeException, std::exception) { @@ -572,7 +543,6 @@ css::uno::Sequence< css::awt::KeyEvent > SAL_CALL XCUBasedAcceleratorConfigurati return lKeys.getAsConstList(); } - OUString SAL_CALL XCUBasedAcceleratorConfiguration::getCommandByKeyEvent(const css::awt::KeyEvent& aKeyEvent) throw(css::container::NoSuchElementException, css::uno::RuntimeException, std::exception ) @@ -593,7 +563,6 @@ OUString SAL_CALL XCUBasedAcceleratorConfiguration::getCommandByKeyEvent(const c return rSecondaryCache.getCommandByKey(aKeyEvent); } - void SAL_CALL XCUBasedAcceleratorConfiguration::setKeyEvent(const css::awt::KeyEvent& aKeyEvent, const OUString& sCommand ) throw(css::lang::IllegalArgumentException, @@ -676,7 +645,6 @@ void SAL_CALL XCUBasedAcceleratorConfiguration::setKeyEvent(const css::awt::KeyE } } - void SAL_CALL XCUBasedAcceleratorConfiguration::removeKeyEvent(const css::awt::KeyEvent& aKeyEvent) throw(css::container::NoSuchElementException, css::uno::RuntimeException, std::exception ) @@ -716,7 +684,6 @@ void SAL_CALL XCUBasedAcceleratorConfiguration::removeKeyEvent(const css::awt::K } } - css::uno::Sequence< css::awt::KeyEvent > SAL_CALL XCUBasedAcceleratorConfiguration::getKeyEventsByCommand(const OUString& sCommand) throw(css::lang::IllegalArgumentException , css::container::NoSuchElementException, @@ -748,7 +715,6 @@ css::uno::Sequence< css::awt::KeyEvent > SAL_CALL XCUBasedAcceleratorConfigurati return lKeys.getAsConstList(); } - AcceleratorCache::TKeyList::const_iterator lcl_getPreferredKey(const AcceleratorCache::TKeyList& lKeys) { AcceleratorCache::TKeyList::const_iterator pIt; @@ -767,7 +733,6 @@ AcceleratorCache::TKeyList::const_iterator lcl_getPreferredKey(const Accelerator return lKeys.end(); } - css::uno::Sequence< css::uno::Any > SAL_CALL XCUBasedAcceleratorConfiguration::getPreferredKeyEventsForCommandList(const css::uno::Sequence< OUString >& lCommandList) throw(css::lang::IllegalArgumentException , css::uno::RuntimeException, std::exception ) @@ -806,7 +771,6 @@ css::uno::Sequence< css::uno::Any > SAL_CALL XCUBasedAcceleratorConfiguration::g return lPreferredOnes; } - void SAL_CALL XCUBasedAcceleratorConfiguration::removeCommandFromAllKeyEvents(const OUString& sCommand) throw(css::lang::IllegalArgumentException , css::container::NoSuchElementException, @@ -834,7 +798,6 @@ void SAL_CALL XCUBasedAcceleratorConfiguration::removeCommandFromAllKeyEvents(co rSecondaryCache.removeCommand(sCommand); } - void SAL_CALL XCUBasedAcceleratorConfiguration::reload() throw(css::uno::Exception , css::uno::RuntimeException, std::exception) @@ -871,7 +834,6 @@ void SAL_CALL XCUBasedAcceleratorConfiguration::reload() impl_ts_load(bPreferred, xAccess); // load the secondary keys } - void SAL_CALL XCUBasedAcceleratorConfiguration::store() throw(css::uno::Exception , css::uno::RuntimeException, std::exception) @@ -896,7 +858,6 @@ void SAL_CALL XCUBasedAcceleratorConfiguration::store() impl_ts_save(bPreferred, xAccess); } - void SAL_CALL XCUBasedAcceleratorConfiguration::storeToStorage(const css::uno::Reference< css::embed::XStorage >& xStorage) throw(css::uno::Exception , css::uno::RuntimeException, std::exception) @@ -961,28 +922,24 @@ void SAL_CALL XCUBasedAcceleratorConfiguration::storeToStorage(const css::uno::R aWriter.flush(); } - sal_Bool SAL_CALL XCUBasedAcceleratorConfiguration::isModified() throw(css::uno::RuntimeException, std::exception) { return sal_False; } - sal_Bool SAL_CALL XCUBasedAcceleratorConfiguration::isReadOnly() throw(css::uno::RuntimeException, std::exception) { return sal_False; } - void SAL_CALL XCUBasedAcceleratorConfiguration::setStorage(const css::uno::Reference< css::embed::XStorage >& /*xStorage*/) throw(css::uno::RuntimeException, std::exception) { SAL_INFO("fwk", "XCUBasedAcceleratorConfiguration::setStorage(): implement this HACK .-)"); } - sal_Bool SAL_CALL XCUBasedAcceleratorConfiguration::hasStorage() throw(css::uno::RuntimeException, std::exception) { @@ -990,21 +947,18 @@ sal_Bool SAL_CALL XCUBasedAcceleratorConfiguration::hasStorage() return sal_False; } - void SAL_CALL XCUBasedAcceleratorConfiguration::addConfigurationListener(const css::uno::Reference< css::ui::XUIConfigurationListener >& /*xListener*/) throw(css::uno::RuntimeException, std::exception) { SAL_INFO("fwk", "XCUBasedAcceleratorConfiguration::addConfigurationListener(): implement me"); } - void SAL_CALL XCUBasedAcceleratorConfiguration::removeConfigurationListener(const css::uno::Reference< css::ui::XUIConfigurationListener >& /*xListener*/) throw(css::uno::RuntimeException, std::exception) { SAL_INFO("fwk", "XCUBasedAcceleratorConfiguration::removeConfigurationListener(): implement me"); } - void SAL_CALL XCUBasedAcceleratorConfiguration::reset() throw(css::uno::RuntimeException, std::exception) { @@ -1026,21 +980,18 @@ void SAL_CALL XCUBasedAcceleratorConfiguration::reset() } } - void SAL_CALL XCUBasedAcceleratorConfiguration::addResetListener(const css::uno::Reference< css::form::XResetListener >& /*xListener*/) throw(css::uno::RuntimeException, std::exception) { SAL_INFO("fwk", "XCUBasedAcceleratorConfiguration::addResetListener(): implement me"); } - void SAL_CALL XCUBasedAcceleratorConfiguration::removeResetListener(const css::uno::Reference< css::form::XResetListener >& /*xListener*/) throw(css::uno::RuntimeException, std::exception) { SAL_INFO("fwk", "XCUBasedAcceleratorConfiguration::removeResetListener(): implement me"); } - void SAL_CALL XCUBasedAcceleratorConfiguration::changesOccurred(const css::util::ChangesEvent& aEvent) throw(css::uno::RuntimeException, std::exception) { @@ -1092,34 +1043,29 @@ void SAL_CALL XCUBasedAcceleratorConfiguration::changesOccurred(const css::util: } } - void SAL_CALL XCUBasedAcceleratorConfiguration::disposing(const css::lang::EventObject& /*aSource*/) throw(css::uno::RuntimeException, std::exception) { } - void SAL_CALL XCUBasedAcceleratorConfiguration::dispose() throw(css::uno::RuntimeException, std::exception) { // nop } - void SAL_CALL XCUBasedAcceleratorConfiguration::addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& /*xListener*/ ) throw(css::uno::RuntimeException, std::exception) { // nop } - void SAL_CALL XCUBasedAcceleratorConfiguration::removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& /*xListener*/ ) throw(css::uno::RuntimeException, std::exception) { // nop } - void XCUBasedAcceleratorConfiguration::impl_ts_load( sal_Bool bPreferred, const css::uno::Reference< css::container::XNameAccess >& xCfg ) { AcceleratorCache aReadCache = AcceleratorCache(); @@ -1228,7 +1174,6 @@ void XCUBasedAcceleratorConfiguration::impl_ts_load( sal_Bool bPreferred, const m_aSecondaryReadCache.takeOver(aReadCache); } - void XCUBasedAcceleratorConfiguration::impl_ts_save(sal_Bool bPreferred, const css::uno::Reference< css::container::XNameAccess >& /*xCfg*/) { if (bPreferred) @@ -1281,7 +1226,6 @@ void XCUBasedAcceleratorConfiguration::impl_ts_save(sal_Bool bPreferred, const c removeKeyFromConfiguration(*pIt, sal_False); } - for ( pIt = lSecondaryWriteKeys.begin(); pIt != lSecondaryWriteKeys.end(); ++pIt ) { OUString sCommand = m_pSecondaryWriteCache->getCommandByKey(*pIt); @@ -1311,7 +1255,6 @@ void XCUBasedAcceleratorConfiguration::impl_ts_save(sal_Bool bPreferred, const c ::comphelper::ConfigurationHelper::flush(m_xCfg); } - void XCUBasedAcceleratorConfiguration::insertKeyToConfiguration( const css::awt::KeyEvent& aKeyEvent, const OUString& sCommand, const sal_Bool bPreferred ) { css::uno::Reference< css::container::XNameAccess > xAccess; @@ -1358,7 +1301,6 @@ void XCUBasedAcceleratorConfiguration::insertKeyToConfiguration( const css::awt: xCommand->replaceByName(sLocale, css::uno::makeAny(sCommand)); } - void XCUBasedAcceleratorConfiguration::removeKeyFromConfiguration( const css::awt::KeyEvent& aKeyEvent, const sal_Bool bPreferred ) { css::uno::Reference< css::container::XNameAccess > xAccess; @@ -1384,7 +1326,6 @@ void XCUBasedAcceleratorConfiguration::removeKeyFromConfiguration( const css::aw xContainer->removeByName(sKey); } - void XCUBasedAcceleratorConfiguration::reloadChanged( const OUString& sPrimarySecondary, const OUString& sGlobalModules, const OUString& sModule, const OUString& sKey ) { css::uno::Reference< css::container::XNameAccess > xAccess; @@ -1455,7 +1396,6 @@ void XCUBasedAcceleratorConfiguration::reloadChanged( const OUString& sPrimarySe } } - AcceleratorCache& XCUBasedAcceleratorConfiguration::impl_getCFG(sal_Bool bPreferred, sal_Bool bWriteAccessRequested) { SolarMutexGuard g; @@ -1501,7 +1441,6 @@ AcceleratorCache& XCUBasedAcceleratorConfiguration::impl_getCFG(sal_Bool bPrefer } } - OUString XCUBasedAcceleratorConfiguration::impl_ts_getLocale() const { OUString sISOLocale = officecfg::Setup::L10N::ooLocale::get(); diff --git a/framework/source/accelerators/documentacceleratorconfiguration.cxx b/framework/source/accelerators/documentacceleratorconfiguration.cxx index aa7b2d5dddf7..77d89d038461 100644 --- a/framework/source/accelerators/documentacceleratorconfiguration.cxx +++ b/framework/source/accelerators/documentacceleratorconfiguration.cxx @@ -54,7 +54,6 @@ class DocumentAcceleratorConfiguration : public DocumentAcceleratorConfiguration { private: - /** points to the root storage of the outside document, where we can read/save our configuration data. */ css::uno::Reference< css::embed::XStorage > m_xDocumentRoot; @@ -109,7 +108,6 @@ private: void impl_ts_clearCache(); }; - DocumentAcceleratorConfiguration::DocumentAcceleratorConfiguration( const css::uno::Reference< css::uno::XComponentContext >& xContext, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& lArguments) @@ -134,13 +132,11 @@ DocumentAcceleratorConfiguration::DocumentAcceleratorConfiguration( impl_ts_fillCache(); } - DocumentAcceleratorConfiguration::~DocumentAcceleratorConfiguration() { m_aPresetHandler.removeStorageListener(this); } - void SAL_CALL DocumentAcceleratorConfiguration::setStorage(const css::uno::Reference< css::embed::XStorage >& xStorage) throw(css::uno::RuntimeException, std::exception) { @@ -160,7 +156,6 @@ void SAL_CALL DocumentAcceleratorConfiguration::setStorage(const css::uno::Refer impl_ts_fillCache(); } - sal_Bool SAL_CALL DocumentAcceleratorConfiguration::hasStorage() throw(css::uno::RuntimeException, std::exception) { @@ -168,7 +163,6 @@ sal_Bool SAL_CALL DocumentAcceleratorConfiguration::hasStorage() return m_xDocumentRoot.is(); } - void DocumentAcceleratorConfiguration::impl_ts_fillCache() { css::uno::Reference< css::embed::XStorage > xDocumentRoot; @@ -209,7 +203,6 @@ void DocumentAcceleratorConfiguration::impl_ts_fillCache() {} } - void DocumentAcceleratorConfiguration::impl_ts_clearCache() { m_aPresetHandler.forgetCachedStorages(); diff --git a/framework/source/accelerators/globalacceleratorconfiguration.cxx b/framework/source/accelerators/globalacceleratorconfiguration.cxx index 9754f85d500d..031d98c666f9 100644 --- a/framework/source/accelerators/globalacceleratorconfiguration.cxx +++ b/framework/source/accelerators/globalacceleratorconfiguration.cxx @@ -123,8 +123,6 @@ void GlobalAcceleratorConfiguration::fillCache() {} } - - // XComponent.dispose(), #i120029#, to release the cyclic reference void SAL_CALL GlobalAcceleratorConfiguration::dispose() diff --git a/framework/source/accelerators/keymapping.cxx b/framework/source/accelerators/keymapping.cxx index a74955d43e5e..bd9ea14e6113 100644 --- a/framework/source/accelerators/keymapping.cxx +++ b/framework/source/accelerators/keymapping.cxx @@ -23,11 +23,9 @@ #include <com/sun/star/awt/Key.hpp> - namespace framework { - // helper KeyMapping::KeyIdentifierInfo KeyMapping::KeyIdentifierMap[] = @@ -140,7 +138,6 @@ KeyMapping::KeyIdentifierInfo KeyMapping::KeyIdentifierMap[] = {0 , "" } // mark the end of this array! }; - KeyMapping::KeyMapping() { sal_Int32 i = 0; @@ -156,12 +153,10 @@ KeyMapping::KeyMapping() } } - KeyMapping::~KeyMapping() { } - sal_uInt16 KeyMapping::mapIdentifierToCode(const OUString& sIdentifier) throw(css::lang::IllegalArgumentException) { @@ -181,7 +176,6 @@ sal_uInt16 KeyMapping::mapIdentifierToCode(const OUString& sIdentifier) return (sal_uInt16)nCode; } - OUString KeyMapping::mapCodeToIdentifier(sal_uInt16 nCode) { Code2IdentifierHash::const_iterator pIt = m_lCodeHash.find(nCode); @@ -192,7 +186,6 @@ OUString KeyMapping::mapCodeToIdentifier(sal_uInt16 nCode) return OUString::number(nCode); } - sal_Bool KeyMapping::impl_st_interpretIdentifierAsPureKeyCode(const OUString& sIdentifier, sal_uInt16& rCode ) { diff --git a/framework/source/accelerators/moduleacceleratorconfiguration.cxx b/framework/source/accelerators/moduleacceleratorconfiguration.cxx index 4b26716d81e7..cc51e0138d94 100644 --- a/framework/source/accelerators/moduleacceleratorconfiguration.cxx +++ b/framework/source/accelerators/moduleacceleratorconfiguration.cxx @@ -163,8 +163,6 @@ void ModuleAcceleratorConfiguration::fillCache() {} } - - // XComponent.dispose(), #i120029#, to release the cyclic reference void SAL_CALL ModuleAcceleratorConfiguration::dispose() diff --git a/framework/source/accelerators/presethandler.cxx b/framework/source/accelerators/presethandler.cxx index a57771df80ba..e35d617d8b2a 100644 --- a/framework/source/accelerators/presethandler.cxx +++ b/framework/source/accelerators/presethandler.cxx @@ -39,7 +39,6 @@ #include <rtl/ustrbuf.hxx> #include <i18nlangtag/languagetag.hxx> - static const ::sal_Int32 ID_CORRUPT_UICONFIG_SHARE = 1; static const ::sal_Int32 ID_CORRUPT_UICONFIG_USER = 2; static const ::sal_Int32 ID_CORRUPT_UICONFIG_GENERAL = 3; @@ -47,43 +46,36 @@ static const ::sal_Int32 ID_CORRUPT_UICONFIG_GENERAL = 3; namespace framework { - OUString PresetHandler::PRESET_DEFAULT() { return OUString("default"); } - OUString PresetHandler::TARGET_CURRENT() { return OUString("current"); } - OUString PresetHandler::RESOURCETYPE_MENUBAR() { return OUString("menubar"); } - OUString PresetHandler::RESOURCETYPE_TOOLBAR() { return OUString("toolbar"); } - OUString PresetHandler::RESOURCETYPE_ACCELERATOR() { return OUString("accelerator"); } - OUString PresetHandler::RESOURCETYPE_STATUSBAR() { return OUString("statusbar"); } - PresetHandler::PresetHandler(const css::uno::Reference< css::uno::XComponentContext >& xContext) : m_xContext(xContext) , m_eConfigType(E_GLOBAL) @@ -93,7 +85,6 @@ PresetHandler::PresetHandler(const css::uno::Reference< css::uno::XComponentCont { } - PresetHandler::PresetHandler(const PresetHandler& rCopy) : m_aLanguageTag( rCopy.m_aLanguageTag) { @@ -113,7 +104,6 @@ PresetHandler::PresetHandler(const PresetHandler& rCopy) m_sRelPathUser = rCopy.m_sRelPathUser; } - PresetHandler::~PresetHandler() { m_xWorkingStorageShare.clear(); @@ -140,7 +130,6 @@ PresetHandler::~PresetHandler() m_lDocumentStorages.forgetCachedStorages(); } - void PresetHandler::forgetCachedStorages() { SolarMutexGuard g; @@ -253,7 +242,6 @@ css::uno::Reference< css::embed::XStorage > PresetHandler::getOrCreateRootStorag return xStorage; } - css::uno::Reference< css::embed::XStorage > PresetHandler::getOrCreateRootStorageUser() { css::uno::Reference< css::embed::XStorage > xRoot = m_aSharedStorages->m_lStoragesUser.getRootStorage(); @@ -301,21 +289,18 @@ css::uno::Reference< css::embed::XStorage > PresetHandler::getOrCreateRootStorag return xStorage; } - css::uno::Reference< css::embed::XStorage > PresetHandler::getWorkingStorageShare() { SolarMutexGuard g; return m_xWorkingStorageShare; } - css::uno::Reference< css::embed::XStorage > PresetHandler::getWorkingStorageUser() { SolarMutexGuard g; return m_xWorkingStorageUser; } - css::uno::Reference< css::embed::XStorage > PresetHandler::getParentStorageShare(const css::uno::Reference< css::embed::XStorage >& /*xChild*/) { css::uno::Reference< css::embed::XStorage > xWorking; @@ -327,7 +312,6 @@ css::uno::Reference< css::embed::XStorage > PresetHandler::getParentStorageShare return m_aSharedStorages->m_lStoragesShare.getParentStorage(xWorking); } - css::uno::Reference< css::embed::XStorage > PresetHandler::getParentStorageUser(const css::uno::Reference< css::embed::XStorage >& /*xChild*/) { css::uno::Reference< css::embed::XStorage > xWorking; @@ -339,7 +323,6 @@ css::uno::Reference< css::embed::XStorage > PresetHandler::getParentStorageUser( return m_aSharedStorages->m_lStoragesUser.getParentStorage(xWorking); } - void PresetHandler::connectToResource( PresetHandler::EConfigType eConfigType , const OUString& sResource , const OUString& sModule , @@ -540,7 +523,6 @@ void PresetHandler::connectToResource( PresetHandler::EConfigType } } - void PresetHandler::copyPresetToTarget(const OUString& sPreset, const OUString& sTarget) { @@ -585,7 +567,6 @@ void PresetHandler::copyPresetToTarget(const OUString& sPreset, commitUserChanges(); } - css::uno::Reference< css::io::XStream > PresetHandler::openPreset(const OUString& sPreset, sal_Bool bUseNoLangGlobal) { @@ -607,7 +588,6 @@ css::uno::Reference< css::io::XStream > PresetHandler::openPreset(const OUString return xStream; } - css::uno::Reference< css::io::XStream > PresetHandler::openTarget(const OUString& sTarget , sal_Bool bCreateIfMissing) { @@ -648,7 +628,6 @@ css::uno::Reference< css::io::XStream > PresetHandler::openTarget(const OUString return xStream; } - void PresetHandler::commitUserChanges() { css::uno::Reference< css::embed::XStorage > xWorking; @@ -686,7 +665,6 @@ void PresetHandler::commitUserChanges() } } - void PresetHandler::addStorageListener(IStorageListener* pListener) { OUString sRelPath; @@ -717,7 +695,6 @@ void PresetHandler::addStorageListener(IStorageListener* pListener) } } - void PresetHandler::removeStorageListener(IStorageListener* pListener) { OUString sRelPath; @@ -748,7 +725,6 @@ void PresetHandler::removeStorageListener(IStorageListener* pListener) } } - css::uno::Reference< css::embed::XStorage > PresetHandler::impl_openPathIgnoringErrors(const OUString& sPath , sal_Int32 eMode , sal_Bool bShare) @@ -768,7 +744,6 @@ css::uno::Reference< css::embed::XStorage > PresetHandler::impl_openPathIgnoring return xPath; } - ::std::vector< OUString >::const_iterator PresetHandler::impl_findMatchingLocalizedValue( const ::std::vector< OUString >& lLocalizedValues, OUString& rLanguageTag, @@ -799,7 +774,6 @@ css::uno::Reference< css::embed::XStorage > PresetHandler::impl_openPathIgnoring return pFound; } - css::uno::Reference< css::embed::XStorage > PresetHandler::impl_openLocalizedPathIgnoringErrors( OUString& sPath , sal_Int32 eMode , @@ -839,7 +813,6 @@ css::uno::Reference< css::embed::XStorage > PresetHandler::impl_openLocalizedPat return xLocalePath; } - ::std::vector< OUString > PresetHandler::impl_getSubFolderNames(const css::uno::Reference< css::embed::XStorage >& xFolder) { css::uno::Reference< css::container::XNameAccess > xAccess(xFolder, css::uno::UNO_QUERY); @@ -868,7 +841,6 @@ css::uno::Reference< css::embed::XStorage > PresetHandler::impl_openLocalizedPat return lSubFolders; } - } // namespace framework /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/framework/source/accelerators/storageholder.cxx b/framework/source/accelerators/storageholder.cxx index b19d3e0c3a32..d1f0a7251f31 100644 --- a/framework/source/accelerators/storageholder.cxx +++ b/framework/source/accelerators/storageholder.cxx @@ -37,28 +37,23 @@ #include <com/sun/star/io/XSeekable.hpp> - #define PATH_SEPARATOR_ASCII "/" #define PATH_SEPARATOR_UNICODE ((sal_Unicode)'/') #define PATH_SEPARATOR OUString(PATH_SEPARATOR_ASCII) - namespace framework { - StorageHolder::StorageHolder() { } - StorageHolder::~StorageHolder() { // TODO implement me // dispose/clear etcpp. } - void StorageHolder::forgetCachedStorages() { osl::MutexGuard g(m_mutex); @@ -74,21 +69,18 @@ void StorageHolder::forgetCachedStorages() m_lStorages.clear(); } - void StorageHolder::setRootStorage(const css::uno::Reference< css::embed::XStorage >& xRoot) { osl::MutexGuard g(m_mutex); m_xRoot = xRoot; } - css::uno::Reference< css::embed::XStorage > StorageHolder::getRootStorage() const { osl::MutexGuard g(m_mutex); return m_xRoot; } - css::uno::Reference< css::embed::XStorage > StorageHolder::openPath(const OUString& sPath , sal_Int32 nOpenMode) { @@ -173,7 +165,6 @@ css::uno::Reference< css::embed::XStorage > StorageHolder::openPath(const OUStri return xChild; } - StorageHolder::TStorageList StorageHolder::getAllPathStorages(const OUString& sPath) { OUString sNormedPath = StorageHolder::impl_st_normPath(sPath); @@ -213,7 +204,6 @@ StorageHolder::TStorageList StorageHolder::getAllPathStorages(const OUString& sP return lStoragesOfPath; } - void StorageHolder::commitPath(const OUString& sPath) { StorageHolder::TStorageList lStorages = getAllPathStorages(sPath); @@ -240,7 +230,6 @@ void StorageHolder::commitPath(const OUString& sPath) xCommit->commit(); } - void StorageHolder::closePath(const OUString& rPath) { OUString sNormedPath = StorageHolder::impl_st_normPath(rPath); @@ -286,7 +275,6 @@ void StorageHolder::closePath(const OUString& rPath) } } - void StorageHolder::notifyPath(const OUString& sPath) { OUString sNormedPath = StorageHolder::impl_st_normPath(sPath); @@ -309,7 +297,6 @@ void StorageHolder::notifyPath(const OUString& sPath) } } - void StorageHolder::addStorageListener( IStorageListener* pListener, const OUString& sPath ) { @@ -327,7 +314,6 @@ void StorageHolder::addStorageListener( IStorageListener* pListener, rInfo.Listener.push_back(pListener); } - void StorageHolder::removeStorageListener( IStorageListener* pListener, const OUString& sPath ) { @@ -345,7 +331,6 @@ void StorageHolder::removeStorageListener( IStorageListener* pListener, rInfo.Listener.erase(pIt2); } - OUString StorageHolder::getPathOfStorage(const css::uno::Reference< css::embed::XStorage >& xStorage) { osl::MutexGuard g(m_mutex); @@ -366,14 +351,12 @@ OUString StorageHolder::getPathOfStorage(const css::uno::Reference< css::embed:: return pIt->first; } - css::uno::Reference< css::embed::XStorage > StorageHolder::getParentStorage(const css::uno::Reference< css::embed::XStorage >& xChild) { OUString sChildPath = getPathOfStorage(xChild); return getParentStorage(sChildPath); } - css::uno::Reference< css::embed::XStorage > StorageHolder::getParentStorage(const OUString& sChildPath) { // normed path = "a/b/c/" ... we search for "a/b/" @@ -417,7 +400,6 @@ css::uno::Reference< css::embed::XStorage > StorageHolder::getParentStorage(cons return css::uno::Reference< css::embed::XStorage >(); } - void StorageHolder::operator=(const StorageHolder& rCopy) { osl::MutexGuard g(m_mutex); @@ -425,7 +407,6 @@ void StorageHolder::operator=(const StorageHolder& rCopy) m_lStorages = rCopy.m_lStorages; } - css::uno::Reference< css::embed::XStorage > StorageHolder::openSubStorageWithFallback(const css::uno::Reference< css::embed::XStorage >& xBaseStorage , const OUString& sSubStorage , sal_Int32 eOpenMode , @@ -465,7 +446,6 @@ css::uno::Reference< css::embed::XStorage > StorageHolder::openSubStorageWithFal return css::uno::Reference< css::embed::XStorage >(); } - css::uno::Reference< css::io::XStream > StorageHolder::openSubStreamWithFallback(const css::uno::Reference< css::embed::XStorage >& xBaseStorage , const OUString& sSubStream , sal_Int32 eOpenMode , @@ -505,7 +485,6 @@ css::uno::Reference< css::io::XStream > StorageHolder::openSubStreamWithFallback return css::uno::Reference< css::io::XStream >(); } - OUString StorageHolder::impl_st_normPath(const OUString& sPath) { // path must start without "/" but end with "/"! @@ -527,7 +506,6 @@ OUString StorageHolder::impl_st_normPath(const OUString& sPath) return sNormedPath; } - OUStringList StorageHolder::impl_st_parsePath(const OUString& sPath) { OUStringList lToken; @@ -542,7 +520,6 @@ OUStringList StorageHolder::impl_st_parsePath(const OUString& sPath) return lToken; } - } // namespace framework /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/framework/source/classes/fwktabwindow.cxx b/framework/source/classes/fwktabwindow.cxx index e0dca444282e..0219bd273894 100644 --- a/framework/source/classes/fwktabwindow.cxx +++ b/framework/source/classes/fwktabwindow.cxx @@ -55,8 +55,6 @@ FwkTabControl::FwkTabControl( Window* pParent, const ResId& rResId ) : { } - - void FwkTabControl::BroadcastEvent( sal_uLong nEvent ) { if ( VCLEVENT_TABPAGE_ACTIVATE == nEvent || VCLEVENT_TABPAGE_DEACTIVATE == nEvent ) @@ -83,16 +81,12 @@ FwkTabPage::FwkTabPage( { } - - FwkTabPage::~FwkTabPage() { Hide(); DeactivatePage(); } - - void FwkTabPage::CreateDialog() { try @@ -130,8 +124,6 @@ void FwkTabPage::CreateDialog() } } - - sal_Bool FwkTabPage::CallMethod( const OUString& rMethod ) { sal_Bool bRet = sal_False; @@ -149,8 +141,6 @@ sal_Bool FwkTabPage::CallMethod( const OUString& rMethod ) return bRet; } - - void FwkTabPage::ActivatePage() { TabPage::ActivatePage(); @@ -165,8 +155,6 @@ void FwkTabPage::ActivatePage() } } - - void FwkTabPage::DeactivatePage() { TabPage::DeactivatePage(); @@ -175,8 +163,6 @@ void FwkTabPage::DeactivatePage() m_xPage->setVisible( sal_False ); } - - void FwkTabPage::Resize() { if ( m_xPage.is () ) @@ -204,15 +190,11 @@ FwkTabWindow::FwkTabWindow( Window* pParent ) : m_aTabCtrl.Show(); } - - FwkTabWindow::~FwkTabWindow() { ClearEntryList(); } - - void FwkTabWindow::ClearEntryList() { TabEntryList::const_iterator pIt; @@ -226,8 +208,6 @@ void FwkTabWindow::ClearEntryList() m_TabList.clear(); } - - bool FwkTabWindow::RemoveEntry( sal_Int32 nIndex ) { TabEntryList::iterator pIt; @@ -249,7 +229,6 @@ bool FwkTabWindow::RemoveEntry( sal_Int32 nIndex ) return false; } - TabEntry* FwkTabWindow::FindEntry( sal_Int32 nIndex ) const { TabEntry* pEntry = NULL; @@ -269,8 +248,6 @@ TabEntry* FwkTabWindow::FindEntry( sal_Int32 nIndex ) const return pEntry; } - - IMPL_LINK_NOARG(FwkTabWindow, ActivatePageHdl) { const sal_uInt16 nId = m_aTabCtrl.GetCurPageId(); @@ -293,16 +270,12 @@ IMPL_LINK_NOARG(FwkTabWindow, ActivatePageHdl) return 1; } - - IMPL_LINK_NOARG(FwkTabWindow, DeactivatePageHdl) { m_aTabCtrl.BroadcastEvent( VCLEVENT_TABPAGE_DEACTIVATE ); return 1; } - - void FwkTabWindow::AddEventListener( const Link& rEventListener ) { m_aTabCtrl.AddEventListener( rEventListener ); @@ -313,8 +286,6 @@ void FwkTabWindow::RemoveEventListener( const Link& rEventListener ) m_aTabCtrl.RemoveEventListener( rEventListener ); } - - FwkTabPage* FwkTabWindow::AddTabPage( sal_Int32 nIndex, const uno::Sequence< beans::NamedValue >& rProperties ) { OUString sTitle, sToolTip, sPageURL; @@ -356,16 +327,12 @@ FwkTabPage* FwkTabWindow::AddTabPage( sal_Int32 nIndex, const uno::Sequence< bea return pEntry->m_pPage; } - - void FwkTabWindow::ActivatePage( sal_Int32 nIndex ) { m_aTabCtrl.SetCurPageId( static_cast< sal_uInt16 >( nIndex ) ); ActivatePageHdl( &m_aTabCtrl ); } - - void FwkTabWindow::RemovePage( sal_Int32 nIndex ) { TabEntry* pEntry = FindEntry(nIndex); @@ -377,7 +344,6 @@ void FwkTabWindow::RemovePage( sal_Int32 nIndex ) } } - void FwkTabWindow::Resize() { Size aPageSize = GetSizePixel(); diff --git a/framework/source/classes/fwlresid.cxx b/framework/source/classes/fwlresid.cxx index a5e1552c8b6e..e65bb689df90 100644 --- a/framework/source/classes/fwlresid.cxx +++ b/framework/source/classes/fwlresid.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "classes/fwlresid.hxx" #include <osl/mutex.hxx> #include <vcl/svapp.hxx> @@ -41,8 +40,6 @@ ResMgr* FwlResId::GetResManager() return pResMgr; } - - FwlResId::FwlResId( sal_uInt16 nId ) : ResId( nId, *FwlResId::GetResManager() ) { diff --git a/framework/source/classes/menumanager.cxx b/framework/source/classes/menumanager.cxx index b35bf4d7fb7b..4b6472911fc6 100644 --- a/framework/source/classes/menumanager.cxx +++ b/framework/source/classes/menumanager.cxx @@ -121,7 +121,6 @@ MenuManager::MenuManager( sal_Int32 nAddonsURLPrefixLength = ADDONSPOPUPMENU_URL_PREFIX.getLength(); - sal_uInt16 nItemCount = pMenu->GetItemCount(); m_aMenuItemHandlerVector.reserve(nItemCount); OUString aItemCommand; @@ -203,7 +202,6 @@ MenuManager::MenuManager( AddMenu(pSubMenu,OUString(),nItemId,sal_True,sal_False); - if ( bShowMenuImages && !pMenu->GetItemImage( nItemId )) { Image aImage = GetImageFromURL( rFrame, aItemCommand, false ); @@ -260,7 +258,6 @@ MenuManager::MenuManager( SetHdl(); } - void MenuManager::SetHdl() { m_pVCLMenu->SetHighlightHdl( LINK( this, MenuManager, Highlight )); @@ -288,7 +285,6 @@ MenuManager::~MenuManager() delete m_pVCLMenu; } - MenuManager::MenuItemHandler* MenuManager::GetMenuItemHandler( sal_uInt16 nItemId ) { SolarMutexGuard g; @@ -304,7 +300,6 @@ MenuManager::MenuItemHandler* MenuManager::GetMenuItemHandler( sal_uInt16 nItemI return 0; } - void SAL_CALL MenuManager::statusChanged( const FeatureStateEvent& Event ) throw ( RuntimeException, std::exception ) { @@ -365,7 +360,6 @@ throw ( RuntimeException, std::exception ) } } - void MenuManager::RemoveListener() { SolarMutexGuard g; @@ -402,7 +396,6 @@ void MenuManager::ClearMenuDispatch(const EventObject& Source,bool _bRemoveOnly) } } - void SAL_CALL MenuManager::disposing( const EventObject& Source ) throw ( RuntimeException, std::exception ) { if ( Source.Source == m_xFrame ) @@ -443,7 +436,6 @@ void SAL_CALL MenuManager::disposing( const EventObject& Source ) throw ( Runtim } } - void MenuManager::UpdateSpecialFileMenu( Menu* pMenu ) { // update picklist @@ -676,7 +668,6 @@ void MenuManager::UpdateSpecialWindowMenu( Menu* pMenu,const Reference< XCompone } } - void MenuManager::CreatePicklistArguments( Sequence< PropertyValue >& aArgsList, const MenuItemHandler* pMenuItemHandler ) { int NUM_OF_PICKLIST_ARGS = 3; @@ -715,11 +706,8 @@ void MenuManager::CreatePicklistArguments( Sequence< PropertyValue >& aArgsList, aArgsList[NUM_OF_PICKLIST_ARGS-1].Value = a; } - - // vcl handler - IMPL_LINK( MenuManager, Activate, Menu *, pMenu ) { if ( pMenu == m_pVCLMenu ) @@ -820,7 +808,6 @@ IMPL_LINK( MenuManager, Activate, Menu *, pMenu ) return 1; } - IMPL_LINK( MenuManager, Deactivate, Menu *, pMenu ) { if ( pMenu == m_pVCLMenu ) @@ -829,7 +816,6 @@ IMPL_LINK( MenuManager, Deactivate, Menu *, pMenu ) return 1; } - IMPL_LINK( MenuManager, Select, Menu *, pMenu ) { URL aTargetURL; @@ -903,7 +889,6 @@ IMPL_LINK( MenuManager, Select, Menu *, pMenu ) return 1; } - IMPL_LINK_NOARG(MenuManager, Highlight) { return 0; diff --git a/framework/source/dispatch/closedispatcher.cxx b/framework/source/dispatch/closedispatcher.cxx index 7c228ec8d595..a4b888a2f5ec 100644 --- a/framework/source/dispatch/closedispatcher.cxx +++ b/framework/source/dispatch/closedispatcher.cxx @@ -40,7 +40,6 @@ #include <unotools/moduleoptions.hxx> #include <comphelper/processfactory.hxx> - using namespace com::sun::star; namespace framework{ @@ -54,8 +53,6 @@ const char URL_CLOSEDOC[] = ".uno:CloseDoc"; const char URL_CLOSEWIN[] = ".uno:CloseWin"; const char URL_CLOSEFRAME[] = ".uno:CloseFrame"; - - CloseDispatcher::CloseDispatcher(const css::uno::Reference< css::uno::XComponentContext >& rxContext , const css::uno::Reference< css::frame::XFrame >& xFrame , const OUString& sTarget) @@ -78,12 +75,10 @@ CloseDispatcher::CloseDispatcher(const css::uno::Reference< css::uno::XComponent } } - CloseDispatcher::~CloseDispatcher() { } - void SAL_CALL CloseDispatcher::dispatch(const css::util::URL& aURL , const css::uno::Sequence< css::beans::PropertyValue >& lArguments) throw(css::uno::RuntimeException, std::exception) @@ -91,7 +86,6 @@ void SAL_CALL CloseDispatcher::dispatch(const css::util::URL& dispatchWithNotification(aURL, lArguments, css::uno::Reference< css::frame::XDispatchResultListener >()); } - css::uno::Sequence< sal_Int16 > SAL_CALL CloseDispatcher::getSupportedCommandGroups() throw(css::uno::RuntimeException, std::exception) { @@ -101,7 +95,6 @@ css::uno::Sequence< sal_Int16 > SAL_CALL CloseDispatcher::getSupportedCommandGro return lGroups; } - css::uno::Sequence< css::frame::DispatchInformation > SAL_CALL CloseDispatcher::getConfigurableDispatchInformation(sal_Int16 nCommandGroup) throw(css::uno::RuntimeException, std::exception) { @@ -126,21 +119,18 @@ css::uno::Sequence< css::frame::DispatchInformation > SAL_CALL CloseDispatcher:: return css::uno::Sequence< css::frame::DispatchInformation >(); } - void SAL_CALL CloseDispatcher::addStatusListener(const css::uno::Reference< css::frame::XStatusListener >& /*xListener*/, const css::util::URL& /*aURL*/ ) throw(css::uno::RuntimeException, std::exception) { } - void SAL_CALL CloseDispatcher::removeStatusListener(const css::uno::Reference< css::frame::XStatusListener >& /*xListener*/, const css::util::URL& /*aURL*/ ) throw(css::uno::RuntimeException, std::exception) { } - void SAL_CALL CloseDispatcher::dispatchWithNotification(const css::util::URL& aURL , const css::uno::Sequence< css::beans::PropertyValue >& lArguments, const css::uno::Reference< css::frame::XDispatchResultListener >& xListener ) @@ -228,7 +218,6 @@ void SAL_CALL CloseDispatcher::dispatchWithNotification(const css::util::URL& m_aAsyncCallback.Post(0); } - /** @short asynchronous callback @descr We start all actions inside this object asnychronoue. @@ -426,7 +415,6 @@ IMPL_LINK_NOARG(CloseDispatcher, impl_asyncCallback) return 0; } - sal_Bool CloseDispatcher::implts_prepareFrameForClosing(const css::uno::Reference< css::frame::XFrame >& xFrame , sal_Bool bAllowSuspend , sal_Bool bCloseAllOtherViewsToo, @@ -479,7 +467,6 @@ sal_Bool CloseDispatcher::implts_prepareFrameForClosing(const css::uno::Referenc return sal_True; } - sal_Bool CloseDispatcher::implts_closeFrame() { css::uno::Reference< css::frame::XFrame > xFrame; @@ -506,7 +493,6 @@ sal_Bool CloseDispatcher::implts_closeFrame() return sal_True; } - sal_Bool CloseDispatcher::implts_establishBackingMode() { css::uno::Reference< css::uno::XComponentContext > xContext; @@ -538,7 +524,6 @@ sal_Bool CloseDispatcher::implts_establishBackingMode() return sal_True; } - sal_Bool CloseDispatcher::implts_terminateApplication() { css::uno::Reference< css::uno::XComponentContext > xContext; @@ -552,7 +537,6 @@ sal_Bool CloseDispatcher::implts_terminateApplication() return xDesktop->terminate(); } - void CloseDispatcher::implts_notifyResultListener(const css::uno::Reference< css::frame::XDispatchResultListener >& xListener, sal_Int16 nState , const css::uno::Any& aResult ) @@ -568,7 +552,6 @@ void CloseDispatcher::implts_notifyResultListener(const css::uno::Reference< css xListener->dispatchFinished(aEvent); } - css::uno::Reference< css::frame::XFrame > CloseDispatcher::static_impl_searchRightTargetFrame(const css::uno::Reference< css::frame::XFrame >& xFrame , const OUString& sTarget) { diff --git a/framework/source/dispatch/dispatchinformationprovider.cxx b/framework/source/dispatch/dispatchinformationprovider.cxx index dbb45dda40a9..febf48b9cf6b 100644 --- a/framework/source/dispatch/dispatchinformationprovider.cxx +++ b/framework/source/dispatch/dispatchinformationprovider.cxx @@ -25,12 +25,10 @@ #include <com/sun/star/frame/CommandGroup.hpp> #include <com/sun/star/frame/AppDispatchProvider.hpp> - #include <comphelper/sequenceasvector.hxx> namespace framework{ - DispatchInformationProvider::DispatchInformationProvider(const css::uno::Reference< css::uno::XComponentContext >& xContext , const css::uno::Reference< css::frame::XFrame >& xFrame) : m_xContext (xContext ) @@ -38,12 +36,10 @@ DispatchInformationProvider::DispatchInformationProvider(const css::uno::Referen { } - DispatchInformationProvider::~DispatchInformationProvider() { } - css::uno::Sequence< sal_Int16 > SAL_CALL DispatchInformationProvider::getSupportedCommandGroups() throw (css::uno::RuntimeException, std::exception) { @@ -75,7 +71,6 @@ css::uno::Sequence< sal_Int16 > SAL_CALL DispatchInformationProvider::getSupport return lGroups.getAsConstList(); } - css::uno::Sequence< css::frame::DispatchInformation > SAL_CALL DispatchInformationProvider::getConfigurableDispatchInformation(sal_Int16 nCommandGroup) throw (css::uno::RuntimeException, std::exception) { @@ -125,7 +120,6 @@ css::uno::Sequence< css::frame::DispatchInformation > SAL_CALL DispatchInformati return lReturn; } - css::uno::Sequence< css::uno::Reference< css::frame::XDispatchInformationProvider > > DispatchInformationProvider::implts_getAllSubProvider() { css::uno::Reference< css::frame::XFrame > xFrame(m_xFrame); diff --git a/framework/source/dispatch/dispatchprovider.cxx b/framework/source/dispatch/dispatchprovider.cxx index 472f6e661e99..80c9026049e1 100644 --- a/framework/source/dispatch/dispatchprovider.cxx +++ b/framework/source/dispatch/dispatchprovider.cxx @@ -176,11 +176,8 @@ css::uno::Reference< css::frame::XDispatch > DispatchProvider::implts_queryDeskt return NULL; } - // I) handle special cases which not right for using findFrame() first - - // I.I) "_blank" // It's not the right place to create a new task here - because we are queried for a dispatch object // only, which can handle such request. Such dispatcher should create the required task on demand. @@ -193,7 +190,6 @@ css::uno::Reference< css::frame::XDispatch > DispatchProvider::implts_queryDeskt xDispatcher = implts_getOrCreateDispatchHelper( E_BLANKDISPATCHER, xDesktop ); } - // I.II) "_default" // This is a combination of search an empty task for recycling - or create a new one. @@ -206,7 +202,6 @@ css::uno::Reference< css::frame::XDispatch > DispatchProvider::implts_queryDeskt xDispatcher = implts_getOrCreateDispatchHelper( E_STARTMODULEDISPATCHER, xDesktop ); } - // I.III) "_self", "", "_top" // The desktop can't load any document - but he can handle some special protocols like "uno", "slot" ... // Why is "top" here handled too? Because the desktop is the topest frame. Normaly it's superflous @@ -221,7 +216,6 @@ css::uno::Reference< css::frame::XDispatch > DispatchProvider::implts_queryDeskt xDispatcher = implts_searchProtocolHandler(aURL); } - // I.IV) no further special targets exist // Now we have to search for the right target frame by calling findFrame() - but should provide our code // against creation of a new task if no frame could be found. @@ -248,8 +242,6 @@ css::uno::Reference< css::frame::XDispatch > DispatchProvider::implts_queryDeskt return xDispatcher; } - - css::uno::Reference< css::frame::XDispatch > DispatchProvider::implts_queryFrameDispatch( const css::uno::Reference< css::frame::XFrame > xFrame , const css::util::URL& aURL , const OUString& sTargetFrameName , @@ -257,18 +249,13 @@ css::uno::Reference< css::frame::XDispatch > DispatchProvider::implts_queryFrame { css::uno::Reference< css::frame::XDispatch > xDispatcher; - // 0) Some URLs are dispatched in a generic way (e.g. by the menu) using the default target "". // But they are specified to use her own fix target. Detect such URLs here and use the correct target. - OUString sTargetName = sTargetFrameName; - // I) handle special cases which not right for using findFrame() first - - // I.I) "_blank", "_default" // It's not the right place to create a new task here. Only the desktop can do that. // Normaly the functionality for "_blank" is provided by findFrame() - but that would create it directly @@ -284,7 +271,6 @@ css::uno::Reference< css::frame::XDispatch > DispatchProvider::implts_queryFrame xDispatcher = xParent->queryDispatch(aURL, sTargetName, 0); // it's a special target - ignore search flags } - // I.II) "_menubar" // Special mode on frame or task to receive the local menu. Not supported by findFrame() @@ -293,7 +279,6 @@ css::uno::Reference< css::frame::XDispatch > DispatchProvider::implts_queryFrame xDispatcher = implts_getOrCreateDispatchHelper( E_MENUDISPATCHER, xFrame ); } - // I.IV) "_beamer" // Special sub frame of a top frame only. Search or create it. ... OK it's currently a little bit HACKI. // Only the sfx (means the controller) can create it it. @@ -315,7 +300,6 @@ css::uno::Reference< css::frame::XDispatch > DispatchProvider::implts_queryFrame } } - // I.V) "_parent" // Our parent frame (if it exist) should handle this URL. @@ -327,7 +311,6 @@ css::uno::Reference< css::frame::XDispatch > DispatchProvider::implts_queryFrame xDispatcher = xParent->queryDispatch(aURL, SPECIALTARGET_SELF, 0); } - // I.VI) "_top" // This request must be forwarded to any parent frame, till we reach a top frame. // If no parent exist, we can handle itself. @@ -351,7 +334,6 @@ css::uno::Reference< css::frame::XDispatch > DispatchProvider::implts_queryFrame } } - // I.VII) "_self", "" // Our owner frame should handle this URL. But we can't do it for all of them. // So we ask the internal setted controller first. If he disagree we try to find a registered @@ -412,7 +394,6 @@ css::uno::Reference< css::frame::XDispatch > DispatchProvider::implts_queryFrame } } - // I.VI) no further special handlings exist // Now we have to search for the right target frame by calling findFrame() - but should provide our code // against creation of a new task if no frame could be found. @@ -458,8 +439,6 @@ css::uno::Reference< css::frame::XDispatch > DispatchProvider::implts_queryFrame return xDispatcher; } - - /** @short search for a registered protocol handler and ask him for a dispatch object @descr Wes earch a suitable handler inside our cfg package org.openoffice.Office.ProtocolHandler. @@ -524,8 +503,6 @@ css::uno::Reference< css::frame::XDispatch > DispatchProvider::implts_searchProt return xDispatcher; } - - /** @short get or create new dispatch helper @descr Sometimes we need some helper implementations to support dispatching of special URLs or commands. @@ -626,8 +603,6 @@ css::uno::Reference< css::frame::XDispatch > DispatchProvider::implts_getOrCreat return xDispatchHelper; } - - /** @short check URL for support by our used loader or handler @descr If we must return our own dispatch helper implementations (self, blank, create dispatcher!) diff --git a/framework/source/dispatch/interceptionhelper.cxx b/framework/source/dispatch/interceptionhelper.cxx index cec5a555281e..8d23fc2ceb3c 100644 --- a/framework/source/dispatch/interceptionhelper.cxx +++ b/framework/source/dispatch/interceptionhelper.cxx @@ -23,14 +23,10 @@ #include <vcl/svapp.hxx> - namespace framework{ - sal_Bool InterceptionHelper::m_bPreferrFirstInterceptor = sal_True; - - InterceptionHelper::InterceptionHelper(const css::uno::Reference< css::frame::XFrame >& xOwner, const css::uno::Reference< css::frame::XDispatchProvider >& xSlave) : m_xOwnerWeak (xOwner ) diff --git a/framework/source/dispatch/mailtodispatcher.cxx b/framework/source/dispatch/mailtodispatcher.cxx index 1d008a658173..409970392ae6 100644 --- a/framework/source/dispatch/mailtodispatcher.cxx +++ b/framework/source/dispatch/mailtodispatcher.cxx @@ -29,7 +29,6 @@ namespace framework{ - // XInterface, XTypeProvider, XServiceInfo DEFINE_XSERVICEINFO_MULTISERVICE_2(MailToDispatcher , @@ -47,8 +46,6 @@ DEFINE_INIT_SERVICE(MailToDispatcher, } ) - - /** @short standard ctor @descr These initialize a new instance of ths class with needed information for work. @@ -61,8 +58,6 @@ MailToDispatcher::MailToDispatcher( const css::uno::Reference< css::uno::XCompon { } - - /** @short standard dtor @descr - @@ -71,8 +66,6 @@ MailToDispatcher::~MailToDispatcher() { } - - /** @short decide if this dispatch implementation can be used for requested URL or not @descr A protocol handler is registerd for an URL pattern inside configuration and will @@ -92,8 +85,6 @@ css::uno::Reference< css::frame::XDispatch > SAL_CALL MailToDispatcher::queryDis return xDispatcher; } - - /** @short do the same like dispatch() but for multiple requests at the same time @descr - @@ -112,8 +103,6 @@ css::uno::Sequence< css::uno::Reference< css::frame::XDispatch > > SAL_CALL Mail return lDispatcher; } - - /** @short dispatch URL with arguments @descr We use threadsafe internal method to do so. It returns a state value - but we ignore it. @@ -135,8 +124,6 @@ void SAL_CALL MailToDispatcher::dispatch( const css::util::URL& // No notification for status listener! } - - /** @short dispatch with guaranteed notifications about success @descr We use threadsafe internal method to do so. Return state of this function will be used @@ -172,8 +159,6 @@ void SAL_CALL MailToDispatcher::dispatchWithNotification( const css::util::URL& } } - - /** @short threadsafe helper for dispatch calls @descr We support two interfaces for the same process - dispatch URLs. That the reason for this internal @@ -215,8 +200,6 @@ sal_Bool MailToDispatcher::implts_dispatch( const css::util::URL& return bSuccess; } - - /** @short add/remove listener for state events @descr Because we use an external process to forward such mail URLs, and this process doesn't @@ -234,8 +217,6 @@ void SAL_CALL MailToDispatcher::addStatusListener( const css::uno::Reference< cs // not supported yet } - - void SAL_CALL MailToDispatcher::removeStatusListener( const css::uno::Reference< css::frame::XStatusListener >& /*xListener*/ , const css::util::URL& /*aURL*/ ) throw( css::uno::RuntimeException, std::exception ) { diff --git a/framework/source/dispatch/menudispatcher.cxx b/framework/source/dispatch/menudispatcher.cxx index 85b1c6c53c3e..e87fbcf2e38e 100644 --- a/framework/source/dispatch/menudispatcher.cxx +++ b/framework/source/dispatch/menudispatcher.cxx @@ -84,7 +84,6 @@ MenuDispatcher::MenuDispatcher( const uno::Reference< XComponentContext >& xOwner->addFrameActionListener( uno::Reference< XFrameActionListener >( (OWeakObject *)this, UNO_QUERY )); } - // destructor MenuDispatcher::~MenuDispatcher() @@ -94,7 +93,6 @@ MenuDispatcher::~MenuDispatcher() // and a dtor isn't the best place to do that! } - // XDispatch void SAL_CALL MenuDispatcher::dispatch( const URL& /*aURL*/ , @@ -102,7 +100,6 @@ void SAL_CALL MenuDispatcher::dispatch( const URL& / { } - // XDispatch void SAL_CALL MenuDispatcher::addStatusListener( const uno::Reference< XStatusListener >& xControl, @@ -116,7 +113,6 @@ void SAL_CALL MenuDispatcher::addStatusListener( const uno::Reference< XStat m_aListenerContainer.addInterface( aURL.Complete, xControl ); } - // XDispatch void SAL_CALL MenuDispatcher::removeStatusListener( const uno::Reference< XStatusListener >& xControl, @@ -130,10 +126,8 @@ void SAL_CALL MenuDispatcher::removeStatusListener( const uno::Reference< X m_aListenerContainer.removeInterface( aURL.Complete, xControl ); } - // XFrameActionListener - void SAL_CALL MenuDispatcher::frameAction( const FrameActionEvent& aEvent ) throw ( RuntimeException, std::exception ) { SolarMutexResettableGuard aGuard; @@ -169,7 +163,6 @@ void SAL_CALL MenuDispatcher::frameAction( const FrameActionEvent& aEvent ) thro } } - // XEventListener void SAL_CALL MenuDispatcher::disposing( const EventObject& ) throw( RuntimeException, std::exception ) { @@ -206,7 +199,6 @@ void SAL_CALL MenuDispatcher::disposing( const EventObject& ) throw( RuntimeExce } } - // private method void MenuDispatcher::impl_setAccelerators( Menu* pMenu, const Accelerator& aAccel ) @@ -226,7 +218,6 @@ void MenuDispatcher::impl_setAccelerators( Menu* pMenu, const Accelerator& aAcce } } - // private method sal_Bool MenuDispatcher::impl_setMenuBar( MenuBar* pMenuBar, sal_Bool bMenuFromResource ) @@ -306,7 +297,6 @@ static sal_Bool impldbg_checkParameter_MenuDispatcher( const uno::Reference< return xContext.is() && xOwner.is(); } - // We need a valid URL. What is meaning with "register for nothing"?! // xControl must correct to - nobody can advised otherwise! static sal_Bool impldbg_checkParameter_addStatusListener( const uno::Reference< XStatusListener >& xControl, @@ -327,7 +317,6 @@ static sal_Bool impldbg_checkParameter_addStatusListener( const uno::Reference return bOK ; } - // The same goes for these case! We have added valid listener for correct URL only. // We can't remove invalid listener for nothing! static sal_Bool impldbg_checkParameter_removeStatusListener( const uno::Reference< XStatusListener >& xControl, diff --git a/framework/source/dispatch/oxt_handler.cxx b/framework/source/dispatch/oxt_handler.cxx index 488f6b4af290..eac9f2daf027 100644 --- a/framework/source/dispatch/oxt_handler.cxx +++ b/framework/source/dispatch/oxt_handler.cxx @@ -31,10 +31,8 @@ namespace framework{ - // XInterface, XTypeProvider, XServiceInfo - DEFINE_XSERVICEINFO_MULTISERVICE ( Oxt_Handler , ::cppu::OWeakObject , SERVICENAME_CONTENTHANDLER , diff --git a/framework/source/dispatch/servicehandler.cxx b/framework/source/dispatch/servicehandler.cxx index 17145248ace4..d59089974ac0 100644 --- a/framework/source/dispatch/servicehandler.cxx +++ b/framework/source/dispatch/servicehandler.cxx @@ -31,7 +31,6 @@ namespace framework{ #define PROTOCOL_VALUE "service:" #define PROTOCOL_LENGTH 8 - // XInterface, XTypeProvider, XServiceInfo DEFINE_XSERVICEINFO_MULTISERVICE(ServiceHandler , @@ -49,8 +48,6 @@ DEFINE_INIT_SERVICE(ServiceHandler, } ) - - /** @short standard ctor @descr These initialize a new instance of ths class with needed information for work. @@ -63,8 +60,6 @@ ServiceHandler::ServiceHandler( const css::uno::Reference< css::lang::XMultiServ { } - - /** @short standard dtor @descr - @@ -73,8 +68,6 @@ ServiceHandler::~ServiceHandler() { } - - /** @short decide if this dispatch implementation can be used for requested URL or not @descr A protocol handler is registerd for an URL pattern inside configuration and will @@ -94,8 +87,6 @@ css::uno::Reference< css::frame::XDispatch > SAL_CALL ServiceHandler::queryDispa return xDispatcher; } - - /** @short do the same like dispatch() but for multiple requests at the same time @descr - @@ -114,8 +105,6 @@ css::uno::Sequence< css::uno::Reference< css::frame::XDispatch > > SAL_CALL Serv return lDispatcher; } - - /** @short dispatch URL with arguments @descr We use threadsafe internal method to do so. It returns a state value - but we ignore it. @@ -136,8 +125,6 @@ void SAL_CALL ServiceHandler::dispatch( const css::util::URL& // No notification for status listener! } - - /** @short dispatch with guaranteed notifications about success @descr We use threadsafe internal method to do so. Return state of this function will be used @@ -174,8 +161,6 @@ void SAL_CALL ServiceHandler::dispatchWithNotification( const css::util::URL& } } - - /** @short threadsafe helper for dispatch calls @descr We support two interfaces for the same process - dispatch URLs. That the reason for this internal @@ -245,8 +230,6 @@ css::uno::Reference< css::uno::XInterface > ServiceHandler::implts_dispatch( con return xService; } - - /** @short add/remove listener for state events @descr We use an internal container to hold such registered listener. This container lives if we live. @@ -264,8 +247,6 @@ void SAL_CALL ServiceHandler::addStatusListener( const css::uno::Reference< css: // not supported yet } - - void SAL_CALL ServiceHandler::removeStatusListener( const css::uno::Reference< css::frame::XStatusListener >& /*xListener*/ , const css::util::URL& /*aURL*/ ) throw( css::uno::RuntimeException, std::exception ) { diff --git a/framework/source/dispatch/startmoduledispatcher.cxx b/framework/source/dispatch/startmoduledispatcher.cxx index 9611dfe29fab..c6e188cf795b 100644 --- a/framework/source/dispatch/startmoduledispatcher.cxx +++ b/framework/source/dispatch/startmoduledispatcher.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <dispatch/startmoduledispatcher.hxx> #include <pattern/frame.hxx> @@ -42,7 +41,6 @@ #include <unotools/moduleoptions.hxx> #include <comphelper/processfactory.hxx> - namespace framework{ #ifdef fpf @@ -50,8 +48,6 @@ namespace framework{ #endif namespace fpf = ::framework::pattern::frame; - - StartModuleDispatcher::StartModuleDispatcher(const css::uno::Reference< css::uno::XComponentContext >& rxContext, const css::uno::Reference< css::frame::XFrame >& xFrame , const OUString& sTarget) @@ -62,12 +58,10 @@ StartModuleDispatcher::StartModuleDispatcher(const css::uno::Reference< css::uno { } - StartModuleDispatcher::~StartModuleDispatcher() { } - void SAL_CALL StartModuleDispatcher::dispatch(const css::util::URL& aURL , const css::uno::Sequence< css::beans::PropertyValue >& lArguments) throw(css::uno::RuntimeException, std::exception) @@ -75,7 +69,6 @@ void SAL_CALL StartModuleDispatcher::dispatch(const css::util::URL& dispatchWithNotification(aURL, lArguments, css::uno::Reference< css::frame::XDispatchResultListener >()); } - void SAL_CALL StartModuleDispatcher::dispatchWithNotification(const css::util::URL& aURL , const css::uno::Sequence< css::beans::PropertyValue >& /*lArguments*/, const css::uno::Reference< css::frame::XDispatchResultListener >& xListener ) @@ -95,35 +88,30 @@ void SAL_CALL StartModuleDispatcher::dispatchWithNotification(const css::util::U implts_notifyResultListener(xListener, nResult, css::uno::Any()); } - css::uno::Sequence< ::sal_Int16 > SAL_CALL StartModuleDispatcher::getSupportedCommandGroups() throw(css::uno::RuntimeException, std::exception) { return css::uno::Sequence< ::sal_Int16 >(); } - css::uno::Sequence< css::frame::DispatchInformation > SAL_CALL StartModuleDispatcher::getConfigurableDispatchInformation(::sal_Int16 /*nCommandGroup*/) throw(css::uno::RuntimeException, std::exception) { return css::uno::Sequence< css::frame::DispatchInformation >(); } - void SAL_CALL StartModuleDispatcher::addStatusListener(const css::uno::Reference< css::frame::XStatusListener >& /*xListener*/, const css::util::URL& /*aURL*/ ) throw(css::uno::RuntimeException, std::exception) { } - void SAL_CALL StartModuleDispatcher::removeStatusListener(const css::uno::Reference< css::frame::XStatusListener >& /*xListener*/, const css::util::URL& /*aURL*/ ) throw(css::uno::RuntimeException, std::exception) { } - sal_Bool StartModuleDispatcher::implts_isBackingModePossible () { if ( ! SvtModuleOptions().IsModuleInstalled(SvtModuleOptions::E_SSTARTMODULE)) @@ -151,7 +139,6 @@ sal_Bool StartModuleDispatcher::implts_isBackingModePossible () return bIsPossible; } - sal_Bool StartModuleDispatcher::implts_establishBackingMode() { css::uno::Reference< css::frame::XDesktop2> xDesktop = css::frame::Desktop::create( m_xContext ); @@ -167,7 +154,6 @@ sal_Bool StartModuleDispatcher::implts_establishBackingMode() return sal_True; } - void StartModuleDispatcher::implts_notifyResultListener(const css::uno::Reference< css::frame::XDispatchResultListener >& xListener, ::sal_Int16 nState , const css::uno::Any& aResult ) diff --git a/framework/source/dispatch/systemexec.cxx b/framework/source/dispatch/systemexec.cxx index 6a5f8263d609..97975a1f4b96 100644 --- a/framework/source/dispatch/systemexec.cxx +++ b/framework/source/dispatch/systemexec.cxx @@ -35,7 +35,6 @@ namespace framework{ #define PROTOCOL_VALUE "systemexecute:" #define PROTOCOL_LENGTH 14 - // XInterface, XTypeProvider, XServiceInfo DEFINE_XSERVICEINFO_MULTISERVICE_2(SystemExec , @@ -53,21 +52,15 @@ DEFINE_INIT_SERVICE(SystemExec, } ) - - SystemExec::SystemExec( const css::uno::Reference< css::uno::XComponentContext >& rxContext ) : m_xContext ( rxContext ) { } - - SystemExec::~SystemExec() { } - - css::uno::Reference< css::frame::XDispatch > SAL_CALL SystemExec::queryDispatch( const css::util::URL& aURL , const OUString&, sal_Int32 ) throw( css::uno::RuntimeException, std::exception ) @@ -78,8 +71,6 @@ css::uno::Reference< css::frame::XDispatch > SAL_CALL SystemExec::queryDispatch( return xDispatcher; } - - css::uno::Sequence< css::uno::Reference< css::frame::XDispatch > > SAL_CALL SystemExec::queryDispatches( const css::uno::Sequence< css::frame::DispatchDescriptor >& lDescriptor ) throw( css::uno::RuntimeException, std::exception ) { sal_Int32 nCount = lDescriptor.getLength(); @@ -94,16 +85,12 @@ css::uno::Sequence< css::uno::Reference< css::frame::XDispatch > > SAL_CALL Syst return lDispatcher; } - - void SAL_CALL SystemExec::dispatch( const css::util::URL& aURL , const css::uno::Sequence< css::beans::PropertyValue >& lArguments ) throw( css::uno::RuntimeException, std::exception ) { dispatchWithNotification(aURL, lArguments, css::uno::Reference< css::frame::XDispatchResultListener >()); } - - void SAL_CALL SystemExec::dispatchWithNotification( const css::util::URL& aURL , const css::uno::Sequence< css::beans::PropertyValue >&, const css::uno::Reference< css::frame::XDispatchResultListener >& xListener ) throw( css::uno::RuntimeException, std::exception ) @@ -136,24 +123,18 @@ void SAL_CALL SystemExec::dispatchWithNotification( const css::util::URL& } } - - void SAL_CALL SystemExec::addStatusListener( const css::uno::Reference< css::frame::XStatusListener >&, const css::util::URL& ) throw( css::uno::RuntimeException, std::exception ) { // not supported yet } - - void SAL_CALL SystemExec::removeStatusListener( const css::uno::Reference< css::frame::XStatusListener >&, const css::util::URL& ) throw( css::uno::RuntimeException, std::exception ) { // not supported yet } - - void SystemExec::impl_notifyResultListener(const css::uno::Reference< css::frame::XDispatchResultListener >& xListener, const sal_Int16 nState ) { diff --git a/framework/source/dispatch/windowcommanddispatch.cxx b/framework/source/dispatch/windowcommanddispatch.cxx index cb47da8e2d7f..725151cceba5 100644 --- a/framework/source/dispatch/windowcommanddispatch.cxx +++ b/framework/source/dispatch/windowcommanddispatch.cxx @@ -33,10 +33,8 @@ #include <osl/mutex.hxx> #include <toolkit/helper/vclunohelper.hxx> - namespace framework{ - WindowCommandDispatch::WindowCommandDispatch(const css::uno::Reference< css::uno::XComponentContext >& xContext , const css::uno::Reference< css::frame::XFrame >& xFrame) : m_xContext (xContext ) @@ -46,14 +44,12 @@ WindowCommandDispatch::WindowCommandDispatch(const css::uno::Reference< css::uno impl_startListening(); } - WindowCommandDispatch::~WindowCommandDispatch() { impl_stopListening(); m_xContext.clear(); } - void WindowCommandDispatch::impl_startListening() { osl::ClearableMutexGuard aReadLock(m_mutex); @@ -96,8 +92,6 @@ void WindowCommandDispatch::impl_stopListening() } } - - IMPL_LINK(WindowCommandDispatch, impl_notifyCommand, void*, pParam) { if ( ! pParam) @@ -142,7 +136,6 @@ IMPL_LINK(WindowCommandDispatch, impl_notifyCommand, void*, pParam) return 0L; } - void WindowCommandDispatch::impl_dispatchCommand(const OUString& sCommand) { // ignore all errors here. It's clicking a menu entry only ... diff --git a/framework/source/fwe/classes/actiontriggercontainer.cxx b/framework/source/fwe/classes/actiontriggercontainer.cxx index 95e3a91d4695..904b3e3fae2e 100644 --- a/framework/source/fwe/classes/actiontriggercontainer.cxx +++ b/framework/source/fwe/classes/actiontriggercontainer.cxx @@ -36,7 +36,6 @@ ActionTriggerContainer::ActionTriggerContainer() : { } - ActionTriggerContainer::~ActionTriggerContainer() { } diff --git a/framework/source/fwe/classes/actiontriggerpropertyset.cxx b/framework/source/fwe/classes/actiontriggerpropertyset.cxx index 402d277ae0f2..7a6a478eda62 100644 --- a/framework/source/fwe/classes/actiontriggerpropertyset.cxx +++ b/framework/source/fwe/classes/actiontriggerpropertyset.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <classes/actiontriggerpropertyset.hxx> #include <threadhelp/lockhelper.hxx> #include <com/sun/star/beans/PropertyAttribute.hpp> @@ -26,7 +25,6 @@ #include <cppuhelper/typeprovider.hxx> #include <vcl/svapp.hxx> - using namespace cppu; using namespace com::sun::star::uno; using namespace com::sun::star::beans; diff --git a/framework/source/fwe/classes/actiontriggerseparatorpropertyset.cxx b/framework/source/fwe/classes/actiontriggerseparatorpropertyset.cxx index d9e3a1aa6598..956fdddf4c2c 100644 --- a/framework/source/fwe/classes/actiontriggerseparatorpropertyset.cxx +++ b/framework/source/fwe/classes/actiontriggerseparatorpropertyset.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <classes/actiontriggerseparatorpropertyset.hxx> #include <threadhelp/lockhelper.hxx> #include <com/sun/star/beans/PropertyAttribute.hpp> @@ -26,7 +25,6 @@ #include <cppuhelper/typeprovider.hxx> #include <vcl/svapp.hxx> - using namespace cppu; using namespace com::sun::star::uno; using namespace com::sun::star::beans; diff --git a/framework/source/fwe/classes/addonmenu.cxx b/framework/source/fwe/classes/addonmenu.cxx index 0f4c16be95a5..4eed572f2ad2 100644 --- a/framework/source/fwe/classes/addonmenu.cxx +++ b/framework/source/fwe/classes/addonmenu.cxx @@ -65,9 +65,6 @@ AddonMenu::~AddonMenu() } } - - - // Check if command URL string has the unique prefix to identify addon popup menus bool AddonPopupMenu::IsCommandURLPrefix( const OUString& aCmdURL ) { @@ -85,8 +82,6 @@ AddonPopupMenu::~AddonPopupMenu() { } - - static Reference< XModel > GetModelFromFrame( const Reference< XFrame >& rFrame ) { // Query for the model to get check the context information @@ -101,8 +96,6 @@ static Reference< XModel > GetModelFromFrame( const Reference< XFrame >& rFrame return xModel; } - - bool AddonMenuManager::HasAddonMenuElements() { return AddonsOptions().HasAddonsMenu(); @@ -150,7 +143,6 @@ sal_uInt16 AddonMenuManager::GetNextPos( sal_uInt16 nPos ) return ( nPos == MENU_APPEND ) ? MENU_APPEND : ( nPos+1 ); } - static sal_uInt16 FindMenuId( Menu* pMenu, const OUString& aCommand ) { sal_uInt16 nPos = 0; @@ -166,7 +158,6 @@ static sal_uInt16 FindMenuId( Menu* pMenu, const OUString& aCommand ) return USHRT_MAX; } - // Merge the Add-Ons help menu items into the given menu bar at a defined pos void AddonMenuManager::MergeAddonHelpMenu( const Reference< XFrame >& rFrame, MenuBar* pMergeMenuBar ) { diff --git a/framework/source/fwe/classes/addonsoptions.cxx b/framework/source/fwe/classes/addonsoptions.cxx index 9008a3dc4509..e723cb4d24f1 100644 --- a/framework/source/fwe/classes/addonsoptions.cxx +++ b/framework/source/fwe/classes/addonsoptions.cxx @@ -38,10 +38,8 @@ #include <algorithm> #include <vector> - // namespaces - using namespace ::std ; using namespace ::utl ; using namespace ::osl ; @@ -152,7 +150,6 @@ using namespace ::com::sun::star; #define OFFSET_STATUSBARITEM_OWNERDRAW 5 #define OFFSET_STATUSBARITEM_WIDTH 6 - // The following order is mandatory. Please add properties at the end! #define PROPERTYCOUNT_IMAGES 8 #define PROPERTYCOUNT_EMBEDDED_IMAGES 4 @@ -192,10 +189,8 @@ using namespace ::com::sun::star; #define EXPAND_PROTOCOL "vnd.sun.star.expand:" - // private declarations! - /*-**************************************************************************************************************** @descr struct to hold information about one menu entry. ****************************************************************************************************************-*/ @@ -208,19 +203,15 @@ class AddonsOptions_Impl : public ConfigItem // public methods - public: // constructor / destructor - AddonsOptions_Impl(); virtual ~AddonsOptions_Impl(); - // overloaded methods of baseclass - /*-**************************************************************************************************** @short called for notify of configmanager @descr These method is called from the ConfigManager before application ends or from the @@ -252,10 +243,8 @@ class AddonsOptions_Impl : public ConfigItem virtual void Commit() SAL_OVERRIDE; - // public interface - /*-**************************************************************************************************** @short base implementation of public interface for "SvtDynamicMenuOptions"! @descr These class is used as static member of "SvtDynamicMenuOptions" ... @@ -282,10 +271,8 @@ class AddonsOptions_Impl : public ConfigItem const MergeStatusbarInstructionContainer& GetMergeStatusbarInstructions() const; void ReadConfigurationData(); - // private methods - private: enum ImageSize { @@ -311,7 +298,6 @@ class AddonsOptions_Impl : public ConfigItem typedef std::vector< Sequence< Sequence< PropertyValue > > > AddonToolBars; typedef ::boost::unordered_map< OUString, MergeToolbarInstructionContainer, OUStringHash, ::std::equal_to< OUString > > ToolbarMergingInstructions; - /*-**************************************************************************************************** @short return list of key names of our configuration management which represent oue module tree @descr These methods return the current list of key names! We need it to get needed values from our @@ -360,10 +346,8 @@ class AddonsOptions_Impl : public ConfigItem Sequence< OUString > GetPropertyNamesImages( const OUString& aPropertyRootNode ) const; bool CreateImageFromSequence( Image& rImage, Sequence< sal_Int8 >& rBitmapDataSeq ) const; - // private member - private: ImageEntry* ReadOptionalImageData( const OUString& aMenuNodeName ); @@ -399,7 +383,6 @@ void AddonsOptions_Impl::ImageEntry::addImage(ImageSize eSize, aURL[(int)eSize] = rURL; } - // constructor AddonsOptions_Impl::AddonsOptions_Impl() @@ -470,7 +453,6 @@ AddonsOptions_Impl::AddonsOptions_Impl() EnableNotification( aNotifySeq ); } - // destructor AddonsOptions_Impl::~AddonsOptions_Impl() @@ -508,7 +490,6 @@ void AddonsOptions_Impl::ReadConfigurationData() ReadStatusbarMergeInstructions( m_aCachedStatusbarMergingInstructions ); } - // public method void AddonsOptions_Impl::Notify( const Sequence< OUString >& /*lPropertyNames*/ ) @@ -516,7 +497,6 @@ void AddonsOptions_Impl::Notify( const Sequence< OUString >& /*lPropertyNames*/ Application::PostUserEvent( STATIC_LINK( 0, AddonsOptions, Notify ) ); } - // public method void AddonsOptions_Impl::Commit() @@ -524,7 +504,6 @@ void AddonsOptions_Impl::Commit() OSL_FAIL( "AddonsOptions_Impl::Commit()\nNot implemented yet!\n" ); } - // public method bool AddonsOptions_Impl::HasAddonsMenu() const @@ -532,7 +511,6 @@ bool AddonsOptions_Impl::HasAddonsMenu() const return ( m_aCachedMenuProperties.getLength() > 0 ); } - // public method sal_Int32 AddonsOptions_Impl::GetAddonsToolBarCount() const @@ -540,7 +518,6 @@ sal_Int32 AddonsOptions_Impl::GetAddonsToolBarCount() const return m_aCachedToolBarPartProperties.size(); } - // public method const Sequence< Sequence< PropertyValue > >& AddonsOptions_Impl::GetAddonsMenu() const @@ -548,7 +525,6 @@ const Sequence< Sequence< PropertyValue > >& AddonsOptions_Impl::GetAddonsMenu() return m_aCachedMenuProperties; } - // public method const Sequence< Sequence< PropertyValue > >& AddonsOptions_Impl::GetAddonsMenuBarPart() const @@ -556,7 +532,6 @@ const Sequence< Sequence< PropertyValue > >& AddonsOptions_Impl::GetAddonsMenuBa return m_aCachedMenuBarPartProperties; } - // public method const Sequence< Sequence< PropertyValue > >& AddonsOptions_Impl::GetAddonsToolBarPart( sal_uInt32 nIndex ) const @@ -567,7 +542,6 @@ const Sequence< Sequence< PropertyValue > >& AddonsOptions_Impl::GetAddonsToolBa return m_aEmptyAddonToolBar; } - // public method const OUString AddonsOptions_Impl::GetAddonsToolbarResourceName( sal_uInt32 nIndex ) const @@ -578,7 +552,6 @@ const OUString AddonsOptions_Impl::GetAddonsToolbarResourceName( sal_uInt32 nInd return OUString(); } - // public method const Sequence< Sequence< PropertyValue > >& AddonsOptions_Impl::GetAddonsHelpMenu () const @@ -586,7 +559,6 @@ const Sequence< Sequence< PropertyValue > >& AddonsOptions_Impl::GetAddonsHelpMe return m_aCachedHelpMenuProperties; } - // public method const MergeMenuInstructionContainer& AddonsOptions_Impl::GetMergeMenuInstructions() const @@ -594,7 +566,6 @@ const MergeMenuInstructionContainer& AddonsOptions_Impl::GetMergeMenuInstruction return m_aCachedMergeMenuInsContainer; } - // public method bool AddonsOptions_Impl::GetMergeToolbarInstructions( @@ -616,7 +587,6 @@ const MergeStatusbarInstructionContainer& AddonsOptions_Impl::GetMergeStatusbarI return m_aCachedStatusbarMergingInstructions; } - // public method static Image ScaleImage( const Image &rImage, bool bBig ) @@ -678,7 +648,6 @@ Image AddonsOptions_Impl::GetImageFromURL( const OUString& aURL, bool bBig, bool return aImage; } - // private method bool AddonsOptions_Impl::ReadAddonMenuSet( Sequence< Sequence< PropertyValue > >& rAddonMenuSeq ) @@ -717,7 +686,6 @@ bool AddonsOptions_Impl::ReadAddonMenuSet( Sequence< Sequence< PropertyValue > > return ( rAddonMenuSeq.getLength() > 0 ); } - // private method bool AddonsOptions_Impl::ReadOfficeHelpSet( Sequence< Sequence< PropertyValue > >& rAddonOfficeHelpMenuSeq ) @@ -756,7 +724,6 @@ bool AddonsOptions_Impl::ReadOfficeHelpSet( Sequence< Sequence< PropertyValue > return ( rAddonOfficeHelpMenuSeq.getLength() > 0 ); } - // private method bool AddonsOptions_Impl::ReadOfficeMenuBarSet( Sequence< Sequence< PropertyValue > >& rAddonOfficeMenuBarSeq ) @@ -812,7 +779,6 @@ bool AddonsOptions_Impl::ReadOfficeMenuBarSet( Sequence< Sequence< PropertyValue return ( rAddonOfficeMenuBarSeq.getLength() > 0 ); } - // private method bool AddonsOptions_Impl::ReadOfficeToolBarSet( AddonToolBars& rAddonOfficeToolBars, std::vector< OUString >& rAddonOfficeToolBarResNames ) @@ -835,8 +801,6 @@ bool AddonsOptions_Impl::ReadOfficeToolBarSet( AddonToolBars& rAddonOfficeToolBa return ( !rAddonOfficeToolBars.empty() ); } - - // private method bool AddonsOptions_Impl::ReadToolBarItemSet( const OUString& rToolBarItemSetNodeName, Sequence< Sequence< PropertyValue > >& rAddonOfficeToolBarSeq ) @@ -923,10 +887,8 @@ void AddonsOptions_Impl::ReadImages( ImageManager& aImageManager ) } } - // private method - OUString AddonsOptions_Impl::GeneratePrefixURL() { // Create an unique prefixed Add-On popup menu URL so it can be identified later as a runtime popup menu. @@ -939,10 +901,8 @@ OUString AddonsOptions_Impl::GeneratePrefixURL() return aPopupMenuURL; } - // private method - bool AddonsOptions_Impl::ReadMenuMergeInstructions( MergeMenuInstructionContainer& aContainer ) { const OUString aMenuMergeRootName( "AddonUI/OfficeMenuBarMerging/" ); @@ -1009,7 +969,6 @@ bool AddonsOptions_Impl::ReadMenuMergeInstructions( MergeMenuInstructionContaine return true; } - // private method bool AddonsOptions_Impl::ReadMergeMenuData( const OUString& aMergeAddonInstructionBase, Sequence< Sequence< PropertyValue > >& rMergeMenu ) @@ -1026,7 +985,6 @@ bool AddonsOptions_Impl::ReadMergeMenuData( const OUString& aMergeAddonInstructi return ReadSubMenuEntries( aSubMenuNodeNames, rMergeMenu ); } - // private method bool AddonsOptions_Impl::ReadToolbarMergeInstructions( ToolbarMergingInstructions& rCachedToolbarMergingInstructions ) @@ -1101,7 +1059,6 @@ bool AddonsOptions_Impl::ReadToolbarMergeInstructions( ToolbarMergingInstruction return true; } - // private method bool AddonsOptions_Impl::ReadMergeToolbarData( const OUString& aMergeAddonInstructionBase, Sequence< Sequence< PropertyValue > >& rMergeToolbarItems ) @@ -1114,7 +1071,6 @@ bool AddonsOptions_Impl::ReadMergeToolbarData( const OUString& aMergeAddonInstru return ReadToolBarItemSet( aMergeToolbarBaseNode, rMergeToolbarItems ); } - bool AddonsOptions_Impl::ReadStatusbarMergeInstructions( MergeStatusbarInstructionContainer& aContainer ) { const ::rtl::OUString aStatusbarMergeRootName( "AddonUI/OfficeStatusbarMerging/" ); @@ -1249,7 +1205,6 @@ bool AddonsOptions_Impl::ReadStatusBarItem( return bResult; } - // private method bool AddonsOptions_Impl::ReadMenuItem( const OUString& aMenuNodeName, Sequence< PropertyValue >& aMenuItem, bool bIgnoreSubMenu ) @@ -1323,7 +1278,6 @@ bool AddonsOptions_Impl::ReadMenuItem( const OUString& aMenuNodeName, Sequence< return bResult; } - // private method bool AddonsOptions_Impl::ReadPopupMenu( const OUString& aPopupMenuNodeName, Sequence< PropertyValue >& aPopupMenu ) @@ -1364,7 +1318,6 @@ bool AddonsOptions_Impl::ReadPopupMenu( const OUString& aPopupMenuNodeName, Sequ return bResult; } - // private method bool AddonsOptions_Impl::AppendPopupMenu( Sequence< PropertyValue >& rTargetPopupMenu, const Sequence< PropertyValue >& rSourcePopupMenu ) @@ -1385,7 +1338,6 @@ bool AddonsOptions_Impl::AppendPopupMenu( Sequence< PropertyValue >& rTargetPopu return true; } - // private method bool AddonsOptions_Impl::ReadToolBarItem( const OUString& aToolBarItemNodeName, Sequence< PropertyValue >& aToolBarItem ) @@ -1442,7 +1394,6 @@ bool AddonsOptions_Impl::ReadToolBarItem( const OUString& aToolBarItemNodeName, return bResult; } - // private method bool AddonsOptions_Impl::ReadSubMenuEntries( const Sequence< OUString >& aSubMenuNodeNames, Sequence< Sequence< PropertyValue > >& rSubMenuSeq ) @@ -1472,7 +1423,6 @@ bool AddonsOptions_Impl::ReadSubMenuEntries( const Sequence< OUString >& aSubMen return true; } - // private method bool AddonsOptions_Impl::HasAssociatedImages( const OUString& aURL ) @@ -1482,7 +1432,6 @@ bool AddonsOptions_Impl::HasAssociatedImages( const OUString& aURL ) return ( pIter != m_aImageManager.end() ); } - // private method void AddonsOptions_Impl::SubstituteVariables( OUString& aURL ) @@ -1499,7 +1448,6 @@ void AddonsOptions_Impl::SubstituteVariables( OUString& aURL ) } } - // private method Image AddonsOptions_Impl::ReadImageFromURL(const OUString& aImageURL) @@ -1533,7 +1481,6 @@ Image AddonsOptions_Impl::ReadImageFromURL(const OUString& aImageURL) return aImage; } - // private method void AddonsOptions_Impl::ReadAndAssociateImages( const OUString& aURL, const OUString& aImageId ) @@ -1561,7 +1508,6 @@ void AddonsOptions_Impl::ReadAndAssociateImages( const OUString& aURL, const OUS m_aImageManager.insert( ImageManager::value_type( aURL, aImageEntry )); } - // private method AddonsOptions_Impl::ImageEntry* AddonsOptions_Impl::ReadImageData( const OUString& aImagesNodeName ) @@ -1610,7 +1556,6 @@ AddonsOptions_Impl::ImageEntry* AddonsOptions_Impl::ReadImageData( const OUStrin return pEntry; } - // private method bool AddonsOptions_Impl::CreateImageFromSequence( Image& rImage, Sequence< sal_Int8 >& rBitmapDataSeq ) const @@ -1652,7 +1597,6 @@ Sequence< OUString > AddonsOptions_Impl::GetPropertyNamesMenuItem( const OUStrin return lResult; } - // private method Sequence< OUString > AddonsOptions_Impl::GetPropertyNamesPopupMenu( const OUString& aPropertyRootNode ) const @@ -1668,7 +1612,6 @@ Sequence< OUString > AddonsOptions_Impl::GetPropertyNamesPopupMenu( const OUStri return lResult; } - // private method Sequence< OUString > AddonsOptions_Impl::GetPropertyNamesToolBarItem( const OUString& aPropertyRootNode ) const @@ -1703,7 +1646,6 @@ Sequence< ::rtl::OUString > AddonsOptions_Impl::GetPropertyNamesStatusbarItem( return lResult; } - // private method Sequence< OUString > AddonsOptions_Impl::GetPropertyNamesImages( const OUString& aPropertyRootNode ) const @@ -1723,7 +1665,6 @@ Sequence< OUString > AddonsOptions_Impl::GetPropertyNamesImages( const OUString& return lResult; } - // initialize static member // DON'T DO IT IN YOUR HEADER! // see definition for further information @@ -1731,7 +1672,6 @@ Sequence< OUString > AddonsOptions_Impl::GetPropertyNamesImages( const OUString& AddonsOptions_Impl* AddonsOptions::m_pDataContainer = NULL ; sal_Int32 AddonsOptions::m_nRefCount = 0 ; - // constructor AddonsOptions::AddonsOptions() @@ -1747,7 +1687,6 @@ AddonsOptions::AddonsOptions() } } - // destructor AddonsOptions::~AddonsOptions() @@ -1765,7 +1704,6 @@ AddonsOptions::~AddonsOptions() } } - // public method bool AddonsOptions::HasAddonsMenu() const @@ -1774,17 +1712,14 @@ bool AddonsOptions::HasAddonsMenu() const return m_pDataContainer->HasAddonsMenu(); } - // public method - sal_Int32 AddonsOptions::GetAddonsToolBarCount() const { MutexGuard aGuard( GetOwnStaticMutex() ); return m_pDataContainer->GetAddonsToolBarCount(); } - // public method const Sequence< Sequence< PropertyValue > >& AddonsOptions::GetAddonsMenu() const @@ -1793,7 +1728,6 @@ const Sequence< Sequence< PropertyValue > >& AddonsOptions::GetAddonsMenu() cons return m_pDataContainer->GetAddonsMenu(); } - // public method const Sequence< Sequence< PropertyValue > >& AddonsOptions::GetAddonsMenuBarPart() const @@ -1802,7 +1736,6 @@ const Sequence< Sequence< PropertyValue > >& AddonsOptions::GetAddonsMenuBarPart return m_pDataContainer->GetAddonsMenuBarPart(); } - // public method const Sequence< Sequence< PropertyValue > >& AddonsOptions::GetAddonsToolBarPart( sal_uInt32 nIndex ) const @@ -1811,7 +1744,6 @@ const Sequence< Sequence< PropertyValue > >& AddonsOptions::GetAddonsToolBarPart return m_pDataContainer->GetAddonsToolBarPart( nIndex ); } - // public method const OUString AddonsOptions::GetAddonsToolbarResourceName( sal_uInt32 nIndex ) const @@ -1820,7 +1752,6 @@ const OUString AddonsOptions::GetAddonsToolbarResourceName( sal_uInt32 nIndex ) return m_pDataContainer->GetAddonsToolbarResourceName( nIndex ); } - // public method const Sequence< Sequence< PropertyValue > >& AddonsOptions::GetAddonsHelpMenu() const @@ -1829,7 +1760,6 @@ const Sequence< Sequence< PropertyValue > >& AddonsOptions::GetAddonsHelpMenu() return m_pDataContainer->GetAddonsHelpMenu(); } - // public method const MergeMenuInstructionContainer& AddonsOptions::GetMergeMenuInstructions() const @@ -1838,7 +1768,6 @@ const MergeMenuInstructionContainer& AddonsOptions::GetMergeMenuInstructions() c return m_pDataContainer->GetMergeMenuInstructions(); } - // public method bool AddonsOptions::GetMergeToolbarInstructions( @@ -1856,7 +1785,6 @@ const MergeStatusbarInstructionContainer& AddonsOptions::GetMergeStatusbarInstru return m_pDataContainer->GetMergeStatusbarInstructions(); } - // public method Image AddonsOptions::GetImageFromURL( const OUString& aURL, bool bBig, bool bNoScale ) const @@ -1865,7 +1793,6 @@ Image AddonsOptions::GetImageFromURL( const OUString& aURL, bool bBig, bool bNoS return m_pDataContainer->GetImageFromURL( aURL, bBig, bNoScale ); } - // public method Image AddonsOptions::GetImageFromURL( const OUString& aURL, bool bBig ) const @@ -1873,7 +1800,6 @@ Image AddonsOptions::GetImageFromURL( const OUString& aURL, bool bBig ) const return GetImageFromURL( aURL, bBig, false ); } - // private method Mutex& AddonsOptions::GetOwnStaticMutex() @@ -1898,7 +1824,6 @@ Mutex& AddonsOptions::GetOwnStaticMutex() return *pMutex; } - // private method IMPL_STATIC_LINK_NOINSTANCE( AddonsOptions, Notify, void*, EMPTYARG ) diff --git a/framework/source/fwe/classes/bmkmenu.cxx b/framework/source/fwe/classes/bmkmenu.cxx index 622fcaab13a7..f2f5b384b03a 100644 --- a/framework/source/fwe/classes/bmkmenu.cxx +++ b/framework/source/fwe/classes/bmkmenu.cxx @@ -70,7 +70,6 @@ class BmkMenu_Impl sal_uInt16 BmkMenu_Impl::m_nMID = BMKMENU_ITEMID_START; - BmkMenu_Impl::BmkMenu_Impl() : m_bInitialized(sal_False) { @@ -88,8 +87,6 @@ sal_uInt16 BmkMenu_Impl::GetMID() return m_nMID; } - - BmkMenu::BmkMenu( Reference< XFrame >& xFrame, BmkMenu::BmkMenuType nType ) :AddonMenu(xFrame) ,m_nType( nType ) diff --git a/framework/source/fwe/classes/framelistanalyzer.cxx b/framework/source/fwe/classes/framelistanalyzer.cxx index 616ca9040bf6..b3cc463ce49a 100644 --- a/framework/source/fwe/classes/framelistanalyzer.cxx +++ b/framework/source/fwe/classes/framelistanalyzer.cxx @@ -173,7 +173,6 @@ void FrameListAnalyzer::impl_analyze() SAL_INFO("fwk", "FrameListAnalyzer::impl_analyze(): ZOMBIE!"); } - // a) Is it the special help task? // Return it separated from any return list. if ( @@ -185,7 +184,6 @@ void FrameListAnalyzer::impl_analyze() continue; } - // b) Or is includes this task the special backing component? // Return it separated from any return list. // But check if the reference task itself is the backing frame. @@ -208,7 +206,6 @@ void FrameListAnalyzer::impl_analyze() } } - // c) Or is it the a task, which uses the specified model? // Add it to the list of "model frames". if ((m_eDetectMode & E_MODEL) == E_MODEL) @@ -225,7 +222,6 @@ void FrameListAnalyzer::impl_analyze() } } - // d) Or is it the a task, which use another or no model at all? // Add it to the list of "other frames". But look for it's // visible state ... if it's allowed to do so. diff --git a/framework/source/fwe/classes/fwkresid.cxx b/framework/source/fwe/classes/fwkresid.cxx index e428fb5e600d..f90289227110 100644 --- a/framework/source/fwe/classes/fwkresid.cxx +++ b/framework/source/fwe/classes/fwkresid.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "classes/fwkresid.hxx" #include <osl/mutex.hxx> #include <vcl/svapp.hxx> @@ -41,8 +40,6 @@ ResMgr* FwkResId::GetResManager() return pResMgr; } - - FwkResId::FwkResId( sal_uInt16 nId ) : ResId( nId, *FwkResId::GetResManager() ) { diff --git a/framework/source/fwe/classes/imagewrapper.cxx b/framework/source/fwe/classes/imagewrapper.cxx index f51751d6fd76..3693ec06d03f 100644 --- a/framework/source/fwe/classes/imagewrapper.cxx +++ b/framework/source/fwe/classes/imagewrapper.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <classes/imagewrapper.hxx> #include <osl/mutex.hxx> #include <vcl/svapp.hxx> @@ -40,17 +39,14 @@ static Sequence< sal_Int8 > impl_getStaticIdentifier() return seqID ; } - ImageWrapper::ImageWrapper( const Image& aImage ) : m_aImage( aImage ) { } - ImageWrapper::~ImageWrapper() { } - Sequence< sal_Int8 > ImageWrapper::GetUnoTunnelId() { return impl_getStaticIdentifier(); diff --git a/framework/source/fwe/classes/rootactiontriggercontainer.cxx b/framework/source/fwe/classes/rootactiontriggercontainer.cxx index d6079fb82a73..88ab372c8786 100644 --- a/framework/source/fwe/classes/rootactiontriggercontainer.cxx +++ b/framework/source/fwe/classes/rootactiontriggercontainer.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <classes/rootactiontriggercontainer.hxx> #include <classes/actiontriggercontainer.hxx> #include <classes/actiontriggerpropertyset.hxx> @@ -34,7 +33,6 @@ using namespace com::sun::star::lang; using namespace com::sun::star::container; using namespace com::sun::star::beans; - namespace framework { diff --git a/framework/source/fwe/classes/sfxhelperfunctions.cxx b/framework/source/fwe/classes/sfxhelperfunctions.cxx index 9ba7fabf5a1e..a1f0826a23f8 100644 --- a/framework/source/fwe/classes/sfxhelperfunctions.cxx +++ b/framework/source/fwe/classes/sfxhelperfunctions.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <framework/sfxhelperfunctions.hxx> #include <tools/diagnose_ex.h> @@ -29,8 +28,6 @@ static pfunc_createDockingWindow pCreateDockingWindow = NULL; static pfunc_isDockingWindowVisible pIsDockingWindowVisible = NULL; static pfunc_activateToolPanel pActivateToolPanel = NULL; - - using namespace ::com::sun::star::uno; using namespace ::com::sun::star::frame; diff --git a/framework/source/fwe/dispatch/interaction.cxx b/framework/source/fwe/dispatch/interaction.cxx index ba76e8dc440b..76ab044bece2 100644 --- a/framework/source/fwe/dispatch/interaction.cxx +++ b/framework/source/fwe/dispatch/interaction.cxx @@ -62,8 +62,6 @@ class ContinuationFilterSelect : public comphelper::OInteraction< ::com::sun::st }; // class ContinuationFilterSelect - - // initialize continuation with right start values ContinuationFilterSelect::ContinuationFilterSelect() @@ -71,7 +69,6 @@ ContinuationFilterSelect::ContinuationFilterSelect() { } - // handler should use it after selection to set user specified filter for transport void SAL_CALL ContinuationFilterSelect::setFilter( const OUString& sFilter ) throw( css::uno::RuntimeException, std::exception ) @@ -79,7 +76,6 @@ void SAL_CALL ContinuationFilterSelect::setFilter( const OUString& sFilter ) thr m_sFilter = sFilter; } - // read access to transported filter OUString SAL_CALL ContinuationFilterSelect::getFilter() throw( css::uno::RuntimeException, std::exception ) @@ -105,7 +101,6 @@ private: ContinuationFilterSelect* m_pFilter; }; - // initialize instance with all necessary information // We use it without any further checks on our member then ...! @@ -126,7 +121,6 @@ RequestFilterSelect_Impl::RequestFilterSelect_Impl( const OUString& sURL ) m_lContinuations[1] = css::uno::Reference< css::task::XInteractionContinuation >( m_pFilter ); } - // return abort state of interaction // If it is true, return value of method "getFilter()" will be unspecified then! @@ -135,7 +129,6 @@ bool RequestFilterSelect_Impl::isAbort() const return m_pAbort->wasSelected(); } - // return user selected filter // Return value valid for non aborted interaction only. Please check "isAbort()" before you call these ony! @@ -144,7 +137,6 @@ OUString RequestFilterSelect_Impl::getFilter() const return m_pFilter->getFilter(); } - // handler call it to get type of request // Is hard coded to "please select filter" here. see ctor for further information. @@ -153,7 +145,6 @@ css::uno::Any SAL_CALL RequestFilterSelect_Impl::getRequest() throw( css::uno::R return m_aRequest; } - // handler call it to get possible continuations // We support "abort/select_filter" only here. // After interaction we support read access on these continuations on our c++ interface to @@ -164,7 +155,6 @@ css::uno::Sequence< css::uno::Reference< css::task::XInteractionContinuation > > return m_lContinuations; } - RequestFilterSelect::RequestFilterSelect( const OUString& sURL ) { pImp = new RequestFilterSelect_Impl( sURL ); @@ -176,8 +166,6 @@ RequestFilterSelect::~RequestFilterSelect() pImp->release(); } - - // return abort state of interaction // If it is true, return value of method "getFilter()" will be unspecified then! @@ -186,7 +174,6 @@ bool RequestFilterSelect::isAbort() const return pImp->isAbort(); } - // return user selected filter // Return value valid for non aborted interaction only. Please check "isAbort()" before you call these ony! diff --git a/framework/source/fwe/helper/actiontriggerhelper.cxx b/framework/source/fwe/helper/actiontriggerhelper.cxx index 0ea11f910f3c..dd47309dda03 100644 --- a/framework/source/fwe/helper/actiontriggerhelper.cxx +++ b/framework/source/fwe/helper/actiontriggerhelper.cxx @@ -40,14 +40,11 @@ using namespace com::sun::star::lang; using namespace com::sun::star::beans; using namespace com::sun::star::container; - namespace framework { - // implementation helper ( menu => ActionTrigger ) - sal_Bool IsSeparator( Reference< XPropertySet > xPropertySet ) { Reference< XServiceInfo > xServiceInfo( xPropertySet, UNO_QUERY ); @@ -237,11 +234,8 @@ void InsertSubMenuItems( Menu* pSubMenu, sal_uInt16& nItemId, Reference< XIndexC } } - - // implementation helper ( ActionTrigger => menu ) - Reference< XPropertySet > CreateActionTrigger( sal_uInt16 nItemId, const Menu* pMenu, const Reference< XIndexContainer >& rActionTriggerContainer ) throw ( RuntimeException ) { Reference< XPropertySet > xPropSet; diff --git a/framework/source/fwe/helper/configimporter.cxx b/framework/source/fwe/helper/configimporter.cxx index 9b32e23fe192..a51b485cad11 100644 --- a/framework/source/fwe/helper/configimporter.cxx +++ b/framework/source/fwe/helper/configimporter.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <framework/configimporter.hxx> #include <framework/toolboxconfiguration.hxx> #include <com/sun/star/embed/ElementModes.hpp> diff --git a/framework/source/fwe/helper/documentundoguard.cxx b/framework/source/fwe/helper/documentundoguard.cxx index bcfd1552f1e5..debb6b024f89 100644 --- a/framework/source/fwe/helper/documentundoguard.cxx +++ b/framework/source/fwe/helper/documentundoguard.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "framework/documentundoguard.hxx" #include <com/sun/star/document/XUndoManagerSupplier.hpp> @@ -26,11 +25,9 @@ #include <rtl/ref.hxx> #include <tools/diagnose_ex.h> - namespace framework { - using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::XInterface; using ::com::sun::star::uno::UNO_QUERY; @@ -47,7 +44,6 @@ namespace framework using ::com::sun::star::document::UndoManagerEvent; using ::com::sun::star::lang::EventObject; - //= UndoManagerContextListener typedef ::cppu::WeakImplHelper1 < XUndoManagerListener @@ -110,91 +106,78 @@ namespace framework bool m_documentDisposed; }; - void SAL_CALL UndoManagerContextListener::undoActionAdded( const UndoManagerEvent& i_event ) throw (RuntimeException, std::exception) { (void)i_event; // not interested in } - void SAL_CALL UndoManagerContextListener::actionUndone( const UndoManagerEvent& i_event ) throw (RuntimeException, std::exception) { (void)i_event; // not interested in } - void SAL_CALL UndoManagerContextListener::actionRedone( const UndoManagerEvent& i_event ) throw (RuntimeException, std::exception) { (void)i_event; // not interested in } - void SAL_CALL UndoManagerContextListener::allActionsCleared( const EventObject& i_event ) throw (RuntimeException, std::exception) { (void)i_event; // not interested in } - void SAL_CALL UndoManagerContextListener::redoActionsCleared( const EventObject& i_event ) throw (RuntimeException, std::exception) { (void)i_event; // not interested in } - void SAL_CALL UndoManagerContextListener::resetAll( const EventObject& i_event ) throw (RuntimeException, std::exception) { (void)i_event; m_nRelativeContextDepth = 0; } - void SAL_CALL UndoManagerContextListener::enteredContext( const UndoManagerEvent& i_event ) throw (RuntimeException, std::exception) { (void)i_event; osl_atomic_increment( &m_nRelativeContextDepth ); } - void SAL_CALL UndoManagerContextListener::enteredHiddenContext( const UndoManagerEvent& i_event ) throw (RuntimeException, std::exception) { (void)i_event; osl_atomic_increment( &m_nRelativeContextDepth ); } - void SAL_CALL UndoManagerContextListener::leftContext( const UndoManagerEvent& i_event ) throw (RuntimeException, std::exception) { (void)i_event; osl_atomic_decrement( &m_nRelativeContextDepth ); } - void SAL_CALL UndoManagerContextListener::leftHiddenContext( const UndoManagerEvent& i_event ) throw (RuntimeException, std::exception) { (void)i_event; osl_atomic_decrement( &m_nRelativeContextDepth ); } - void SAL_CALL UndoManagerContextListener::cancelledContext( const UndoManagerEvent& i_event ) throw (RuntimeException, std::exception) { (void)i_event; osl_atomic_decrement( &m_nRelativeContextDepth ); } - void SAL_CALL UndoManagerContextListener::disposing( const EventObject& i_event ) throw (RuntimeException, std::exception) { (void)i_event; m_documentDisposed = true; } - //= DocumentUndoGuard_Data struct DocumentUndoGuard_Data @@ -223,7 +206,6 @@ namespace framework } } - void lcl_restore( DocumentUndoGuard_Data& i_data ) { try @@ -239,10 +221,8 @@ namespace framework } } - //= DocumentUndoGuard - DocumentUndoGuard::DocumentUndoGuard( const Reference< XInterface >& i_undoSupplierComponent ) :m_pData( new DocumentUndoGuard_Data ) { @@ -254,8 +234,6 @@ namespace framework lcl_restore( *m_pData ); } - } // namespace framework - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/framework/source/fwe/helper/imageproducer.cxx b/framework/source/fwe/helper/imageproducer.cxx index 4cff53f8ca1a..24cd403b3a42 100644 --- a/framework/source/fwe/helper/imageproducer.cxx +++ b/framework/source/fwe/helper/imageproducer.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <framework/imageproducer.hxx> namespace framework @@ -33,7 +32,6 @@ pfunc_getImage SAL_CALL SetImageProducer( pfunc_getImage pNewGetImageFunc ) return pOldFunc; } - Image SAL_CALL GetImageFromURL( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame, const OUString& aURL, diff --git a/framework/source/fwe/helper/propertysetcontainer.cxx b/framework/source/fwe/helper/propertysetcontainer.cxx index 2eea34c93421..e659c03bb90d 100644 --- a/framework/source/fwe/helper/propertysetcontainer.cxx +++ b/framework/source/fwe/helper/propertysetcontainer.cxx @@ -38,12 +38,10 @@ PropertySetContainer::PropertySetContainer() { } - PropertySetContainer::~PropertySetContainer() { } - // XInterface void SAL_CALL PropertySetContainer::acquire() throw () { diff --git a/framework/source/fwe/helper/titlehelper.cxx b/framework/source/fwe/helper/titlehelper.cxx index aa04ecd4d723..1e0d8d8dbfdf 100644 --- a/framework/source/fwe/helper/titlehelper.cxx +++ b/framework/source/fwe/helper/titlehelper.cxx @@ -35,10 +35,8 @@ #include <osl/mutex.hxx> #include <tools/urlobj.hxx> - namespace framework{ - TitleHelper::TitleHelper(const css::uno::Reference< css::uno::XComponentContext >& rxContext) : ::cppu::BaseMutex () , m_xContext (rxContext) @@ -52,12 +50,10 @@ TitleHelper::TitleHelper(const css::uno::Reference< css::uno::XComponentContext { } - TitleHelper::~TitleHelper() { } - void TitleHelper::setOwner(const css::uno::Reference< css::uno::XInterface >& xOwner) { // SYNCHRONIZED -> @@ -90,7 +86,6 @@ void TitleHelper::setOwner(const css::uno::Reference< css::uno::XInterface >& xO } } - OUString SAL_CALL TitleHelper::getTitle() throw (css::uno::RuntimeException, std::exception) { @@ -115,7 +110,6 @@ OUString SAL_CALL TitleHelper::getTitle() // <- SYNCHRONIZED } - void TitleHelper::connectWithUntitledNumbers (const css::uno::Reference< css::frame::XUntitledNumbers >& xNumbers) { // SYNCHRONIZED -> @@ -126,7 +120,6 @@ void TitleHelper::connectWithUntitledNumbers (const css::uno::Reference< css::fr // <- SYNCHRONIZED } - void SAL_CALL TitleHelper::setTitle(const OUString& sTitle) throw (css::uno::RuntimeException, std::exception) { @@ -142,7 +135,6 @@ void SAL_CALL TitleHelper::setTitle(const OUString& sTitle) impl_sendTitleChangedEvent (); } - void SAL_CALL TitleHelper::addTitleChangeListener(const css::uno::Reference< css::frame::XTitleChangeListener >& xListener) throw (css::uno::RuntimeException, std::exception) { @@ -150,7 +142,6 @@ void SAL_CALL TitleHelper::addTitleChangeListener(const css::uno::Reference< css m_aListener.addInterface( ::getCppuType( (const css::uno::Reference< css::frame::XTitleChangeListener >*)NULL ), xListener ); } - void SAL_CALL TitleHelper::removeTitleChangeListener(const css::uno::Reference< css::frame::XTitleChangeListener >& xListener) throw (css::uno::RuntimeException, std::exception) { @@ -158,7 +149,6 @@ void SAL_CALL TitleHelper::removeTitleChangeListener(const css::uno::Reference< m_aListener.removeInterface( ::getCppuType( (const css::uno::Reference< css::frame::XTitleChangeListener >*)NULL ), xListener ); } - void SAL_CALL TitleHelper::titleChanged(const css::frame::TitleChangedEvent& aEvent) throw (css::uno::RuntimeException, std::exception) { @@ -176,7 +166,6 @@ void SAL_CALL TitleHelper::titleChanged(const css::frame::TitleChangedEvent& aEv impl_updateTitle (); } - void SAL_CALL TitleHelper::notifyEvent(const css::document::EventObject& aEvent) throw (css::uno::RuntimeException, std::exception) { @@ -204,7 +193,6 @@ void SAL_CALL TitleHelper::notifyEvent(const css::document::EventObject& aEvent) impl_updateTitle (); } - void SAL_CALL TitleHelper::frameAction(const css::frame::FrameActionEvent& aEvent) throw(css::uno::RuntimeException, std::exception) { @@ -232,7 +220,6 @@ void SAL_CALL TitleHelper::frameAction(const css::frame::FrameActionEvent& aEven } } - void SAL_CALL TitleHelper::disposing(const css::lang::EventObject& aEvent) throw (css::uno::RuntimeException, std::exception) { @@ -268,7 +255,6 @@ void SAL_CALL TitleHelper::disposing(const css::lang::EventObject& aEvent) impl_sendTitleChangedEvent (); } - void TitleHelper::impl_sendTitleChangedEvent () { // SYNCHRONIZED -> @@ -297,7 +283,6 @@ void TitleHelper::impl_sendTitleChangedEvent () } } - void TitleHelper::impl_updateTitle (bool init) { // SYNCHRONIZED -> @@ -324,7 +309,6 @@ void TitleHelper::impl_updateTitle (bool init) } } - void TitleHelper::impl_updateTitleForModel (const css::uno::Reference< css::frame::XModel >& xModel, bool init) { // SYNCHRONIZED -> @@ -395,7 +379,6 @@ void TitleHelper::impl_updateTitleForModel (const css::uno::Reference< css::fram impl_sendTitleChangedEvent (); } - void TitleHelper::impl_updateTitleForController (const css::uno::Reference< css::frame::XController >& xController, bool init) { // SYNCHRONIZED -> @@ -461,7 +444,6 @@ void TitleHelper::impl_updateTitleForController (const css::uno::Reference< css: impl_sendTitleChangedEvent (); } - void TitleHelper::impl_updateTitleForFrame (const css::uno::Reference< css::frame::XFrame >& xFrame, bool init) { if ( ! xFrame.is ()) @@ -507,7 +489,6 @@ void TitleHelper::impl_updateTitleForFrame (const css::uno::Reference< css::fram impl_sendTitleChangedEvent (); } - void TitleHelper::impl_appendComponentTitle ( OUStringBuffer& sTitle , const css::uno::Reference< css::uno::XInterface >& xComponent) { @@ -518,7 +499,6 @@ void TitleHelper::impl_appendComponentTitle ( OUStringBuffer& sTitle.append (xTitle->getTitle ()); } - void TitleHelper::impl_appendProductName (OUStringBuffer& sTitle) { OUString name(utl::ConfigManager::getProductName()); @@ -530,7 +510,6 @@ void TitleHelper::impl_appendProductName (OUStringBuffer& sTitle) } } - void TitleHelper::impl_appendModuleName (OUStringBuffer& sTitle) { // SYNCHRONIZED -> @@ -563,7 +542,6 @@ void TitleHelper::impl_appendModuleName (OUStringBuffer& sTitle) {} } - #ifdef DBG_UTIL void TitleHelper::impl_appendDebugVersion (OUStringBuffer& sTitle) { @@ -582,7 +560,6 @@ void TitleHelper::impl_appendDebugVersion (OUStringBuffer&) } #endif - void TitleHelper::impl_startListeningForModel (const css::uno::Reference< css::frame::XModel >& xModel) { css::uno::Reference< css::document::XEventBroadcaster > xBroadcaster(xModel, css::uno::UNO_QUERY); @@ -592,28 +569,24 @@ void TitleHelper::impl_startListeningForModel (const css::uno::Reference< css::f xBroadcaster->addEventListener (static_cast< css::document::XEventListener* >(this)); } - void TitleHelper::impl_startListeningForController (const css::uno::Reference< css::frame::XController >& xController) { css::uno::Reference< css::frame::XTitle > xSubTitle(xController->getModel (), css::uno::UNO_QUERY); impl_setSubTitle (xSubTitle); } - void TitleHelper::impl_startListeningForFrame (const css::uno::Reference< css::frame::XFrame >& xFrame) { xFrame->addFrameActionListener(this ); impl_updateListeningForFrame (xFrame); } - void TitleHelper::impl_updateListeningForFrame (const css::uno::Reference< css::frame::XFrame >& xFrame) { css::uno::Reference< css::frame::XTitle > xSubTitle(xFrame->getController (), css::uno::UNO_QUERY); impl_setSubTitle (xSubTitle); } - void TitleHelper::impl_setSubTitle (const css::uno::Reference< css::frame::XTitle >& xSubTitle) { // SYNCHRONIZED -> @@ -640,7 +613,6 @@ void TitleHelper::impl_setSubTitle (const css::uno::Reference< css::frame::XTitl xNewBroadcaster->addTitleChangeListener (xThis); } - OUString TitleHelper::impl_convertURL2Title(const OUString& sURL) { INetURLObject aURL (sURL); diff --git a/framework/source/fwe/helper/undomanagerhelper.cxx b/framework/source/fwe/helper/undomanagerhelper.cxx index 0e1fe7354556..565ddfa6bac2 100644 --- a/framework/source/fwe/helper/undomanagerhelper.cxx +++ b/framework/source/fwe/helper/undomanagerhelper.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "framework/undomanagerhelper.hxx" #include <com/sun/star/lang/XComponent.hpp> @@ -34,11 +33,9 @@ #include <queue> #include <boost/function.hpp> - namespace framework { - using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::XInterface; using ::com::sun::star::uno::UNO_QUERY; @@ -65,7 +62,6 @@ namespace framework using ::com::sun::star::util::XModifyListener; using ::svl::IUndoManager; - //= UndoActionWrapper class UndoActionWrapper : public SfxUndoAction @@ -85,7 +81,6 @@ namespace framework const Reference< XUndoAction > m_xUndoAction; }; - UndoActionWrapper::UndoActionWrapper( Reference< XUndoAction > const& i_undoAction ) :SfxUndoAction() ,m_xUndoAction( i_undoAction ) @@ -93,7 +88,6 @@ namespace framework ENSURE_OR_THROW( m_xUndoAction.is(), "illegal undo action" ); } - UndoActionWrapper::~UndoActionWrapper() { try @@ -108,7 +102,6 @@ namespace framework } } - OUString UndoActionWrapper::GetComment() const { OUString sComment; @@ -123,25 +116,21 @@ namespace framework return sComment; } - void UndoActionWrapper::Undo() { m_xUndoAction->undo(); } - void UndoActionWrapper::Redo() { m_xUndoAction->redo(); } - bool UndoActionWrapper::CanRepeat(SfxRepeatTarget&) const { return false; } - //= UndoManagerRequest class UndoManagerRequest : public ::comphelper::AnyEvent @@ -195,9 +184,6 @@ namespace framework ::osl::Condition m_finishCondition; }; - - - //= UndoManagerHelper_Impl class UndoManagerHelper_Impl : public SfxUndoListener @@ -241,13 +227,11 @@ namespace framework { } - IUndoManager& getUndoManager() const { return m_rUndoManagerImplementation.getImplUndoManager(); } - Reference< XUndoManager > getXUndoManager() const { return m_rUndoManagerImplementation.getThis(); @@ -329,7 +313,6 @@ namespace framework void impl_reset(); }; - void UndoManagerHelper_Impl::disposing() { EventObject aEvent; @@ -344,7 +327,6 @@ namespace framework m_disposed = true; } - UndoManagerEvent UndoManagerHelper_Impl::buildEvent( OUString const& i_title ) const { UndoManagerEvent aEvent; @@ -354,14 +336,12 @@ namespace framework return aEvent; } - void UndoManagerHelper_Impl::impl_notifyModified() { const EventObject aEvent( getXUndoManager() ); m_aModifyListeners.notifyEach( &XModifyListener::modified, aEvent ); } - void UndoManagerHelper_Impl::notify( OUString const& i_title, void ( SAL_CALL XUndoManagerListener::*i_notificationMethod )( const UndoManagerEvent& ) ) { @@ -377,7 +357,6 @@ namespace framework impl_notifyModified(); } - void UndoManagerHelper_Impl::notify( void ( SAL_CALL XUndoManagerListener::*i_notificationMethod )( const EventObject& ) ) { const EventObject aEvent( getXUndoManager() ); @@ -388,7 +367,6 @@ namespace framework impl_notifyModified(); } - void UndoManagerHelper_Impl::enterUndoContext( const OUString& i_title, const bool i_hidden, IMutexGuard& i_instanceLock ) { impl_processRequest( @@ -402,7 +380,6 @@ namespace framework ); } - void UndoManagerHelper_Impl::leaveUndoContext( IMutexGuard& i_instanceLock ) { impl_processRequest( @@ -414,7 +391,6 @@ namespace framework ); } - void UndoManagerHelper_Impl::addUndoAction( const Reference< XUndoAction >& i_action, IMutexGuard& i_instanceLock ) { if ( !i_action.is() ) @@ -434,7 +410,6 @@ namespace framework ); } - void UndoManagerHelper_Impl::clear( IMutexGuard& i_instanceLock ) { impl_processRequest( @@ -446,7 +421,6 @@ namespace framework ); } - void UndoManagerHelper_Impl::clearRedo( IMutexGuard& i_instanceLock ) { impl_processRequest( @@ -458,7 +432,6 @@ namespace framework ); } - void UndoManagerHelper_Impl::reset( IMutexGuard& i_instanceLock ) { impl_processRequest( @@ -470,7 +443,6 @@ namespace framework ); } - void UndoManagerHelper_Impl::lock() { // SYNCHRONIZED ---> @@ -484,7 +456,6 @@ namespace framework // <--- SYNCHRONIZED } - void UndoManagerHelper_Impl::unlock() { // SYNCHRONIZED ---> @@ -501,7 +472,6 @@ namespace framework // <--- SYNCHRONIZED } - void UndoManagerHelper_Impl::impl_processRequest( ::boost::function0< void > const& i_request, IMutexGuard& i_instanceLock ) { // create the request, and add it to our queue @@ -563,7 +533,6 @@ namespace framework while ( true ); } - void UndoManagerHelper_Impl::impl_enterUndoContext( const OUString& i_title, const bool i_hidden ) { // SYNCHRONIZED ---> @@ -595,7 +564,6 @@ namespace framework impl_notifyModified(); } - void UndoManagerHelper_Impl::impl_leaveUndoContext() { // SYNCHRONIZED ---> @@ -655,7 +623,6 @@ namespace framework impl_notifyModified(); } - void UndoManagerHelper_Impl::impl_doUndoRedo( IMutexGuard& i_externalLock, const bool i_undo ) { ::osl::Guard< ::framework::IMutex > aExternalGuard( i_externalLock.getGuardedMutex() ); @@ -703,7 +670,6 @@ namespace framework // So, we do not need to do this notification here ourself. } - void UndoManagerHelper_Impl::impl_addUndoAction( const Reference< XUndoAction >& i_action ) { // SYNCHRONIZED ---> @@ -733,7 +699,6 @@ namespace framework impl_notifyModified(); } - void UndoManagerHelper_Impl::impl_clear() { // SYNCHRONIZED ---> @@ -756,7 +721,6 @@ namespace framework impl_notifyModified(); } - void UndoManagerHelper_Impl::impl_clearRedo() { // SYNCHRONIZED ---> @@ -779,7 +743,6 @@ namespace framework impl_notifyModified(); } - void UndoManagerHelper_Impl::impl_reset() { // SYNCHRONIZED ---> @@ -799,7 +762,6 @@ namespace framework impl_notifyModified(); } - void UndoManagerHelper_Impl::actionUndone( const OUString& i_actionComment ) { UndoManagerEvent aEvent; @@ -810,7 +772,6 @@ namespace framework impl_notifyModified(); } - void UndoManagerHelper_Impl::actionRedone( const OUString& i_actionComment ) { UndoManagerEvent aEvent; @@ -821,7 +782,6 @@ namespace framework impl_notifyModified(); } - void UndoManagerHelper_Impl::undoActionAdded( const OUString& i_actionComment ) { if ( m_bAPIActionRunning ) @@ -830,7 +790,6 @@ namespace framework notify( i_actionComment, &XUndoManagerListener::undoActionAdded ); } - void UndoManagerHelper_Impl::cleared() { if ( m_bAPIActionRunning ) @@ -839,7 +798,6 @@ namespace framework notify( &XUndoManagerListener::allActionsCleared ); } - void UndoManagerHelper_Impl::clearedRedo() { if ( m_bAPIActionRunning ) @@ -848,7 +806,6 @@ namespace framework notify( &XUndoManagerListener::redoActionsCleared ); } - void UndoManagerHelper_Impl::resetAll() { if ( m_bAPIActionRunning ) @@ -857,7 +814,6 @@ namespace framework notify( &XUndoManagerListener::resetAll ); } - void UndoManagerHelper_Impl::listActionEntered( const OUString& i_comment ) { #if OSL_DEBUG_LEVEL > 0 @@ -870,7 +826,6 @@ namespace framework notify( i_comment, &XUndoManagerListener::enteredContext ); } - void UndoManagerHelper_Impl::listActionLeft( const OUString& i_comment ) { #if OSL_DEBUG_LEVEL > 0 @@ -885,7 +840,6 @@ namespace framework notify( i_comment, &XUndoManagerListener::leftContext ); } - void UndoManagerHelper_Impl::listActionLeftAndMerged() { #if OSL_DEBUG_LEVEL > 0 @@ -900,7 +854,6 @@ namespace framework notify( &XUndoManagerListener::leftHiddenContext ); } - void UndoManagerHelper_Impl::listActionCancelled() { #if OSL_DEBUG_LEVEL > 0 @@ -915,51 +868,42 @@ namespace framework notify( &XUndoManagerListener::cancelledContext ); } - void UndoManagerHelper_Impl::undoManagerDying() { // TODO: do we need to care? Or is this the responsibility of our owner? } - //= UndoManagerHelper - UndoManagerHelper::UndoManagerHelper( IUndoManagerImplementation& i_undoManagerImpl ) :m_pImpl( new UndoManagerHelper_Impl( i_undoManagerImpl ) ) { } - UndoManagerHelper::~UndoManagerHelper() { } - void UndoManagerHelper::disposing() { m_pImpl->disposing(); } - void UndoManagerHelper::enterUndoContext( const OUString& i_title, IMutexGuard& i_instanceLock ) { m_pImpl->enterUndoContext( i_title, false, i_instanceLock ); } - void UndoManagerHelper::enterHiddenUndoContext( IMutexGuard& i_instanceLock ) { m_pImpl->enterUndoContext( OUString(), true, i_instanceLock ); } - void UndoManagerHelper::leaveUndoContext( IMutexGuard& i_instanceLock ) { m_pImpl->leaveUndoContext( i_instanceLock ); } - void UndoManagerHelper_Impl::undo( IMutexGuard& i_instanceLock ) { impl_processRequest( @@ -973,7 +917,6 @@ namespace framework ); } - void UndoManagerHelper_Impl::redo( IMutexGuard& i_instanceLock ) { impl_processRequest( @@ -987,25 +930,21 @@ namespace framework ); } - void UndoManagerHelper::addUndoAction( const Reference< XUndoAction >& i_action, IMutexGuard& i_instanceLock ) { m_pImpl->addUndoAction( i_action, i_instanceLock ); } - void UndoManagerHelper::undo( IMutexGuard& i_instanceLock ) { m_pImpl->undo( i_instanceLock ); } - void UndoManagerHelper::redo( IMutexGuard& i_instanceLock ) { m_pImpl->redo( i_instanceLock ); } - bool UndoManagerHelper::isUndoPossible() const { // SYNCHRONIZED ---> @@ -1017,7 +956,6 @@ namespace framework // <--- SYNCHRONIZED } - bool UndoManagerHelper::isRedoPossible() const { // SYNCHRONIZED ---> @@ -1029,7 +967,6 @@ namespace framework // <--- SYNCHRONIZED } - namespace { @@ -1054,7 +991,6 @@ namespace framework // <--- SYNCHRONIZED } - Sequence< OUString > lcl_getAllActionTitles( UndoManagerHelper_Impl& i_impl, const bool i_undo ) { // SYNCHRONIZED ---> @@ -1077,61 +1013,51 @@ namespace framework } } - OUString UndoManagerHelper::getCurrentUndoActionTitle() const { return lcl_getCurrentActionTitle( *m_pImpl, true ); } - OUString UndoManagerHelper::getCurrentRedoActionTitle() const { return lcl_getCurrentActionTitle( *m_pImpl, false ); } - Sequence< OUString > UndoManagerHelper::getAllUndoActionTitles() const { return lcl_getAllActionTitles( *m_pImpl, true ); } - Sequence< OUString > UndoManagerHelper::getAllRedoActionTitles() const { return lcl_getAllActionTitles( *m_pImpl, false ); } - void UndoManagerHelper::clear( IMutexGuard& i_instanceLock ) { m_pImpl->clear( i_instanceLock ); } - void UndoManagerHelper::clearRedo( IMutexGuard& i_instanceLock ) { m_pImpl->clearRedo( i_instanceLock ); } - void UndoManagerHelper::reset( IMutexGuard& i_instanceLock ) { m_pImpl->reset( i_instanceLock ); } - void UndoManagerHelper::lock() { m_pImpl->lock(); } - void UndoManagerHelper::unlock() { m_pImpl->unlock(); } - bool UndoManagerHelper::isLocked() { // SYNCHRONIZED ---> @@ -1142,36 +1068,30 @@ namespace framework // <--- SYNCHRONIZED } - void UndoManagerHelper::addUndoManagerListener( const Reference< XUndoManagerListener >& i_listener ) { if ( i_listener.is() ) m_pImpl->addUndoManagerListener( i_listener ); } - void UndoManagerHelper::removeUndoManagerListener( const Reference< XUndoManagerListener >& i_listener ) { if ( i_listener.is() ) m_pImpl->removeUndoManagerListener( i_listener ); } - void UndoManagerHelper::addModifyListener( const Reference< XModifyListener >& i_listener ) { if ( i_listener.is() ) m_pImpl->addModifyListener( i_listener ); } - void UndoManagerHelper::removeModifyListener( const Reference< XModifyListener >& i_listener ) { if ( i_listener.is() ) m_pImpl->removeModifyListener( i_listener ); } - } // namespace framework - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/framework/source/fwe/interaction/preventduplicateinteraction.cxx b/framework/source/fwe/interaction/preventduplicateinteraction.cxx index 3f3f320d4639..caef1881d302 100644 --- a/framework/source/fwe/interaction/preventduplicateinteraction.cxx +++ b/framework/source/fwe/interaction/preventduplicateinteraction.cxx @@ -31,14 +31,10 @@ PreventDuplicateInteraction::PreventDuplicateInteraction(const css::uno::Referen { } - - PreventDuplicateInteraction::~PreventDuplicateInteraction() { } - - void PreventDuplicateInteraction::setHandler(const css::uno::Reference< css::task::XInteractionHandler >& xHandler) { // SAFE -> @@ -48,8 +44,6 @@ void PreventDuplicateInteraction::setHandler(const css::uno::Reference< css::tas // <- SAFE } - - void PreventDuplicateInteraction::useDefaultUUIHandler() { // SAFE -> @@ -66,7 +60,6 @@ void PreventDuplicateInteraction::useDefaultUUIHandler() // <- SAFE } - css::uno::Any SAL_CALL PreventDuplicateInteraction::queryInterface( const css::uno::Type& aType ) throw (css::uno::RuntimeException, std::exception) { @@ -80,8 +73,6 @@ css::uno::Any SAL_CALL PreventDuplicateInteraction::queryInterface( const css::u return ::cppu::WeakImplHelper1< css::task::XInteractionHandler2 >::queryInterface( aType ); } - - void SAL_CALL PreventDuplicateInteraction::handle(const css::uno::Reference< css::task::XInteractionRequest >& xRequest) throw(css::uno::RuntimeException, std::exception) { @@ -136,8 +127,6 @@ void SAL_CALL PreventDuplicateInteraction::handle(const css::uno::Reference< css } } - - sal_Bool SAL_CALL PreventDuplicateInteraction::handleInteractionRequest( const css::uno::Reference< css::task::XInteractionRequest >& xRequest ) throw (css::uno::RuntimeException, std::exception) { @@ -195,8 +184,6 @@ sal_Bool SAL_CALL PreventDuplicateInteraction::handleInteractionRequest( const c return false; } - - void PreventDuplicateInteraction::addInteractionRule(const PreventDuplicateInteraction::InteractionInfo& aInteractionInfo) { // SAFE -> @@ -222,8 +209,6 @@ void PreventDuplicateInteraction::addInteractionRule(const PreventDuplicateInter // <- SAFE } - - bool PreventDuplicateInteraction::getInteractionInfo(const css::uno::Type& aInteraction, PreventDuplicateInteraction::InteractionInfo* pReturn ) const { diff --git a/framework/source/fwe/xml/menuconfiguration.cxx b/framework/source/fwe/xml/menuconfiguration.cxx index 3e3600128517..8b87cdde2b23 100644 --- a/framework/source/fwe/xml/menuconfiguration.cxx +++ b/framework/source/fwe/xml/menuconfiguration.cxx @@ -49,12 +49,10 @@ MenuConfiguration::MenuConfiguration( { } - MenuConfiguration::~MenuConfiguration() { } - Reference< XIndexAccess > MenuConfiguration::CreateMenuBarConfigurationFromXML( Reference< XInputStream >& rInputStream ) throw ( WrappedTargetException ) @@ -66,7 +64,6 @@ throw ( WrappedTargetException ) aInputSource.aInputStream = rInputStream; - // create menu bar Reference< XIndexContainer > xItemContainer( static_cast< cppu::OWeakObject *>( new RootItemContainer()), UNO_QUERY ); diff --git a/framework/source/fwe/xml/menudocumenthandler.cxx b/framework/source/fwe/xml/menudocumenthandler.cxx index 85479e99aaa3..4f02287d7001 100644 --- a/framework/source/fwe/xml/menudocumenthandler.cxx +++ b/framework/source/fwe/xml/menudocumenthandler.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <stdio.h> #include <sal/macros.h> @@ -34,7 +33,6 @@ #include <comphelper/processfactory.hxx> #include <comphelper/attributelist.hxx> - #define XMLNS_MENU "http://openoffice.org/2001/menu" #define ELEMENT_MENUBAR "http://openoffice.org/2001/menu^menubar" @@ -83,10 +81,8 @@ static const char CMD_PROTOCOL[] = ".uno:"; static const char ADDDIRECT_CMD[] = ".uno:AddDirect" ; static const char AUTOPILOTMENU_CMD[] = ".uno:AutoPilotMenu" ; - // using namespaces - using namespace ::com::sun::star::uno; using namespace ::com::sun::star::lang; using namespace ::com::sun::star::beans; @@ -109,7 +105,6 @@ MenuStyleItem MenuItemStyles[ ] = { { ::com::sun::star::ui::ItemStyle::RADIO_CHECK, ATTRIBUTE_ITEMSTYLE_RADIO } }; - sal_Int32 nMenuStyleItemEntries = (sizeof (MenuItemStyles) / sizeof (MenuItemStyles[0])); static void ExtractMenuParameters( const Sequence< PropertyValue > rProp, @@ -150,8 +145,6 @@ static void ExtractMenuParameters( const Sequence< PropertyValue > rProp, } } - - // Base class implementation ReadMenuDocumentHandlerBase::ReadMenuDocumentHandlerBase() : @@ -222,8 +215,6 @@ void ReadMenuDocumentHandlerBase::initPropertyCommon( rProps[5].Value <<= ::com::sun::star::ui::ItemType::DEFAULT; } - - OReadMenuDocumentHandler::OReadMenuDocumentHandler( const Reference< XIndexContainer >& rMenuBarContainer ) : m_nElementDepth( 0 ), @@ -237,13 +228,11 @@ OReadMenuDocumentHandler::~OReadMenuDocumentHandler() { } - void SAL_CALL OReadMenuDocumentHandler::startDocument(void) throw ( SAXException, RuntimeException, std::exception ) { } - void SAL_CALL OReadMenuDocumentHandler::endDocument(void) throw( SAXException, RuntimeException, std::exception ) { @@ -255,7 +244,6 @@ void SAL_CALL OReadMenuDocumentHandler::endDocument(void) } } - void SAL_CALL OReadMenuDocumentHandler::startElement( const OUString& aName, const Reference< XAttributeList > &xAttrList ) throw( SAXException, RuntimeException, std::exception ) @@ -275,13 +263,11 @@ throw( SAXException, RuntimeException, std::exception ) } } - void SAL_CALL OReadMenuDocumentHandler::characters(const OUString&) throw( SAXException, RuntimeException, std::exception ) { } - void SAL_CALL OReadMenuDocumentHandler::endElement( const OUString& aName ) throw( SAXException, RuntimeException, std::exception ) { @@ -304,9 +290,6 @@ void SAL_CALL OReadMenuDocumentHandler::endElement( const OUString& aName ) } } - - - OReadMenuBarHandler::OReadMenuBarHandler( const Reference< XIndexContainer >& rMenuBarContainer, const Reference< XSingleComponentFactory >& rFactory ) @@ -317,24 +300,20 @@ OReadMenuBarHandler::OReadMenuBarHandler( { } - OReadMenuBarHandler::~OReadMenuBarHandler() { } - void SAL_CALL OReadMenuBarHandler::startDocument(void) throw ( SAXException, RuntimeException, std::exception ) { } - void SAL_CALL OReadMenuBarHandler::endDocument(void) throw( SAXException, RuntimeException, std::exception ) { } - void SAL_CALL OReadMenuBarHandler::startElement( const OUString& rName, const Reference< XAttributeList > &xAttrList ) throw( SAXException, RuntimeException, std::exception ) @@ -424,13 +403,11 @@ throw( SAXException, RuntimeException, std::exception ) } } - void SAL_CALL OReadMenuBarHandler::characters(const OUString&) throw( SAXException, RuntimeException, std::exception ) { } - void OReadMenuBarHandler::endElement( const OUString& aName ) throw( SAXException, RuntimeException, std::exception ) { @@ -454,10 +431,6 @@ void OReadMenuBarHandler::endElement( const OUString& aName ) } } - - - - OReadMenuHandler::OReadMenuHandler( const Reference< XIndexContainer >& rMenuContainer, const Reference< XSingleComponentFactory >& rFactory ) : @@ -468,24 +441,20 @@ OReadMenuHandler::OReadMenuHandler( { } - OReadMenuHandler::~OReadMenuHandler() { } - void SAL_CALL OReadMenuHandler::startDocument(void) throw ( SAXException, RuntimeException, std::exception ) { } - void SAL_CALL OReadMenuHandler::endDocument(void) throw( SAXException, RuntimeException, std::exception) { } - void SAL_CALL OReadMenuHandler::startElement( const OUString& aName, const Reference< XAttributeList > &xAttrList ) throw( SAXException, RuntimeException, std::exception ) @@ -510,13 +479,11 @@ throw( SAXException, RuntimeException, std::exception ) } } - void SAL_CALL OReadMenuHandler::characters(const OUString&) throw( SAXException, RuntimeException, std::exception ) { } - void SAL_CALL OReadMenuHandler::endElement( const OUString& aName ) throw( SAXException, RuntimeException, std::exception ) { @@ -540,10 +507,6 @@ void SAL_CALL OReadMenuHandler::endElement( const OUString& aName ) } } - - - - OReadMenuPopupHandler::OReadMenuPopupHandler( const Reference< XIndexContainer >& rMenuContainer, const Reference< XSingleComponentFactory >& rFactory ) : @@ -556,18 +519,15 @@ OReadMenuPopupHandler::OReadMenuPopupHandler( { } - OReadMenuPopupHandler::~OReadMenuPopupHandler() { } - void SAL_CALL OReadMenuPopupHandler::startDocument(void) throw ( SAXException, RuntimeException, std::exception ) { } - void SAL_CALL OReadMenuPopupHandler::endDocument(void) throw( SAXException, RuntimeException, std::exception) { @@ -714,13 +674,11 @@ throw( SAXException, RuntimeException, std::exception ) } } - void SAL_CALL OReadMenuPopupHandler::characters(const OUString&) throw( SAXException, RuntimeException, std::exception ) { } - void SAL_CALL OReadMenuPopupHandler::endElement( const OUString& aName ) throw( SAXException, RuntimeException, std::exception ) { @@ -767,10 +725,8 @@ void SAL_CALL OReadMenuPopupHandler::endElement( const OUString& aName ) } } - // --------------------------------- Write XML --------------------------------- - OWriteMenuDocumentHandler::OWriteMenuDocumentHandler( const Reference< XIndexAccess >& rMenuBarContainer, const Reference< XDocumentHandler >& rDocumentHandler ) : @@ -782,12 +738,10 @@ OWriteMenuDocumentHandler::OWriteMenuDocumentHandler( m_aAttributeType = OUString( ATTRIBUTE_TYPE_CDATA ); } - OWriteMenuDocumentHandler::~OWriteMenuDocumentHandler() { } - void OWriteMenuDocumentHandler::WriteMenuDocument() throw ( SAXException, RuntimeException ) { @@ -823,7 +777,6 @@ throw ( SAXException, RuntimeException ) m_xWriteDocumentHandler->endDocument(); } - void OWriteMenuDocumentHandler::WriteMenu( const Reference< XIndexAccess >& rMenuContainer ) throw ( SAXException, RuntimeException ) { @@ -904,7 +857,6 @@ throw ( SAXException, RuntimeException ) } } - void OWriteMenuDocumentHandler::WriteMenuItem( const OUString& aCommandURL, const OUString& aLabel, const OUString& aHelpURL, sal_Int16 nStyle ) { ::comphelper::AttributeList* pList = new ::comphelper::AttributeList; @@ -952,7 +904,6 @@ void OWriteMenuDocumentHandler::WriteMenuItem( const OUString& aCommandURL, cons m_xWriteDocumentHandler->endElement( OUString( ELEMENT_NS_MENUITEM ) ); } - void OWriteMenuDocumentHandler::WriteMenuSeparator() { m_xWriteDocumentHandler->ignorableWhitespace( OUString() ); diff --git a/framework/source/fwe/xml/saxnamespacefilter.cxx b/framework/source/fwe/xml/saxnamespacefilter.cxx index cff7cf734497..894e7f11c25d 100644 --- a/framework/source/fwe/xml/saxnamespacefilter.cxx +++ b/framework/source/fwe/xml/saxnamespacefilter.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - /** Attention: stl headers must(!) be included at first. Otherwhise it can make trouble with solaris headers ... */ @@ -36,7 +35,6 @@ using namespace ::com::sun::star::uno; namespace framework{ - SaxNamespaceFilter::SaxNamespaceFilter( Reference< XDocumentHandler >& rSax1DocumentHandler ) : m_xLocator( 0 ), xDocumentHandler( rSax1DocumentHandler ), diff --git a/framework/source/fwe/xml/statusbarconfiguration.cxx b/framework/source/fwe/xml/statusbarconfiguration.cxx index 0a9c3d8843b5..69aaf0c097c6 100644 --- a/framework/source/fwe/xml/statusbarconfiguration.cxx +++ b/framework/source/fwe/xml/statusbarconfiguration.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <framework/statusbarconfiguration.hxx> #include <xml/statusbardocumenthandler.hxx> #include <xml/saxnamespacefilter.hxx> @@ -38,7 +37,6 @@ using namespace ::com::sun::star::lang; using namespace ::com::sun::star::io; using namespace ::com::sun::star::container; - namespace framework { diff --git a/framework/source/fwe/xml/statusbardocumenthandler.cxx b/framework/source/fwe/xml/statusbardocumenthandler.cxx index 6837dbb8d170..cf4ce24b5aa6 100644 --- a/framework/source/fwe/xml/statusbardocumenthandler.cxx +++ b/framework/source/fwe/xml/statusbardocumenthandler.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <stdio.h> #include <xml/statusbardocumenthandler.hxx> @@ -143,7 +142,6 @@ StatusBarEntryProperty StatusBarEntries[OReadStatusBarDocumentHandler::SB_XML_EN { OReadStatusBarDocumentHandler::SB_NS_STATUSBAR, ATTRIBUTE_HELPURL } }; - OReadStatusBarDocumentHandler::OReadStatusBarDocumentHandler( const Reference< XIndexContainer >& rStatusBarItems ) : m_aStatusBarItems( rStatusBarItems ) @@ -482,11 +480,8 @@ OUString OReadStatusBarDocumentHandler::getErrorLineString() return OUString(); } - - // OWriteStatusBarDocumentHandler - OWriteStatusBarDocumentHandler::OWriteStatusBarDocumentHandler( const Reference< XIndexAccess >& aStatusBarItems, const Reference< XDocumentHandler >& rWriteDocumentHandler ) : @@ -567,10 +562,8 @@ void OWriteStatusBarDocumentHandler::WriteStatusBarDocument() throw m_xWriteDocumentHandler->endDocument(); } - // protected member functions - void OWriteStatusBarDocumentHandler::WriteStatusBarItem( const OUString& rCommandURL, const OUString& /*rHelpURL*/, diff --git a/framework/source/fwe/xml/toolboxconfiguration.cxx b/framework/source/fwe/xml/toolboxconfiguration.cxx index 26bd8d66f6bc..013702dec886 100644 --- a/framework/source/fwe/xml/toolboxconfiguration.cxx +++ b/framework/source/fwe/xml/toolboxconfiguration.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <framework/toolboxconfiguration.hxx> #include <xml/toolboxdocumenthandler.hxx> #include <xml/saxnamespacefilter.hxx> @@ -38,7 +37,6 @@ using namespace ::com::sun::star::lang; using namespace ::com::sun::star::io; using namespace ::com::sun::star::container; - namespace framework { @@ -80,7 +78,6 @@ bool ToolBoxConfiguration::LoadToolBox( } } - bool ToolBoxConfiguration::StoreToolBox( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext, const ::com::sun::star::uno::Reference< ::com::sun::star::io::XOutputStream >& rOutputStream, diff --git a/framework/source/fwe/xml/toolboxdocumenthandler.cxx b/framework/source/fwe/xml/toolboxdocumenthandler.cxx index 854cb4b4fa03..f4425bc8be0b 100644 --- a/framework/source/fwe/xml/toolboxdocumenthandler.cxx +++ b/framework/source/fwe/xml/toolboxdocumenthandler.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <stdio.h> #include <xml/toolboxdocumenthandler.hxx> @@ -42,7 +41,6 @@ using namespace ::com::sun::star::beans; using namespace ::com::sun::star::container; using namespace ::com::sun::star::xml::sax; - #define TOOLBAR_DOCTYPE "<!DOCTYPE toolbar:toolbar PUBLIC \"-//OpenOffice.org//DTD OfficeDocument 1.0//EN\" \"toolbar.dtd\">" namespace framework @@ -653,11 +651,8 @@ OUString OReadToolBoxDocumentHandler::getErrorLineString() return OUString(); } - - // OWriteToolBoxDocumentHandler - OWriteToolBoxDocumentHandler::OWriteToolBoxDocumentHandler( const Reference< XIndexAccess >& rItemAccess, Reference< XDocumentHandler >& rWriteDocumentHandler ) : @@ -758,10 +753,8 @@ void OWriteToolBoxDocumentHandler::WriteToolBoxDocument() throw m_xWriteDocumentHandler->endDocument(); } - // protected member functions - void OWriteToolBoxDocumentHandler::WriteToolBoxItem( const OUString& rCommandURL, const OUString& rLabel, diff --git a/framework/source/fwe/xml/xmlnamespaces.cxx b/framework/source/fwe/xml/xmlnamespaces.cxx index 12c252b6dfd2..d44c06c7c1ec 100644 --- a/framework/source/fwe/xml/xmlnamespaces.cxx +++ b/framework/source/fwe/xml/xmlnamespaces.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <xml/xmlnamespaces.hxx> using namespace ::com::sun::star::xml::sax; diff --git a/framework/source/fwi/classes/converter.cxx b/framework/source/fwi/classes/converter.cxx index ff3560425f43..4799f083ced0 100644 --- a/framework/source/fwi/classes/converter.cxx +++ b/framework/source/fwi/classes/converter.cxx @@ -22,7 +22,6 @@ namespace framework{ - /** * converts a sequence of PropertyValue to a sequence of NamedValue. */ @@ -38,7 +37,6 @@ css::uno::Sequence< css::beans::NamedValue > Converter::convert_seqPropVal2seqNa return lDestination; } - /** * converts a sequence of unicode strings into a vector of such items */ diff --git a/framework/source/fwi/classes/propertysethelper.cxx b/framework/source/fwi/classes/propertysethelper.cxx index 338e0036147b..4a0600be050c 100644 --- a/framework/source/fwi/classes/propertysethelper.cxx +++ b/framework/source/fwi/classes/propertysethelper.cxx @@ -26,8 +26,6 @@ namespace framework{ - - PropertySetHelper::PropertySetHelper( osl::Mutex & mutex, TransactionManager* pExternalTransactionManager , sal_Bool bReleaseLockOnCall ) @@ -38,12 +36,10 @@ PropertySetHelper::PropertySetHelper( osl::Mutex & mutex, { } - PropertySetHelper::~PropertySetHelper() { } - void PropertySetHelper::impl_setPropertyChangeBroadcaster(const css::uno::Reference< css::uno::XInterface >& xBroadcaster) { TransactionGuard aTransaction(m_rTransactionManager, E_SOFTEXCEPTIONS); @@ -52,7 +48,6 @@ void PropertySetHelper::impl_setPropertyChangeBroadcaster(const css::uno::Refere m_xBroadcaster = xBroadcaster; } - void SAL_CALL PropertySetHelper::impl_addPropertyInfo(const css::beans::Property& aProperty) throw(css::beans::PropertyExistException, css::uno::Exception ) @@ -68,7 +63,6 @@ void SAL_CALL PropertySetHelper::impl_addPropertyInfo(const css::beans::Property m_lProps[aProperty.Name] = aProperty; } - void SAL_CALL PropertySetHelper::impl_removePropertyInfo(const OUString& sProperty) throw(css::beans::UnknownPropertyException, css::uno::Exception ) @@ -84,12 +78,10 @@ void SAL_CALL PropertySetHelper::impl_removePropertyInfo(const OUString& sProper m_lProps.erase(pIt); } - void SAL_CALL PropertySetHelper::impl_enablePropertySet() { } - void SAL_CALL PropertySetHelper::impl_disablePropertySet() { TransactionGuard aTransaction(m_rTransactionManager, E_SOFTEXCEPTIONS); @@ -104,7 +96,6 @@ void SAL_CALL PropertySetHelper::impl_disablePropertySet() m_lProps.free(); } - sal_Bool PropertySetHelper::impl_existsVeto(const css::beans::PropertyChangeEvent& aEvent) { /* Dont use the lock here! @@ -134,7 +125,6 @@ sal_Bool PropertySetHelper::impl_existsVeto(const css::beans::PropertyChangeEven return sal_False; } - void PropertySetHelper::impl_notifyChangeListener(const css::beans::PropertyChangeEvent& aEvent) { /* Dont use the lock here! @@ -160,7 +150,6 @@ void PropertySetHelper::impl_notifyChangeListener(const css::beans::PropertyChan } } - css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL PropertySetHelper::getPropertySetInfo() throw(css::uno::RuntimeException, std::exception) { @@ -170,7 +159,6 @@ css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL PropertySetHelper:: return xInfo; } - void SAL_CALL PropertySetHelper::setPropertyValue(const OUString& sProperty, const css::uno::Any& aValue ) throw(css::beans::UnknownPropertyException, @@ -236,7 +224,6 @@ void SAL_CALL PropertySetHelper::setPropertyValue(const OUString& sProperty, impl_notifyChangeListener(aEvent); } - css::uno::Any SAL_CALL PropertySetHelper::getPropertyValue(const OUString& sProperty) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException , @@ -259,7 +246,6 @@ css::uno::Any SAL_CALL PropertySetHelper::getPropertyValue(const OUString& sProp return impl_getPropertyValue(aPropInfo.Name, aPropInfo.Handle); } - void SAL_CALL PropertySetHelper::addPropertyChangeListener(const OUString& sProperty, const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener) throw(css::beans::UnknownPropertyException, @@ -281,7 +267,6 @@ void SAL_CALL PropertySetHelper::addPropertyChangeListener(const OUString& m_lSimpleChangeListener.addInterface(sProperty, xListener); } - void SAL_CALL PropertySetHelper::removePropertyChangeListener(const OUString& sProperty, const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener) throw(css::beans::UnknownPropertyException, @@ -303,7 +288,6 @@ void SAL_CALL PropertySetHelper::removePropertyChangeListener(const OUString& m_lSimpleChangeListener.removeInterface(sProperty, xListener); } - void SAL_CALL PropertySetHelper::addVetoableChangeListener(const OUString& sProperty, const css::uno::Reference< css::beans::XVetoableChangeListener >& xListener) throw(css::beans::UnknownPropertyException, @@ -325,7 +309,6 @@ void SAL_CALL PropertySetHelper::addVetoableChangeListener(const OUString& m_lVetoChangeListener.addInterface(sProperty, xListener); } - void SAL_CALL PropertySetHelper::removeVetoableChangeListener(const OUString& sProperty, const css::uno::Reference< css::beans::XVetoableChangeListener >& xListener) throw(css::beans::UnknownPropertyException, @@ -347,7 +330,6 @@ void SAL_CALL PropertySetHelper::removeVetoableChangeListener(const OUString& m_lVetoChangeListener.removeInterface(sProperty, xListener); } - css::uno::Sequence< css::beans::Property > SAL_CALL PropertySetHelper::getProperties() throw(css::uno::RuntimeException, std::exception) { @@ -369,7 +351,6 @@ css::uno::Sequence< css::beans::Property > SAL_CALL PropertySetHelper::getProper return lProps; } - css::beans::Property SAL_CALL PropertySetHelper::getPropertyByName(const OUString& sName) throw(css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception ) @@ -385,7 +366,6 @@ css::beans::Property SAL_CALL PropertySetHelper::getPropertyByName(const OUStrin return pIt->second; } - sal_Bool SAL_CALL PropertySetHelper::hasPropertyByName(const OUString& sName) throw(css::uno::RuntimeException, std::exception) { diff --git a/framework/source/fwi/helper/mischelper.cxx b/framework/source/fwi/helper/mischelper.cxx index d243795e4e20..5ad024035358 100644 --- a/framework/source/fwi/helper/mischelper.cxx +++ b/framework/source/fwi/helper/mischelper.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/document/XDocumentLanguages.hpp> #include <com/sun/star/frame/ModuleManager.hpp> @@ -34,7 +33,6 @@ #include <helper/mischelper.hxx> #include <services.h> - using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::frame; @@ -42,8 +40,6 @@ using namespace ::com::sun::star::beans; using namespace ::com::sun::star::container; using namespace ::com::sun::star::lang; - - namespace framework { @@ -63,7 +59,6 @@ uno::Reference< linguistic2::XLanguageGuessing > LanguageGuessingHelper::GetGues return m_xLanguageGuesser; } - OUString RetrieveLabelFromCommand( const OUString& aCmdURL, const uno::Reference< uno::XComponentContext >& _xContext, @@ -135,7 +130,6 @@ OUString RetrieveLabelFromCommand( return aLabel; } - void FillLangItems( std::set< OUString > &rLangItems, const SvtLanguageTable & rLanguageTable, const uno::Reference< frame::XFrame > & rxFrame, @@ -221,5 +215,4 @@ void FillLangItems( std::set< OUString > &rLangItems, } // namespace framework - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/framework/source/fwi/helper/networkdomain.cxx b/framework/source/fwi/helper/networkdomain.cxx index 3dc4ee9c5737..6ea2a37f5469 100644 --- a/framework/source/fwi/helper/networkdomain.cxx +++ b/framework/source/fwi/helper/networkdomain.cxx @@ -23,7 +23,6 @@ // Windows - #define UNICODE #if defined _MSC_VER #pragma warning(push, 1) @@ -51,10 +50,8 @@ static OUString GetUserDomain() return OUString(); } - // Windows - namespace framework { @@ -77,16 +74,12 @@ OUString NetworkDomain::GetNTDomainName() #include <errno.h> #include <osl/thread.h> - // Unix - #if defined( SOLARIS ) - // Solaris - #include <sys/systeminfo.h> #include <sal/alloca.h> @@ -129,10 +122,8 @@ static rtl_uString *getDomainName() #elif defined( LINUX ) /* endif SOLARIS */ - // Linux - #include <unistd.h> #include <string.h> @@ -170,10 +161,8 @@ static rtl_uString *getDomainName() #else /* LINUX */ - // Other Unix - static rtl_uString *getDomainName() { return NULL; @@ -181,10 +170,8 @@ static rtl_uString *getDomainName() #endif - // Unix - namespace framework { @@ -206,10 +193,8 @@ OUString NetworkDomain::GetNTDomainName() #else /* UNIX */ - // Other operating systems (non-Windows and non-Unix) - namespace framework { diff --git a/framework/source/fwi/jobs/configaccess.cxx b/framework/source/fwi/jobs/configaccess.cxx index fb88bff4bc89..e7ba8180369e 100644 --- a/framework/source/fwi/jobs/configaccess.cxx +++ b/framework/source/fwi/jobs/configaccess.cxx @@ -52,7 +52,6 @@ ConfigAccess::ConfigAccess( /*IN*/ const css::uno::Reference< css::uno::XCompone { } - /** @short last chance to close an open configuration access point @descr In case our user forgot to close this configuration point @@ -64,7 +63,6 @@ ConfigAccess::~ConfigAccess() close(); } - /** @short return the internal mode of this instance @descr May be the outside user need any information about successfully opened @@ -78,7 +76,6 @@ ConfigAccess::EOpenMode ConfigAccess::getMode() const return m_eMode; } - /** @short open the configuration access in the specified mode @descr We set the opened configuration access as our member. So any following method, @@ -141,7 +138,6 @@ void ConfigAccess::open( /*IN*/ EOpenMode eMode ) } } - /** @short close the internal opened configuration access and flush all changes @descr It checks, if the given access is valid and react in the right way. @@ -161,7 +157,6 @@ void ConfigAccess::close() } } - /** @short provides an access to the internal wrapped configuration access @descr It's not allowed to safe this c++ (!) reference outside. You have diff --git a/framework/source/fwi/uielement/constitemcontainer.cxx b/framework/source/fwi/uielement/constitemcontainer.cxx index 43fb032904a1..f5f7a3fa0c13 100644 --- a/framework/source/fwi/uielement/constitemcontainer.cxx +++ b/framework/source/fwi/uielement/constitemcontainer.cxx @@ -66,7 +66,6 @@ public: virtual sal_Bool SAL_CALL hasPropertyByName(const OUString& PropertyName) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; - /** * Create an object that implements XPropertySetInfo IPropertyArrayHelper. */ diff --git a/framework/source/fwi/uielement/itemcontainer.cxx b/framework/source/fwi/uielement/itemcontainer.cxx index a7b243a0afb4..febae153689f 100644 --- a/framework/source/fwi/uielement/itemcontainer.cxx +++ b/framework/source/fwi/uielement/itemcontainer.cxx @@ -32,16 +32,13 @@ const char WRONG_TYPE_EXCEPTION[] = "Type must be com::sun::star::uno::Sequence< namespace framework { - // XInterface, XTypeProvider - ItemContainer::ItemContainer( const ShareableMutex& rMutex ) : m_aShareMutex( rMutex ) { } - ItemContainer::ItemContainer( const ConstItemContainer& rConstItemContainer, const ShareableMutex& rMutex ) : m_aShareMutex( rMutex ) { copyItemContainer( rConstItemContainer.m_aItemVector, rMutex ); diff --git a/framework/source/helper/dockingareadefaultacceptor.cxx b/framework/source/helper/dockingareadefaultacceptor.cxx index a1c9acb7e95a..33c79a8492f8 100644 --- a/framework/source/helper/dockingareadefaultacceptor.cxx +++ b/framework/source/helper/dockingareadefaultacceptor.cxx @@ -34,7 +34,6 @@ using namespace ::com::sun::star::uno ; using namespace ::cppu ; using namespace ::osl ; - // constructor DockingAreaDefaultAcceptor::DockingAreaDefaultAcceptor( const css::uno::Reference< XFrame >& xOwner ) @@ -42,14 +41,12 @@ DockingAreaDefaultAcceptor::DockingAreaDefaultAcceptor( const css::uno::Refere { } - // destructor DockingAreaDefaultAcceptor::~DockingAreaDefaultAcceptor() { } - // XDockingAreaAcceptor css::uno::Reference< css::awt::XWindow > SAL_CALL DockingAreaDefaultAcceptor::getContainerWindow() throw (css::uno::RuntimeException, std::exception) { diff --git a/framework/source/helper/ocomponentaccess.cxx b/framework/source/helper/ocomponentaccess.cxx index f8679988eff1..63238bc90416 100644 --- a/framework/source/helper/ocomponentaccess.cxx +++ b/framework/source/helper/ocomponentaccess.cxx @@ -34,7 +34,6 @@ using namespace ::cppu ; using namespace ::osl ; using namespace ::rtl ; - // constructor OComponentAccess::OComponentAccess( const css::uno::Reference< XDesktop >& xOwner ) @@ -44,14 +43,12 @@ OComponentAccess::OComponentAccess( const css::uno::Reference< XDesktop >& xOwne SAL_WARN_IF( !impldbg_checkParameter_OComponentAccessCtor( xOwner ), "fwk", "OComponentAccess::OComponentAccess(): Invalid parameter detected!" ); } - // destructor OComponentAccess::~OComponentAccess() { } - // XEnumerationAccess css::uno::Reference< XEnumeration > SAL_CALL OComponentAccess::createEnumeration() throw( RuntimeException, std::exception ) { @@ -79,7 +76,6 @@ css::uno::Reference< XEnumeration > SAL_CALL OComponentAccess::createEnumeration return xReturn; } - // XElementAccess Type SAL_CALL OComponentAccess::getElementType() throw( RuntimeException, std::exception ) { @@ -88,7 +84,6 @@ Type SAL_CALL OComponentAccess::getElementType() throw( RuntimeException, std::e return ::getCppuType((const css::uno::Reference< XComponent >*)NULL); } - // XElementAccess sal_Bool SAL_CALL OComponentAccess::hasElements() throw( RuntimeException, std::exception ) { @@ -109,7 +104,6 @@ sal_Bool SAL_CALL OComponentAccess::hasElements() throw( RuntimeException, std:: return bReturn; } - // private method void OComponentAccess::impl_collectAllChildComponents( const css::uno::Reference< XFramesSupplier >& xNode , @@ -143,7 +137,6 @@ void OComponentAccess::impl_collectAllChildComponents( const css::uno::Refere // ... otherwise break a recursive path and go back at current stack! } - // private method css::uno::Reference< XComponent > OComponentAccess::impl_getFrameComponent( const css::uno::Reference< XFrame >& xFrame ) const @@ -176,10 +169,8 @@ css::uno::Reference< XComponent > OComponentAccess::impl_getFrameComponent( cons return xComponent; } - // debug methods - /*----------------------------------------------------------------------------------------------------------------- The follow methods checks the parameter for other functions. If a parameter or his value is non valid, we return "sal_False". (else sal_True) This mechanism is used to throw an ASSERT! @@ -190,7 +181,6 @@ css::uno::Reference< XComponent > OComponentAccess::impl_getFrameComponent( cons But ... look for right testing! See using of this methods! -----------------------------------------------------------------------------------------------------------------*/ - sal_Bool OComponentAccess::impldbg_checkParameter_OComponentAccessCtor( const css::uno::Reference< XDesktop >& xOwner ) { return xOwner.is(); diff --git a/framework/source/helper/ocomponentenumeration.cxx b/framework/source/helper/ocomponentenumeration.cxx index 2f3057c8d137..650228013e61 100644 --- a/framework/source/helper/ocomponentenumeration.cxx +++ b/framework/source/helper/ocomponentenumeration.cxx @@ -30,7 +30,6 @@ using namespace ::cppu ; using namespace ::osl ; using namespace ::rtl ; - // constructor OComponentEnumeration::OComponentEnumeration( const Sequence< css::uno::Reference< XComponent > >& seqComponents ) @@ -42,7 +41,6 @@ OComponentEnumeration::OComponentEnumeration( const Sequence< css::uno::Referenc SAL_WARN_IF( !impldbg_checkParameter_OComponentEnumerationCtor( seqComponents ), "fwk", "OComponentEnumeration::OComponentEnumeration(): Invalid parameter detected!" ); } - // destructor OComponentEnumeration::~OComponentEnumeration() @@ -51,7 +49,6 @@ OComponentEnumeration::~OComponentEnumeration() impl_resetObject(); } - // XEventListener void SAL_CALL OComponentEnumeration::disposing( const EventObject& aEvent ) throw( RuntimeException, std::exception ) { @@ -66,7 +63,6 @@ void SAL_CALL OComponentEnumeration::disposing( const EventObject& aEvent ) thro impl_resetObject(); } - // XEnumeration sal_Bool SAL_CALL OComponentEnumeration::hasMoreElements() throw( RuntimeException, std::exception ) { @@ -79,7 +75,6 @@ sal_Bool SAL_CALL OComponentEnumeration::hasMoreElements() throw( RuntimeExcepti return ( m_nPosition < (sal_uInt32)(m_seqComponents.getLength()) ); } - // XEnumeration Any SAL_CALL OComponentEnumeration::nextElement() throw( NoSuchElementException , @@ -105,7 +100,6 @@ Any SAL_CALL OComponentEnumeration::nextElement() throw( NoSuchElementExcepti return aComponent; } - // proteced method void OComponentEnumeration::impl_resetObject() @@ -125,10 +119,8 @@ void OComponentEnumeration::impl_resetObject() m_nPosition = 0 ; } - // debug methods - /*----------------------------------------------------------------------------------------------------------------- The follow methods checks the parameter for other functions. If a parameter or his value is non valid, we return "sal_False". (else sal_True) This mechanism is used to throw an ASSERT! @@ -139,7 +131,6 @@ void OComponentEnumeration::impl_resetObject() But ... look for right testing! See using of this methods! -----------------------------------------------------------------------------------------------------------------*/ - // An empty list is allowed ... hasMoreElements() will return false then! sal_Bool OComponentEnumeration::impldbg_checkParameter_OComponentEnumerationCtor( const Sequence< css::uno::Reference< XComponent > >& seqComponents ) { @@ -156,7 +147,6 @@ sal_Bool OComponentEnumeration::impldbg_checkParameter_OComponentEnumerationCtor return bOK ; } - sal_Bool OComponentEnumeration::impldbg_checkParameter_disposing( const EventObject& aEvent ) { return aEvent.Source.is(); diff --git a/framework/source/helper/oframes.cxx b/framework/source/helper/oframes.cxx index 00652b6cd109..c1ca703da3aa 100644 --- a/framework/source/helper/oframes.cxx +++ b/framework/source/helper/oframes.cxx @@ -34,8 +34,6 @@ using namespace ::cppu ; using namespace ::osl ; using namespace ::std ; - - // constructor OFrames::OFrames( const css::uno::Reference< XFrame >& xOwner , @@ -49,7 +47,6 @@ OFrames::OFrames( const css::uno::Reference< XFrame >& xOwner SAL_WARN_IF( !impldbg_checkParameter_OFramesCtor( xOwner, pFrameContainer ), "fwk", "OFrames::OFrames(): Invalid parameter detected!" ); } - // (proteced!) destructor OFrames::~OFrames() @@ -58,7 +55,6 @@ OFrames::~OFrames() impl_resetObject(); } - // XFrames void SAL_CALL OFrames::append( const css::uno::Reference< XFrame >& xFrame ) throw( RuntimeException, std::exception ) { @@ -82,7 +78,6 @@ void SAL_CALL OFrames::append( const css::uno::Reference< XFrame >& xFrame ) thr SAL_WARN_IF( !xOwner.is(), "fwk", "OFrames::append():Our owner is dead - you can't append any frames ...!" ); } - // XFrames void SAL_CALL OFrames::remove( const css::uno::Reference< XFrame >& xFrame ) throw( RuntimeException, std::exception ) { @@ -107,7 +102,6 @@ void SAL_CALL OFrames::remove( const css::uno::Reference< XFrame >& xFrame ) thr SAL_WARN_IF( !xOwner.is(), "fwk", "OFrames::remove(): Our owner is dead - you can't remove any frames ...!" ); } - // XFrames Sequence< css::uno::Reference< XFrame > > SAL_CALL OFrames::queryFrames( sal_Int32 nSearchFlags ) throw( RuntimeException, std::exception ) { @@ -133,18 +127,15 @@ Sequence< css::uno::Reference< XFrame > > SAL_CALL OFrames::queryFrames( sal_Int // All searchflags are supported by this implementation! // If some flags should not be supported - don't call me with this flags!!! - // Search with AUTO-flag is not supported yet! // We think about right implementation. SAL_WARN_IF( (nSearchFlags & FrameSearchFlag::AUTO), "fwk", "OFrames::queryFrames(): Search with AUTO-flag is not supported yet!" ); - // Search for ALL and GLOBAL is superflous! // We support all necessary flags, from which these two flags are derived. // ALL = PARENT + SELF + CHILDREN + SIBLINGS // GLOBAL = ALL + TASKS - // Add parent to list ... if any exist! if( nSearchFlags & FrameSearchFlag::PARENT ) { @@ -157,7 +148,6 @@ Sequence< css::uno::Reference< XFrame > > SAL_CALL OFrames::queryFrames( sal_Int } } - // Add owner to list if SELF is searched. if( nSearchFlags & FrameSearchFlag::SELF ) { @@ -166,7 +156,6 @@ Sequence< css::uno::Reference< XFrame > > SAL_CALL OFrames::queryFrames( sal_Int impl_appendSequence( seqFrames, seqSelf ); } - // Add SIBLINGS to list. if( nSearchFlags & FrameSearchFlag::SIBLINGS ) { @@ -186,7 +175,6 @@ Sequence< css::uno::Reference< XFrame > > SAL_CALL OFrames::queryFrames( sal_Int m_bRecursiveSearchProtection = sal_False; } - // If searched for children, step over all elements in container and collect the information. if ( nSearchFlags & FrameSearchFlag::CHILDREN ) { @@ -212,7 +200,6 @@ Sequence< css::uno::Reference< XFrame > > SAL_CALL OFrames::queryFrames( sal_Int return seqFrames; } - // XIndexAccess sal_Int32 SAL_CALL OFrames::getCount() throw( RuntimeException, std::exception ) { @@ -234,7 +221,6 @@ sal_Int32 SAL_CALL OFrames::getCount() throw( RuntimeException, std::exception ) return nCount; } - // XIndexAccess Any SAL_CALL OFrames::getByIndex( sal_Int32 nIndex ) throw( IndexOutOfBoundsException , @@ -265,7 +251,6 @@ Any SAL_CALL OFrames::getByIndex( sal_Int32 nIndex ) throw( IndexOutOfBoundsExce return aReturnValue; } - // XElementAccess Type SAL_CALL OFrames::getElementType() throw( RuntimeException, std::exception ) { @@ -273,7 +258,6 @@ Type SAL_CALL OFrames::getElementType() throw( RuntimeException, std::exception return ::getCppuType( (const css::uno::Reference< XFrame >*)NULL ); } - // XElementAccess sal_Bool SAL_CALL OFrames::hasElements() throw( RuntimeException, std::exception ) { @@ -297,7 +281,6 @@ sal_Bool SAL_CALL OFrames::hasElements() throw( RuntimeException, std::exception return bHasElements; } - // proteced method void OFrames::impl_resetObject() @@ -314,7 +297,6 @@ void OFrames::impl_resetObject() m_pFrameContainer = NULL; } - // private method void OFrames::impl_appendSequence( Sequence< css::uno::Reference< XFrame > >& seqDestination , @@ -353,10 +335,8 @@ void OFrames::impl_appendSequence( Sequence< css::uno::Reference< XFram seqDestination = seqResult; } - // debug methods - /*----------------------------------------------------------------------------------------------------------------- The follow methods checks the parameter for other functions. If a parameter or his value is non valid, we return "sal_False". (else sal_True) This mechanism is used to throw an ASSERT! @@ -367,7 +347,6 @@ void OFrames::impl_appendSequence( Sequence< css::uno::Reference< XFram But ... look for right testing! See using of this methods! -----------------------------------------------------------------------------------------------------------------*/ - // An instance of this class can only work with valid initialization. // We share the mutex with ouer owner class, need a valid factory to instanciate new services and // use the access to ouer owner for some operations. @@ -377,7 +356,6 @@ sal_Bool OFrames::impldbg_checkParameter_OFramesCtor( const css::uno::Refere return xOwner.is() && pFrameContainer != 0; } - // Its only allowed to add valid references to container. // AND - alle frames must support XFrames-interface! sal_Bool OFrames::impldbg_checkParameter_append( const css::uno::Reference< XFrame >& xFrame ) @@ -385,7 +363,6 @@ sal_Bool OFrames::impldbg_checkParameter_append( const css::uno::Reference< XFra return xFrame.is(); } - // Its only allowed to add valid references to container... // ... => You can only delete valid references! sal_Bool OFrames::impldbg_checkParameter_remove( const css::uno::Reference< XFrame >& xFrame ) @@ -393,7 +370,6 @@ sal_Bool OFrames::impldbg_checkParameter_remove( const css::uno::Reference< XFra return xFrame.is(); } - // A search for frames must initiate with right flags. // Some one are superflous and not supported yet. But here we control only the range of incoming parameter! sal_Bool OFrames::impldbg_checkParameter_queryFrames( sal_Int32 nSearchFlags ) diff --git a/framework/source/helper/persistentwindowstate.cxx b/framework/source/helper/persistentwindowstate.cxx index a542484e7095..411e3dbf03a1 100644 --- a/framework/source/helper/persistentwindowstate.cxx +++ b/framework/source/helper/persistentwindowstate.cxx @@ -38,23 +38,18 @@ #include <vcl/wrkwin.hxx> #include <rtl/string.hxx> - namespace framework{ - - PersistentWindowState::PersistentWindowState(const css::uno::Reference< css::uno::XComponentContext >& xContext) : m_xContext (xContext ) , m_bWindowStateAlreadySet(sal_False ) { } - PersistentWindowState::~PersistentWindowState() { } - void SAL_CALL PersistentWindowState::initialize(const css::uno::Sequence< css::uno::Any >& lArguments) throw(css::uno::Exception , css::uno::RuntimeException, std::exception) @@ -83,7 +78,6 @@ void SAL_CALL PersistentWindowState::initialize(const css::uno::Sequence< css::u xFrame->addFrameActionListener(this); } - void SAL_CALL PersistentWindowState::frameAction(const css::frame::FrameActionEvent& aEvent) throw(css::uno::RuntimeException, std::exception) { @@ -143,14 +137,12 @@ void SAL_CALL PersistentWindowState::frameAction(const css::frame::FrameActionEv } } - void SAL_CALL PersistentWindowState::disposing(const css::lang::EventObject&) throw(css::uno::RuntimeException, std::exception) { // nothing todo here - because we hold the frame as weak reference only } - OUString PersistentWindowState::implst_identifyModule(const css::uno::Reference< css::uno::XComponentContext >& rxContext, const css::uno::Reference< css::frame::XFrame >& xFrame) { @@ -171,7 +163,6 @@ OUString PersistentWindowState::implst_identifyModule(const css::uno::Reference< return sModuleName; } - OUString PersistentWindowState::implst_getWindowStateFromConfig(const css::uno::Reference< css::uno::XComponentContext >& rxContext, const OUString& sModuleName) { @@ -202,7 +193,6 @@ OUString PersistentWindowState::implst_getWindowStateFromConfig(const css::uno:: return sWindowState; } - void PersistentWindowState::implst_setWindowStateOnConfig(const css::uno::Reference< css::uno::XComponentContext >& rxContext, const OUString& sModuleName , const OUString& sWindowState) @@ -231,7 +221,6 @@ void PersistentWindowState::implst_setWindowStateOnConfig(const css::uno::Refere {} } - OUString PersistentWindowState::implst_getWindowStateFromWindow(const css::uno::Reference< css::awt::XWindow >& xWindow) { OUString sWindowState; @@ -260,8 +249,6 @@ OUString PersistentWindowState::implst_getWindowStateFromWindow(const css::uno:: return sWindowState; } - - void PersistentWindowState::implst_setWindowStateOnWindow(const css::uno::Reference< css::awt::XWindow >& xWindow , const OUString& sWindowState) { diff --git a/framework/source/helper/statusindicator.cxx b/framework/source/helper/statusindicator.cxx index 2889d58f096a..168442c55bb2 100644 --- a/framework/source/helper/statusindicator.cxx +++ b/framework/source/helper/statusindicator.cxx @@ -19,24 +19,19 @@ #include <config_features.h> - #include <helper/statusindicator.hxx> namespace framework{ - - StatusIndicator::StatusIndicator(StatusIndicatorFactory* pFactory) : m_xFactory (pFactory) { } - StatusIndicator::~StatusIndicator() { } - void SAL_CALL StatusIndicator::start(const OUString& sText , sal_Int32 nRange) throw(css::uno::RuntimeException, std::exception) @@ -54,7 +49,6 @@ void SAL_CALL StatusIndicator::start(const OUString& sText , #endif } - void SAL_CALL StatusIndicator::end() throw(css::uno::RuntimeException, std::exception) { @@ -68,7 +62,6 @@ void SAL_CALL StatusIndicator::end() #endif } - void SAL_CALL StatusIndicator::reset() throw(css::uno::RuntimeException, std::exception) { @@ -82,7 +75,6 @@ void SAL_CALL StatusIndicator::reset() #endif } - void SAL_CALL StatusIndicator::setText(const OUString& sText) throw(css::uno::RuntimeException, std::exception) { @@ -98,7 +90,6 @@ void SAL_CALL StatusIndicator::setText(const OUString& sText) #endif } - void SAL_CALL StatusIndicator::setValue(sal_Int32 nValue) throw(css::uno::RuntimeException, std::exception) { diff --git a/framework/source/helper/statusindicatorfactory.cxx b/framework/source/helper/statusindicatorfactory.cxx index ef05159898f9..5f138561e8d8 100644 --- a/framework/source/helper/statusindicatorfactory.cxx +++ b/framework/source/helper/statusindicatorfactory.cxx @@ -49,11 +49,9 @@ namespace framework{ - sal_Int32 StatusIndicatorFactory::m_nInReschedule = 0; /// static counter for rescheduling const char PROGRESS_RESOURCE[] = "private:resource/progressbar/progressbar"; - StatusIndicatorFactory::StatusIndicatorFactory(const css::uno::Reference< css::uno::XComponentContext >& xContext) : m_xContext (xContext ) , m_pWakeUp (0 ) @@ -63,13 +61,11 @@ StatusIndicatorFactory::StatusIndicatorFactory(const css::uno::Reference< css::u { } - StatusIndicatorFactory::~StatusIndicatorFactory() { impl_stopWakeUpThread(); } - void SAL_CALL StatusIndicatorFactory::initialize(const css::uno::Sequence< css::uno::Any >& lArguments) throw(css::uno::Exception , css::uno::RuntimeException, std::exception) @@ -105,7 +101,6 @@ void SAL_CALL StatusIndicatorFactory::initialize(const css::uno::Sequence< css:: impl_createProgress(); } - css::uno::Reference< css::task::XStatusIndicator > SAL_CALL StatusIndicatorFactory::createStatusIndicator() throw(css::uno::RuntimeException, std::exception) { @@ -115,7 +110,6 @@ css::uno::Reference< css::task::XStatusIndicator > SAL_CALL StatusIndicatorFacto return xIndicator; } - void SAL_CALL StatusIndicatorFactory::update() throw(css::uno::RuntimeException, std::exception) { @@ -123,7 +117,6 @@ void SAL_CALL StatusIndicatorFactory::update() m_bAllowReschedule = sal_True; } - void StatusIndicatorFactory::start(const css::uno::Reference< css::task::XStatusIndicator >& xChild, const OUString& sText , sal_Int32 nRange) @@ -153,7 +146,6 @@ void StatusIndicatorFactory::start(const css::uno::Reference< css::task::XStatus impl_reschedule(sal_True); } - void StatusIndicatorFactory::reset(const css::uno::Reference< css::task::XStatusIndicator >& xChild) { // SAFE -> ---------------------------------- @@ -184,7 +176,6 @@ void StatusIndicatorFactory::reset(const css::uno::Reference< css::task::XStatus impl_reschedule(sal_True); } - void StatusIndicatorFactory::end(const css::uno::Reference< css::task::XStatusIndicator >& xChild) { // SAFE -> ---------------------------------- @@ -238,7 +229,6 @@ void StatusIndicatorFactory::end(const css::uno::Reference< css::task::XStatusIn impl_reschedule(sal_True); } - void StatusIndicatorFactory::setText(const css::uno::Reference< css::task::XStatusIndicator >& xChild, const OUString& sText ) { @@ -268,7 +258,6 @@ void StatusIndicatorFactory::setText(const css::uno::Reference< css::task::XStat impl_reschedule(sal_True); } - void StatusIndicatorFactory::setValue( const css::uno::Reference< css::task::XStatusIndicator >& xChild , sal_Int32 nValue ) { @@ -301,7 +290,6 @@ void StatusIndicatorFactory::setValue( const css::uno::Reference< css::task::XSt impl_reschedule(sal_False); } - void StatusIndicatorFactory::implts_makeParentVisibleIfAllowed() { // SAFE -> ---------------------------------- @@ -394,7 +382,6 @@ void StatusIndicatorFactory::implts_makeParentVisibleIfAllowed() } - void StatusIndicatorFactory::impl_createProgress() { // SAFE -> ---------------------------------- @@ -441,7 +428,6 @@ void StatusIndicatorFactory::impl_createProgress() m_xProgress = xProgress; } - void StatusIndicatorFactory::impl_showProgress() { // SAFE -> ---------------------------------- @@ -483,7 +469,6 @@ void StatusIndicatorFactory::impl_showProgress() } } - void StatusIndicatorFactory::impl_hideProgress() { // SAFE -> ---------------------------------- @@ -509,7 +494,6 @@ void StatusIndicatorFactory::impl_hideProgress() } } - void StatusIndicatorFactory::impl_reschedule(sal_Bool bForce) { // SAFE -> @@ -550,7 +534,6 @@ void StatusIndicatorFactory::impl_reschedule(sal_Bool bForce) } } - void StatusIndicatorFactory::impl_startWakeUpThread() { osl::MutexGuard g(m_mutex); @@ -565,7 +548,6 @@ void StatusIndicatorFactory::impl_startWakeUpThread() } } - void StatusIndicatorFactory::impl_stopWakeUpThread() { osl::MutexGuard g(m_mutex); diff --git a/framework/source/helper/tagwindowasmodified.cxx b/framework/source/helper/tagwindowasmodified.cxx index 30a0f957783a..6ebaa567357c 100644 --- a/framework/source/helper/tagwindowasmodified.cxx +++ b/framework/source/helper/tagwindowasmodified.cxx @@ -36,21 +36,16 @@ #include <vcl/wrkwin.hxx> #include <tools/wintypes.hxx> - namespace framework{ - - TagWindowAsModified::TagWindowAsModified() { } - TagWindowAsModified::~TagWindowAsModified() { } - void SAL_CALL TagWindowAsModified::initialize(const css::uno::Sequence< css::uno::Any >& lArguments) throw(css::uno::Exception , css::uno::RuntimeException, std::exception) @@ -72,7 +67,6 @@ void SAL_CALL TagWindowAsModified::initialize(const css::uno::Sequence< css::uno impl_update (xFrame); } - void SAL_CALL TagWindowAsModified::modified(const css::lang::EventObject& aEvent) throw(css::uno::RuntimeException, std::exception) { @@ -111,7 +105,6 @@ void SAL_CALL TagWindowAsModified::modified(const css::lang::EventObject& aEvent // <- SYNCHRONIZED } - void SAL_CALL TagWindowAsModified::frameAction(const css::frame::FrameActionEvent& aEvent) throw(css::uno::RuntimeException, std::exception) { @@ -135,7 +128,6 @@ void SAL_CALL TagWindowAsModified::frameAction(const css::frame::FrameActionEven impl_update (xFrame); } - void SAL_CALL TagWindowAsModified::disposing(const css::lang::EventObject& aEvent) throw(css::uno::RuntimeException, std::exception) { @@ -162,7 +154,6 @@ void SAL_CALL TagWindowAsModified::disposing(const css::lang::EventObject& aEven } } - void TagWindowAsModified::impl_update (const css::uno::Reference< css::frame::XFrame >& xFrame) { if ( ! xFrame.is ()) diff --git a/framework/source/helper/titlebarupdate.cxx b/framework/source/helper/titlebarupdate.cxx index 16b157fa5c73..5f6791cff4bf 100644 --- a/framework/source/helper/titlebarupdate.cxx +++ b/framework/source/helper/titlebarupdate.cxx @@ -50,20 +50,16 @@ namespace framework{ static const ::sal_Int32 INVALID_ICON_ID = -1; static const ::sal_Int32 DEFAULT_ICON_ID = 0; - - TitleBarUpdate::TitleBarUpdate(const css::uno::Reference< css::uno::XComponentContext >& xContext) : m_xContext (xContext ) , m_xFrame ( ) { } - TitleBarUpdate::~TitleBarUpdate() { } - void SAL_CALL TitleBarUpdate::initialize(const css::uno::Sequence< css::uno::Any >& lArguments) throw(css::uno::Exception , css::uno::RuntimeException, std::exception) @@ -97,7 +93,6 @@ void SAL_CALL TitleBarUpdate::initialize(const css::uno::Sequence< css::uno::Any xBroadcaster->addTitleChangeListener (this); } - void SAL_CALL TitleBarUpdate::frameAction(const css::frame::FrameActionEvent& aEvent) throw(css::uno::RuntimeException, std::exception) { @@ -113,14 +108,12 @@ void SAL_CALL TitleBarUpdate::frameAction(const css::frame::FrameActionEvent& aE } } - void SAL_CALL TitleBarUpdate::titleChanged(const css::frame::TitleChangedEvent& /* aEvent */) throw (css::uno::RuntimeException, std::exception) { impl_forceUpdate (); } - void SAL_CALL TitleBarUpdate::disposing(const css::lang::EventObject&) throw(css::uno::RuntimeException, std::exception) { @@ -198,8 +191,6 @@ void TitleBarUpdate::impl_updateApplicationID(const css::uno::Reference< css::fr // <- VCL SYNCHRONIZED } - - sal_Bool TitleBarUpdate::implst_getModuleInfo(const css::uno::Reference< css::frame::XFrame >& xFrame, TModuleInfo& rInfo ) { @@ -228,7 +219,6 @@ sal_Bool TitleBarUpdate::implst_getModuleInfo(const css::uno::Reference< css::fr return sal_False; } - void TitleBarUpdate::impl_forceUpdate() { css::uno::Reference< css::frame::XFrame > xFrame; @@ -253,7 +243,6 @@ void TitleBarUpdate::impl_forceUpdate() #endif } - void TitleBarUpdate::impl_updateIcon(const css::uno::Reference< css::frame::XFrame >& xFrame) { css::uno::Reference< css::frame::XController > xController = xFrame->getController (); @@ -325,7 +314,6 @@ void TitleBarUpdate::impl_updateIcon(const css::uno::Reference< css::frame::XFra // <- VCL SYNCHRONIZED } - void TitleBarUpdate::impl_updateTitle(const css::uno::Reference< css::frame::XFrame >& xFrame) { // no window ... no chance to set any title -> return diff --git a/framework/source/helper/uiconfigelementwrapperbase.cxx b/framework/source/helper/uiconfigelementwrapperbase.cxx index 2bbccfee7c8c..bf3a8c86093a 100644 --- a/framework/source/helper/uiconfigelementwrapperbase.cxx +++ b/framework/source/helper/uiconfigelementwrapperbase.cxx @@ -452,7 +452,6 @@ void SAL_CALL UIConfigElementWrapperBase::setSettings( const Reference< XIndexAc { SolarMutexClearableGuard aLock; - if ( xSettings.is() ) { // Create a copy of the data if the container is not const @@ -491,7 +490,6 @@ Reference< XIndexAccess > SAL_CALL UIConfigElementWrapperBase::getSettings( sal_ { SolarMutexGuard g; - if ( bWriteable ) return Reference< XIndexAccess >( static_cast< OWeakObject * >( new RootItemContainer( m_xConfigData ) ), UNO_QUERY ); diff --git a/framework/source/helper/vclstatusindicator.cxx b/framework/source/helper/vclstatusindicator.cxx index 4bdb97a0d1b9..ef84803b6e3f 100644 --- a/framework/source/helper/vclstatusindicator.cxx +++ b/framework/source/helper/vclstatusindicator.cxx @@ -22,11 +22,8 @@ #include <toolkit/helper/vclunohelper.hxx> #include <vcl/svapp.hxx> - namespace framework { - - VCLStatusIndicator::VCLStatusIndicator(const css::uno::Reference< css::awt::XWindow >& xParentWindow) : m_xParentWindow (xParentWindow ) , m_pStatusBar (0 ) @@ -39,12 +36,10 @@ VCLStatusIndicator::VCLStatusIndicator(const css::uno::Reference< css::awt::XWin static_cast< css::task::XStatusIndicator* >(this)); } - VCLStatusIndicator::~VCLStatusIndicator() { } - void SAL_CALL VCLStatusIndicator::start(const OUString& sText , sal_Int32 nRange) throw(css::uno::RuntimeException, std::exception) @@ -71,7 +66,6 @@ void SAL_CALL VCLStatusIndicator::start(const OUString& sText , m_nValue = 0; } - void SAL_CALL VCLStatusIndicator::reset() throw(css::uno::RuntimeException, std::exception) { @@ -83,7 +77,6 @@ void SAL_CALL VCLStatusIndicator::reset() } } - void SAL_CALL VCLStatusIndicator::end() throw(css::uno::RuntimeException, std::exception) { @@ -103,7 +96,6 @@ void SAL_CALL VCLStatusIndicator::end() } } - void SAL_CALL VCLStatusIndicator::setText(const OUString& sText) throw(css::uno::RuntimeException, std::exception) { @@ -113,7 +105,6 @@ void SAL_CALL VCLStatusIndicator::setText(const OUString& sText) m_pStatusBar->SetText(sText); } - void SAL_CALL VCLStatusIndicator::setValue(sal_Int32 nValue) throw(css::uno::RuntimeException, std::exception) { @@ -136,7 +127,6 @@ void SAL_CALL VCLStatusIndicator::setValue(sal_Int32 nValue) m_pStatusBar->SetProgressValue(nPercent); } - void VCLStatusIndicator::impl_recalcLayout(Window* pStatusBar , Window* pParentWindow) { diff --git a/framework/source/helper/wakeupthread.cxx b/framework/source/helper/wakeupthread.cxx index b0cd2a94e851..e695a603a1b5 100644 --- a/framework/source/helper/wakeupthread.cxx +++ b/framework/source/helper/wakeupthread.cxx @@ -26,14 +26,11 @@ namespace framework{ - - WakeUpThread::WakeUpThread(const css::uno::Reference< css::util::XUpdatable >& xListener) : m_xListener (xListener) { } - void SAL_CALL WakeUpThread::run() { ::osl::Condition aSleeper; @@ -53,7 +50,6 @@ void SAL_CALL WakeUpThread::run() } } - void SAL_CALL WakeUpThread::onTerminated() { delete this; diff --git a/framework/source/inc/accelerators/acceleratorcache.hxx b/framework/source/inc/accelerators/acceleratorcache.hxx index 932cfcaf2dc5..a49cb1ca3393 100644 --- a/framework/source/inc/accelerators/acceleratorcache.hxx +++ b/framework/source/inc/accelerators/acceleratorcache.hxx @@ -27,13 +27,11 @@ #include <comphelper/sequenceasvector.hxx> - // definition namespace framework { - /** @short implements a cache for any accelerator configuration. @@ -50,14 +48,12 @@ class AcceleratorCache public: - /** TODO document me commands -> keys */ typedef ::comphelper::SequenceAsVector< css::awt::KeyEvent > TKeyList; typedef BaseHash< TKeyList > TCommand2Keys; - /** TODO document me keys -> commands */ @@ -66,40 +62,32 @@ class AcceleratorCache KeyEventHashCode , KeyEventEqualsFunc > TKey2Commands; - // member private: - /** map commands to keys in relation 1:n. First key is interpreted as preferred one! */ TCommand2Keys m_lCommand2Keys; - /** map keys to commands in relation 1:1. */ TKey2Commands m_lKey2Commands; - // interface public: - /** @short creates a new - but empty - cache instance. */ AcceleratorCache(); - /** @short make a copy of this cache. @descr Used for the copy-on-write feature. */ AcceleratorCache(const AcceleratorCache& rCopy); - /** @short does nothing real. */ virtual ~AcceleratorCache(); - /** @short write changes back to the original container. @param rCopy @@ -108,11 +96,9 @@ class AcceleratorCache */ virtual void takeOver(const AcceleratorCache& rCopy); - /** TODO document me */ AcceleratorCache& operator=(const AcceleratorCache& rCopy); - /** @short checks if the specified key exists. @param aKey @@ -124,11 +110,9 @@ class AcceleratorCache virtual sal_Bool hasKey(const css::awt::KeyEvent& aKey) const; virtual sal_Bool hasCommand(const OUString& sCommand) const; - /** TODO document me */ virtual TKeyList getAllKeys() const; - /** @short add a new or change an existing key-command pair of this container. @@ -141,7 +125,6 @@ class AcceleratorCache virtual void setKeyCommandPair(const css::awt::KeyEvent& aKey , const OUString& sCommand); - /** @short returns the list of keys, which are registered for this command. @@ -153,11 +136,9 @@ class AcceleratorCache */ virtual TKeyList getKeysByCommand(const OUString& sCommand) const; - /** TODO */ virtual OUString getCommandByKey(const css::awt::KeyEvent& aKey) const; - /** TODO */ virtual void removeKey(const css::awt::KeyEvent& aKey); virtual void removeCommand(const OUString& sCommand); diff --git a/framework/source/inc/accelerators/acceleratorconfiguration.hxx b/framework/source/inc/accelerators/acceleratorconfiguration.hxx index 27095364888b..8065456744f6 100644 --- a/framework/source/inc/accelerators/acceleratorconfiguration.hxx +++ b/framework/source/inc/accelerators/acceleratorconfiguration.hxx @@ -50,7 +50,6 @@ #include <cppuhelper/implbase4.hxx> #include <salhelper/singletonref.hxx> - // definition namespace framework @@ -64,7 +63,6 @@ const char CFG_ENTRY_MODULES[] = "Modules"; in combination with the salhelper::SingletonRef mechanism! */ typedef PresetHandler AcceleratorPresets; - /** implements a read/write access to the accelerator configuration. */ @@ -80,12 +78,10 @@ class XMLBasedAcceleratorConfiguration : public IStorageListener, protected: - /** the global uno service manager. Must be used to create own needed services. */ css::uno::Reference< css::uno::XComponentContext > m_xContext; - /** used to: i ) copy configuration files from the share to the user layer ii ) provide access to these config files @@ -93,15 +89,12 @@ class XMLBasedAcceleratorConfiguration : public IStorageListener, iv ) provide commit for changes. */ PresetHandler m_aPresetHandler; - /** contains the cached configuration data */ AcceleratorCache m_aReadCache; - /** used to implement the copy on write pattern! */ AcceleratorCache* m_pWriteCache; - // native interface! public: @@ -109,7 +102,6 @@ class XMLBasedAcceleratorConfiguration : public IStorageListener, XMLBasedAcceleratorConfiguration( const css::uno::Reference< css::uno::XComponentContext >& xContext); virtual ~XMLBasedAcceleratorConfiguration( ); - // uno interface! public: @@ -192,12 +184,10 @@ class XMLBasedAcceleratorConfiguration : public IStorageListener, // IStorageListener virtual void changesOccurred(const OUString& sPath) SAL_OVERRIDE; - // helper for derived classes protected: - /** @short return the current office locale. @descr We do not cache this value, because we are not listen @@ -208,12 +198,10 @@ class XMLBasedAcceleratorConfiguration : public IStorageListener, */ OUString impl_ts_getLocale() const; - // helper private: - /** @short load a configuration set, using the given stream. @param xStream @@ -221,7 +209,6 @@ class XMLBasedAcceleratorConfiguration : public IStorageListener, */ void impl_ts_load(const css::uno::Reference< css::io::XInputStream >& xStream); - /** @short save a configuration set, using the given stream. @param xStream @@ -229,7 +216,6 @@ class XMLBasedAcceleratorConfiguration : public IStorageListener, */ void impl_ts_save(const css::uno::Reference< css::io::XOutputStream >& xStream); - /** @short try to locate and open a sub storage. @descr It search at the root storage for the specified @@ -257,7 +243,6 @@ class XMLBasedAcceleratorConfiguration : public IStorageListener, const OUString& sSubStorage , sal_Bool bOutStream ); - /** @short returns a reference to one of our internal cache members. @descr We implement the copy-on-write pattern. Doing so @@ -293,7 +278,6 @@ class XCUBasedAcceleratorConfiguration : public ::cppu::WeakImplHelper4< protected: - /** the global uno service manager. Must be used to create own needed services. */ css::uno::Reference< css::uno::XComponentContext > m_xContext; @@ -309,7 +293,6 @@ class XCUBasedAcceleratorConfiguration : public ::cppu::WeakImplHelper4< ::salhelper::SingletonRef< KeyMapping > m_rKeyMapping; - // native interface! public: @@ -317,7 +300,6 @@ class XCUBasedAcceleratorConfiguration : public ::cppu::WeakImplHelper4< XCUBasedAcceleratorConfiguration( const css::uno::Reference< css::uno::XComponentContext >& xContext ); virtual ~XCUBasedAcceleratorConfiguration( ); - // uno interface! public: @@ -410,12 +392,10 @@ class XCUBasedAcceleratorConfiguration : public ::cppu::WeakImplHelper4< virtual void SAL_CALL addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& aListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - // helper for derived classes protected: - /** @short return the current office locale. @descr We do not cache this value, because we are not listen @@ -426,7 +406,6 @@ class XCUBasedAcceleratorConfiguration : public ::cppu::WeakImplHelper4< */ OUString impl_ts_getLocale() const; - // helper private: diff --git a/framework/source/inc/accelerators/istoragelistener.hxx b/framework/source/inc/accelerators/istoragelistener.hxx index 154a1eb0caee..b6786dc6bc79 100644 --- a/framework/source/inc/accelerators/istoragelistener.hxx +++ b/framework/source/inc/accelerators/istoragelistener.hxx @@ -23,14 +23,11 @@ #include <general.h> #include <stdtypes.h> - - // definition namespace framework { - /** TODO document me */ @@ -38,7 +35,6 @@ class IStorageListener { public: - /** @short TODO */ virtual void changesOccurred(const OUString& sPath) = 0; diff --git a/framework/source/inc/accelerators/keymapping.hxx b/framework/source/inc/accelerators/keymapping.hxx index 0336934f4358..be7821e07738 100644 --- a/framework/source/inc/accelerators/keymapping.hxx +++ b/framework/source/inc/accelerators/keymapping.hxx @@ -30,7 +30,6 @@ namespace framework { - /** can be used to map key identifier to the corresponding key codes ... @@ -42,7 +41,6 @@ class KeyMapping private: - /** @short is used to map a key code to the right key identifier, which is used to make the xml file "human readable" @@ -53,33 +51,27 @@ class KeyMapping const char* Identifier; }; - /** @short hash structure to map identifier to key codes. */ typedef BaseHash< sal_Int16 > Identifier2CodeHash; - /** @short hash structure to map key codes to identifier. */ typedef ::boost::unordered_map< sal_Int16 , OUString , ShortHashCode , ::std::equal_to< sal_Int16 > > Code2IdentifierHash; - // member private: static KeyIdentifierInfo KeyIdentifierMap[]; - /** @short hash to map identifier to key codes. */ Identifier2CodeHash m_lIdentifierHash; - /** @short hash to map key codes to identifier. */ Code2IdentifierHash m_lCodeHash; - // interface public: @@ -87,7 +79,6 @@ class KeyMapping KeyMapping(); virtual ~KeyMapping(); - /** @short return a suitable key code for the specified key identifier. @@ -105,7 +96,6 @@ class KeyMapping virtual sal_uInt16 mapIdentifierToCode(const OUString& sIdentifier) throw(css::lang::IllegalArgumentException); - /** @short return a suitable key identifier for the specified key code. @@ -116,19 +106,16 @@ class KeyMapping */ virtual OUString mapCodeToIdentifier(sal_uInt16 nCode); - // helper private: - /** @short check if the given string describe a numeric value ... and convert it. @param sIdentifier the string value, which should be converted. - @param rCode contains the converted code, but is defined only if this method returns sal_True! diff --git a/framework/source/inc/accelerators/presethandler.hxx b/framework/source/inc/accelerators/presethandler.hxx index 86fa1cc13ace..d7cea6a7e097 100644 --- a/framework/source/inc/accelerators/presethandler.hxx +++ b/framework/source/inc/accelerators/presethandler.hxx @@ -52,7 +52,6 @@ namespace framework class PresetHandler { - public: static OUString PRESET_DEFAULT(); @@ -63,12 +62,10 @@ class PresetHandler static OUString RESOURCETYPE_ACCELERATOR(); static OUString RESOURCETYPE_STATUSBAR(); - // types public: - /** @short this handler can provide different types of configuration. @@ -84,7 +81,6 @@ class PresetHandler private: - /** @short because a concurrent access to the same storage from different implementations isnt supported, we have to share it with others. @@ -109,23 +105,19 @@ class PresetHandler virtual ~TSharedStorages() {}; }; - // member private: - /** @short can be used to create on needed uno resources. */ css::uno::Reference< css::uno::XComponentContext > m_xContext; - /** @short knows the type of provided configuration. @descr e.g. global, modules, ... */ EConfigType m_eConfigType; - /** @short specify the type of resource, which configuration sets must be provided here. @@ -133,7 +125,6 @@ class PresetHandler */ OUString m_sResourceType; - /** @short specify the application module for a module dependend configuration. @@ -143,19 +134,16 @@ class PresetHandler */ OUString m_sModule; - /** @short provides access to the: a) shared root storages b) shared "inbetween" storages of the share and user layer. */ ::salhelper::SingletonRef< TSharedStorages > m_aSharedStorages; - /** @short if we run in document mode, we cant use the global root storages! We have to use a special document storage explicitly. */ StorageHolder m_lDocumentStorages; - /** @short holds the folder storage of the share layer alive, where the current configuration set exists. @@ -168,12 +156,10 @@ class PresetHandler */ css::uno::Reference< css::embed::XStorage > m_xWorkingStorageShare; - /** @short global language-independent storage */ css::uno::Reference< css::embed::XStorage > m_xWorkingStorageNoLang; - /** @short holds the folder storage of the user layer alive, where the current configuration set exists. @@ -186,17 +172,14 @@ class PresetHandler */ css::uno::Reference< css::embed::XStorage > m_xWorkingStorageUser; - /** @short knows the names of all presets inside the current working storage of the share layer. */ OUStringList m_lPresets; - /** @short knows the names of all targets inside the current working storage of the user layer. */ OUStringList m_lTargets; - /** @short its the current office locale and will be used to handle localized presets. @@ -204,18 +187,15 @@ class PresetHandler localized handling inside this class! */ LanguageTag m_aLanguageTag; - /** @short knows the relative path from the root. */ OUString m_sRelPathShare; OUString m_sRelPathNoLang; OUString m_sRelPathUser; - // native interface public: - /** @short does nothing real. @descr Because this class should be useable in combination @@ -228,19 +208,15 @@ class PresetHandler */ PresetHandler(const css::uno::Reference< css::uno::XComponentContext >& xContext); - /** @short copy ctor */ PresetHandler(const PresetHandler& rCopy); - /** @short closes all open storages ... if user forgot that .-) */ virtual ~PresetHandler(); - /** @short free all currently cache(!) storages. */ void forgetCachedStorages(); - /** @short return access to the internally used and cached root storage. @descr These root storages are the base of all further opened @@ -258,7 +234,6 @@ class PresetHandler css::uno::Reference< css::embed::XStorage > getOrCreateRootStorageShare(); css::uno::Reference< css::embed::XStorage > getOrCreateRootStorageUser(); - /** @short provides access to the current working storages. @descr Working storages are the "lowest" storages, where the @@ -270,7 +245,6 @@ class PresetHandler css::uno::Reference< css::embed::XStorage > getWorkingStorageShare(); css::uno::Reference< css::embed::XStorage > getWorkingStorageUser(); - /** @short check if there is a parent storage well known for the specified child storage and return it. @@ -283,7 +257,6 @@ class PresetHandler css::uno::Reference< css::embed::XStorage > getParentStorageShare(const css::uno::Reference< css::embed::XStorage >& xChild); css::uno::Reference< css::embed::XStorage > getParentStorageUser (const css::uno::Reference< css::embed::XStorage >& xChild); - /** @short free all internal structures and let this handler work on a new type of configuration sets. @@ -324,7 +297,6 @@ class PresetHandler const css::uno::Reference< css::embed::XStorage >& xDocumentRoot , const LanguageTag& rLanguageTag = LanguageTag(LANGUAGE_USER_PRIV_NOTRANSLATE)); - /** @short try to copy the specified preset from the share layer to the user layer and establish it as the specified target. @@ -348,7 +320,6 @@ class PresetHandler void copyPresetToTarget(const OUString& sPreset, const OUString& sTarget); - /** @short open the specified preset as stream object and return it. @@ -366,7 +337,6 @@ class PresetHandler css::uno::Reference< css::io::XStream > openPreset(const OUString& sPreset, sal_Bool bUseNoLangGlobal = sal_False); - /** @short open the specified target as stream object and return it. @@ -388,7 +358,6 @@ class PresetHandler css::uno::Reference< css::io::XStream > openTarget(const OUString& sTarget , sal_Bool bCreateIfMissing); - /** @short do anything which is necessary to flush all changes back to disk. @@ -398,17 +367,14 @@ class PresetHandler */ void commitUserChanges(); - /** TODO */ void addStorageListener(IStorageListener* pListener); void removeStorageListener(IStorageListener* pListener); - // helper private: - /** @short open a config path ignoring errors (catching exceptions). @descr We catch only normal exceptions here - no runtime exceptions. @@ -428,7 +394,6 @@ class PresetHandler sal_Int32 eMode , sal_Bool bShare); - /** @short try to find the specified locale inside list of possible ones. @descr The lits of possible locale values was e.g. retrieved from the system @@ -455,7 +420,6 @@ class PresetHandler OUString& rLanguageTag , sal_Bool bAllowFallbacks ); - /** @short open a config path ignoring errors (catching exceptions). @descr We catch only normal exceptions here - no runtime exceptions. @@ -489,7 +453,6 @@ class PresetHandler OUString& rLanguageTag , sal_Bool bAllowFallback); - /** @short returns the names of all sub storages of specified storage. @param xFolder diff --git a/framework/source/inc/accelerators/storageholder.hxx b/framework/source/inc/accelerators/storageholder.hxx index 07c0b116c999..c0c4269dba66 100644 --- a/framework/source/inc/accelerators/storageholder.hxx +++ b/framework/source/inc/accelerators/storageholder.hxx @@ -26,12 +26,9 @@ #include <com/sun/star/embed/XStorage.hpp> - namespace framework { - - /** TODO document me */ @@ -64,7 +61,6 @@ class StorageHolder OUStringHash , ::std::equal_to< OUString > > TPath2StorageInfo; - // member private: mutable osl::Mutex m_mutex; @@ -75,95 +71,77 @@ class StorageHolder /** @short TODO */ TPath2StorageInfo m_lStorages; - // interface public: - /** @short TODO */ StorageHolder(); - /** @short TODO */ virtual ~StorageHolder(); - /** @short TODO */ virtual void forgetCachedStorages(); - /** @short TODO */ virtual void setRootStorage(const css::uno::Reference< css::embed::XStorage >& xRoot); - /** @short TODO */ virtual css::uno::Reference< css::embed::XStorage > getRootStorage() const; - /** @short TODO open or get! */ virtual css::uno::Reference< css::embed::XStorage > openPath(const OUString& sPath , sal_Int32 nOpenMode); - /** @short TODO */ virtual StorageHolder::TStorageList getAllPathStorages(const OUString& sPath); - /** @short TODO */ virtual void commitPath(const OUString& sPath); - /** @short TODO */ virtual void closePath(const OUString& sPath); - /** @short TODO */ virtual void notifyPath(const OUString& sPath); - /** @short TODO */ virtual void addStorageListener( IStorageListener* pListener, const OUString& sPath ); - /** @short TODO */ virtual void removeStorageListener( IStorageListener* pListener, const OUString& sPath ); - /** @short TODO */ virtual OUString getPathOfStorage(const css::uno::Reference< css::embed::XStorage >& xStorage); - /** @short TODO */ virtual css::uno::Reference< css::embed::XStorage > getParentStorage(const css::uno::Reference< css::embed::XStorage >& xChild); - /** @short TODO */ virtual css::uno::Reference< css::embed::XStorage > getParentStorage(const OUString& sChildPath); - /** @short TODO */ void operator=(const StorageHolder& rCopy); - /** @short opens a sub element of the specified base storage. @descr First this method try to open the requested sub element @@ -197,16 +175,13 @@ class StorageHolder sal_Int32 eOpenMode , sal_Bool bAllowFallback); - // helper private: - /** @short TODO */ static OUString impl_st_normPath(const OUString& sPath); - /** @short TODO */ static OUStringList impl_st_parsePath(const OUString& sPath); diff --git a/framework/source/inc/dispatch/loaddispatcher.hxx b/framework/source/inc/dispatch/loaddispatcher.hxx index b3aec4cd4070..f9b6fa0bb936 100644 --- a/framework/source/inc/dispatch/loaddispatcher.hxx +++ b/framework/source/inc/dispatch/loaddispatcher.hxx @@ -59,7 +59,6 @@ class LoadDispatcher : public ::cppu::WeakImplHelper2< css::frame::XNotifyingDi /** @short TODO document me */ LoadEnv m_aLoader; - // native interface public: @@ -88,13 +87,10 @@ class LoadDispatcher : public ::cppu::WeakImplHelper2< css::frame::XNotifyingDi const OUString& sTargetName , sal_Int32 nSearchFlags); - - /** @short used to free internal resources. */ virtual ~LoadDispatcher(); - // uno interface public: diff --git a/framework/source/inc/dispatch/windowcommanddispatch.hxx b/framework/source/inc/dispatch/windowcommanddispatch.hxx index 6436b32fe26f..11329a2017d6 100644 --- a/framework/source/inc/dispatch/windowcommanddispatch.hxx +++ b/framework/source/inc/dispatch/windowcommanddispatch.hxx @@ -59,13 +59,10 @@ class WindowCommandDispatch /// knows the VCL window (where the hard coded commands occurred) as weak XWindow reference css::uno::WeakReference< css::awt::XWindow > m_xWindow; - // native interface public: - - /** @short creates a new instance and initialize it with all necessary parameters. @descr Every instance of such MACDispatch can be used for the specified context only. @@ -81,19 +78,14 @@ class WindowCommandDispatch WindowCommandDispatch(const css::uno::Reference< css::uno::XComponentContext >& xContext , const css::uno::Reference< css::frame::XFrame >& xFrame); - - /** @short used to free internal resources. */ virtual ~WindowCommandDispatch(); - // implementation private: - - /** @short establish all listener connections we need. @descr Those listener connections will be created one times only (see ctor). @@ -107,14 +99,10 @@ class WindowCommandDispatch */ void impl_stopListening(); - - /** @short callback from VCL to notify new commands */ DECL_LINK( impl_notifyCommand, void* ); - - /** @short dispatch right command URLs into our frame context. @param sCommand diff --git a/framework/source/inc/loadenv/actionlockguard.hxx b/framework/source/inc/loadenv/actionlockguard.hxx index 589deeab7fa4..1cedab697e53 100644 --- a/framework/source/inc/loadenv/actionlockguard.hxx +++ b/framework/source/inc/loadenv/actionlockguard.hxx @@ -20,10 +20,8 @@ #ifndef INCLUDED_FRAMEWORK_SOURCE_INC_LOADENV_ACTIONLOCKGUARD_HXX #define INCLUDED_FRAMEWORK_SOURCE_INC_LOADENV_ACTIONLOCKGUARD_HXX - #include <com/sun/star/document/XActionLockable.hpp> - namespace framework{ /** @short implements a guard, which can use the interface @@ -47,12 +45,10 @@ class ActionLockGuard forced by this guard instance. */ sal_Bool m_bActionLocked; - // interface public: - /** @short default ctor to initialize a "non working guard". @descr That can be useful in cases, where no resource still exists, @@ -64,7 +60,6 @@ class ActionLockGuard { } - /** @short initialize new guard instance and lock the given resource immediately. @param xLock @@ -76,7 +71,6 @@ class ActionLockGuard setResource(xLock); } - /** @short release this guard instance and make shure, that no lock will exist afterwards on the internal wrapped resource. */ @@ -85,7 +79,6 @@ class ActionLockGuard unlock(); } - /** @short set a new resource for locking at this guard. @descr This call will fail, if an internal resource already exists @@ -111,7 +104,6 @@ class ActionLockGuard return sal_True; } - /** @short set a new resource for locking at this guard. @descr This call will fail, if an internal resource already exists @@ -141,7 +133,6 @@ class ActionLockGuard xLock->removeActionLock(); } - /** @short lock the internal wrapped resource, if its not already done. */ virtual void lock() { @@ -153,7 +144,6 @@ class ActionLockGuard } } - /** @short unlock the internal wrapped resource, if its not already done. */ virtual void unlock() { diff --git a/framework/source/inc/loadenv/loadenv.hxx b/framework/source/inc/loadenv/loadenv.hxx index 29b65999ae3b..3006e82adbc1 100644 --- a/framework/source/inc/loadenv/loadenv.hxx +++ b/framework/source/inc/loadenv/loadenv.hxx @@ -19,7 +19,6 @@ #ifndef INCLUDED_FRAMEWORK_SOURCE_INC_LOADENV_LOADENV_HXX #define INCLUDED_FRAMEWORK_SOURCE_INC_LOADENV_LOADENV_HXX - #include <loadenv/loadenvexception.hxx> #include <loadenv/actionlockguard.hxx> @@ -38,7 +37,6 @@ #include <comphelper/sequenceashashmap.hxx> #include <cppuhelper/implbase2.hxx> - namespace framework { class QuietInteraction; @@ -305,8 +303,6 @@ public: */ void startLoading(); - - /** @short wait for an alreay running load request (started by calling startLoading() before). @@ -329,7 +325,6 @@ public: */ sal_Bool waitWhileLoading(sal_uInt32 nTimeout = 0); - /** TODO document me ... */ css::uno::Reference< css::lang::XComponent > getTargetComponent() const; @@ -381,8 +376,6 @@ public: /** TODO document me ... */ css::uno::Reference< css::uno::XInterface > impl_searchLoader(); - - /** @short it means; show the frame, bring it to front, might set the right icon etcpp. in case loading was successfully or reactivate a might existing old document or diff --git a/framework/source/inc/loadenv/targethelper.hxx b/framework/source/inc/loadenv/targethelper.hxx index 8ec03e2c09ad..618cc486d8a7 100644 --- a/framework/source/inc/loadenv/targethelper.hxx +++ b/framework/source/inc/loadenv/targethelper.hxx @@ -34,7 +34,6 @@ namespace framework{ class TargetHelper { - public: /** @short its used at the following interfaces to classify @@ -54,13 +53,10 @@ class TargetHelper E_HELPTASK }; - // interface public: - - /** @short it checks the given unknown target name, if it's the expected special one. @@ -78,8 +74,6 @@ class TargetHelper static sal_Bool matchSpecialTarget(const OUString& sCheckTarget , ESpecialTarget eSpecialTarget); - - /** @short it checks, if the given name can be used to set it at a frame using XFrame.setName() method. diff --git a/framework/source/inc/pattern/frame.hxx b/framework/source/inc/pattern/frame.hxx index e8d400bab416..38a0b8551274 100644 --- a/framework/source/inc/pattern/frame.hxx +++ b/framework/source/inc/pattern/frame.hxx @@ -35,8 +35,6 @@ namespace framework{ namespace pattern{ namespace frame{ - - inline css::uno::Reference< css::frame::XModel > extractFrameModel(const css::uno::Reference< css::frame::XFrame >& xFrame) { css::uno::Reference< css::frame::XModel > xModel; @@ -48,7 +46,6 @@ inline css::uno::Reference< css::frame::XModel > extractFrameModel(const css::un return xModel; } - /** @short close (or dispose) the given resource. @descr It try to close the given resource first. diff --git a/framework/source/inc/pattern/window.hxx b/framework/source/inc/pattern/window.hxx index 222fd319077f..19ff84bb55e7 100644 --- a/framework/source/inc/pattern/window.hxx +++ b/framework/source/inc/pattern/window.hxx @@ -33,17 +33,14 @@ #include <osl/mutex.hxx> #include <rtl/ustring.hxx> - // namespaces namespace framework{ - class WindowHelper { public: - static OUString getWindowState(const css::uno::Reference< css::awt::XWindow >& xWindow) { if (!xWindow.is()) @@ -68,7 +65,6 @@ static OUString getWindowState(const css::uno::Reference< css::awt::XWindow >& x return OStringToOUString(sWindowState,RTL_TEXTENCODING_UTF8); } - static void setWindowState(const css::uno::Reference< css::awt::XWindow >& xWindow , const OUString& sWindowState) { @@ -99,7 +95,6 @@ static void setWindowState(const css::uno::Reference< css::awt::XWindow >& xWind // <- SOLAR SAFE ---------------------------- } - static sal_Bool isTopWindow(const css::uno::Reference< css::awt::XWindow >& xWindow) { // even child frame containing top level windows (e.g. query designer of database) will be closed diff --git a/framework/source/interaction/quietinteraction.cxx b/framework/source/interaction/quietinteraction.cxx index 1717bf0cc17f..6675787f1cf5 100644 --- a/framework/source/interaction/quietinteraction.cxx +++ b/framework/source/interaction/quietinteraction.cxx @@ -39,15 +39,11 @@ namespace framework{ - - QuietInteraction::QuietInteraction() : m_aRequest ( ) { } - - void SAL_CALL QuietInteraction::handle( const css::uno::Reference< css::task::XInteractionRequest >& xRequest ) throw( css::uno::RuntimeException, std::exception ) { // safe the request for outside analyzing everytime! @@ -134,16 +130,12 @@ void SAL_CALL QuietInteraction::handle( const css::uno::Reference< css::task::XI xAbort->select(); } - - css::uno::Any QuietInteraction::getRequest() const { SolarMutexGuard g; return m_aRequest; } - - sal_Bool QuietInteraction::wasUsed() const { SolarMutexGuard g; diff --git a/framework/source/jobs/helponstartup.cxx b/framework/source/jobs/helponstartup.cxx index f710be534597..ff55ba5b5700 100644 --- a/framework/source/jobs/helponstartup.cxx +++ b/framework/source/jobs/helponstartup.cxx @@ -17,14 +17,11 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - - // include own header #include <jobs/helponstartup.hxx> #include <loadenv/targethelper.hxx> #include <services.h> - // include others #include <comphelper/configurationhelper.hxx> #include <comphelper/sequenceashashmap.hxx> @@ -33,14 +30,12 @@ #include <vcl/help.hxx> #include <rtl/ustrbuf.hxx> - // include interfaces #include <com/sun/star/frame/FrameSearchFlag.hpp> #include <com/sun/star/frame/ModuleManager.hpp> #include <com/sun/star/frame/XFramesSupplier.hpp> #include <com/sun/star/frame/Desktop.hpp> - namespace framework{ DEFINE_XSERVICEINFO_MULTISERVICE_2(HelpOnStartup , @@ -98,18 +93,15 @@ DEFINE_INIT_SERVICE(HelpOnStartup, } ) - HelpOnStartup::HelpOnStartup(const css::uno::Reference< css::uno::XComponentContext >& xContext) : m_xContext (xContext) { } - HelpOnStartup::~HelpOnStartup() { } - // css.task.XJob css::uno::Any SAL_CALL HelpOnStartup::execute(const css::uno::Sequence< css::beans::NamedValue >& lArguments) throw(css::lang::IllegalArgumentException, @@ -157,7 +149,6 @@ css::uno::Any SAL_CALL HelpOnStartup::execute(const css::uno::Sequence< css::bea return css::uno::Any(); } - void SAL_CALL HelpOnStartup::disposing(const css::lang::EventObject& aEvent) throw(css::uno::RuntimeException, std::exception) { @@ -170,7 +161,6 @@ void SAL_CALL HelpOnStartup::disposing(const css::lang::EventObject& aEvent) m_xConfig.clear(); } - OUString HelpOnStartup::its_getModuleIdFromEnv(const css::uno::Sequence< css::beans::NamedValue >& lArguments) { ::comphelper::SequenceAsHashMap lArgs (lArguments); @@ -222,7 +212,6 @@ OUString HelpOnStartup::its_getModuleIdFromEnv(const css::uno::Sequence< css::be return sModuleId; } - OUString HelpOnStartup::its_getCurrentHelpURL() { // SAFE -> @@ -264,7 +253,6 @@ OUString HelpOnStartup::its_getCurrentHelpURL() return sCurrentHelpURL; } - sal_Bool HelpOnStartup::its_isHelpUrlADefaultOne(const OUString& sHelpURL) { if (sHelpURL.isEmpty()) @@ -311,7 +299,6 @@ sal_Bool HelpOnStartup::its_isHelpUrlADefaultOne(const OUString& sHelpURL) return sal_False; } - OUString HelpOnStartup::its_checkIfHelpEnabledAndGetURL(const OUString& sModule) { // SAFE -> @@ -349,7 +336,6 @@ OUString HelpOnStartup::its_checkIfHelpEnabledAndGetURL(const OUString& sModule) return sHelpURL; } - OUString HelpOnStartup::ist_createHelpURL(const OUString& sBaseURL, const OUString& sLocale , const OUString& sSystem ) diff --git a/framework/source/jobs/job.cxx b/framework/source/jobs/job.cxx index a48dd4a49a08..0ce101790895 100644 --- a/framework/source/jobs/job.cxx +++ b/framework/source/jobs/job.cxx @@ -34,7 +34,6 @@ namespace framework{ - /** @short standard ctor @descr It initialize this new instance. But it set some generic parameters here only. @@ -62,7 +61,6 @@ Job::Job( /*IN*/ const css::uno::Reference< css::uno::XComponentContext >& xCont { } - /** @short standard ctor @descr It initialize this new instance. But it set some generic parameters here only. @@ -90,7 +88,6 @@ Job::Job( /*IN*/ const css::uno::Reference< css::uno::XComponentContext >& xCont { } - /** @short superflous! @descr Releasing of memory and reference must be done inside die() call. @@ -100,7 +97,6 @@ Job::~Job() { } - /** @short set (or delete) a listener for sending dispatch result events @descr Because this object is used in a wrapped mode ... the original listener @@ -144,7 +140,6 @@ void Job::setJobData( const JobData& aData ) m_aJobCfg = aData; } - /** @short runs the job @descr It doesn't matter, if the job is an asynchronous or @@ -271,7 +266,6 @@ void Job::execute( /*IN*/ const css::uno::Sequence< css::beans::NamedValue >& lD die(); } - /** @short kill this job @descr It doesn't matter if this request is called from inside or @@ -313,7 +307,6 @@ void Job::die() m_bPendingCloseModel = sal_False; } - /** @short generates list of arguments for job execute @descr There exist a set of information, which can be needed by a job. @@ -414,7 +407,6 @@ css::uno::Sequence< css::beans::NamedValue > Job::impl_generateJobArgs( /*IN*/ c return lAllArgs; } - /** @short analyze the given job result and change the job configuration @descr Note: Some results can be handled only, if this job has a valid configuration! @@ -476,7 +468,6 @@ void Job::impl_reactForJobResult( /*IN*/ const css::uno::Any& aResult ) } } - /** @short starts listening for office shutdown and closing of our given target frame (if it's a valid reference) @@ -552,7 +543,6 @@ void Job::impl_startListening() } } - /** @short release listener connection for office shutdown @descr see description of impl_startListening() @@ -613,7 +603,6 @@ void Job::impl_stopListening() } } - /** @short callback from any asynchronous executed job @@ -653,7 +642,6 @@ void SAL_CALL Job::jobFinished( /*IN*/ const css::uno::Reference< css::task::XAs m_aAsyncWait.set(); } - /** @short prevent internal wrapped job against office termination @descr This event is broadcasted by the desktop instance and ask for an office termination. @@ -692,8 +680,6 @@ void SAL_CALL Job::queryTermination( /*IN*/ const css::lang::EventObject& ) thro } } - - /** @short inform us about office termination @descr Instead of the method queryTermination(), here is no chance to disagree with that. @@ -713,7 +699,6 @@ void SAL_CALL Job::notifyTermination( /*IN*/ const css::lang::EventObject& ) thr // Do nothing else here. Our internal resources was released ... } - /** @short prevent internal wrapped job against frame closing @descr This event is broadcasted by the frame instance and ask for closing. @@ -794,7 +779,6 @@ void SAL_CALL Job::queryClosing( const css::lang::EventObject& aEvent , // call us back. We must give him the chance to finish it's work successfully. } - /** @short inform us about frame closing @descr Instead of the method queryClosing(), here is no chance to disagree with that. @@ -809,7 +793,6 @@ void SAL_CALL Job::notifyClosing( const css::lang::EventObject& ) throw(css::uno // Do nothing else here. Our internal resources was released ... } - /** @short shouldn't be called normaly @descr But it doesn't matter, who called it. We have to kill our internal diff --git a/framework/source/jobs/jobdata.cxx b/framework/source/jobs/jobdata.cxx index bd17661a943f..2ea5d5d66c1b 100644 --- a/framework/source/jobs/jobdata.cxx +++ b/framework/source/jobs/jobdata.cxx @@ -31,7 +31,6 @@ #include <unotools/configpaths.hxx> #include <vcl/svapp.hxx> - namespace framework{ /** @@ -50,7 +49,6 @@ JobData::JobData( const css::uno::Reference< css::uno::XComponentContext >& rxCo impl_reset(); } - /** @short copy ctor @descr Sometimes such job data container must be moved from one using place @@ -65,7 +63,6 @@ JobData::JobData( const JobData& rCopy ) *this = rCopy; } - /** @short operator for coping JobData instances @descr Sometimes such job data container must be moved from one using place @@ -89,7 +86,6 @@ void JobData::operator=( const JobData& rCopy ) m_aLastExecutionResult = rCopy.m_aLastExecutionResult; } - /** @short let this instance die @descr There is no chance any longer to work. We have to @@ -100,7 +96,6 @@ JobData::~JobData() impl_reset(); } - /** @short initalize this instance as a job with configuration @descr They given alias can be used to address some configuration data. @@ -168,7 +163,6 @@ void JobData::setAlias( const OUString& sAlias ) aConfig.close(); } - /** @short initalize this instance as a job without configuration @descr This job has no configuration data. We have to forget all old information @@ -187,7 +181,6 @@ void JobData::setService( const OUString& sService ) m_eMode = E_SERVICE; } - /** @short initialize this instance with new job values. @descr It reads automaticly all properties of the specified @@ -218,7 +211,6 @@ void JobData::setEvent( const OUString& sEvent , m_eMode = E_EVENT; } - /** @short set the new job specific arguments @descr If a job finish his work, it can give us a new list of arguments (which @@ -270,7 +262,6 @@ void JobData::setJobConfig( const css::uno::Sequence< css::beans::NamedValue >& } } - /** @short set a new excution result @descr Every executed job can have returned a result. @@ -295,7 +286,6 @@ void JobData::setResult( const JobResult& aResult ) // from outside! Here we save this information only. } - /** @short set a new environment descriptor for this job @descr It must(!) be done everytime this container is initialized @@ -308,7 +298,6 @@ void JobData::setEnvironment( EEnvironment eEnvironment ) m_eEnvironment = eEnvironment; } - /** @short these functions provides access to our internal members @descr These member represent any information about the job @@ -320,16 +309,12 @@ JobData::EMode JobData::getMode() const return m_eMode; } - - JobData::EEnvironment JobData::getEnvironment() const { SolarMutexGuard g; return m_eEnvironment; } - - OUString JobData::getEnvironmentDescriptor() const { OUString sDescriptor; @@ -353,32 +338,24 @@ OUString JobData::getEnvironmentDescriptor() const return sDescriptor; } - - OUString JobData::getService() const { SolarMutexGuard g; return m_sService; } - - OUString JobData::getEvent() const { SolarMutexGuard g; return m_sEvent; } - - css::uno::Sequence< css::beans::NamedValue > JobData::getJobConfig() const { SolarMutexGuard g; return m_lArguments; } - - css::uno::Sequence< css::beans::NamedValue > JobData::getConfig() const { SolarMutexGuard g; @@ -403,7 +380,6 @@ css::uno::Sequence< css::beans::NamedValue > JobData::getConfig() const return lConfig; } - /** @short return information, if this job is part of the global configuration package org.openoffice.Office.Jobs @@ -421,7 +397,6 @@ sal_Bool JobData::hasConfig() const return (m_eMode==E_ALIAS || m_eMode==E_EVENT); } - /** @short mark a job as non startable for further requests @descr We don't remove the configuration entry! We set a timestamp value only. @@ -465,7 +440,6 @@ void JobData::disableJob() aConfig.close(); } - /** */ sal_Bool isEnabled( const OUString& sAdminTime , @@ -491,7 +465,6 @@ sal_Bool isEnabled( const OUString& sAdminTime , ); } - /** */ void JobData::appendEnabledJobsForEvent( const css::uno::Reference< css::uno::XComponentContext >& rxContext, @@ -509,7 +482,6 @@ void JobData::appendEnabledJobsForEvent( const css::uno::Reference< css::uno::XC } } - /** */ sal_Bool JobData::hasCorrectContext(const OUString& rModuleIdent) const @@ -533,7 +505,6 @@ sal_Bool JobData::hasCorrectContext(const OUString& rModuleIdent) const return sal_False; } - /** */ css::uno::Sequence< OUString > JobData::getEnabledJobsForEvent( const css::uno::Reference< css::uno::XComponentContext >& rxContext, @@ -604,7 +575,6 @@ css::uno::Sequence< OUString > JobData::getEnabledJobsForEvent( const css::uno:: return lEnabledJobs; } - /** @short reset all internal structures @descr If someone recycles this instance, he can switch from one diff --git a/framework/source/jobs/jobdispatch.cxx b/framework/source/jobs/jobdispatch.cxx index fc38935ec3a8..7c1de4431122 100644 --- a/framework/source/jobs/jobdispatch.cxx +++ b/framework/source/jobs/jobdispatch.cxx @@ -45,7 +45,6 @@ using namespace framework; namespace { - /** @short implements a dispatch object for jobs @descr Such dispatch object will be used by the generic dispatch mechanism if @@ -73,7 +72,6 @@ private: /** name of module (writer, impress etc.) the frame is for */ OUString m_sModuleIdentifier; - // native interface methods public: @@ -136,7 +134,6 @@ public: const css::util::URL& aURL ) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; - /** @short standard ctor @descr It initialize this new instance. @@ -149,7 +146,6 @@ JobDispatch::JobDispatch( /*IN*/ const css::uno::Reference< css::uno::XComponent { } - /** @short let this instance die @descr We have to release all used resources and free used memory. @@ -161,7 +157,6 @@ JobDispatch::~JobDispatch() m_xFrame.clear(); } - /** @short implementation of XInitalization @descr A protocol handler can provide this functionality, if it wish to get additional information @@ -194,7 +189,6 @@ void SAL_CALL JobDispatch::initialize( const css::uno::Sequence< css::uno::Any > } } - /** @short implementation of XDispatchProvider::queryDispatches() @descr Every protocol handler will be asked for his agreement, if an URL was queried @@ -225,7 +219,6 @@ css::uno::Reference< css::frame::XDispatch > SAL_CALL JobDispatch::queryDispatch return xDispatch; } - /** @short implementation of XDispatchProvider::queryDispatches() @descr It's an optimized access for remote, so you can ask for @@ -251,7 +244,6 @@ css::uno::Sequence< css::uno::Reference< css::frame::XDispatch > > SAL_CALL JobD return lDispatches; } - /** @short implementation of XNotifyingDispatch::dispatchWithNotification() @descr It creates the job service implementation and call execute on it. @@ -295,7 +287,6 @@ void SAL_CALL JobDispatch::dispatchWithNotification( /*IN*/ const css::util::URL } } - /** @short dispatch an event @descr We search all registered jobs for this event and execute it. @@ -378,7 +369,6 @@ void JobDispatch::impl_dispatchEvent( /*IN*/ const OUString& } } - /** @short dispatch a service @descr We use the given name only to create and if possible to initialize @@ -430,7 +420,6 @@ void JobDispatch::impl_dispatchService( /*IN*/ const OUString& pJob->execute(Converter::convert_seqPropVal2seqNamedVal(lArgs)); } - /** @short dispatch an alias @descr We use this alias to locate a job inside the configuration @@ -481,7 +470,6 @@ void JobDispatch::impl_dispatchAlias( /*IN*/ const OUString& pJob->execute(Converter::convert_seqPropVal2seqNamedVal(lArgs)); } - /** @short implementation of XDispatch::dispatch() @descr Because the methods dispatch() and dispatchWithNotification() are different in her parameters @@ -501,7 +489,6 @@ void SAL_CALL JobDispatch::dispatch( /*IN*/ const css::util::URL& dispatchWithNotification(aURL, lArgs, css::uno::Reference< css::frame::XDispatchResultListener >()); } - /** @short not supported */ @@ -510,7 +497,6 @@ void SAL_CALL JobDispatch::addStatusListener( /*IN*/ const css::uno::Reference< { } - /** @short not supported */ diff --git a/framework/source/jobs/jobexecutor.cxx b/framework/source/jobs/jobexecutor.cxx index 428c5bd92b6d..bbf0eecf2e54 100644 --- a/framework/source/jobs/jobexecutor.cxx +++ b/framework/source/jobs/jobexecutor.cxx @@ -189,8 +189,6 @@ void JobExecutor::disposing() { } } - - /** @short implementation of XJobExecutor interface @descr We use the given event to locate any registered job inside our configuration @@ -247,8 +245,6 @@ void SAL_CALL JobExecutor::trigger( const OUString& sEvent ) throw(css::uno::Run } } - - void SAL_CALL JobExecutor::notifyEvent( const css::document::EventObject& aEvent ) throw(css::uno::RuntimeException, std::exception) { const char EVENT_ON_NEW[] = "OnNew"; // Doc UI event @@ -336,8 +332,6 @@ void SAL_CALL JobExecutor::notifyEvent( const css::document::EventObject& aEvent } } - - void SAL_CALL JobExecutor::elementInserted( const css::container::ContainerEvent& aEvent ) throw(css::uno::RuntimeException, std::exception) { OUString sValue; @@ -373,8 +367,6 @@ void SAL_CALL JobExecutor::elementReplaced( const css::container::ContainerEvent // I'm not interested on changed items :-) } - - /** @short the used cfg changes notifier wish to be released in its reference. @descr We close our internal used configuration instance to diff --git a/framework/source/jobs/jobresult.cxx b/framework/source/jobs/jobresult.cxx index 731cdf176c93..f4a94110e2ae 100644 --- a/framework/source/jobs/jobresult.cxx +++ b/framework/source/jobs/jobresult.cxx @@ -42,7 +42,6 @@ JobResult::JobResult() m_eParts = E_NOPART; } - /** @short special ctor @descr It initialize this new instance with a pure job execution result @@ -127,7 +126,6 @@ JobResult::JobResult( /*IN*/ const css::uno::Any& aResult ) } } - /** @short copy dtor @descr - @@ -141,7 +139,6 @@ JobResult::JobResult( const JobResult& rCopy ) m_aDispatchResult = rCopy.m_aDispatchResult ; } - /** @short standard dtor @descr Free all internally used resources at the end of living. @@ -151,7 +148,6 @@ JobResult::~JobResult() // Nothing really to do here. } - /** @short =operator @descr Must be implemented to overwrite this instance with another one. @@ -169,7 +165,6 @@ void JobResult::operator=( const JobResult& rCopy ) m_aDispatchResult = rCopy.m_aDispatchResult ; } - /** @short checks for existing parts of the analyzed result @descr The internal flag mask was set after analyzing of the pure result. @@ -188,7 +183,6 @@ sal_Bool JobResult::existPart( sal_uInt32 eParts ) const return ((m_eParts & eParts) == eParts); } - /** @short provides access to our internal members @descr The return value will be valid only in case a call of @@ -203,8 +197,6 @@ css::uno::Sequence< css::beans::NamedValue > JobResult::getArguments() const return m_lArguments; } - - css::frame::DispatchResultEvent JobResult::getDispatchResult() const { SolarMutexGuard g; diff --git a/framework/source/jobs/joburl.cxx b/framework/source/jobs/joburl.cxx index f1e3c8e6cf8d..575fed00a499 100644 --- a/framework/source/jobs/joburl.cxx +++ b/framework/source/jobs/joburl.cxx @@ -97,7 +97,6 @@ JobURL::JobURL( /*IN*/ const OUString& sURL ) } } - /** @short knows, if this job URL object hold a valid URL inside @@ -109,7 +108,6 @@ sal_Bool JobURL::isValid() const return (m_eRequest!=E_UNKNOWN); } - /** @short get the event item of this job URL @descr Because the three possible parts of such URL (event, alias, service) @@ -138,7 +136,6 @@ sal_Bool JobURL::getEvent( /*OUT*/ OUString& sEvent ) const return bSet; } - /** @short get the alias item of this job URL @descr Because the three possible parts of such URL (event, alias, service) @@ -167,7 +164,6 @@ sal_Bool JobURL::getAlias( /*OUT*/ OUString& sAlias ) const return bSet; } - /** @short get the service item of this job URL @descr Because the three possible parts of such URL (event, service, service) @@ -196,7 +192,6 @@ sal_Bool JobURL::getService( /*OUT*/ OUString& sService ) const return bSet; } - /** @short searches for a special identifier in the given string and split it @descr If the given identifier could be found at the beginning of the given string, @@ -258,7 +253,6 @@ sal_Bool JobURL::implst_split( /*IN*/ const OUString& sPart , return bPartFound; } - /** @short special debug method @descr It's the entry point method to start a self component check for this class. @@ -308,7 +302,6 @@ void JobURL::impldbg_checkIt() JobURL::impldbg_checkURL("vnd.sun.star.job:service=css.myService?serviceArg1;alias=myAlias?aliasArg=564", E_EVENT | E_ALIAS, "" , "myAlias", "css.myService", NULL , "aliasArg=564" , "serviceArg1" ); } - /** @short helper debug method @descr It uses the given parameter to create a new instance of a JobURL. @@ -512,7 +505,6 @@ void JobURL::impldbg_checkURL( /*IN*/ const sal_Char* pURL , SAL_INFO("fwk.joburl", OUString(sMsg)); } - /** @short helper debug method @descr It returns a representation of the internal object state @@ -545,8 +537,6 @@ OUString JobURL::impldbg_toString() const return sBuffer.makeStringAndClear(); } - - sal_Bool JobURL::getServiceArgs( /*OUT*/ OUString& sServiceArgs ) const { SolarMutexGuard g; @@ -559,8 +549,6 @@ sal_Bool JobURL::getServiceArgs( /*OUT*/ OUString& sServiceArgs ) const return bSet; } - - sal_Bool JobURL::getEventArgs( /*OUT*/ OUString& sEventArgs ) const { SolarMutexGuard g; @@ -573,8 +561,6 @@ sal_Bool JobURL::getEventArgs( /*OUT*/ OUString& sEventArgs ) const return bSet; } - - sal_Bool JobURL::getAliasArgs( /*OUT*/ OUString& sAliasArgs ) const { SolarMutexGuard g; diff --git a/framework/source/jobs/shelljob.cxx b/framework/source/jobs/shelljob.cxx index 47f9847a58cd..0653be8e7e83 100644 --- a/framework/source/jobs/shelljob.cxx +++ b/framework/source/jobs/shelljob.cxx @@ -17,15 +17,12 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - - // include own header #include <jobs/shelljob.hxx> #include <jobs/jobconst.hxx> #include <services.h> - // include others #include <osl/file.hxx> @@ -35,16 +32,13 @@ #include <comphelper/processfactory.hxx> #include <comphelper/sequenceashashmap.hxx> - // include interfaces #include <com/sun/star/util/PathSubstitution.hpp> #include <com/sun/star/util/XStringSubstitution.hpp> - namespace framework{ - /** address job configuration inside argument set provided on method execute(). */ static const OUString PROP_JOBCONFIG("JobConfig"); @@ -60,8 +54,6 @@ static const OUString PROP_DEACTIVATEJOBIFDONE("DeactivateJobIfDone"); /** address job configuration property "CheckExitCode". */ static const OUString PROP_CHECKEXITCODE("CheckExitCode"); - - DEFINE_XSERVICEINFO_MULTISERVICE_2(ShellJob , ::cppu::OWeakObject , SERVICENAME_JOB , @@ -77,18 +69,15 @@ DEFINE_INIT_SERVICE(ShellJob, } ) - ShellJob::ShellJob(const css::uno::Reference< css::uno::XComponentContext >& xContext) : m_xContext (xContext) { } - ShellJob::~ShellJob() { } - css::uno::Any SAL_CALL ShellJob::execute(const css::uno::Sequence< css::beans::NamedValue >& lJobArguments) throw(css::lang::IllegalArgumentException, css::uno::Exception , @@ -126,7 +115,6 @@ css::uno::Any SAL_CALL ShellJob::execute(const css::uno::Sequence< css::beans::N return css::uno::Any(); } - css::uno::Any ShellJob::impl_generateAnswer4Deactivation() { css::uno::Sequence< css::beans::NamedValue > aAnswer(1); @@ -136,7 +124,6 @@ css::uno::Any ShellJob::impl_generateAnswer4Deactivation() return css::uno::makeAny(aAnswer); } - OUString ShellJob::impl_substituteCommandVariables(const OUString& sCommand) { try @@ -153,7 +140,6 @@ OUString ShellJob::impl_substituteCommandVariables(const OUString& sCommand) return OUString(); } - sal_Bool ShellJob::impl_execute(const OUString& sCommand , const css::uno::Sequence< OUString >& lArguments , sal_Bool bCheckExitCode) diff --git a/framework/source/layoutmanager/layoutmanager.cxx b/framework/source/layoutmanager/layoutmanager.cxx index a86d5f07ce5a..1729d9d29ed1 100644 --- a/framework/source/layoutmanager/layoutmanager.cxx +++ b/framework/source/layoutmanager/layoutmanager.cxx @@ -1207,7 +1207,6 @@ throw (RuntimeException, std::exception) implts_reset( sal_True ); } - // XMenuBarMergingAcceptor sal_Bool SAL_CALL LayoutManager::setMergedMenuBar( @@ -2277,7 +2276,6 @@ throw (RuntimeException, std::exception) implts_doLayout_notify( sal_True ); } - // ILayoutNotifications void LayoutManager::requestLayout( Hint eHint ) @@ -2528,7 +2526,6 @@ void LayoutManager::implts_setDockingAreaWindowSizes( const awt::Rectangle& /*rB } } - // XMenuCloser void LayoutManager::implts_updateMenuBarClose() @@ -2614,7 +2611,6 @@ IMPL_LINK_NOARG(LayoutManager, SettingsChanged) return 1; } - // XLayoutManagerEventBroadcaster void SAL_CALL LayoutManager::addLayoutManagerEventListener( const uno::Reference< frame::XLayoutManagerListener >& xListener ) @@ -2650,7 +2646,6 @@ void LayoutManager::implts_notifyListeners( short nEvent, uno::Any aInfoParam ) } } - // XWindowListener void SAL_CALL LayoutManager::windowResized( const awt::WindowEvent& aEvent ) @@ -2767,7 +2762,6 @@ IMPL_LINK_NOARG(LayoutManager, AsyncLayoutHdl) return 0; } - // XFrameActionListener void SAL_CALL LayoutManager::frameAction( const FrameActionEvent& aEvent ) @@ -2808,8 +2802,6 @@ throw ( RuntimeException, std::exception ) } } - - void SAL_CALL LayoutManager::disposing( const lang::EventObject& rEvent ) throw( RuntimeException, std::exception ) { @@ -3097,7 +3089,6 @@ void SAL_CALL LayoutManager::elementReplaced( const ui::ConfigurationEvent& Even } } - // OPropertySetHelper sal_Bool SAL_CALL LayoutManager::convertFastPropertyValue( Any& aConvertedValue, diff --git a/framework/source/layoutmanager/toolbarlayoutmanager.cxx b/framework/source/layoutmanager/toolbarlayoutmanager.cxx index 068567fc7d7d..0ba6d67449d0 100644 --- a/framework/source/layoutmanager/toolbarlayoutmanager.cxx +++ b/framework/source/layoutmanager/toolbarlayoutmanager.cxx @@ -81,7 +81,6 @@ ToolbarLayoutManager::~ToolbarLayoutManager() delete m_pAddonOptions; } - // XInterface void SAL_CALL ToolbarLayoutManager::acquire() throw() @@ -1561,10 +1560,8 @@ void ToolbarLayoutManager::implts_destroyDockingAreaWindows() xBottomDockingWindow->dispose(); } - // persistence methods - sal_Bool ToolbarLayoutManager::implts_readWindowStateData( const OUString& aName, UIElement& rElementData ) { return LayoutManager::readWindowStateData( aName, rElementData, m_xPersistentWindowState, @@ -2119,7 +2116,6 @@ void ToolbarLayoutManager::implts_getDockingAreaElementInfoOnSingleRowCol( ui::D nLastPos = rElement.m_aDockedData.m_aPos.X + aPosSize.Width; - rRowColumnWindowData.aRowColumnWindowSizes.push_back( awt::Rectangle( rElement.m_aDockedData.m_aPos.X, rElement.m_aDockedData.m_aPos.Y, aPosSize.Width, aPosSize.Height )); @@ -3206,7 +3202,6 @@ void ToolbarLayoutManager::implts_renumberRowColumnData( } } - // XWindowListener void SAL_CALL ToolbarLayoutManager::windowResized( const awt::WindowEvent& aEvent ) @@ -3274,7 +3269,6 @@ throw( uno::RuntimeException, std::exception ) { } - // XDockableWindowListener void SAL_CALL ToolbarLayoutManager::startDocking( const awt::DockingEvent& e ) @@ -3348,7 +3342,6 @@ throw (uno::RuntimeException, std::exception) uno::Reference< awt::XWindow2 > xContainerWindow( m_xContainerWindow ); UIElement aUIDockingElement( m_aDockUIElement ); - DockingOperation eDockingOperation( DOCKOP_ON_COLROW ); bool bDockingInProgress( m_bDockingInProgress ); aReadLock.clear(); @@ -3441,7 +3434,6 @@ throw (uno::RuntimeException, std::exception) ::Rectangle aNewDockingRect( aTrackingRect ); - implts_calcDockingPosSize( aUIDockingElement, eDockingOperation, aNewDockingRect, aMousePos ); ::Point aScreenPos = pContainerWindow->OutputToScreenPixel( aNewDockingRect.TopLeft() ); @@ -3494,7 +3486,6 @@ throw (uno::RuntimeException, std::exception) { m_aDockUIElement.m_aDockedData = aUIDockingElement.m_aDockedData; - m_eDockOperation = eDockingOperation; } else @@ -3829,7 +3820,6 @@ throw (uno::RuntimeException, std::exception) { } - // XUIConfigurationListener void SAL_CALL ToolbarLayoutManager::elementInserted( const ui::ConfigurationEvent& rEvent ) diff --git a/framework/source/layoutmanager/toolbarlayoutmanager.hxx b/framework/source/layoutmanager/toolbarlayoutmanager.hxx index 1da31287c261..efe6c1d59bc1 100644 --- a/framework/source/layoutmanager/toolbarlayoutmanager.hxx +++ b/framework/source/layoutmanager/toolbarlayoutmanager.hxx @@ -55,7 +55,6 @@ #include <cppuhelper/implbase3.hxx> - namespace framework { @@ -136,18 +135,15 @@ class ToolbarLayoutManager : public ::cppu::WeakImplHelper3< ::com::sun::star::a // child window notifications long childWindowEvent( VclSimpleEvent* pEvent ); - // XInterface virtual void SAL_CALL acquire() throw() SAL_OVERRIDE; virtual void SAL_CALL release() throw() SAL_OVERRIDE; virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) 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; - // 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; @@ -197,7 +193,6 @@ class ToolbarLayoutManager : public ::cppu::WeakImplHelper3< ::com::sun::star::a sal_Int32 nRowColumn; }; - // internal helper methods bool implts_isParentWindowVisible() const; @@ -208,7 +203,6 @@ class ToolbarLayoutManager : public ::cppu::WeakImplHelper3< ::com::sun::star::a void implts_setElementData( UIElement& rUIElement, const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XDockableWindow >& rDockWindow ); void implts_destroyDockingAreaWindows(); - // layout methods void implts_setDockingAreaWindowSizes( const ::com::sun::star::awt::Rectangle& rBorderSpace ); @@ -222,7 +216,6 @@ class ToolbarLayoutManager : public ::cppu::WeakImplHelper3< ::com::sun::star::a void implts_setLayoutInProgress( bool bInProgress = true ); bool implts_isLayoutInProgress() const { return m_bLayoutInProgress; } - // lookup/container methods UIElement implts_findToolbar( const OUString& aName ); @@ -235,7 +228,6 @@ class ToolbarLayoutManager : public ::cppu::WeakImplHelper3< ::com::sun::star::a ::Size implts_getTopBottomDockingAreaSizes(); void implts_getUIElementVectorCopy( UIElementVector& rCopy ); - // internal docking methods ::Rectangle implts_calcHotZoneRect( const ::Rectangle& rRect, sal_Int32 nHotZoneOffset ); @@ -259,7 +251,6 @@ class ToolbarLayoutManager : public ::cppu::WeakImplHelper3< ::com::sun::star::a void implts_findNextDockingPos( ::com::sun::star::ui::DockingArea DockingArea, const ::Size& aUIElementSize, ::com::sun::star::awt::Point& rVirtualPos, ::Point& rPixelPos ); void implts_setTrackingRect( ::com::sun::star::ui::DockingArea eDockingArea, const ::Point& rMousePos, ::Rectangle& rTrackingRect ); - // creation methods void implts_createAddonsToolBars(); @@ -272,13 +263,11 @@ class ToolbarLayoutManager : public ::cppu::WeakImplHelper3< ::com::sun::star::a void implts_setToolbarCreation( bool bStart = true ); bool implts_isToolbarCreationActive(); - // persistence methods sal_Bool implts_readWindowStateData( const OUString& aName, UIElement& rElementData ); void implts_writeWindowStateData( const UIElement& rElementData ); - // members css::uno::Reference< css::uno::XComponentContext > m_xContext; diff --git a/framework/source/loadenv/loadenv.cxx b/framework/source/loadenv/loadenv.cxx index 99a3730f4c50..72d0458be12e 100644 --- a/framework/source/loadenv/loadenv.cxx +++ b/framework/source/loadenv/loadenv.cxx @@ -91,7 +91,6 @@ namespace framework { using namespace com::sun::star; - class LoadEnvListener : public ::cppu::WeakImplHelper2< css::frame::XLoadEventListener , css::frame::XDispatchResultListener > { @@ -102,14 +101,12 @@ class LoadEnvListener : public ::cppu::WeakImplHelper2< css::frame::XLoadEventLi public: - LoadEnvListener(LoadEnv* pLoadEnv) : m_bWaitingResult(true) , m_pLoadEnv(pLoadEnv) { } - // frame.XLoadEventListener virtual void SAL_CALL loadFinished(const css::uno::Reference< css::frame::XFrameLoader >& xLoader) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; @@ -117,18 +114,15 @@ class LoadEnvListener : public ::cppu::WeakImplHelper2< css::frame::XLoadEventLi virtual void SAL_CALL loadCancelled(const css::uno::Reference< css::frame::XFrameLoader >& xLoader) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - // frame.XDispatchResultListener virtual void SAL_CALL dispatchFinished(const css::frame::DispatchResultEvent& aEvent) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - // lang.XEventListener virtual void SAL_CALL disposing(const css::lang::EventObject& aEvent) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; - LoadEnv::LoadEnv(const css::uno::Reference< css::uno::XComponentContext >& xContext) throw(LoadEnvException, css::uno::RuntimeException) : m_xContext (xContext) @@ -136,12 +130,10 @@ LoadEnv::LoadEnv(const css::uno::Reference< css::uno::XComponentContext >& xCont { } - LoadEnv::~LoadEnv() { } - css::uno::Reference< css::lang::XComponent > LoadEnv::loadComponentFromURL(const css::uno::Reference< css::frame::XComponentLoader >& xLoader, const css::uno::Reference< css::uno::XComponentContext >& xContext , const OUString& sURL , @@ -203,7 +195,6 @@ css::uno::Reference< css::lang::XComponent > LoadEnv::loadComponentFromURL(const return xComponent; } - utl::MediaDescriptor impl_mergeMediaDescriptorWithMightExistingModelArgs(const css::uno::Sequence< css::beans::PropertyValue >& lOutsideDescriptor) { utl::MediaDescriptor lDescriptor(lOutsideDescriptor); @@ -221,7 +212,6 @@ utl::MediaDescriptor impl_mergeMediaDescriptorWithMightExistingModelArgs(const c return lDescriptor; } - void LoadEnv::initializeLoading(const OUString& sURL , const css::uno::Sequence< css::beans::PropertyValue >& lMediaDescriptor, const css::uno::Reference< css::frame::XFrame >& xBaseFrame , @@ -299,7 +289,6 @@ void LoadEnv::initializeLoading(const OUString& ); } - void LoadEnv::initializeUIDefaults( const css::uno::Reference< css::uno::XComponentContext >& i_rxContext, utl::MediaDescriptor& io_lMediaDescriptor, const bool i_bUIMode, QuietInteraction** o_ppQuietInteraction ) @@ -348,7 +337,6 @@ void LoadEnv::initializeUIDefaults( const css::uno::Reference< css::uno::XCompon io_lMediaDescriptor[utl::MediaDescriptor::PROP_UPDATEDOCMODE()] <<= nUpdateMode; } - void LoadEnv::startLoading() { // SAFE -> @@ -454,7 +442,6 @@ css::uno::Reference< css::lang::XComponent > LoadEnv::getTargetComponent() const return css::uno::Reference< css::lang::XComponent >(xModel, css::uno::UNO_QUERY); } - void SAL_CALL LoadEnvListener::loadFinished(const css::uno::Reference< css::frame::XFrameLoader >&) throw(css::uno::RuntimeException, std::exception) { @@ -464,7 +451,6 @@ void SAL_CALL LoadEnvListener::loadFinished(const css::uno::Reference< css::fram m_bWaitingResult = false; } - void SAL_CALL LoadEnvListener::loadCancelled(const css::uno::Reference< css::frame::XFrameLoader >&) throw(css::uno::RuntimeException, std::exception) { @@ -474,7 +460,6 @@ void SAL_CALL LoadEnvListener::loadCancelled(const css::uno::Reference< css::fra m_bWaitingResult = false; } - void SAL_CALL LoadEnvListener::dispatchFinished(const css::frame::DispatchResultEvent& aEvent) throw(css::uno::RuntimeException, std::exception) { @@ -500,7 +485,6 @@ void SAL_CALL LoadEnvListener::dispatchFinished(const css::frame::DispatchResult m_bWaitingResult = false; } - void SAL_CALL LoadEnvListener::disposing(const css::lang::EventObject&) throw(css::uno::RuntimeException, std::exception) { @@ -510,7 +494,6 @@ void SAL_CALL LoadEnvListener::disposing(const css::lang::EventObject&) m_bWaitingResult = false; } - void LoadEnv::impl_setResult(sal_Bool bResult) { osl::MutexGuard g(m_mutex); @@ -555,7 +538,6 @@ LoadEnv::EContentType LoadEnv::classifyContent(const OUString& return E_UNSUPPORTED_CONTENT; } - // (ii) Some special URLs indicates a given input stream, // a full featured document model directly or // specify a request for opening an empty document. @@ -617,8 +599,6 @@ LoadEnv::EContentType LoadEnv::classifyContent(const OUString& css::uno::Reference< css::container::XEnumeration > xSet ; css::uno::Sequence< OUString > lTypesReg(1); - - // (iii) If a FrameLoader service (or at least // a Filter) can be found, which supports // this URL - it must be a loadable content. @@ -644,7 +624,6 @@ LoadEnv::EContentType LoadEnv::classifyContent(const OUString& if (xSet->hasMoreElements()) return E_CAN_BE_LOADED; - // (iv) Some URL protocols are supported by special services. // E.g. ContentHandler. // Such contents can be handled ... but not loaded. @@ -659,7 +638,6 @@ LoadEnv::EContentType LoadEnv::classifyContent(const OUString& if (xSet->hasMoreElements()) return E_CAN_BE_HANDLED; - // (v) Last but not least the UCB is used inside office to // load contents. He has a special configuration to know // which URL schemata can be used inside office. @@ -667,7 +645,6 @@ LoadEnv::EContentType LoadEnv::classifyContent(const OUString& if (xUCB->queryContentProvider(sURL).is()) return E_CAN_BE_LOADED; - // (TODO) At this point, we have no idea .-) // But it seems to be better, to break all // further requests for this URL. Otherwise @@ -872,7 +849,6 @@ void LoadEnv::impl_detectTypeAndFilter() } } - sal_Bool LoadEnv::impl_handleContent() throw(LoadEnvException, css::uno::RuntimeException) { @@ -939,7 +915,6 @@ sal_Bool LoadEnv::impl_handleContent() return sal_False; } - sal_Bool LoadEnv::impl_furtherDocsAllowed() { // SAFE -> @@ -1020,7 +995,6 @@ sal_Bool LoadEnv::impl_furtherDocsAllowed() return bAllowed; } - sal_Bool LoadEnv::impl_loadContent() throw(LoadEnvException, css::uno::RuntimeException) { @@ -1157,7 +1131,6 @@ sal_Bool LoadEnv::impl_loadContent() return sal_False; } - css::uno::Reference< css::uno::XInterface > LoadEnv::impl_searchLoader() { // SAFE -> ----------------------------------- @@ -1224,7 +1197,6 @@ css::uno::Reference< css::uno::XInterface > LoadEnv::impl_searchLoader() return css::uno::Reference< css::uno::XInterface >(); } - void LoadEnv::impl_jumpToMark(const css::uno::Reference< css::frame::XFrame >& xFrame, const css::util::URL& aURL ) { @@ -1256,7 +1228,6 @@ void LoadEnv::impl_jumpToMark(const css::uno::Reference< css::frame::XFrame >& x xDispatcher->dispatch(aCmd, lArgs.getAsConstPropertyValueList()); } - css::uno::Reference< css::frame::XFrame > LoadEnv::impl_searchAlreadyLoaded() throw(LoadEnvException, css::uno::RuntimeException) { @@ -1397,7 +1368,6 @@ css::uno::Reference< css::frame::XFrame > LoadEnv::impl_searchAlreadyLoaded() return xResult; } - sal_Bool LoadEnv::impl_isFrameAlreadyUsedForLoading(const css::uno::Reference< css::frame::XFrame >& xFrame) const { css::uno::Reference< css::document::XActionLockable > xLock(xFrame, css::uno::UNO_QUERY); @@ -1412,7 +1382,6 @@ sal_Bool LoadEnv::impl_isFrameAlreadyUsedForLoading(const css::uno::Reference< c return xLock->isActionLocked(); } - css::uno::Reference< css::frame::XFrame > LoadEnv::impl_searchRecycleTarget() throw(LoadEnvException, css::uno::RuntimeException) { @@ -1544,7 +1513,6 @@ css::uno::Reference< css::frame::XFrame > LoadEnv::impl_searchRecycleTarget() return xTask; } - void LoadEnv::impl_reactForLoadingState() throw(LoadEnvException, css::uno::RuntimeException) { @@ -1664,7 +1632,6 @@ void LoadEnv::impl_reactForLoadingState() // <- SAFE ---------------------------------- } - void LoadEnv::impl_makeFrameWindowVisible(const css::uno::Reference< css::awt::XWindow >& xWindow , sal_Bool bForceToFront) { @@ -1701,7 +1668,6 @@ void LoadEnv::impl_makeFrameWindowVisible(const css::uno::Reference< css::awt::X } } - void LoadEnv::impl_applyPersistentWindowState(const css::uno::Reference< css::awt::XWindow >& xWindow) { static OUString PACKAGE_SETUP_MODULES("/org.openoffice.Setup/Office/Factories"); diff --git a/framework/source/recording/dispatchrecorder.cxx b/framework/source/recording/dispatchrecorder.cxx index 5e5fd4961c8d..d6879ef8a977 100644 --- a/framework/source/recording/dispatchrecorder.cxx +++ b/framework/source/recording/dispatchrecorder.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <recording/dispatchrecorder.hxx> #include <com/sun/star/frame/DispatchStatement.hpp> #include <com/sun/star/script/Converter.hpp> @@ -32,10 +31,8 @@ namespace framework{ // used to mark a dispatch as comment (mostly it indicates an error) Changing of this wdefine will impact all using of such comments ... #define REM_AS_COMMENT "rem " - // XInterface, XTypeProvider, XServiceInfo - DEFINE_XSERVICEINFO_MULTISERVICE_2( DispatchRecorder, ::cppu::OWeakObject, @@ -50,7 +47,6 @@ DEFINE_INIT_SERVICE( #include <typelib/typedescription.h> - void flatten_struct_members( ::std::vector< Any > * vec, void const * data, typelib_CompoundTypeDescription * pTD ) @@ -98,19 +94,16 @@ Sequence< Any > make_seq_out_of_struct( return Sequence< Any >( &vec[ 0 ], vec.size() ); } - DispatchRecorder::DispatchRecorder( const css::uno::Reference< css::uno::XComponentContext >& xContext ) : m_nRecordingID(0) , m_xConverter(css::script::Converter::create(xContext)) { } - DispatchRecorder::~DispatchRecorder() { } - // generate header void SAL_CALL DispatchRecorder::startRecording( const css::uno::Reference< css::frame::XFrame >& ) throw( css::uno::RuntimeException, std::exception ) { @@ -118,7 +111,6 @@ void SAL_CALL DispatchRecorder::startRecording( const css::uno::Reference< css:: /* } */ } - void SAL_CALL DispatchRecorder::recordDispatch( const css::util::URL& aURL, const css::uno::Sequence< css::beans::PropertyValue >& lArguments ) throw( css::uno::RuntimeException, std::exception ) { @@ -128,7 +120,6 @@ void SAL_CALL DispatchRecorder::recordDispatch( const css::util::URL& aURL, m_aStatements.push_back( aStatement ); } - void SAL_CALL DispatchRecorder::recordDispatchAsComment( const css::util::URL& aURL, const css::uno::Sequence< css::beans::PropertyValue >& lArguments ) throw( css::uno::RuntimeException, std::exception ) { @@ -172,7 +163,6 @@ OUString SAL_CALL DispatchRecorder::getRecordedMacro() throw( css::uno::RuntimeE return sScript; } - void SAL_CALL DispatchRecorder::AppendToBuffer( css::uno::Any aValue, OUStringBuffer& aArgumentBuffer ) { // if value == bool diff --git a/framework/source/recording/dispatchrecordersupplier.cxx b/framework/source/recording/dispatchrecordersupplier.cxx index 41e9c2664456..a6a07a258d37 100644 --- a/framework/source/recording/dispatchrecordersupplier.cxx +++ b/framework/source/recording/dispatchrecordersupplier.cxx @@ -26,10 +26,8 @@ namespace framework{ - // XInterface, XTypeProvider - DEFINE_XSERVICEINFO_MULTISERVICE( DispatchRecorderSupplier, ::cppu::OWeakObject, @@ -47,7 +45,6 @@ DEFINE_INIT_SERVICE( } ) - /** @short standard constructor to create instance @descr Because an instance will be initialized by her interface methods @@ -58,7 +55,6 @@ DispatchRecorderSupplier::DispatchRecorderSupplier( const css::uno::Reference< c { } - /** @short standard destructor @descr We are a helper and not a real service. So we don't provide @@ -70,7 +66,6 @@ DispatchRecorderSupplier::~DispatchRecorderSupplier() m_xDispatchRecorder = NULL; } - /** @short set a new dispatch recorder on this supplier @descr Because there can exist more then one recorder implementations @@ -114,7 +109,6 @@ css::uno::Reference< css::frame::XDispatchRecorder > SAL_CALL DispatchRecorderSu return m_xDispatchRecorder; } - /** @short execute a dispatch request and record it @descr If given dispatch object provides right recording interface it diff --git a/framework/source/services/autorecovery.cxx b/framework/source/services/autorecovery.cxx index 58e48d4157fd..f9eccb764128 100644 --- a/framework/source/services/autorecovery.cxx +++ b/framework/source/services/autorecovery.cxx @@ -104,7 +104,6 @@ using namespace framework; namespace { - /** @short hold all needed information for an asynchronous dispatch alive. @descr Because some operations are forced to be executed asynchronously @@ -127,7 +126,6 @@ public: public: - /** @short can be set from outside and is provided to our internal started operations. @@ -139,16 +137,13 @@ public: */ css::uno::Reference< css::task::XStatusIndicator > m_xProgress; - /** TODO document me */ OUString m_sSavePath; - /** @short define the current cache entry, which should be used for current backup or cleanUp operation ... which is may be done asynchronous */ sal_Int32 m_nWorkingEntryID; - /** @short used for asyncoperations, to prevent us from dying. @descr If our dispatch() method was forced to start the @@ -160,7 +155,6 @@ public: css::uno::Reference< css::uno::XInterface > m_xHoldRefForAsyncOpAlive; }; - /** implements the functionality of AutoSave and AutoRecovery of documents - including features of an EmergencySave in @@ -264,13 +258,11 @@ public: E_USER_AUTO_SAVE = 2048 }; - /** @short combine different information about one office document. */ struct TDocumentInfo { public: - TDocumentInfo() : DocumentState (E_UNKNOWN) , UsedForSaving (sal_False) @@ -279,11 +271,9 @@ public: , ID (-1 ) {} - /** @short points to the document. */ css::uno::Reference< css::frame::XModel > Document; - /** @short knows, if the document is really modified since the last autosave, or was postponed, because it was an active one etcpp... @@ -296,14 +286,12 @@ public: */ sal_Int32 DocumentState; - /** Because our applications not ready for concurrent save requests at the same time, we have supress our own AutoSave for the moment, a document will be already saved by others. */ sal_Bool UsedForSaving; - /** For every user action, which modifies a document (e.g. key input) we get a notification as XModifyListener. That seems to be a "performance issue" .-) So we decided to listen for such modify events only for the time in which the document @@ -311,7 +299,6 @@ public: */ sal_Bool ListenForModify; - /** For SessionSave we must close all open documents by ourself. But because we are listen for documents events, we get some ... and deregister these documents from our configuration. @@ -320,7 +307,6 @@ public: */ sal_Bool IgnoreClosing; - /** TODO: document me */ OUString OrgURL; OUString FactoryURL; @@ -341,104 +327,86 @@ public: sal_Int32 ID; }; - /** @short used to know every currently open document. */ typedef ::std::vector< TDocumentInfo > TDocumentList; - // member private: - /** @short the global uno service manager. @descr Must be used to create own needed services. */ css::uno::Reference< css::uno::XComponentContext > m_xContext; - /** @short points to the underlying recovery configuration. @descr This instance does not cache - it calls directly the configuration API! */ css::uno::Reference< css::container::XNameAccess > m_xRecoveryCFG; - /** @short proxy weak binding to forward Events to ourself without an ownership cycle */ css::uno::Reference< css::util::XChangesListener > m_xRecoveryCFGListener; - /** @short points to the used configuration package or.openoffice.Setup @descr This instance does not cache - it calls directly the configuration API! */ css::uno::Reference< css::container::XNameAccess > m_xModuleCFG; - /** @short holds the global event broadcaster alive, where we listen for new created documents. */ css::uno::Reference< css::frame::XGlobalEventBroadcaster > m_xNewDocBroadcaster; - /** @short proxy weak binding to forward Events to ourself without an ownership cycle */ css::uno::Reference< css::document::XEventListener > m_xNewDocBroadcasterListener; - /** @short because we stop/restart listening sometimes, it's a good idea to know if we already registered as listener .-) */ sal_Bool m_bListenForDocEvents; sal_Bool m_bListenForConfigChanges; - /** @short specify the time intervall between two save actions. @descr Time is measured in [min]. */ sal_Int32 m_nAutoSaveTimeIntervall; - /** @short for an asynchronous operation we must know, if there is at least one running job (may be asynchronous!). */ sal_Int32 m_eJob; - /** @short the timer, which is used to be informed about the next saving time ... */ Timer m_aTimer; - /** @short make our dispatch asynchronous ... if required to do so! */ ::vcl::EventPoster m_aAsyncDispatcher; - /** @see DispatchParams */ DispatchParams m_aDispatchParams; - /** @short indicates, which time period is currently used by the internal timer. */ ETimerType m_eTimerType; - /** @short this cache is used to hold all information about recovery/emergency save documents alive. */ TDocumentList m_lDocCache; - // TODO document me sal_Int32 m_nIdPool; - /** @short contains all status listener registered at this instance. */ ListenerHash m_lListener; @@ -466,7 +434,6 @@ private: sal_Int32 m_nMinSpaceDocSave; sal_Int32 m_nMinSpaceConfigSave; - /** @short special debug option to make testing faster. @descr We dont interpret the timer unit as [min] ... @@ -477,11 +444,9 @@ private: sal_Bool m_dbg_bMakeItFaster; #endif - // HACK ... TODO css::uno::Reference< css::task::XStatusIndicator > m_xExternalProgress; - // interface public: @@ -522,7 +487,6 @@ public: // XTypeProvider virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes( ) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - // css.frame.XDispatch virtual void SAL_CALL dispatch(const css::util::URL& aURL , const css::uno::Sequence< css::beans::PropertyValue >& lArguments) @@ -536,7 +500,6 @@ public: const css::util::URL& aURL ) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - // css.document.XEventListener /** @short informs about created/opened documents. @@ -550,24 +513,20 @@ public: virtual void SAL_CALL notifyEvent(const css::document::EventObject& aEvent) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - // css.util.XChangesListener virtual void SAL_CALL changesOccurred(const css::util::ChangesEvent& aEvent) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - // css.util.XModifyListener virtual void SAL_CALL modified(const css::lang::EventObject& aEvent) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - // css.lang.XEventListener virtual void SAL_CALL disposing(const css::lang::EventObject& aEvent) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; protected: - // OPropertySetHelper virtual sal_Bool SAL_CALL convertFastPropertyValue( css::uno::Any& aConvertedValue, @@ -591,7 +550,6 @@ protected: private: virtual void SAL_CALL disposing() SAL_OVERRIDE; - /** @short open the underlying configuration. @descr This method must be called every time @@ -610,7 +568,6 @@ private: */ css::uno::Reference< css::container::XNameAccess > implts_openConfig(); - /** @short read the underlying configuration. @descr After that we know the initial state - means: @@ -625,7 +582,6 @@ private: */ void implts_readConfig(); - /** @short read the underlying configuration... @descr ... but only keys related to the AutoSave mechanism. @@ -639,22 +595,18 @@ private: */ void implts_readAutoSaveConfig(); - // TODO document me void implts_flushConfigItem(const AutoRecovery::TDocumentInfo& rInfo , sal_Bool bRemoveIt = sal_False); - // TODO document me void implts_startListening(); void implts_startModifyListeningOnDoc(AutoRecovery::TDocumentInfo& rInfo); - // TODO document me void implts_stopListening(); void implts_stopModifyListeningOnDoc(AutoRecovery::TDocumentInfo& rInfo); - /** @short stops and may be(!) restarts the timer. @descr A running timer is stopped every time here. @@ -669,7 +621,6 @@ private: */ void implts_updateTimer(); - /** @short stop the timer. @descr Double calls will be ignored - means we do @@ -682,21 +633,17 @@ private: */ void implts_stopTimer(); - /** @short callback of our internal timer. */ DECL_LINK(implts_timerExpired, void*); - /** @short makes our dispatch() method asynchronous! */ DECL_LINK(implts_asyncDispatch, void*); - /** @short implements the dispatch real. */ void implts_dispatch(const DispatchParams& aParams); - /** @short validate new detected document and add it into the internal document list. @@ -712,7 +659,6 @@ private: */ void implts_registerDocument(const css::uno::Reference< css::frame::XModel >& xDocument); - /** @short remove the specified document from our internal document list. @param xDocument @@ -729,24 +675,19 @@ private: void implts_deregisterDocument(const css::uno::Reference< css::frame::XModel >& xDocument , sal_Bool bStopListening = sal_True); - // TODO document me void implts_markDocumentModifiedAgainstLastBackup(const css::uno::Reference< css::frame::XModel >& xDocument); - // TODO document me void implts_updateModifiedState(const css::uno::Reference< css::frame::XModel >& xDocument); - // TODO document me void implts_updateDocumentUsedForSavingState(const css::uno::Reference< css::frame::XModel >& xDocument , sal_Bool bSaveInProgress); - // TODO document me void implts_markDocumentAsSaved(const css::uno::Reference< css::frame::XModel >& xDocument); - /** @short search a document inside given list. @param rList @@ -765,12 +706,10 @@ private: static TDocumentList::iterator impl_searchDocument( AutoRecovery::TDocumentList& rList , const css::uno::Reference< css::frame::XModel >& xDocument); - /** TODO document me */ void implts_changeAllDocVisibility(sal_Bool bVisible); void implts_prepareSessionShutdown(); - /** @short save all current opened documents to a specific backup directory. @@ -810,7 +749,6 @@ private: sal_Bool bRemoveLockFiles, const DispatchParams* pParams = 0); - /** @short save one of the current documents to a specific backup directory. @@ -848,7 +786,6 @@ private: AutoRecovery::TDocumentInfo& rInfo , const css::uno::Reference< css::task::XStatusIndicator >& xExternalProgress); - /** @short recovery all documents, which was saved during a crash before. @@ -858,19 +795,16 @@ private: */ AutoRecovery::ETimerType implts_openDocs(const DispatchParams& aParams); - // TODO document me void implts_openOneDoc(const OUString& sURL , utl::MediaDescriptor& lDescriptor, AutoRecovery::TDocumentInfo& rInfo ); - // TODO document me void implts_generateNewTempURL(const OUString& sBackupPath , utl::MediaDescriptor& rMediaDescriptor, AutoRecovery::TDocumentInfo& rInfo ); - /** @short notifies all interested listener about the current state of the currently running operation. @@ -890,7 +824,6 @@ private: void implts_informListener( sal_Int32 eJob , const css::frame::FeatureStateEvent& aEvent); - /** short create a feature event struct, which can be send to any interested listener. @@ -913,7 +846,6 @@ private: const OUString& sEventType, AutoRecovery::TDocumentInfo* pInfo ); - class ListenerInformer { private: @@ -933,16 +865,12 @@ private: } }; - - // TODO document me void implts_resetHandleStates(sal_Bool bLoadCache); - // TODO document me void implts_specifyDefaultFilterAndExtension(AutoRecovery::TDocumentInfo& rInfo); - // TODO document me void implts_specifyAppModuleAndFactory(AutoRecovery::TDocumentInfo& rInfo); @@ -956,39 +884,30 @@ private: */ void implts_persistAllActiveViewNames(); - // TODO document me void implts_prepareEmergencySave(); - // TODO document me void implts_doEmergencySave(const DispatchParams& aParams); - // TODO document me void implts_doRecovery(const DispatchParams& aParams); - // TODO document me void implts_doSessionSave(const DispatchParams& aParams); - // TODO document me void implts_doSessionQuietQuit(const DispatchParams& aParams); - // TODO document me void implts_doSessionRestore(const DispatchParams& aParams); - // TODO document me void implts_backupWorkingEntry(const DispatchParams& aParams); - // TODO document me void implts_cleanUpWorkingEntry(const DispatchParams& aParams); - /** try to make sure that all changed config items (not our used config access only) will be flushed back to disc. @@ -999,13 +918,11 @@ private: */ void impl_flushALLConfigChanges(); - // TODO document me AutoRecovery::EFailureSafeResult implts_copyFile(const OUString& sSource , const OUString& sTargetPath, const OUString& sTargetName); - /** @short converts m_eJob into a job description, which can be used to inform an outside listener about the current running operation @@ -1020,7 +937,6 @@ private: */ static OUString implst_getJobDescription(sal_Int32 eJob); - /** @short mape the given URL to an internal int representation. @param aURL @@ -1042,7 +958,6 @@ private: /// TODO document me static void impl_showFullDiscError(); - /** @short try to create/use a progress and set it inside the environment. @@ -1074,7 +989,6 @@ private: utl::MediaDescriptor& rArgs , const css::uno::Reference< css::frame::XFrame >& xNewFrame); - /** try to remove the specified file from disc. Every URL supported by our UCB component can be used here. @@ -1092,7 +1006,6 @@ private: */ void st_impl_removeFile(const OUString& sURL); - /** try to remove ".lock" file from disc if office will be terminated not using the offical way .-) @@ -1102,8 +1015,6 @@ private: void st_impl_removeLockFile(); }; - - // recovery.xcu static const char CFG_PACKAGE_RECOVERY[] = "org.openoffice.Office.Recovery/"; static const char CFG_ENTRY_RECOVERYLIST[] = "RecoveryList"; @@ -1206,7 +1117,6 @@ static const sal_Int32 GIVE_UP_RETRY = 1; // in // force "return sal_False" for the method impl_enoughDiscSpace(). // #define SIMULATE_FULL_DISC - class CacheLockGuard { private: @@ -1237,7 +1147,6 @@ class CacheLockGuard void unlock(); }; - CacheLockGuard::CacheLockGuard(AutoRecovery* pOwner , osl::Mutex& rMutex , sal_Int32& rCacheLock , @@ -1250,14 +1159,12 @@ CacheLockGuard::CacheLockGuard(AutoRecovery* pOwner , lock(bLockForAddRemoveVectorItems); } - CacheLockGuard::~CacheLockGuard() { unlock(); m_xOwner.clear(); } - void CacheLockGuard::lock(sal_Bool bLockForAddRemoveVectorItems) { /* SAFE */ { @@ -1292,7 +1199,6 @@ void CacheLockGuard::lock(sal_Bool bLockForAddRemoveVectorItems) } /* SAFE */ } - void CacheLockGuard::unlock() { /* SAFE */ { @@ -1314,13 +1220,11 @@ void CacheLockGuard::unlock() } /* SAFE */ } - DispatchParams::DispatchParams() : m_nWorkingEntryID(-1) { }; - DispatchParams::DispatchParams(const ::comphelper::SequenceAsHashMap& lArgs , const css::uno::Reference< css::uno::XInterface >& xOwner) { @@ -1330,7 +1234,6 @@ DispatchParams::DispatchParams(const ::comphelper::SequenceAsHashMap& m_xHoldRefForAsyncOpAlive = xOwner; }; - DispatchParams::DispatchParams(const DispatchParams& rCopy) { m_xProgress = rCopy.m_xProgress; @@ -1339,11 +1242,9 @@ DispatchParams::DispatchParams(const DispatchParams& rCopy) m_xHoldRefForAsyncOpAlive = rCopy.m_xHoldRefForAsyncOpAlive; }; - DispatchParams::~DispatchParams() {}; - DispatchParams& DispatchParams::operator=(const DispatchParams& rCopy) { m_xProgress = rCopy.m_xProgress; @@ -1353,7 +1254,6 @@ DispatchParams& DispatchParams::operator=(const DispatchParams& rCopy) return *this; } - void DispatchParams::forget() { m_sSavePath = ""; @@ -1362,7 +1262,6 @@ void DispatchParams::forget() m_xHoldRefForAsyncOpAlive.clear(); }; - AutoRecovery::AutoRecovery(const css::uno::Reference< css::uno::XComponentContext >& xContext) : AutoRecovery_BASE (m_aMutex) , ::cppu::OPropertySetHelper(cppu::WeakComponentImplHelperBase::rBHelper) @@ -1397,7 +1296,6 @@ void AutoRecovery::initListeners() m_aTimer.SetTimeoutHdl(LINK(this, AutoRecovery, implts_timerExpired)); } - AutoRecovery::~AutoRecovery() { disposing(); @@ -1424,7 +1322,6 @@ Sequence< css::uno::Type > SAL_CALL AutoRecovery::getTypes( ) throw(css::uno::R ); } - void SAL_CALL AutoRecovery::dispatch(const css::util::URL& aURL , const css::uno::Sequence< css::beans::PropertyValue >& lArguments) throw(css::uno::RuntimeException, std::exception) @@ -1521,7 +1418,6 @@ void AutoRecovery::ListenerInformer::stop() m_bStopped = true; } - void AutoRecovery::implts_dispatch(const DispatchParams& aParams) { sal_Int32 eJob; @@ -1659,7 +1555,6 @@ void AutoRecovery::implts_dispatch(const DispatchParams& aParams) implts_startListening(); } - void SAL_CALL AutoRecovery::addStatusListener(const css::uno::Reference< css::frame::XStatusListener >& xListener, const css::util::URL& aURL ) throw(css::uno::RuntimeException, std::exception) @@ -1693,7 +1588,6 @@ void SAL_CALL AutoRecovery::addStatusListener(const css::uno::Reference< css::fr } /* SAFE */ } - void SAL_CALL AutoRecovery::removeStatusListener(const css::uno::Reference< css::frame::XStatusListener >& xListener, const css::util::URL& aURL ) throw(css::uno::RuntimeException, std::exception) @@ -1704,7 +1598,6 @@ void SAL_CALL AutoRecovery::removeStatusListener(const css::uno::Reference< css: m_lListener.removeInterface(aURL.Complete, xListener); } - void SAL_CALL AutoRecovery::notifyEvent(const css::document::EventObject& aEvent) throw(css::uno::RuntimeException, std::exception) { @@ -1773,7 +1666,6 @@ void SAL_CALL AutoRecovery::notifyEvent(const css::document::EventObject& aEvent } } - void SAL_CALL AutoRecovery::changesOccurred(const css::util::ChangesEvent& aEvent) throw(css::uno::RuntimeException, std::exception) { @@ -1827,7 +1719,6 @@ void SAL_CALL AutoRecovery::changesOccurred(const css::util::ChangesEvent& aEven implts_updateTimer(); } - void SAL_CALL AutoRecovery::modified(const css::lang::EventObject& aEvent) throw(css::uno::RuntimeException, std::exception) { @@ -1838,7 +1729,6 @@ void SAL_CALL AutoRecovery::modified(const css::lang::EventObject& aEvent) implts_markDocumentModifiedAgainstLastBackup(xDocument); } - void SAL_CALL AutoRecovery::disposing(const css::lang::EventObject& aEvent) throw(css::uno::RuntimeException, std::exception) { @@ -1870,7 +1760,6 @@ void SAL_CALL AutoRecovery::disposing(const css::lang::EventObject& aEvent) } /* SAFE */ } - css::uno::Reference< css::container::XNameAccess > AutoRecovery::implts_openConfig() { /* SAFE */ { @@ -1923,7 +1812,6 @@ css::uno::Reference< css::container::XNameAccess > AutoRecovery::implts_openConf return xCFG; } - void AutoRecovery::implts_readAutoSaveConfig() { css::uno::Reference< css::container::XHierarchicalNameAccess > xCommonRegistry(implts_openConfig(), css::uno::UNO_QUERY); @@ -1969,7 +1857,6 @@ void AutoRecovery::implts_readAutoSaveConfig() } /* SAFE */ } - void AutoRecovery::implts_readConfig() { implts_readAutoSaveConfig(); @@ -2056,7 +1943,6 @@ void AutoRecovery::implts_readConfig() implts_updateTimer(); } - void AutoRecovery::implts_specifyDefaultFilterAndExtension(AutoRecovery::TDocumentInfo& rInfo) { if (rInfo.AppModule.isEmpty()) @@ -2119,7 +2005,6 @@ void AutoRecovery::implts_specifyDefaultFilterAndExtension(AutoRecovery::TDocume } } - void AutoRecovery::implts_specifyAppModuleAndFactory(AutoRecovery::TDocumentInfo& rInfo) { ENSURE_OR_THROW2( @@ -2137,7 +2022,6 @@ void AutoRecovery::implts_specifyAppModuleAndFactory(AutoRecovery::TDocumentInfo lModuleDescription[OUString(CFG_ENTRY_PROP_FACTORYSERVICE)] >>= rInfo.FactoryService; } - void AutoRecovery::implts_collectActiveViewNames( AutoRecovery::TDocumentInfo& i_rInfo ) { ENSURE_OR_THROW2( i_rInfo.Document.is(), "need at document, at the very least", *this ); @@ -2178,7 +2062,6 @@ void AutoRecovery::implts_collectActiveViewNames( AutoRecovery::TDocumentInfo& i ::std::copy( aViewNames.begin(), aViewNames.end(), i_rInfo.ViewNames.getArray() ); } - void AutoRecovery::implts_persistAllActiveViewNames() { osl::MutexGuard g(cppu::WeakComponentImplHelperBase::rBHelper.rMutex); @@ -2194,7 +2077,6 @@ void AutoRecovery::implts_persistAllActiveViewNames() } } - void AutoRecovery::implts_flushConfigItem(const AutoRecovery::TDocumentInfo& rInfo, sal_Bool bRemoveIt) { css::uno::Reference< css::container::XHierarchicalNameAccess > xCFG; @@ -2300,7 +2182,6 @@ void AutoRecovery::implts_flushConfigItem(const AutoRecovery::TDocumentInfo& rIn while(nRetry>0); } - void AutoRecovery::implts_startListening() { css::uno::Reference< css::util::XChangesNotifier > xCFG; @@ -2346,7 +2227,6 @@ void AutoRecovery::implts_startListening() } } - void AutoRecovery::implts_stopListening() { css::uno::Reference< css::util::XChangesNotifier > xCFG; @@ -2379,7 +2259,6 @@ void AutoRecovery::implts_stopListening() } } - void AutoRecovery::implts_startModifyListeningOnDoc(AutoRecovery::TDocumentInfo& rInfo) { if (rInfo.ListenForModify) @@ -2394,7 +2273,6 @@ void AutoRecovery::implts_startModifyListeningOnDoc(AutoRecovery::TDocumentInfo& } } - void AutoRecovery::implts_stopModifyListeningOnDoc(AutoRecovery::TDocumentInfo& rInfo) { if (! rInfo.ListenForModify) @@ -2409,7 +2287,6 @@ void AutoRecovery::implts_stopModifyListeningOnDoc(AutoRecovery::TDocumentInfo& } } - void AutoRecovery::implts_updateTimer() { implts_stopTimer(); @@ -2449,7 +2326,6 @@ void AutoRecovery::implts_updateTimer() } /* SAFE */ } - void AutoRecovery::implts_stopTimer() { osl::MutexGuard g(cppu::WeakComponentImplHelperBase::rBHelper.rMutex); @@ -2459,7 +2335,6 @@ void AutoRecovery::implts_stopTimer() m_aTimer.Stop(); } - IMPL_LINK_NOARG(AutoRecovery, implts_timerExpired) { try @@ -2556,7 +2431,6 @@ IMPL_LINK_NOARG(AutoRecovery, implts_timerExpired) return 0; } - IMPL_LINK_NOARG(AutoRecovery, implts_asyncDispatch) { DispatchParams aParams; @@ -2577,7 +2451,6 @@ IMPL_LINK_NOARG(AutoRecovery, implts_asyncDispatch) return 0; } - void AutoRecovery::implts_registerDocument(const css::uno::Reference< css::frame::XModel >& xDocument) { // ignore corrupted events, where no document is given ... Runtime Error ?! @@ -2700,7 +2573,6 @@ void AutoRecovery::implts_registerDocument(const css::uno::Reference< css::frame aCacheLock.unlock(); } - void AutoRecovery::implts_deregisterDocument(const css::uno::Reference< css::frame::XModel >& xDocument , sal_Bool bStopListening) { @@ -2748,7 +2620,6 @@ void AutoRecovery::implts_deregisterDocument(const css::uno::Reference< css::fra implts_flushConfigItem(aInfo, sal_True); // sal_True => remove it from config } - void AutoRecovery::implts_markDocumentModifiedAgainstLastBackup(const css::uno::Reference< css::frame::XModel >& xDocument) { CacheLockGuard aCacheLock(this, cppu::WeakComponentImplHelperBase::rBHelper.rMutex, m_nDocCacheLock, LOCK_FOR_CACHE_USE); @@ -2770,7 +2641,6 @@ void AutoRecovery::implts_markDocumentModifiedAgainstLastBackup(const css::uno:: } /* SAFE */ } - void AutoRecovery::implts_updateModifiedState(const css::uno::Reference< css::frame::XModel >& xDocument) { CacheLockGuard aCacheLock(this, cppu::WeakComponentImplHelperBase::rBHelper.rMutex, m_nDocCacheLock, LOCK_FOR_CACHE_USE); @@ -2801,7 +2671,6 @@ void AutoRecovery::implts_updateModifiedState(const css::uno::Reference< css::fr } /* SAFE */ } - void AutoRecovery::implts_updateDocumentUsedForSavingState(const css::uno::Reference< css::frame::XModel >& xDocument , sal_Bool bSaveInProgress) { @@ -2819,7 +2688,6 @@ void AutoRecovery::implts_updateDocumentUsedForSavingState(const css::uno::Refer } /* SAFE */ } - void AutoRecovery::implts_markDocumentAsSaved(const css::uno::Reference< css::frame::XModel >& xDocument) { CacheLockGuard aCacheLock(this, cppu::WeakComponentImplHelperBase::rBHelper.rMutex, m_nDocCacheLock, LOCK_FOR_CACHE_USE); @@ -2870,7 +2738,6 @@ void AutoRecovery::implts_markDocumentAsSaved(const css::uno::Reference< css::fr AutoRecovery::st_impl_removeFile(sRemoveURL2); } - AutoRecovery::TDocumentList::iterator AutoRecovery::impl_searchDocument( AutoRecovery::TDocumentList& rList , const css::uno::Reference< css::frame::XModel >& xDocument) { @@ -2886,7 +2753,6 @@ AutoRecovery::TDocumentList::iterator AutoRecovery::impl_searchDocument( Au return pIt; } - namespace { void lcl_changeVisibility( const css::uno::Reference< css::frame::XFramesSupplier >& i_rFrames, sal_Bool i_bVisible ) @@ -2913,14 +2779,12 @@ namespace } } - void AutoRecovery::implts_changeAllDocVisibility(sal_Bool bVisible) { css::uno::Reference< css::frame::XFramesSupplier > xDesktop( css::frame::Desktop::create(m_xContext), css::uno::UNO_QUERY); lcl_changeVisibility( xDesktop, bVisible ); } - /* Currently the document is not closed in case of crash, so the lock file must be removed explicitly */ @@ -2948,8 +2812,6 @@ void lc_removeLockFile(AutoRecovery::TDocumentInfo& rInfo) #endif } - - void AutoRecovery::implts_prepareSessionShutdown() { SAL_INFO("fwk.autorecovery", "AutoRecovery::implts_prepareSessionShutdown() starts ..."); @@ -3014,7 +2876,6 @@ void AutoRecovery::implts_prepareSessionShutdown() } /* SAFE */ } - /* TODO WORKAROUND: #i64599# @@ -3042,7 +2903,6 @@ sal_Bool lc_checkIfSaveForbiddenByArguments(AutoRecovery::TDocumentInfo& rInfo) return bNoAutoSave; } - AutoRecovery::ETimerType AutoRecovery::implts_saveDocs( sal_Bool bAllowUserIdleLoop, sal_Bool bRemoveLockFiles, const DispatchParams* pParams ) @@ -3215,7 +3075,6 @@ AutoRecovery::ETimerType AutoRecovery::implts_saveDocs( sal_Bool bAl return eTimer; } - void AutoRecovery::implts_saveOneDoc(const OUString& sBackupPath , AutoRecovery::TDocumentInfo& rInfo , const css::uno::Reference< css::task::XStatusIndicator >& xExternalProgress) @@ -3348,7 +3207,6 @@ void AutoRecovery::implts_saveOneDoc(const OUString& AutoRecovery::st_impl_removeFile(sRemoveFile); } - AutoRecovery::ETimerType AutoRecovery::implts_openDocs(const DispatchParams& aParams) { AutoRecovery::ETimerType eTimer = AutoRecovery::E_DONT_START_TIMER; @@ -3543,7 +3401,6 @@ AutoRecovery::ETimerType AutoRecovery::implts_openDocs(const DispatchParams& aPa return eTimer; } - void AutoRecovery::implts_openOneDoc(const OUString& sURL , utl::MediaDescriptor& lDescriptor, AutoRecovery::TDocumentInfo& rInfo ) @@ -3663,7 +3520,6 @@ void AutoRecovery::implts_openOneDoc(const OUString& sURL , } } - void AutoRecovery::implts_generateNewTempURL(const OUString& sBackupPath , utl::MediaDescriptor& /*rMediaDescriptor*/, AutoRecovery::TDocumentInfo& rInfo ) @@ -3699,7 +3555,6 @@ void AutoRecovery::implts_generateNewTempURL(const OUString& sBack rInfo.NewTempURL = aTempFile.GetURL(); } - void AutoRecovery::implts_informListener( sal_Int32 eJob , const css::frame::FeatureStateEvent& aEvent) { @@ -3727,7 +3582,6 @@ void AutoRecovery::implts_informListener( sal_Int32 eJ } } - OUString AutoRecovery::implst_getJobDescription(sal_Int32 eJob) { // describe the current running operation @@ -3764,7 +3618,6 @@ OUString AutoRecovery::implst_getJobDescription(sal_Int32 eJob) return sFeature.makeStringAndClear(); } - sal_Int32 AutoRecovery::implst_classifyJob(const css::util::URL& aURL) { if ( aURL.Protocol == CMD_PROTOCOL ) @@ -3795,7 +3648,6 @@ sal_Int32 AutoRecovery::implst_classifyJob(const css::util::URL& aURL) return AutoRecovery::E_NO_JOB; } - css::frame::FeatureStateEvent AutoRecovery::implst_createFeatureStateEvent( sal_Int32 eJob , const OUString& sEventType, AutoRecovery::TDocumentInfo* pInfo ) @@ -3824,7 +3676,6 @@ css::frame::FeatureStateEvent AutoRecovery::implst_createFeatureStateEvent( return aEvent; } - void AutoRecovery::implts_resetHandleStates(sal_Bool /*bLoadCache*/) { CacheLockGuard aCacheLock(this, cppu::WeakComponentImplHelperBase::rBHelper.rMutex, m_nDocCacheLock, LOCK_FOR_CACHE_USE); @@ -3850,7 +3701,6 @@ void AutoRecovery::implts_resetHandleStates(sal_Bool /*bLoadCache*/) } /* SAFE */ } - void AutoRecovery::implts_prepareEmergencySave() { // Be sure to know all open documents really .-) @@ -3860,7 +3710,6 @@ void AutoRecovery::implts_prepareEmergencySave() implts_changeAllDocVisibility(sal_False); } - void AutoRecovery::implts_doEmergencySave(const DispatchParams& aParams) { // Write a hint "we chrashed" into the configuration, so @@ -3909,7 +3758,6 @@ void AutoRecovery::implts_doEmergencySave(const DispatchParams& aParams) AutoRecovery::st_impl_removeLockFile(); } - void AutoRecovery::implts_doRecovery(const DispatchParams& aParams) { AutoRecovery::ETimerType eSuggestedTimer = AutoRecovery::E_DONT_START_TIMER; @@ -3936,7 +3784,6 @@ void AutoRecovery::implts_doRecovery(const DispatchParams& aParams) ::comphelper::ConfigurationHelper::E_STANDARD); } - void AutoRecovery::implts_doSessionSave(const DispatchParams& aParams) { SAL_INFO("fwk.autorecovery", "AutoRecovery::implts_doSessionSave()"); @@ -3975,7 +3822,6 @@ void AutoRecovery::implts_doSessionSave(const DispatchParams& aParams) impl_flushALLConfigChanges(); } - void AutoRecovery::implts_doSessionQuietQuit(const DispatchParams& /*aParams*/) { SAL_INFO("fwk.autorecovery", "AutoRecovery::implts_doSessionQuietQuit()"); @@ -4006,8 +3852,6 @@ void AutoRecovery::implts_doSessionQuietQuit(const DispatchParams& /*aParams*/) impl_flushALLConfigChanges(); } - - void AutoRecovery::implts_doSessionRestore(const DispatchParams& aParams) { SAL_INFO("fwk.autorecovery", "AutoRecovery::implts_doSessionRestore() ..."); @@ -4042,7 +3886,6 @@ void AutoRecovery::implts_doSessionRestore(const DispatchParams& aParams) SAL_INFO("fwk.autorecovery", "... AutoRecovery::implts_doSessionRestore()"); } - void AutoRecovery::implts_backupWorkingEntry(const DispatchParams& aParams) { CacheLockGuard aCacheLock(this, cppu::WeakComponentImplHelperBase::rBHelper.rMutex, m_nDocCacheLock, LOCK_FOR_CACHE_USE); @@ -4079,7 +3922,6 @@ void AutoRecovery::implts_backupWorkingEntry(const DispatchParams& aParams) } } - void AutoRecovery::implts_cleanUpWorkingEntry(const DispatchParams& aParams) { CacheLockGuard aCacheLock(this, cppu::WeakComponentImplHelperBase::rBHelper.rMutex, m_nDocCacheLock, LOCK_FOR_CACHE_ADD_REMOVE); @@ -4102,7 +3944,6 @@ void AutoRecovery::implts_cleanUpWorkingEntry(const DispatchParams& aParams) } } - AutoRecovery::EFailureSafeResult AutoRecovery::implts_copyFile(const OUString& sSource , const OUString& sTargetPath, const OUString& sTargetName) @@ -4142,7 +3983,6 @@ AutoRecovery::EFailureSafeResult AutoRecovery::implts_copyFile(const OUString& s return AutoRecovery::E_COPIED; } - sal_Bool SAL_CALL AutoRecovery::convertFastPropertyValue( css::uno::Any& /*aConvertedValue*/, css::uno::Any& /*aOldValue*/ , sal_Int32 /*nHandle*/ , @@ -4153,7 +3993,6 @@ sal_Bool SAL_CALL AutoRecovery::convertFastPropertyValue( css::uno::Any& /* return sal_False; } - void SAL_CALL AutoRecovery::setFastPropertyValue_NoBroadcast( sal_Int32 /*nHandle*/, const css::uno::Any& /*aValue*/ ) throw(css::uno::Exception, std::exception) @@ -4161,7 +4000,6 @@ void SAL_CALL AutoRecovery::setFastPropertyValue_NoBroadcast( sal_Int32 // not needed currently } - void SAL_CALL AutoRecovery::getFastPropertyValue(css::uno::Any& aValue , sal_Int32 nHandle) const { @@ -4208,7 +4046,6 @@ void SAL_CALL AutoRecovery::getFastPropertyValue(css::uno::Any& aValue , } } - const css::uno::Sequence< css::beans::Property > impl_getStaticPropertyDescriptor() { const css::beans::Property pPropertys[] = @@ -4221,7 +4058,6 @@ const css::uno::Sequence< css::beans::Property > impl_getStaticPropertyDescripto return lPropertyDescriptor; } - ::cppu::IPropertyArrayHelper& SAL_CALL AutoRecovery::getInfoHelper() { static ::cppu::OPropertyArrayHelper* pInfoHelper = 0; @@ -4238,7 +4074,6 @@ const css::uno::Sequence< css::beans::Property > impl_getStaticPropertyDescripto return (*pInfoHelper); } - css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL AutoRecovery::getPropertySetInfo() throw(css::uno::RuntimeException, std::exception) { @@ -4257,7 +4092,6 @@ css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL AutoRecovery::getPr return (*pInfo); } - void AutoRecovery::implts_verifyCacheAgainstDesktopDocumentList() { SAL_INFO("fwk.autorecovery", "AutoRecovery::implts_verifyCacheAgainstDesktopDocumentList() ..."); @@ -4330,7 +4164,6 @@ void AutoRecovery::implts_verifyCacheAgainstDesktopDocumentList() SAL_INFO("fwk.autorecovery", "... AutoRecovery::implts_verifyCacheAgainstDesktopDocumentList()"); } - sal_Bool AutoRecovery::impl_enoughDiscSpace(sal_Int32 nRequiredSpace) { #ifdef SIMULATE_FULL_DISC @@ -4359,7 +4192,6 @@ sal_Bool AutoRecovery::impl_enoughDiscSpace(sal_Int32 nRequiredSpace) #endif // SIMULATE_FULL_DISC } - void AutoRecovery::impl_showFullDiscError() { OUString sBtn(FWK_RESSTR(STR_FULL_DISC_RETRY_BUTTON)); @@ -4379,7 +4211,6 @@ void AutoRecovery::impl_showFullDiscError() dlgError.Execute(); } - void AutoRecovery::impl_establishProgress(const AutoRecovery::TDocumentInfo& rInfo , utl::MediaDescriptor& rArgs , const css::uno::Reference< css::frame::XFrame >& xNewFrame) @@ -4445,7 +4276,6 @@ void AutoRecovery::impl_establishProgress(const AutoRecovery::TDocumentInfo& rArgs.createItemIfMissing(utl::MediaDescriptor::PROP_STATUSINDICATOR(), xInternalProgress); } - void AutoRecovery::impl_forgetProgress(const AutoRecovery::TDocumentInfo& rInfo , utl::MediaDescriptor& rArgs , const css::uno::Reference< css::frame::XFrame >& xNewFrame) @@ -4480,7 +4310,6 @@ void AutoRecovery::impl_forgetProgress(const AutoRecovery::TDocumentInfo& } } - void AutoRecovery::impl_flushALLConfigChanges() { try @@ -4503,7 +4332,6 @@ void AutoRecovery::impl_flushALLConfigChanges() } } - void AutoRecovery::st_impl_removeFile(const OUString& sURL) { if ( sURL.isEmpty()) @@ -4519,7 +4347,6 @@ void AutoRecovery::st_impl_removeFile(const OUString& sURL) } } - void AutoRecovery::st_impl_removeLockFile() { try diff --git a/framework/source/services/desktop.cxx b/framework/source/services/desktop.cxx index 98190049e2dc..d8483d0830bf 100644 --- a/framework/source/services/desktop.cxx +++ b/framework/source/services/desktop.cxx @@ -98,14 +98,12 @@ void Desktop::constructorInit() OFrames* pFramesHelper = new OFrames( this, &m_aChildTaskContainer ); m_xFramesHelper = css::uno::Reference< css::frame::XFrames >( static_cast< ::cppu::OWeakObject* >(pFramesHelper), css::uno::UNO_QUERY ); - // Initialize a new dispatchhelper-object to handle dispatches. // We use these helper as slave for our interceptor helper ... not directly! // But he is event listener on THIS instance! DispatchProvider* pDispatchHelper = new DispatchProvider( m_xContext, this ); css::uno::Reference< css::frame::XDispatchProvider > xDispatchProvider( static_cast< ::cppu::OWeakObject* >(pDispatchHelper), css::uno::UNO_QUERY ); - // Initialize a new interception helper object to handle dispatches and implement an interceptor mechanism. // Set created dispatch provider as slowest slave of it. // Hold interception helper by reference only - not by pointer! @@ -213,7 +211,6 @@ css::uno::Sequence< css::uno::Type > SAL_CALL Desktop::getTypes( ) throw(css::u ); } - sal_Bool SAL_CALL Desktop::terminate() throw( css::uno::RuntimeException, std::exception ) { @@ -231,7 +228,6 @@ sal_Bool SAL_CALL Desktop::terminate() aReadLock.clear(); - // Ask normal terminate listener. They could stop terminate without closing any open document. Desktop::TTerminateListenerList lCalledTerminationListener; sal_Bool bVeto = sal_False; @@ -242,7 +238,6 @@ sal_Bool SAL_CALL Desktop::terminate() return sal_False; } - // try to close all open frames. // Allow using of any UI ... because Desktop.terminate() was designed as UI functionality in the past. sal_Bool bAllowUI = sal_True; @@ -253,7 +248,6 @@ sal_Bool SAL_CALL Desktop::terminate() return sal_False; } - // Normal listener had no problem ... // all frames was closed ... // now it's time to ask our specialized listener. @@ -375,7 +369,6 @@ bool SAL_CALL Desktop::terminateQuickstarterToo() return terminate(); } - void SAL_CALL Desktop::addTerminateListener( const css::uno::Reference< css::frame::XTerminateListener >& xListener ) throw( css::uno::RuntimeException, std::exception ) { @@ -414,7 +407,6 @@ void SAL_CALL Desktop::addTerminateListener( const css::uno::Reference< css::fra m_aListenerContainer.addInterface( ::getCppuType( ( const css::uno::Reference< css::frame::XTerminateListener >*) NULL ), xListener ); } - void SAL_CALL Desktop::removeTerminateListener( const css::uno::Reference< css::frame::XTerminateListener >& xListener ) throw( css::uno::RuntimeException, std::exception ) { @@ -719,7 +711,6 @@ void SAL_CALL Desktop::registerDispatchProviderInterceptor( const css::uno::Refe xInterceptionHelper->registerDispatchProviderInterceptor( xInterceptor ); } - void SAL_CALL Desktop::releaseDispatchProviderInterceptor ( const css::uno::Reference< css::frame::XDispatchProviderInterceptor >& xInterceptor) throw( css::uno::RuntimeException, std::exception) { @@ -871,7 +862,6 @@ sal_Bool SAL_CALL Desktop::isActive() throw( css::uno::RuntimeException, std::ex return sal_True; } - sal_Bool SAL_CALL Desktop::setComponent( const css::uno::Reference< css::awt::XWindow >& /*xComponentWindow*/ , const css::uno::Reference< css::frame::XController >& /*xController*/ ) throw( css::uno::RuntimeException, std::exception ) { @@ -896,7 +886,6 @@ void SAL_CALL Desktop::addFrameActionListener( const css::uno::Reference< css::f { } - // css::frame::XFrame void SAL_CALL Desktop::removeFrameActionListener( const css::uno::Reference< css::frame::XFrameActionListener >& ) throw( css::uno::RuntimeException, std::exception ) { @@ -934,7 +923,6 @@ css::uno::Reference< css::frame::XFrame > SAL_CALL Desktop::findFrame( const OUS { css::uno::Reference< css::frame::XFrame > xTarget; - // 0) Ignore wrong parameter! // We don't support search for following special targets. // If we reject this requests - we mustnt check for such names @@ -952,12 +940,9 @@ css::uno::Reference< css::frame::XFrame > SAL_CALL Desktop::findFrame( const OUS return NULL; } - // I) check for special defined targets first which must be handled exclusive. // force using of "if() else if() ..." - - // I.I) "_blank" // create a new task as child of this desktop instance // Note: Used helper TaskCreator use us automaticly ... @@ -968,7 +953,6 @@ css::uno::Reference< css::frame::XFrame > SAL_CALL Desktop::findFrame( const OUS xTarget = aCreator.createTask(sTargetFrameName,sal_False); } - // I.II) "_top" // We are top by definition @@ -977,7 +961,6 @@ css::uno::Reference< css::frame::XFrame > SAL_CALL Desktop::findFrame( const OUS xTarget = this; } - // I.III) "_self", "" // This mean this "frame" in every case. @@ -999,8 +982,6 @@ css::uno::Reference< css::frame::XFrame > SAL_CALL Desktop::findFrame( const OUS // TASK and CREATE are handled special. // But note: Such flags are not valid for the desktop - especialy SIBLINGS or PARENT. - - // II.I) SELF // Check for right name. If it's the searched one return ourself - otherwise // ignore this flag. @@ -1013,7 +994,6 @@ css::uno::Reference< css::frame::XFrame > SAL_CALL Desktop::findFrame( const OUS xTarget = this; } - // II.II) TASKS // This is a special flag. Normaly it regulate search inside tasks and forbid access to parent trees. // But the desktop exists outside such task trees. They are our sub trees. So the desktop implement @@ -1030,7 +1010,6 @@ css::uno::Reference< css::frame::XFrame > SAL_CALL Desktop::findFrame( const OUS xTarget = m_aChildTaskContainer.searchOnDirectChildrens(sTargetFrameName); } - // II.III) CHILDREN // Search on all children for the given target name. // An empty name value can't occur here - because it must be already handled as "_self" @@ -1045,7 +1024,6 @@ css::uno::Reference< css::frame::XFrame > SAL_CALL Desktop::findFrame( const OUS xTarget = m_aChildTaskContainer.searchOnAllChildrens(sTargetFrameName); } - // II.IV) CREATE // If we haven't found any valid target frame by using normal flags - but user allowed us to create // a new one ... we should do that. Used TaskCreator use us automaticly as parent! @@ -1329,7 +1307,6 @@ void SAL_CALL Desktop::handle( const css::uno::Reference< css::task::XInteractio } } - ::sal_Int32 SAL_CALL Desktop::leaseNumber( const css::uno::Reference< css::uno::XInterface >& xComponent ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception ) @@ -1338,7 +1315,6 @@ void SAL_CALL Desktop::handle( const css::uno::Reference< css::task::XInteractio return m_xTitleNumberGenerator->leaseNumber (xComponent); } - void SAL_CALL Desktop::releaseNumber( ::sal_Int32 nNumber ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception ) @@ -1347,7 +1323,6 @@ void SAL_CALL Desktop::releaseNumber( ::sal_Int32 nNumber ) m_xTitleNumberGenerator->releaseNumber (nNumber); } - void SAL_CALL Desktop::releaseNumberForComponent( const css::uno::Reference< css::uno::XInterface >& xComponent ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception ) @@ -1356,7 +1331,6 @@ void SAL_CALL Desktop::releaseNumberForComponent( const css::uno::Reference< css m_xTitleNumberGenerator->releaseNumberForComponent (xComponent); } - OUString SAL_CALL Desktop::getUntitledPrefix() throw (css::uno::RuntimeException, std::exception) { @@ -1685,7 +1659,6 @@ const css::uno::Sequence< css::beans::Property > Desktop::impl_getStaticProperty return lPropertyDescriptor; } - void Desktop::impl_sendQueryTerminationEvent(Desktop::TTerminateListenerList& lCalledListener, sal_Bool& bVeto ) { @@ -1726,7 +1699,6 @@ void Desktop::impl_sendQueryTerminationEvent(Desktop::TTerminateListenerList& lC } } - void Desktop::impl_sendCancelTerminationEvent(const Desktop::TTerminateListenerList& lCalledListener) { TransactionGuard aTransaction( m_aTransactionManager, E_HARDEXCEPTIONS ); @@ -1751,7 +1723,6 @@ void Desktop::impl_sendCancelTerminationEvent(const Desktop::TTerminateListenerL } } - void Desktop::impl_sendNotifyTerminationEvent() { TransactionGuard aTransaction( m_aTransactionManager, E_HARDEXCEPTIONS ); @@ -1782,7 +1753,6 @@ void Desktop::impl_sendNotifyTerminationEvent() } } - sal_Bool Desktop::impl_closeFrames(sal_Bool bAllowUI) { SolarMutexClearableGuard aReadLock; diff --git a/framework/source/services/dispatchhelper.cxx b/framework/source/services/dispatchhelper.cxx index 355ad53115d3..f69767c93ba9 100644 --- a/framework/source/services/dispatchhelper.cxx +++ b/framework/source/services/dispatchhelper.cxx @@ -28,7 +28,6 @@ namespace framework{ - // XInterface, XTypeProvider, XServiceInfo DEFINE_XSERVICEINFO_MULTISERVICE_2(DispatchHelper , @@ -38,8 +37,6 @@ DEFINE_XSERVICEINFO_MULTISERVICE_2(DispatchHelper , DEFINE_INIT_SERVICE( DispatchHelper, {} ) - - /** ctor. @param xSMGR the global uno service manager, which can be used to create own needed services. @@ -49,16 +46,12 @@ DispatchHelper::DispatchHelper( const css::uno::Reference< css::uno::XComponentC { } - - /** dtor. */ DispatchHelper::~DispatchHelper() { } - - /** capsulate all steps of a dispatch request and provide so an easy way for dispatches. @param xDispatchProvider @@ -147,8 +140,6 @@ css::uno::Any SAL_CALL DispatchHelper::executeDispatch( return aResult; } - - /** callback for started dispatch with guaranteed notifications. We must save the result, so the method executeDispatch() can return it. @@ -167,8 +158,6 @@ void SAL_CALL DispatchHelper::dispatchFinished( const css::frame::DispatchResult m_xBroadcaster.clear(); } - - /** we has to realease our broadcaster reference. @param aEvent diff --git a/framework/source/services/frame.cxx b/framework/source/services/frame.cxx index ce6f4a42abae..2c2d1d16292a 100644 --- a/framework/source/services/frame.cxx +++ b/framework/source/services/frame.cxx @@ -174,7 +174,6 @@ public: return aSeq; } - // XComponentLoader virtual css::uno::Reference< css::lang::XComponent > SAL_CALL loadComponentFromURL( @@ -186,15 +185,12 @@ public: css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - - // XFramesSupplier virtual css::uno::Reference< css::frame::XFrames > SAL_CALL getFrames ( ) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual css::uno::Reference< css::frame::XFrame > SAL_CALL getActiveFrame ( ) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual void SAL_CALL setActiveFrame ( const css::uno::Reference< css::frame::XFrame >& xFrame ) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - // XFrame virtual void SAL_CALL initialize ( const css::uno::Reference< css::awt::XWindow >& xWindow ) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; @@ -217,19 +213,16 @@ public: virtual void SAL_CALL addFrameActionListener ( const css::uno::Reference< css::frame::XFrameActionListener >& xListener ) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual void SAL_CALL removeFrameActionListener ( const css::uno::Reference< css::frame::XFrameActionListener >& xListener ) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - // XComponent virtual void SAL_CALL dispose ( ) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual void SAL_CALL addEventListener ( const css::uno::Reference< css::lang::XEventListener >& xListener ) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual void SAL_CALL removeEventListener ( const css::uno::Reference< css::lang::XEventListener >& xListener ) throw( 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; - // XDispatchProvider virtual css::uno::Reference< css::frame::XDispatch > SAL_CALL queryDispatch ( const css::util::URL& aURL , @@ -238,19 +231,16 @@ public: 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 virtual void SAL_CALL registerDispatchProviderInterceptor( const css::uno::Reference< css::frame::XDispatchProviderInterceptor >& xInterceptor ) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual void SAL_CALL releaseDispatchProviderInterceptor ( const css::uno::Reference< css::frame::XDispatchProviderInterceptor >& xInterceptor ) 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; - // XWindowListener // Attention: windowResized() and windowShown() are implement only! All other are empty! @@ -259,14 +249,12 @@ public: virtual void SAL_CALL windowShown ( const css::lang::EventObject& aEvent ) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual void SAL_CALL windowHidden ( const css::lang::EventObject& aEvent ) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - // XFocusListener // Attention: focusLost() not implemented yet! virtual void SAL_CALL focusGained ( const css::awt::FocusEvent& aEvent ) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual void SAL_CALL focusLost ( const css::awt::FocusEvent& /*aEvent*/ ) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE {}; - // XTopWindowListener // Attention: windowActivated(), windowDeactivated() and windowClosing() are implement only! All other are empty! @@ -278,12 +266,10 @@ public: virtual void SAL_CALL windowMinimized ( const css::lang::EventObject& /*aEvent*/ ) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE {}; virtual void SAL_CALL windowNormalized ( const css::lang::EventObject& /*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; - // XActionLockable virtual sal_Bool SAL_CALL isActionLocked ( ) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; @@ -292,32 +278,26 @@ public: virtual void SAL_CALL setActionLocks ( sal_Int16 nLock ) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual sal_Int16 SAL_CALL resetActionLocks( ) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - // XCloseable virtual void SAL_CALL close( sal_Bool bDeliverOwnership ) throw( css::util::CloseVetoException, css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - // XCloseBroadcaster virtual void SAL_CALL addCloseListener ( const css::uno::Reference< css::util::XCloseListener >& xListener ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL removeCloseListener( const css::uno::Reference< css::util::XCloseListener >& xListener ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - // XTitle virtual OUString SAL_CALL getTitle( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL setTitle( const OUString& sTitle ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - // XTitleChangeBroadcaster virtual void SAL_CALL addTitleChangeListener ( const css::uno::Reference< css::frame::XTitleChangeListener >& xListener) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL removeTitleChangeListener( const css::uno::Reference< css::frame::XTitleChangeListener >& xListenr ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - - // XFrame2 attributes virtual css::uno::Reference<css::container::XNameContainer> SAL_CALL getUserDefinedAttributes() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; @@ -328,8 +308,6 @@ public: virtual css::uno::Reference<css::uno::XInterface> SAL_CALL getLayoutManager() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL setLayoutManager(const css::uno::Reference<css::uno::XInterface>&) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - - // PropertySetHelper => XPropertySet, XPropertySetInfo private: @@ -343,10 +321,8 @@ private: virtual css::uno::Any SAL_CALL impl_getPropertyValue(const OUString& sProperty, sal_Int32 nHandle ) SAL_OVERRIDE; - // private methods - private: /*-**************************************************************************************************** @@ -373,11 +349,9 @@ private: void impl_setCloser ( const css::uno::Reference< css::frame::XFrame2 >& xFrame , sal_Bool bState ); void impl_disposeContainerWindow ( css::uno::Reference< css::awt::XWindow >& xWindow ); - // 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 @@ -409,7 +383,6 @@ private: static sal_Bool implcp_windowDeactivated ( const css::lang::EventObject& aEvent ); static sal_Bool implcp_disposing ( const css::lang::EventObject& aEvent ); - // variables // -threadsafe by SolarMutex @@ -479,7 +452,6 @@ protected: css::uno::WeakReference< css::frame::XFrame2 > Frame::m_xCloserFrame = css::uno::WeakReference< css::frame::XFrame2 >(); - // XInterface, XTypeProvider, XServiceInfo DEFINE_XINTERFACE_22 ( Frame , @@ -582,18 +554,15 @@ void Frame::initListeners() { css::uno::Reference< css::uno::XInterface > xThis(static_cast< ::cppu::OWeakObject* >(this), css::uno::UNO_QUERY_THROW); - // Initialize a new dispatchhelper-object to handle dispatches. // We use these helper as slave for our interceptor helper ... not directly! // But he is event listener on THIS instance! DispatchProvider* pDispatchHelper = new DispatchProvider( m_xContext, this ); css::uno::Reference< css::frame::XDispatchProvider > xDispatchProvider( static_cast< ::cppu::OWeakObject* >(pDispatchHelper), css::uno::UNO_QUERY ); - DispatchInformationProvider* pInfoHelper = new DispatchInformationProvider(m_xContext, this); m_xDispatchInfoHelper = css::uno::Reference< css::frame::XDispatchInformationProvider >( static_cast< ::cppu::OWeakObject* >(pInfoHelper), css::uno::UNO_QUERY ); - // Initialize a new interception helper object to handle dispatches and implement an interceptor mechanism. // Set created dispatch provider as slowest slave of it. // Hold interception helper by reference only - not by pointer! @@ -601,7 +570,6 @@ void Frame::initListeners() InterceptionHelper* pInterceptionHelper = new InterceptionHelper( this, xDispatchProvider ); m_xDispatchHelper = css::uno::Reference< css::frame::XDispatchProvider >( static_cast< ::cppu::OWeakObject* >(pInterceptionHelper), css::uno::UNO_QUERY ); - // Initialize a new XFrames-helper-object to handle XIndexAccess and XElementAccess. // We hold member as reference ... not as pointer too! // Attention: We share our frame container with this helper. Container is threadsafe himself ... So I think we can do that. @@ -609,7 +577,6 @@ void Frame::initListeners() OFrames* pFramesHelper = new OFrames( this, &m_aChildFrameContainer ); m_xFramesHelper = css::uno::Reference< css::frame::XFrames >( static_cast< ::cppu::OWeakObject* >(pFramesHelper), css::uno::UNO_QUERY ); - // Initialize a the drop target listener. // We hold member as reference ... not as pointer too! OpenFileDropTargetListener* pDropListener = new OpenFileDropTargetListener( m_xContext, this ); @@ -622,16 +589,13 @@ void Frame::initListeners() SAL_WARN_IF( !m_xFramesHelper.is(), "fwk", "Frame::Frame(): Frames helper isn't valid. XFrames, XIndexAccess and XElementAcces are not supported!" ); SAL_WARN_IF( !m_xDropTargetListener.is(), "fwk", "Frame::Frame(): DropTarget helper isn't valid. Drag and drop without functionality!" ); - // establish notifies for changing of "disabled commands" configuration during runtime m_aCommandOptions.EstablisFrameCallback(this); - // Create an initial layout manager // Create layout manager and connect it to the newly created frame m_xLayoutManager = css::frame::LayoutManager::create(m_xContext); - // set information about all supported properties at the base class helper PropertySetHelper impl_initializePropInfo(); } @@ -1097,7 +1061,6 @@ css::uno::Reference< css::frame::XFrame > SAL_CALL Frame::findFrame( const OUStr { css::uno::Reference< css::frame::XFrame > xTarget; - // 0) Ignore wrong parameter! // We don't support search for following special targets. // If we reject this requests - we mustnt check for such names @@ -1112,11 +1075,9 @@ css::uno::Reference< css::frame::XFrame > SAL_CALL Frame::findFrame( const OUStr return NULL; } - // I) check for special defined targets first which must be handled exclusive. // force using of "if() else if() ..." - // get threadsafe some necessary member which are necessary for following functionality /* SAFE { */ SolarMutexResettableGuard aReadLock; @@ -1127,7 +1088,6 @@ css::uno::Reference< css::frame::XFrame > SAL_CALL Frame::findFrame( const OUStr aReadLock.clear(); /* } SAFE */ - // I.I) "_blank" // Not allowed for a normal frame - but for the desktop. // Use helper class to do so. It use the desktop automaticly. @@ -1138,7 +1098,6 @@ css::uno::Reference< css::frame::XFrame > SAL_CALL Frame::findFrame( const OUStr xTarget = aCreator.createTask(sTargetFrameName,sal_False); } - // I.II) "_parent" // It doesn't matter if we have a valid parent or not. User ask for him and get it. // An empty result is a valid result too. @@ -1148,7 +1107,6 @@ css::uno::Reference< css::frame::XFrame > SAL_CALL Frame::findFrame( const OUStr xTarget = xParent; } - // I.III) "_top" // If we are not the top frame in this hierarchy, we must forward request to our parent. // Otherwhise we must return ourself. @@ -1161,7 +1119,6 @@ css::uno::Reference< css::frame::XFrame > SAL_CALL Frame::findFrame( const OUStr xTarget = xParent->findFrame(SPECIALTARGET_TOP,0); } - // I.IV) "_self", "" // This mean this frame in every case. @@ -1173,7 +1130,6 @@ css::uno::Reference< css::frame::XFrame > SAL_CALL Frame::findFrame( const OUStr xTarget = this; } - // I.V) "_beamer" // This is a special sub frame of any task. We must return it if we found it on our direct children // or create it there if it not already exists. @@ -1208,7 +1164,6 @@ css::uno::Reference< css::frame::XFrame > SAL_CALL Frame::findFrame( const OUStr // Order of using flags is fix: SELF - CHILDREN - SIBLINGS - PARENT // TASK and CREATE are handled special. - // get threadsafe some necessary member which are necessary for following functionality /* SAFE { */ aReadLock.reset(); @@ -1216,7 +1171,6 @@ css::uno::Reference< css::frame::XFrame > SAL_CALL Frame::findFrame( const OUStr aReadLock.clear(); /* } SAFE */ - // II.I) SELF // Check for right name. If it's the searched one return ourself - otherwise // ignore this flag. @@ -1229,7 +1183,6 @@ css::uno::Reference< css::frame::XFrame > SAL_CALL Frame::findFrame( const OUStr xTarget = this; } - // II.II) CHILDREN // Search on all children for the given target name. // An empty name value can't occur here - because it must be already handled as "_self" @@ -1244,7 +1197,6 @@ css::uno::Reference< css::frame::XFrame > SAL_CALL Frame::findFrame( const OUStr xTarget = m_aChildFrameContainer.searchOnAllChildrens(sTargetFrameName); } - // II.III) TASKS // This is a special flag. It regulate search on this task tree only or allow search on // all other ones (which are sibling trees of us) too. @@ -1308,7 +1260,6 @@ css::uno::Reference< css::frame::XFrame > SAL_CALL Frame::findFrame( const OUStr } } - // II.III.II) PARENT // Forward search to our parent (if he exists.) // To prevent us against recursive and superflous calls (which can occur if we allow him @@ -1331,7 +1282,6 @@ css::uno::Reference< css::frame::XFrame > SAL_CALL Frame::findFrame( const OUStr } } - // II.IV) CREATE // If we haven't found any valid target frame by using normal flags - but user allowed us to create // a new one ... we should do that. Used TaskCreator use Desktop instance automaticly as parent! @@ -1416,7 +1366,6 @@ void SAL_CALL Frame::activate() throw( css::uno::RuntimeException, std::exceptio aWriteLock.clear(); /* UNSAFE AREA --------------------------------------------------------------------------------------------- */ - // 1) If I'am not active before ... if( eState == E_INACTIVE ) { @@ -1449,7 +1398,6 @@ void SAL_CALL Frame::activate() throw( css::uno::RuntimeException, std::exceptio implts_sendFrameActionEvent( css::frame::FrameAction_FRAME_ACTIVATED ); } - // 2) I was active before or current activated and there is a path from here to bottom, who CAN be active. // But ouer direct child of path is not active yet. // (It can be, if activation occur in the middle of a current path!) @@ -1459,7 +1407,6 @@ void SAL_CALL Frame::activate() throw( css::uno::RuntimeException, std::exceptio xActiveChild->activate(); } - // 3) I was active before or current activated. But if I have no active child => I will get the focus! if ( eState == E_ACTIVE && !xActiveChild.is() ) { @@ -1514,7 +1461,6 @@ void SAL_CALL Frame::deactivate() throw( css::uno::RuntimeException, std::except xActiveChild->deactivate(); } - // 2) If I have the focus - I will lost it now. if( eState == E_FOCUS ) { @@ -1527,7 +1473,6 @@ void SAL_CALL Frame::deactivate() throw( css::uno::RuntimeException, std::except implts_sendFrameActionEvent( css::frame::FrameAction_FRAME_UI_DEACTIVATING ); } - // 3) If I'am active - I will be deactivated now. if( eState == E_ACTIVE ) { @@ -1539,7 +1484,6 @@ void SAL_CALL Frame::deactivate() throw( css::uno::RuntimeException, std::except implts_sendFrameActionEvent( css::frame::FrameAction_FRAME_DEACTIVATING ); } - // 4) If there is a path from here to my parent ... // ... I'am on the top or in the middle of deactivated subtree and action was started here. // I must deactivate all frames from here to top, which are members of current path. @@ -1640,7 +1584,6 @@ sal_Bool SAL_CALL Frame::setComponent( const css::uno::Reference< css::awt::X TransactionGuard aTransaction( m_aTransactionManager, E_HARDEXCEPTIONS ); - // Get threadsafe some copies of used members. /* SAFE { */ SolarMutexClearableGuard aReadLock; @@ -1653,7 +1596,6 @@ sal_Bool SAL_CALL Frame::setComponent( const css::uno::Reference< css::awt::X aReadLock.clear(); /* } SAFE */ - // stop listening on old window // May it produce some trouble. // But don't forget to listen on new window again ... or reactivate listening @@ -1664,7 +1606,6 @@ sal_Bool SAL_CALL Frame::setComponent( const css::uno::Reference< css::awt::X if (bWasConnected) implts_sendFrameActionEvent( css::frame::FrameAction_COMPONENT_DETACHING ); - // otherwise release old component first // Always release controller before releasing window, // because controller may want to access its window! @@ -1700,7 +1641,6 @@ sal_Bool SAL_CALL Frame::setComponent( const css::uno::Reference< css::awt::X xOldController = NULL; } - // Now it's time to release the component window. // If controller wasn't released successfully - this code line shouldn't be reached. // Because in case of "suspend()==false" we return immediately with false ... @@ -1731,7 +1671,6 @@ sal_Bool SAL_CALL Frame::setComponent( const css::uno::Reference< css::awt::X xOldComponentWindow = NULL; } - // Now it's time to set the new component ... // By the way - find out our new "load state" - means if we have a valid component inside. /* SAFE { */ @@ -1743,14 +1682,12 @@ sal_Bool SAL_CALL Frame::setComponent( const css::uno::Reference< css::awt::X aWriteLock.clear(); /* } SAFE */ - // notifies all interest listener, that current component was changed or a new one was loaded if (bIsConnected && bWasConnected) implts_sendFrameActionEvent( css::frame::FrameAction_COMPONENT_REATTACHED ); else if (bIsConnected && !bWasConnected) implts_sendFrameActionEvent( css::frame::FrameAction_COMPONENT_ATTACHED ); - // A new component window doesn't know anything about current active/focus states. // Set this information on it! if ( @@ -2001,7 +1938,6 @@ void SAL_CALL Frame::removeCloseListener( const css::uno::Reference< css::util:: m_aListenerContainer.removeInterface( ::getCppuType( ( const css::uno::Reference< css::util::XCloseListener >* ) NULL ), xListener ); } - OUString SAL_CALL Frame::getTitle() throw (css::uno::RuntimeException, std::exception) { @@ -2016,7 +1952,6 @@ OUString SAL_CALL Frame::getTitle() return xTitle->getTitle(); } - void SAL_CALL Frame::setTitle( const OUString& sTitle ) throw (css::uno::RuntimeException, std::exception) { @@ -2031,7 +1966,6 @@ void SAL_CALL Frame::setTitle( const OUString& sTitle ) xTitle->setTitle(sTitle); } - void SAL_CALL Frame::addTitleChangeListener( const css::uno::Reference< css::frame::XTitleChangeListener >& xListener) throw (css::uno::RuntimeException, std::exception) { @@ -2046,7 +1980,6 @@ void SAL_CALL Frame::addTitleChangeListener( const css::uno::Reference< css::fra xTitle->addTitleChangeListener(xListener); } - void SAL_CALL Frame::removeTitleChangeListener( const css::uno::Reference< css::frame::XTitleChangeListener >& xListener ) throw (css::uno::RuntimeException, std::exception) { @@ -2095,7 +2028,6 @@ void SAL_CALL Frame::setLayoutManager(const css::uno::Reference<css::uno::XInter m_xLayoutManager.set(p1, css::uno::UNO_QUERY); } - /*-****************************************************************************************************/ void Frame::implts_forgetSubFrames() { @@ -2470,7 +2402,6 @@ css::uno::Sequence< sal_Int16 > SAL_CALL Frame::getSupportedCommandGroups() return m_xDispatchInfoHelper->getSupportedCommandGroups(); } - css::uno::Sequence< css::frame::DispatchInformation > SAL_CALL Frame::getConfigurableDispatchInformation(sal_Int16 nCommandGroup) throw(css::uno::RuntimeException, std::exception) { @@ -2839,7 +2770,6 @@ sal_Int16 SAL_CALL Frame::resetActionLocks() throw( css::uno::RuntimeException, return nCurrentLocks; } - void Frame::impl_initializePropInfo() { impl_setPropertyChangeBroadcaster(static_cast< css::frame::XFrame* >(this)); @@ -2880,7 +2810,6 @@ void Frame::impl_initializePropInfo() css::beans::PropertyAttribute::TRANSIENT)); } - void SAL_CALL Frame::impl_setPropertyValue(const OUString& /*sProperty*/, sal_Int32 nHandle , const css::uno::Any& aValue ) @@ -2940,7 +2869,6 @@ void SAL_CALL Frame::impl_setPropertyValue(const OUString& /*sProperty*/, } } - css::uno::Any SAL_CALL Frame::impl_getPropertyValue(const OUString& /*sProperty*/, sal_Int32 nHandle ) { @@ -3143,7 +3071,6 @@ void Frame::implts_setIconOnWindow() // We must reset it to any fallback value - if no search step returns a valid result. sal_Int32 nIcon = -1; - // b) try to find information on controller propertyset directly // Don't forget to catch possible exceptions - because these property is an optional one! css::uno::Reference< css::beans::XPropertySet > xSet( xController, css::uno::UNO_QUERY ); @@ -3161,7 +3088,6 @@ void Frame::implts_setIconOnWindow() } } - // c) if b) failed ... analyze argument list of currently loaded document insde the frame to find the filter. // He can be used to detect right factory - and these can be used to match factory to icon ... if( nIcon == -1 ) @@ -3175,14 +3101,12 @@ void Frame::implts_setIconOnWindow() } } - // d) if all steps failed - use fallback! if( nIcon == -1 ) { nIcon = 0; } - // e) set icon on container window now // Don't forget SolarMutex! We use vcl directly :-( // Check window pointer for right WorkWindow class too!!! @@ -3257,7 +3181,6 @@ void Frame::implts_startWindowListening() } } - void Frame::implts_stopWindowListening() { /* UNSAFE AREA --------------------------------------------------------------------------------------------- */ @@ -3335,8 +3258,6 @@ void Frame::implts_checkSuicide() {} } - - /** little helper to enable/disable the menu closer at the menubar of the given frame. @param xFrame @@ -3368,8 +3289,6 @@ void Frame::impl_setCloser( /*IN*/ const css::uno::Reference< css::frame::XFrame {} } - - /** it checks, which of the top level task frames must have the special menu closer for switching to the backing window mode. @@ -3406,7 +3325,6 @@ void Frame::impl_checkMenuCloser() // specify the new frame, which must have this special state ... css::uno::Reference< css::frame::XFrame2 > xNewCloserFrame; - // a) // If there exist ate least one other frame - there are two frames currently open. // But we can enable this closer only, if one of these two tasks includes the help module. @@ -3455,11 +3373,8 @@ void Frame::impl_checkMenuCloser() } } - // debug methods - - // Its allowed to reset the active frame membervariable with a NULL-css::uno::Reference but not with a NULL-pointer! // And we accept frames only! No tasks and desktops! sal_Bool Frame::implcp_setActiveFrame( const css::uno::Reference< css::frame::XFrame >& xFrame ) @@ -3467,49 +3382,41 @@ sal_Bool Frame::implcp_setActiveFrame( const css::uno::Reference< css::frame::XF return css::uno::Reference< css::frame::XDesktop >( xFrame, css::uno::UNO_QUERY ).is(); } - sal_Bool Frame::implcp_addFrameActionListener( const css::uno::Reference< css::frame::XFrameActionListener >& xListener ) { return !xListener.is(); } - sal_Bool Frame::implcp_removeFrameActionListener( const css::uno::Reference< css::frame::XFrameActionListener >& xListener ) { return !xListener.is(); } - sal_Bool Frame::implcp_addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) { return !xListener.is(); } - sal_Bool Frame::implcp_removeEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) { return !xListener.is(); } - sal_Bool Frame::implcp_windowResized( const css::awt::WindowEvent& aEvent ) { return !aEvent.Source.is(); } - sal_Bool Frame::implcp_focusGained( const css::awt::FocusEvent& aEvent ) { return !aEvent.Source.is(); } - sal_Bool Frame::implcp_windowActivated( const css::lang::EventObject& aEvent ) { return !aEvent.Source.is(); } - sal_Bool Frame::implcp_windowDeactivated( const css::lang::EventObject& aEvent ) { return !aEvent.Source.is(); diff --git a/framework/source/services/mediatypedetectionhelper.cxx b/framework/source/services/mediatypedetectionhelper.cxx index 77c5e723bcef..8ba63897f8fa 100644 --- a/framework/source/services/mediatypedetectionhelper.cxx +++ b/framework/source/services/mediatypedetectionhelper.cxx @@ -27,7 +27,6 @@ namespace framework using namespace ::com::sun::star ; using namespace ::rtl ; - // constructor MediaTypeDetectionHelper::MediaTypeDetectionHelper( const uno::Reference< lang::XMultiServiceFactory >& xFactory ) @@ -35,7 +34,6 @@ MediaTypeDetectionHelper::MediaTypeDetectionHelper( const uno::Reference< lang:: { } - // destructor MediaTypeDetectionHelper::~MediaTypeDetectionHelper() @@ -53,10 +51,8 @@ DEFINE_INIT_SERVICE ( MediaTypeDetectionHelper, } ) - // XStringMapping - sal_Bool SAL_CALL MediaTypeDetectionHelper::mapStrings(uno::Sequence< OUString >& rSeq) throw (uno::RuntimeException, std::exception) { diff --git a/framework/source/services/modulemanager.cxx b/framework/source/services/modulemanager.cxx index 15d4e52b38e0..62e84736bc37 100644 --- a/framework/source/services/modulemanager.cxx +++ b/framework/source/services/modulemanager.cxx @@ -49,13 +49,11 @@ class ModuleManager: { private: - /** the global uno service manager. Must be used to create own needed services. */ css::uno::Reference< css::uno::XComponentContext > m_xContext; - /** points to the underlying configuration. This ModuleManager does not cache - it calls directly the configuration API! @@ -121,7 +119,6 @@ public: private: - /** @short makes the real identification of the module. @descr It checks for the optional but preferred interface diff --git a/framework/source/services/pathsettings.cxx b/framework/source/services/pathsettings.cxx index 0ceeebb4c561..21fb2908cc63 100644 --- a/framework/source/services/pathsettings.cxx +++ b/framework/source/services/pathsettings.cxx @@ -394,7 +394,6 @@ private: void impl_subst(PathSettings::PathInfo& aPath , sal_Bool bReSubst); - /** converts our new string list schema to the old ";" separated schema ... */ OUString impl_convertPath2OldStyle(const PathSettings::PathInfo& rPath ) const; OUStringList impl_convertOldStyle2Path(const OUString& sOldStylePath) const; @@ -434,7 +433,6 @@ private: const PathSettings::PathInfo* pPathOld, const PathSettings::PathInfo* pPathNew); - // OPropertySetHelper virtual sal_Bool SAL_CALL convertFastPropertyValue( css::uno::Any& aConvertedValue, css::uno::Any& aOldValue, @@ -457,7 +455,6 @@ private: css::uno::Reference< css::container::XNameAccess > fa_getCfgNew(); }; - PathSettings::PathSettings( const css::uno::Reference< css::uno::XComponentContext >& xContext ) : PathSettings_BASE(m_aMutex) , ::cppu::OPropertySetHelper(cppu::WeakComponentImplHelperBase::rBHelper) @@ -467,7 +464,6 @@ PathSettings::PathSettings( const css::uno::Reference< css::uno::XComponentConte { } - PathSettings::~PathSettings() { disposing(); @@ -491,7 +487,6 @@ void SAL_CALL PathSettings::disposing() m_pPropHelp = 0; } - css::uno::Any SAL_CALL PathSettings::queryInterface( const css::uno::Type& _rType ) throw(css::uno::RuntimeException, std::exception) { @@ -501,7 +496,6 @@ css::uno::Any SAL_CALL PathSettings::queryInterface( const css::uno::Type& _rTyp return aRet; } - css::uno::Sequence< css::uno::Type > SAL_CALL PathSettings::getTypes( ) throw(css::uno::RuntimeException, std::exception) { @@ -511,7 +505,6 @@ css::uno::Sequence< css::uno::Type > SAL_CALL PathSettings::getTypes( ) ); } - void SAL_CALL PathSettings::changesOccurred(const css::util::ChangesEvent& aEvent) throw (css::uno::RuntimeException, std::exception) { @@ -542,7 +535,6 @@ void SAL_CALL PathSettings::changesOccurred(const css::util::ChangesEvent& aEven impl_rebuildPropertyDescriptor(); } - void SAL_CALL PathSettings::disposing(const css::lang::EventObject& aSource) throw(css::uno::RuntimeException, std::exception) { @@ -552,7 +544,6 @@ void SAL_CALL PathSettings::disposing(const css::lang::EventObject& aSource) m_xCfgNew.clear(); } - OUString PathSettings::getStringProperty(const OUString& p1) throw(css::uno::RuntimeException) { @@ -562,14 +553,12 @@ OUString PathSettings::getStringProperty(const OUString& p1) return s; } - void PathSettings::setStringProperty(const OUString& p1, const OUString& p2) throw(css::uno::RuntimeException) { ::cppu::OPropertySetHelper::setPropertyValue(p1, css::uno::Any(p2)); } - void PathSettings::impl_readAll() { try @@ -592,7 +581,6 @@ void PathSettings::impl_readAll() impl_rebuildPropertyDescriptor(); } - // NO substitution here ! It's done outside ... OUStringList PathSettings::impl_readOldFormat(const OUString& sPath) { @@ -619,7 +607,6 @@ OUStringList PathSettings::impl_readOldFormat(const OUString& sPath) return aPathVal; } - // NO substitution here ! It's done outside ... PathSettings::PathInfo PathSettings::impl_readNewFormat(const OUString& sPath) { @@ -671,7 +658,6 @@ PathSettings::PathInfo PathSettings::impl_readNewFormat(const OUString& sPath) return aPathVal; } - void PathSettings::impl_storePath(const PathSettings::PathInfo& aPath) { m_bIgnoreEvents = sal_True; @@ -717,7 +703,6 @@ void PathSettings::impl_storePath(const PathSettings::PathInfo& aPath) m_bIgnoreEvents = sal_False; } - void PathSettings::impl_mergeOldUserPaths( PathSettings::PathInfo& rPath, const OUStringList& lOld ) { @@ -746,7 +731,6 @@ void PathSettings::impl_mergeOldUserPaths( PathSettings::PathInfo& rPath, } } - PathSettings::EChangeOp PathSettings::impl_updatePath(const OUString& sPath , sal_Bool bNotifyListener) { @@ -853,7 +837,6 @@ PathSettings::EChangeOp PathSettings::impl_updatePath(const OUString& sPath return eOp; } - css::uno::Sequence< sal_Int32 > PathSettings::impl_mapPathName2IDList(const OUString& sPath) { OUString sOldStyleProp = sPath; @@ -897,7 +880,6 @@ css::uno::Sequence< sal_Int32 > PathSettings::impl_mapPathName2IDList(const OUSt return lIDs; } - void PathSettings::impl_notifyPropListener( PathSettings::EChangeOp /*eOp*/ , const OUString& sPath , const PathSettings::PathInfo* pPathOld, @@ -975,7 +957,6 @@ void PathSettings::impl_notifyPropListener( PathSettings::EChangeOp /*eOp*/ } } - void PathSettings::impl_subst( OUStringList& lVals , const css::uno::Reference< css::util::XStringSubstitution >& xSubst , sal_Bool bReSubst) @@ -997,7 +978,6 @@ void PathSettings::impl_subst( OUStringList& } } - void PathSettings::impl_subst(PathSettings::PathInfo& aPath , sal_Bool bReSubst) { @@ -1011,7 +991,6 @@ void PathSettings::impl_subst(PathSettings::PathInfo& aPath , aPath.sWritePath = xSubst->substituteVariables(aPath.sWritePath, sal_False); } - OUString PathSettings::impl_convertPath2OldStyle(const PathSettings::PathInfo& rPath) const { OUStringList::const_iterator pIt; @@ -1048,7 +1027,6 @@ OUString PathSettings::impl_convertPath2OldStyle(const PathSettings::PathInfo& r return sPathVal.makeStringAndClear(); } - OUStringList PathSettings::impl_convertOldStyle2Path(const OUString& sOldStylePath) const { OUStringList lList; @@ -1064,7 +1042,6 @@ OUStringList PathSettings::impl_convertOldStyle2Path(const OUString& sOldStylePa return lList; } - void PathSettings::impl_purgeKnownPaths(const PathSettings::PathInfo& rPath, OUStringList& lList) { @@ -1093,7 +1070,6 @@ void PathSettings::impl_purgeKnownPaths(const PathSettings::PathInfo& rPath, lList.erase(pItem); } - void PathSettings::impl_rebuildPropertyDescriptor() { // SAFE -> @@ -1153,7 +1129,6 @@ void PathSettings::impl_rebuildPropertyDescriptor() // <- SAFE } - css::uno::Any PathSettings::impl_getPathValue(sal_Int32 nID) const { const PathSettings::PathInfo* pPath = impl_getPathAccessConst(nID); @@ -1192,7 +1167,6 @@ css::uno::Any PathSettings::impl_getPathValue(sal_Int32 nID) const return aVal; } - void PathSettings::impl_setPathValue( sal_Int32 nID , const css::uno::Any& aVal) { @@ -1299,7 +1273,6 @@ void PathSettings::impl_setPathValue( sal_Int32 nID , pOrgPath->takeOver(aChangePath); } - sal_Bool PathSettings::impl_isValidPath(const OUStringList& lPath) const { OUStringList::const_iterator pIt; @@ -1315,7 +1288,6 @@ sal_Bool PathSettings::impl_isValidPath(const OUStringList& lPath) const return sal_True; } - sal_Bool PathSettings::impl_isValidPath(const OUString& sPath) const { // allow empty path to reset a path. @@ -1328,7 +1300,6 @@ sal_Bool PathSettings::impl_isValidPath(const OUString& sPath) const return (! INetURLObject(sPath).HasError()); } - OUString impl_extractBaseFromPropName(const OUString& sPropName) { sal_Int32 i = sPropName.indexOf(POSTFIX_INTERNAL_PATHS); @@ -1344,7 +1315,6 @@ OUString impl_extractBaseFromPropName(const OUString& sPropName) return sPropName; } - PathSettings::PathInfo* PathSettings::impl_getPathAccess(sal_Int32 nHandle) { // SAFE -> @@ -1364,7 +1334,6 @@ PathSettings::PathInfo* PathSettings::impl_getPathAccess(sal_Int32 nHandle) // <- SAFE } - const PathSettings::PathInfo* PathSettings::impl_getPathAccessConst(sal_Int32 nHandle) const { // SAFE -> @@ -1384,7 +1353,6 @@ const PathSettings::PathInfo* PathSettings::impl_getPathAccessConst(sal_Int32 nH // <- SAFE } - sal_Bool SAL_CALL PathSettings::convertFastPropertyValue( css::uno::Any& aConvertedValue, css::uno::Any& aOldValue , sal_Int32 nHandle , @@ -1401,7 +1369,6 @@ sal_Bool SAL_CALL PathSettings::convertFastPropertyValue( css::uno::Any& aC aConvertedValue); } - void SAL_CALL PathSettings::setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const css::uno::Any& aValue ) throw(css::uno::Exception, std::exception) @@ -1410,20 +1377,17 @@ void SAL_CALL PathSettings::setFastPropertyValue_NoBroadcast( sal_Int32 impl_setPathValue(nHandle, aValue); } - void SAL_CALL PathSettings::getFastPropertyValue(css::uno::Any& aValue , sal_Int32 nHandle) const { aValue = impl_getPathValue(nHandle); } - ::cppu::IPropertyArrayHelper& SAL_CALL PathSettings::getInfoHelper() { return *m_pPropHelp; } - css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL PathSettings::getPropertySetInfo() throw(css::uno::RuntimeException, std::exception) { @@ -1431,7 +1395,6 @@ css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL PathSettings::getPr ::cppu::OPropertySetHelper::createPropertySetInfo(getInfoHelper())); } - css::uno::Reference< css::util::XStringSubstitution > PathSettings::fa_getSubstitution() { css::uno::Reference< css::util::XStringSubstitution > xSubst; @@ -1457,7 +1420,6 @@ css::uno::Reference< css::util::XStringSubstitution > PathSettings::fa_getSubsti return xSubst; } - css::uno::Reference< css::container::XNameAccess > PathSettings::fa_getCfgOld() { const OUString CFG_NODE_OLD("org.openoffice.Office.Common/Path/Current"); @@ -1486,7 +1448,6 @@ css::uno::Reference< css::container::XNameAccess > PathSettings::fa_getCfgOld() return xCfg; } - css::uno::Reference< css::container::XNameAccess > PathSettings::fa_getCfgNew() { const OUString CFG_NODE_NEW("org.openoffice.Office.Paths/Paths"); diff --git a/framework/source/services/sessionlistener.cxx b/framework/source/services/sessionlistener.cxx index a426404b7a34..3b68e9561b93 100644 --- a/framework/source/services/sessionlistener.cxx +++ b/framework/source/services/sessionlistener.cxx @@ -100,7 +100,6 @@ private: sal_Bool m_bAllowUserInteractionOnQuit; sal_Bool m_bTerminated; - // in case of synchronous call the caller should do saveDone() call himself! void StoreSession( sal_Bool bAsync ); @@ -294,7 +293,6 @@ void SAL_CALL SessionListener::statusChanged(const frame::FeatureStateEvent& eve } } - sal_Bool SAL_CALL SessionListener::doRestore() throw (RuntimeException, std::exception) { @@ -320,7 +318,6 @@ sal_Bool SAL_CALL SessionListener::doRestore() return m_bRestored; } - void SAL_CALL SessionListener::doSave( sal_Bool bShutdown, sal_Bool /*bCancelable*/ ) throw (RuntimeException, std::exception) { diff --git a/framework/source/services/substitutepathvars.cxx b/framework/source/services/substitutepathvars.cxx index bef035e68c17..db50d8ffd0bc 100644 --- a/framework/source/services/substitutepathvars.cxx +++ b/framework/source/services/substitutepathvars.cxx @@ -394,10 +394,8 @@ static const FixedVariable aFixedVarTable[] = { RTL_CONSTASCII_STRINGPARAM("$(brandbaseurl)"),PREDEFVAR_BRANDBASEURL, true } }; - // Implementation helper classes - OperatingSystem SubstitutePathVariables_Impl::GetOperatingSystemFromString( const OUString& aOSString ) { for ( int i = 0; i < OS_COUNT; i++ ) @@ -488,11 +486,8 @@ void SubstitutePathVariables_Impl::Commit() { } - - // private methods - OperatingSystem SubstitutePathVariables_Impl::GetOperatingSystem() { #ifdef SOLARIS @@ -823,10 +818,8 @@ throw ( NoSuchElementException, RuntimeException, std::exception ) return impl_getSubstituteVariableValue( aVariable ); } - // protected methods - IMPL_LINK_NOARG(SubstitutePathVariables, implts_ConfigurationNotify) { /* SAFE AREA ----------------------------------------------------------------------------------------------- */ diff --git a/framework/source/services/tabwindowservice.cxx b/framework/source/services/tabwindowservice.cxx index 331025b6212a..94c2daaeb216 100644 --- a/framework/source/services/tabwindowservice.cxx +++ b/framework/source/services/tabwindowservice.cxx @@ -121,10 +121,8 @@ public: return aSeq; } - // XSimpleTabController - virtual sal_Int32 SAL_CALL insertTab() throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual void SAL_CALL removeTab( sal_Int32 nID ) throw ( css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual void SAL_CALL setTabProps( sal_Int32 nID, const css::uno::Sequence< css::beans::NamedValue >& aProperties ) throw ( css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; @@ -134,10 +132,8 @@ public: virtual void SAL_CALL addTabListener( const css::uno::Reference< css::awt::XTabListener >& Listener ) throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual void SAL_CALL removeTabListener( const css::uno::Reference< css::awt::XTabListener >& Listener ) throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - // XComponent - virtual void SAL_CALL dispose() throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; @@ -200,8 +196,6 @@ DEFINE_XTYPEPROVIDER_6 ( TabWindowService , css::beans::XPropertySetInfo ) - - // constructor TabWindowService::TabWindowService() @@ -227,7 +221,6 @@ void TabWindowService::initProperties() m_aTransactionManager.setWorkingMode( E_WORK ); } - // destructor TabWindowService::~TabWindowService() @@ -237,7 +230,6 @@ TabWindowService::~TabWindowService() m_pTabWin->RemoveEventListener( LINK( this, TabWindowService, EventListener ) ); } - // XSimpleTabController ::sal_Int32 SAL_CALL TabWindowService::insertTab() @@ -253,7 +245,6 @@ TabWindowService::~TabWindowService() return nID; } - // XSimpleTabController void SAL_CALL TabWindowService::removeTab(::sal_Int32 nID) @@ -271,7 +262,6 @@ void SAL_CALL TabWindowService::removeTab(::sal_Int32 nID) pTabWin->RemovePage(nID); } - // XSimpleTabController void SAL_CALL TabWindowService::setTabProps( ::sal_Int32 nID , @@ -297,7 +287,6 @@ void SAL_CALL TabWindowService::setTabProps( ::sal_Int32 } } - // XSimpleTabController css::uno::Sequence< css::beans::NamedValue > SAL_CALL TabWindowService::getTabProps(::sal_Int32 nID) @@ -313,7 +302,6 @@ css::uno::Sequence< css::beans::NamedValue > SAL_CALL TabWindowService::getTabPr return rInfo.m_lProperties; } - // XSimpleTabController void SAL_CALL TabWindowService::activateTab(::sal_Int32 nID) @@ -331,7 +319,6 @@ void SAL_CALL TabWindowService::activateTab(::sal_Int32 nID) pTabWin->ActivatePage(nID); } - // XSimpleTabController ::sal_Int32 SAL_CALL TabWindowService::getActiveTabID() @@ -341,7 +328,6 @@ void SAL_CALL TabWindowService::activateTab(::sal_Int32 nID) return m_nCurrentPageIndex; } - // XSimpleTabController void SAL_CALL TabWindowService::addTabListener(const css::uno::Reference< css::awt::XTabListener >& xListener) @@ -350,7 +336,6 @@ void SAL_CALL TabWindowService::addTabListener(const css::uno::Reference< css::a m_lListener.addInterface(::getCppuType((const css::uno::Reference< css::awt::XTabListener >*)NULL), xListener); } - // XSimpleTabController void SAL_CALL TabWindowService::removeTabListener(const css::uno::Reference< css::awt::XTabListener >& xListener) @@ -359,7 +344,6 @@ void SAL_CALL TabWindowService::removeTabListener(const css::uno::Reference< css m_lListener.removeInterface(::getCppuType((const css::uno::Reference< css::awt::XTabListener >*)NULL), xListener); } - // XComponent void SAL_CALL TabWindowService::dispose() @@ -379,7 +363,6 @@ void SAL_CALL TabWindowService::dispose() m_xTabWin.clear(); } - // XComponent void SAL_CALL TabWindowService::addEventListener(const css::uno::Reference< css::lang::XEventListener >& xListener) @@ -388,7 +371,6 @@ void SAL_CALL TabWindowService::addEventListener(const css::uno::Reference< css: m_lListener.addInterface(::getCppuType((const css::uno::Reference< css::lang::XEventListener >*)NULL), xListener); } - // XComponent void SAL_CALL TabWindowService::removeEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener) @@ -397,7 +379,6 @@ void SAL_CALL TabWindowService::removeEventListener( const css::uno::Reference< m_lListener.removeInterface(::getCppuType((const css::uno::Reference< css::lang::XEventListener >*)NULL), xListener); } - void TabWindowService::impl_initializePropInfo() { impl_setPropertyChangeBroadcaster(static_cast< css::awt::XSimpleTabController* >(this)); @@ -410,7 +391,6 @@ void TabWindowService::impl_initializePropInfo() css::beans::PropertyAttribute::TRANSIENT)); } - void SAL_CALL TabWindowService::impl_setPropertyValue(const OUString& /*sProperty*/, sal_Int32 /*nHandle */, const css::uno::Any& /*aValue */) @@ -418,7 +398,6 @@ void SAL_CALL TabWindowService::impl_setPropertyValue(const OUString& /*sPropert { } - css::uno::Any SAL_CALL TabWindowService::impl_getPropertyValue(const OUString& /*sProperty*/, sal_Int32 nHandle ) { @@ -441,7 +420,6 @@ css::uno::Any SAL_CALL TabWindowService::impl_getPropertyValue(const OUString& / return aValue; } - // TabWindowService IMPL_LINK( TabWindowService, EventListener, VclSimpleEvent*, pEvent ) @@ -510,7 +488,6 @@ IMPL_LINK( TabWindowService, EventListener, VclSimpleEvent*, pEvent ) return 0; } - // TabWindowService void TabWindowService::impl_checkTabIndex (::sal_Int32 nID) @@ -527,7 +504,6 @@ void TabWindowService::impl_checkTabIndex (::sal_Int32 nID) } } - // TabWindowService TTabPageInfoHash::iterator TabWindowService::impl_getTabPageInfo(::sal_Int32 nID) diff --git a/framework/source/services/taskcreatorsrv.cxx b/framework/source/services/taskcreatorsrv.cxx index 2407f739e886..d187419a1c32 100644 --- a/framework/source/services/taskcreatorsrv.cxx +++ b/framework/source/services/taskcreatorsrv.cxx @@ -56,7 +56,6 @@ class TaskCreatorService : private cppu::BaseMutex, { private: - /** @short the global uno service manager. @descr Must be used to create own needed services. */ @@ -116,19 +115,16 @@ private: OUString impl_filterNames( const OUString& sName ); }; - TaskCreatorService::TaskCreatorService(const css::uno::Reference< css::uno::XComponentContext >& xContext) : TaskCreatorService_BASE(m_aMutex) , m_xContext (xContext ) { } - TaskCreatorService::~TaskCreatorService() { } - css::uno::Reference< css::uno::XInterface > SAL_CALL TaskCreatorService::createInstance() throw(css::uno::Exception , css::uno::RuntimeException, std::exception) @@ -136,7 +132,6 @@ css::uno::Reference< css::uno::XInterface > SAL_CALL TaskCreatorService::createI return createInstanceWithArguments(css::uno::Sequence< css::uno::Any >()); } - css::uno::Reference< css::uno::XInterface > SAL_CALL TaskCreatorService::createInstanceWithArguments(const css::uno::Sequence< css::uno::Any >& lArguments) throw(css::uno::Exception , css::uno::RuntimeException, std::exception) @@ -219,7 +214,6 @@ css::uno::Reference< css::uno::XInterface > SAL_CALL TaskCreatorService::createI return css::uno::Reference< css::uno::XInterface >(xFrame, css::uno::UNO_QUERY_THROW); } - void TaskCreatorService::implts_applyDocStyleToWindow(const css::uno::Reference< css::awt::XWindow >& xWindow) const { // SYNCHRONIZED -> @@ -230,7 +224,6 @@ void TaskCreatorService::implts_applyDocStyleToWindow(const css::uno::Reference< // <- SYNCHRONIZED } - css::uno::Reference< css::awt::XWindow > TaskCreatorService::implts_createContainerWindow( const css::uno::Reference< css::awt::XWindow >& xParentWindow , const css::awt::Rectangle& aPosSize , sal_Bool bTopWindow ) @@ -287,7 +280,6 @@ css::uno::Reference< css::awt::XWindow > TaskCreatorService::implts_createContai return xWindow; } - css::uno::Reference< css::frame::XFrame2 > TaskCreatorService::implts_createFrame( const css::uno::Reference< css::frame::XFrame >& xParentFrame , const css::uno::Reference< css::awt::XWindow >& xContainerWindow, const OUString& sName ) @@ -316,7 +308,6 @@ css::uno::Reference< css::frame::XFrame2 > TaskCreatorService::implts_createFram return xNewFrame; } - void TaskCreatorService::implts_establishWindowStateListener( const css::uno::Reference< css::frame::XFrame2 >& xFrame ) { // Special feature: It's allowed for frames using a top level window only! @@ -331,7 +322,6 @@ void TaskCreatorService::implts_establishWindowStateListener( const css::uno::Re xInit->initialize(lInitData); } - void TaskCreatorService::implts_establishDocModifyListener( const css::uno::Reference< css::frame::XFrame2 >& xFrame ) { // Special feature: It's allowed for frames using a top level window only! @@ -345,7 +335,6 @@ void TaskCreatorService::implts_establishDocModifyListener( const css::uno::Refe xInit->initialize(lInitData); } - void TaskCreatorService::implts_establishTitleBarUpdate( const css::uno::Reference< css::frame::XFrame2 >& xFrame ) { TitleBarUpdate* pHelper = new TitleBarUpdate (m_xContext); diff --git a/framework/source/services/uriabbreviation.cxx b/framework/source/services/uriabbreviation.cxx index 3f60751bd7a2..82a39a4f8055 100644 --- a/framework/source/services/uriabbreviation.cxx +++ b/framework/source/services/uriabbreviation.cxx @@ -30,7 +30,6 @@ namespace framework { - // XInterface, XTypeProvider, XServiceInfo DEFINE_XSERVICEINFO_MULTISERVICE_2 ( UriAbbreviation , @@ -65,8 +64,4 @@ OUString SAL_CALL UriAbbreviation::abbreviateString(const css::uno::Reference< c } // namespace framework - - - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/framework/source/services/urltransformer.cxx b/framework/source/services/urltransformer.cxx index 4ee2f705af9a..7511af83e98a 100644 --- a/framework/source/services/urltransformer.cxx +++ b/framework/source/services/urltransformer.cxx @@ -175,7 +175,6 @@ sal_Bool SAL_CALL URLTransformer::parseStrict( css::util::URL& aURL ) throw( css return sal_False; } - // XURLTransformer sal_Bool SAL_CALL URLTransformer::parseSmart( css::util::URL& aURL, @@ -231,7 +230,6 @@ sal_Bool SAL_CALL URLTransformer::parseSmart( css::util::URL& aURL, } } - // XURLTransformer sal_Bool SAL_CALL URLTransformer::assemble( css::util::URL& aURL ) throw( css::uno::RuntimeException, std::exception ) { @@ -293,7 +291,6 @@ sal_Bool SAL_CALL URLTransformer::assemble( css::util::URL& aURL ) throw( css::u return sal_False; } - // XURLTransformer OUString SAL_CALL URLTransformer::getPresentation( const css::util::URL& aURL, diff --git a/framework/source/tabwin/tabwindow.cxx b/framework/source/tabwin/tabwindow.cxx index 2a5ed23d7694..0c0e30a9514c 100644 --- a/framework/source/tabwin/tabwindow.cxx +++ b/framework/source/tabwin/tabwindow.cxx @@ -34,16 +34,13 @@ #include <toolkit/helper/vclunohelper.hxx> #include <comphelper/sequenceashashmap.hxx> - // Defines - using namespace com::sun::star; namespace framework { - // XInterface, XTypeProvider, XServiceInfo DEFINE_XINTERFACE_11 ( TabWindow , @@ -100,10 +97,8 @@ TabWindow::~TabWindow() { } - // Helper - void TabWindow::implts_LayoutWindows() const { const sal_Int32 nTabControlHeight = 30; @@ -229,10 +224,8 @@ void TabWindow::implts_SendNotification( Notification eNotify, sal_Int32 ID, con } } - // Links - IMPL_LINK( TabWindow, Activate, TabControl*, pTabControl ) { /* SAFE AREA ----------------------------------------------------------------------------------------------- */ @@ -263,10 +256,8 @@ IMPL_LINK( TabWindow, Deactivate, TabControl*, pTabControl ) return 1; } - // XInitilization - void SAL_CALL TabWindow::initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) throw (css::uno::Exception, css::uno::RuntimeException, std::exception) { @@ -420,7 +411,6 @@ throw (css::uno::Exception, css::uno::RuntimeException, std::exception) } } - // XComponent void SAL_CALL TabWindow::dispose() throw (css::uno::RuntimeException, std::exception) @@ -488,7 +478,6 @@ throw (css::uno::RuntimeException, std::exception) m_aListenerContainer.removeInterface( ::getCppuType( ( const css::uno::Reference< css::lang::XEventListener >* ) NULL ), xListener ); } - // XEventListener void SAL_CALL TabWindow::disposing( const css::lang::EventObject& ) @@ -496,7 +485,6 @@ throw( css::uno::RuntimeException, std::exception ) { } - // XWindowListener void SAL_CALL TabWindow::windowResized( const css::awt::WindowEvent& ) @@ -543,7 +531,6 @@ throw( css::uno::RuntimeException, std::exception ) pTabControl->Hide(); } - // XTopWindowListener void SAL_CALL TabWindow::windowOpened( const css::lang::EventObject& ) @@ -584,10 +571,8 @@ throw (css::uno::RuntimeException, std::exception) { } - // XSimpleTabController - ::sal_Int32 SAL_CALL TabWindow::insertTab() throw (css::uno::RuntimeException, std::exception) { @@ -806,10 +791,8 @@ throw (css::uno::RuntimeException, std::exception) ::getCppuType( ( const css::uno::Reference< css::awt::XTabListener >* ) NULL ), xListener ); } - // OPropertySetHelper - // XPropertySet helper sal_Bool SAL_CALL TabWindow::convertFastPropertyValue( css::uno::Any& aConvertedValue , css::uno::Any& aOldValue , diff --git a/framework/source/tabwin/tabwinfactory.cxx b/framework/source/tabwin/tabwinfactory.cxx index 41f724672e5c..7b93711f485e 100644 --- a/framework/source/tabwin/tabwinfactory.cxx +++ b/framework/source/tabwin/tabwinfactory.cxx @@ -29,10 +29,8 @@ #include <vcl/svapp.hxx> #include <rtl/ustrbuf.hxx> - // Defines - using namespace com::sun::star::uno; using namespace com::sun::star::lang; using namespace com::sun::star::beans; @@ -41,7 +39,6 @@ using namespace com::sun::star::util; namespace framework { - // XInterface, XTypeProvider, XServiceInfo DEFINE_XSERVICEINFO_ONEINSTANCESERVICE_2( TabWinFactory , diff --git a/framework/source/uiconfiguration/globalsettings.cxx b/framework/source/uiconfiguration/globalsettings.cxx index f7c561b2f78c..314d8247c6db 100644 --- a/framework/source/uiconfiguration/globalsettings.cxx +++ b/framework/source/uiconfiguration/globalsettings.cxx @@ -33,17 +33,12 @@ #include <rtl/instance.hxx> #include <cppuhelper/implbase2.hxx> - // Defines - using namespace ::com::sun::star; - - // Namespace - static const char GLOBALSETTINGS_ROOT_ACCESS[] = "/org.openoffice.Office.UI.GlobalSettings/Toolbars"; static const char GLOBALSETTINGS_NODEREF_STATES[] = "States"; @@ -54,10 +49,8 @@ static const char GLOBALSETTINGS_PROPERTY_STATESENABLED[] = "StatesEnabled"; namespace framework { - // Configuration access class for WindowState supplier implementation - class GlobalSettings_Access : public ::cppu::WeakImplHelper2< ::com::sun::star::lang::XComponent, ::com::sun::star::lang::XEventListener> @@ -93,9 +86,6 @@ class GlobalSettings_Access : public ::cppu::WeakImplHelper2< ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext> m_xContext; }; - - - GlobalSettings_Access::GlobalSettings_Access( const css::uno::Reference< css::uno::XComponentContext >& rxContext ) : m_bDisposed( sal_False ), m_bConfigRead( sal_False ), @@ -267,10 +257,8 @@ sal_Bool GlobalSettings_Access::impl_initConfigAccess() return sal_False; } - // global class - struct mutexGlobalSettings : public rtl::Static< osl::Mutex, mutexGlobalSettings > {}; static GlobalSettings_Access* pStaticSettings = 0; diff --git a/framework/source/uiconfiguration/imagemanager.cxx b/framework/source/uiconfiguration/imagemanager.cxx index f69f9adcf3f0..60770cbbe5ad 100644 --- a/framework/source/uiconfiguration/imagemanager.cxx +++ b/framework/source/uiconfiguration/imagemanager.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <uiconfiguration/imagemanager.hxx> #include <xml/imagesconfiguration.hxx> #include <uiconfiguration/graphicnameaccess.hxx> diff --git a/framework/source/uiconfiguration/imagemanagerimpl.cxx b/framework/source/uiconfiguration/imagemanagerimpl.cxx index 20a7e629d850..4fea5649914c 100644 --- a/framework/source/uiconfiguration/imagemanagerimpl.cxx +++ b/framework/source/uiconfiguration/imagemanagerimpl.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <imagemanagerimpl.hxx> #include <xml/imagesconfiguration.hxx> #include <uiconfiguration/graphicnameaccess.hxx> @@ -146,8 +145,6 @@ static OUString getCanonicalName( const OUString& rFileName ) return aBuf.makeStringAndClear(); } - - CmdImageList::CmdImageList( const uno::Reference< uno::XComponentContext >& rxContext, const OUString& aModuleIdentifier ) : m_bVectorInit( sal_False ), m_aModuleIdentifier( aModuleIdentifier ), @@ -319,8 +316,6 @@ bool CmdImageList::hasImage( sal_Int16 /*nImageType*/, const OUString& rCommandU return impl_getImageCommandNameVector(); } - - GlobalImageList::GlobalImageList( const uno::Reference< uno::XComponentContext >& rxContext ) : CmdImageList( rxContext, OUString() ), m_nRefCount( 0 ) @@ -1135,7 +1130,6 @@ throw ( ::com::sun::star::container::ElementExistException, replaceImages(nImageType,aCommandURLSequence,aGraphicSequence); } - // XUIConfigurationPersistence void ImageManagerImpl::reload() throw ( ::com::sun::star::uno::Exception, @@ -1390,7 +1384,6 @@ throw (::com::sun::star::uno::RuntimeException) m_aListenerContainer.removeInterface( ::getCppuType( ( const uno::Reference< XUIConfigurationListener >* ) NULL ), xListener ); } - void ImageManagerImpl::implts_notifyContainerListener( const ConfigurationEvent& aEvent, NotifyOp eOp ) { ::cppu::OInterfaceContainerHelper* pContainer = m_aListenerContainer.getContainer( diff --git a/framework/source/uiconfiguration/imagemanagerimpl.hxx b/framework/source/uiconfiguration/imagemanagerimpl.hxx index b0e6c0b31a63..dbd1664bd0cb 100644 --- a/framework/source/uiconfiguration/imagemanagerimpl.hxx +++ b/framework/source/uiconfiguration/imagemanagerimpl.hxx @@ -176,7 +176,6 @@ namespace framework const rtl::Reference< GlobalImageList >& implts_getGlobalImageList(); CmdImageList* implts_getDefaultImageList(); - com::sun::star::uno::Reference< com::sun::star::embed::XStorage > m_xUserConfigStorage; com::sun::star::uno::Reference< com::sun::star::embed::XStorage > m_xUserImageStorage; com::sun::star::uno::Reference< com::sun::star::embed::XStorage > m_xUserBitmapsStorage; diff --git a/framework/source/uiconfiguration/moduleimagemanager.cxx b/framework/source/uiconfiguration/moduleimagemanager.cxx index bb7c4d19667b..1047878f2d2a 100644 --- a/framework/source/uiconfiguration/moduleimagemanager.cxx +++ b/framework/source/uiconfiguration/moduleimagemanager.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <uiconfiguration/moduleimagemanager.hxx> #include <xml/imagesconfiguration.hxx> #include <uiconfiguration/graphicnameaccess.hxx> @@ -47,10 +46,8 @@ #include <vcl/pngread.hxx> #include <vcl/pngwrite.hxx> - // namespaces - using ::com::sun::star::uno::Sequence; using ::com::sun::star::uno::XInterface; using ::com::sun::star::uno::Exception; diff --git a/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx b/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx index d9860f746cde..5dc3555654a4 100644 --- a/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx +++ b/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx @@ -173,7 +173,6 @@ private: bDefaultLayer( false ), nElementType( css::ui::UIElementType::UNKNOWN ) {} - bool bModified; bool bLoaded; bool bDefaultLayer; @@ -1003,7 +1002,6 @@ void SAL_CALL ModuleUIConfigurationManager::removeConfigurationListener( const R m_aListenerContainer.removeInterface( ::getCppuType( ( const Reference< ui::XUIConfigurationListener >* ) NULL ), xListener ); } - // XUIConfigurationManager void SAL_CALL ModuleUIConfigurationManager::reset() throw (::com::sun::star::uno::RuntimeException, std::exception) { diff --git a/framework/source/uiconfiguration/uicategorydescription.cxx b/framework/source/uiconfiguration/uicategorydescription.cxx index 26798c9c32cc..138aff04123d 100644 --- a/framework/source/uiconfiguration/uicategorydescription.cxx +++ b/framework/source/uiconfiguration/uicategorydescription.cxx @@ -119,10 +119,8 @@ class ConfigurationAccess_UICategory : public ::cppu::WeakImplHelper2<XNameAcces IdToInfoCache m_aIdCache; }; - // XInterface, XTypeProvider - ConfigurationAccess_UICategory::ConfigurationAccess_UICategory( const OUString& aModuleName, const Reference< XNameAccess >& rGenericUICategories, const Reference< XComponentContext >& rxContext ) : m_aConfigCategoryAccess( CONFIGURATION_ROOT_ACCESS ), m_aPropUIName( CONFIGURATION_PROPERTY_NAME ), diff --git a/framework/source/uiconfiguration/uiconfigurationmanager.cxx b/framework/source/uiconfiguration/uiconfigurationmanager.cxx index 51ea91363237..0a04ab944f1d 100644 --- a/framework/source/uiconfiguration/uiconfigurationmanager.cxx +++ b/framework/source/uiconfiguration/uiconfigurationmanager.cxx @@ -159,7 +159,6 @@ private: bDefaultLayer( false ), nElementType( css::ui::UIElementType::UNKNOWN ) {} - bool bModified; bool bLoaded; bool bDefaultLayer; @@ -772,7 +771,6 @@ void SAL_CALL UIConfigurationManager::removeConfigurationListener( const Referen m_aListenerContainer.removeInterface( ::getCppuType( ( const Reference< XUIConfigurationListener >* ) NULL ), xListener ); } - void SAL_CALL UIConfigurationManager::reset() throw (::com::sun::star::uno::RuntimeException, std::exception) { SolarMutexClearableGuard aGuard; diff --git a/framework/source/uiconfiguration/windowstateconfiguration.cxx b/framework/source/uiconfiguration/windowstateconfiguration.cxx index 3c4e5ec645ba..dc21537aae5e 100644 --- a/framework/source/uiconfiguration/windowstateconfiguration.cxx +++ b/framework/source/uiconfiguration/windowstateconfiguration.cxx @@ -99,10 +99,8 @@ static const char* CONFIGURATION_PROPERTIES[] = 0 }; - // Configuration access class for WindowState supplier implementation - class ConfigurationAccess_WindowState : public ::cppu::WeakImplHelper2< XNameContainer, XContainerListener > { public: @@ -233,8 +231,6 @@ class ConfigurationAccess_WindowState : public ::cppu::WeakImplHelper2< XNameCo std::vector< OUString > m_aPropArray; }; - - ConfigurationAccess_WindowState::ConfigurationAccess_WindowState( const OUString& aModuleName, const Reference< XComponentContext >& rxContext ) : m_aConfigWindowAccess( "/org.openoffice.Office.UI." ), m_bConfigAccessInitialized( sal_False ), diff --git a/framework/source/uielement/addonstoolbarmanager.cxx b/framework/source/uielement/addonstoolbarmanager.cxx index 111b79742ce7..c3f47b35670e 100644 --- a/framework/source/uielement/addonstoolbarmanager.cxx +++ b/framework/source/uielement/addonstoolbarmanager.cxx @@ -57,10 +57,8 @@ #include <vcl/toolbox.hxx> #include <vcl/settings.hxx> - // namespaces - using namespace ::com::sun::star; using namespace ::com::sun::star::awt; using namespace ::com::sun::star::beans; diff --git a/framework/source/uielement/addonstoolbarwrapper.cxx b/framework/source/uielement/addonstoolbarwrapper.cxx index dba446aaa049..7f050045270d 100644 --- a/framework/source/uielement/addonstoolbarwrapper.cxx +++ b/framework/source/uielement/addonstoolbarwrapper.cxx @@ -178,7 +178,6 @@ void AddonsToolBarWrapper::populateImages() } } - } // namespace framework /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/framework/source/uielement/buttontoolbarcontroller.cxx b/framework/source/uielement/buttontoolbarcontroller.cxx index d09fb90d693a..d233d58e90c7 100644 --- a/framework/source/uielement/buttontoolbarcontroller.cxx +++ b/framework/source/uielement/buttontoolbarcontroller.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "uielement/buttontoolbarcontroller.hxx" #include <com/sun/star/util/URLTransformer.hpp> diff --git a/framework/source/uielement/comboboxtoolbarcontroller.cxx b/framework/source/uielement/comboboxtoolbarcontroller.cxx index c49e14689f1c..edc205e078ea 100644 --- a/framework/source/uielement/comboboxtoolbarcontroller.cxx +++ b/framework/source/uielement/comboboxtoolbarcontroller.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "uielement/comboboxtoolbarcontroller.hxx" #include <com/sun/star/util/XURLTransformer.hpp> @@ -47,8 +46,6 @@ using namespace ::com::sun::star::util; namespace framework { - - // Wrapper class to notify controller about events from combobox. // Unfortunaltly the events are notifed through virtual methods instead // of Listeners. @@ -135,8 +132,6 @@ bool ComboBoxControl::PreNotify( NotifyEvent& rNEvt ) return nRet; } - - ComboboxToolbarController::ComboboxToolbarController( const Reference< XComponentContext >& rxContext, const Reference< XFrame >& rFrame, @@ -159,14 +154,10 @@ ComboboxToolbarController::ComboboxToolbarController( m_pToolbar->SetItemWindow( m_nID, m_pComboBox ); } - - ComboboxToolbarController::~ComboboxToolbarController() { } - - void SAL_CALL ComboboxToolbarController::dispose() throw ( RuntimeException, std::exception ) { @@ -180,7 +171,6 @@ throw ( RuntimeException, std::exception ) m_pComboBox = 0; } - Sequence<PropertyValue> ComboboxToolbarController::getExecuteArgs(sal_Int16 KeyModifier) const { Sequence<PropertyValue> aArgs( 2 ); @@ -194,8 +184,6 @@ Sequence<PropertyValue> ComboboxToolbarController::getExecuteArgs(sal_Int16 KeyM return aArgs; } - - void ComboboxToolbarController::Select() { if ( m_pComboBox->GetEntryCount() > 0 ) @@ -259,8 +247,6 @@ bool ComboboxToolbarController::PreNotify( NotifyEvent& rNEvt ) return false; } - - void ComboboxToolbarController::executeControlCommand( const ::com::sun::star::frame::ControlCommand& rControlCommand ) { if ( rControlCommand.Command == "SetText" ) diff --git a/framework/source/uielement/complextoolbarcontroller.cxx b/framework/source/uielement/complextoolbarcontroller.cxx index 7ce3c45a1243..d1392528ea76 100644 --- a/framework/source/uielement/complextoolbarcontroller.cxx +++ b/framework/source/uielement/complextoolbarcontroller.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "uielement/complextoolbarcontroller.hxx" #include <com/sun/star/util/URLTransformer.hpp> @@ -50,8 +49,6 @@ using namespace ::com::sun::star::util; namespace framework { - - ComplexToolbarController::ComplexToolbarController( const Reference< XComponentContext >& rxContext, const Reference< XFrame >& rFrame, @@ -66,14 +63,10 @@ ComplexToolbarController::ComplexToolbarController( m_xURLTransformer.set( URLTransformer::create(m_xContext) ); } - - ComplexToolbarController::~ComplexToolbarController() { } - - void SAL_CALL ComplexToolbarController::dispose() throw ( RuntimeException, std::exception ) { @@ -87,7 +80,6 @@ throw ( RuntimeException, std::exception ) m_nID = 0; } - Sequence<PropertyValue> ComplexToolbarController::getExecuteArgs(sal_Int16 KeyModifier) const { Sequence<PropertyValue> aArgs( 1 ); @@ -136,8 +128,6 @@ throw ( RuntimeException, std::exception ) } } - - void ComplexToolbarController::statusChanged( const FeatureStateEvent& Event ) throw ( RuntimeException, std::exception ) { @@ -206,8 +196,6 @@ throw ( RuntimeException, std::exception ) } } - - IMPL_STATIC_LINK_NOINSTANCE( ComplexToolbarController, ExecuteHdl_Impl, ExecuteInfo*, pExecuteInfo ) { const sal_uInt32 nRef = Application::ReleaseSolarMutex(); @@ -227,8 +215,6 @@ IMPL_STATIC_LINK_NOINSTANCE( ComplexToolbarController, ExecuteHdl_Impl, ExecuteI return 0; } - - IMPL_STATIC_LINK_NOINSTANCE( ComplexToolbarController, Notify_Impl, NotifyInfo*, pNotifyInfo ) { const sal_uInt32 nRef = Application::ReleaseSolarMutex(); @@ -252,8 +238,6 @@ IMPL_STATIC_LINK_NOINSTANCE( ComplexToolbarController, Notify_Impl, NotifyInfo*, return 0; } - - void ComplexToolbarController::addNotifyInfo( const OUString& aEventName, const uno::Reference< frame::XDispatch >& xDispatch, @@ -282,7 +266,6 @@ void ComplexToolbarController::addNotifyInfo( } } - sal_Int32 ComplexToolbarController::getFontSizePixel( const Window* pWindow ) { const StyleSettings& rSettings = Application::GetSettings().GetStyleSettings(); @@ -294,8 +277,6 @@ sal_Int32 ComplexToolbarController::getFontSizePixel( const Window* pWindow ) return aPixelSize.Height(); } - - uno::Reference< frame::XDispatch > ComplexToolbarController::getDispatchFromCommand( const OUString& aCommand ) const { uno::Reference< frame::XDispatch > xDispatch; @@ -310,8 +291,6 @@ uno::Reference< frame::XDispatch > ComplexToolbarController::getDispatchFromComm return xDispatch; } - - const ::com::sun::star::util::URL& ComplexToolbarController::getInitializedURL() { if ( m_aURL.Complete.isEmpty() ) diff --git a/framework/source/uielement/controlmenucontroller.cxx b/framework/source/uielement/controlmenucontroller.cxx index 6049a3c14ff9..db664334a8a9 100644 --- a/framework/source/uielement/controlmenucontroller.cxx +++ b/framework/source/uielement/controlmenucontroller.cxx @@ -201,7 +201,6 @@ public: return aSeq; } - // XPopupMenuController virtual void SAL_CALL updatePopupMenu() throw (uno::RuntimeException, std::exception) SAL_OVERRIDE; diff --git a/framework/source/uielement/dropdownboxtoolbarcontroller.cxx b/framework/source/uielement/dropdownboxtoolbarcontroller.cxx index 75e894670535..dc64b4a77020 100644 --- a/framework/source/uielement/dropdownboxtoolbarcontroller.cxx +++ b/framework/source/uielement/dropdownboxtoolbarcontroller.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "uielement/dropdownboxtoolbarcontroller.hxx" #include <com/sun/star/util/XURLTransformer.hpp> @@ -46,8 +45,6 @@ using namespace ::com::sun::star::util; namespace framework { - - // Wrapper class to notify controller about events from ListBox. // Unfortunaltly the events are notifed through virtual methods instead // of Listeners. @@ -118,8 +115,6 @@ bool ListBoxControl::PreNotify( NotifyEvent& rNEvt ) return nRet; } - - DropdownToolbarController::DropdownToolbarController( const Reference< XComponentContext >& rxContext, const Reference< XFrame >& rFrame, @@ -143,14 +138,10 @@ DropdownToolbarController::DropdownToolbarController( m_pListBoxControl->SetDropDownLineCount( 5 ); } - - DropdownToolbarController::~DropdownToolbarController() { } - - void SAL_CALL DropdownToolbarController::dispose() throw ( RuntimeException, std::exception ) { @@ -164,7 +155,6 @@ throw ( RuntimeException, std::exception ) m_pListBoxControl = 0; } - Sequence<PropertyValue> DropdownToolbarController::getExecuteArgs(sal_Int16 KeyModifier) const { Sequence<PropertyValue> aArgs( 2 ); @@ -178,8 +168,6 @@ Sequence<PropertyValue> DropdownToolbarController::getExecuteArgs(sal_Int16 KeyM return aArgs; } - - void DropdownToolbarController::Select() { if ( m_pListBoxControl->GetEntryCount() > 0 ) @@ -210,8 +198,6 @@ bool DropdownToolbarController::PreNotify( NotifyEvent& /*rNEvt*/ ) return false; } - - void DropdownToolbarController::executeControlCommand( const ::com::sun::star::frame::ControlCommand& rControlCommand ) { if ( rControlCommand.Command == "SetList" ) diff --git a/framework/source/uielement/edittoolbarcontroller.cxx b/framework/source/uielement/edittoolbarcontroller.cxx index 047c122b650d..5a6b6b9ae7ac 100644 --- a/framework/source/uielement/edittoolbarcontroller.cxx +++ b/framework/source/uielement/edittoolbarcontroller.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "uielement/edittoolbarcontroller.hxx" #include <com/sun/star/util/XURLTransformer.hpp> @@ -45,8 +44,6 @@ using namespace ::com::sun::star::util; namespace framework { - - // Wrapper class to notify controller about events from edit. // Unfortunaltly the events are notifed through virtual methods instead // of Listeners. @@ -117,8 +114,6 @@ bool EditControl::PreNotify( NotifyEvent& rNEvt ) return nRet; } - - EditToolbarController::EditToolbarController( const Reference< XComponentContext >& rxContext, const Reference< XFrame >& rFrame, @@ -140,14 +135,10 @@ EditToolbarController::EditToolbarController( m_pToolbar->SetItemWindow( m_nID, m_pEditControl ); } - - EditToolbarController::~EditToolbarController() { } - - void SAL_CALL EditToolbarController::dispose() throw ( RuntimeException, std::exception ) { @@ -161,7 +152,6 @@ throw ( RuntimeException, std::exception ) m_pEditControl = 0; } - Sequence<PropertyValue> EditToolbarController::getExecuteArgs(sal_Int16 KeyModifier) const { Sequence<PropertyValue> aArgs( 2 ); @@ -175,8 +165,6 @@ Sequence<PropertyValue> EditToolbarController::getExecuteArgs(sal_Int16 KeyModif return aArgs; } - - void EditToolbarController::Modify() { notifyTextChanged( m_pEditControl->GetText() ); @@ -214,8 +202,6 @@ bool EditToolbarController::PreNotify( NotifyEvent& rNEvt ) return false; } - - void EditToolbarController::executeControlCommand( const ::com::sun::star::frame::ControlCommand& rControlCommand ) { if ( rControlCommand.Command.startsWith( "SetText" )) diff --git a/framework/source/uielement/fontmenucontroller.cxx b/framework/source/uielement/fontmenucontroller.cxx index 14b00fb689b0..86307faf79a3 100644 --- a/framework/source/uielement/fontmenucontroller.cxx +++ b/framework/source/uielement/fontmenucontroller.cxx @@ -35,10 +35,8 @@ #include <vcl/mnemonic.hxx> #include <osl/mutex.hxx> - // Defines - using namespace com::sun::star::uno; using namespace com::sun::star::lang; using namespace com::sun::star::frame; diff --git a/framework/source/uielement/fontsizemenucontroller.cxx b/framework/source/uielement/fontsizemenucontroller.cxx index 615408800fad..674c47e0fbca 100644 --- a/framework/source/uielement/fontsizemenucontroller.cxx +++ b/framework/source/uielement/fontsizemenucontroller.cxx @@ -37,10 +37,8 @@ #include <svtools/ctrltool.hxx> #include <osl/mutex.hxx> - // Defines - using namespace com::sun::star::uno; using namespace com::sun::star::lang; using namespace com::sun::star::frame; diff --git a/framework/source/uielement/footermenucontroller.cxx b/framework/source/uielement/footermenucontroller.cxx index 454a51ebfa0f..95c195269a42 100644 --- a/framework/source/uielement/footermenucontroller.cxx +++ b/framework/source/uielement/footermenucontroller.cxx @@ -37,10 +37,8 @@ #include <vcl/i18nhelp.hxx> #include <rtl/ustrbuf.hxx> - // Defines - using namespace com::sun::star::uno; using namespace com::sun::star::lang; using namespace com::sun::star::frame; diff --git a/framework/source/uielement/genericstatusbarcontroller.cxx b/framework/source/uielement/genericstatusbarcontroller.cxx index 2133045074c5..aab1150d7f21 100644 --- a/framework/source/uielement/genericstatusbarcontroller.cxx +++ b/framework/source/uielement/genericstatusbarcontroller.cxx @@ -160,7 +160,6 @@ throw ( RuntimeException, std::exception ) } } - } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/framework/source/uielement/generictoolbarcontroller.cxx b/framework/source/uielement/generictoolbarcontroller.cxx index 4e76152904db..ff6f23255361 100644 --- a/framework/source/uielement/generictoolbarcontroller.cxx +++ b/framework/source/uielement/generictoolbarcontroller.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "uielement/generictoolbarcontroller.hxx" #include <com/sun/star/util/URLTransformer.hpp> diff --git a/framework/source/uielement/headermenucontroller.cxx b/framework/source/uielement/headermenucontroller.cxx index 3ba2c31a8d0a..3fde88b62891 100644 --- a/framework/source/uielement/headermenucontroller.cxx +++ b/framework/source/uielement/headermenucontroller.cxx @@ -38,10 +38,8 @@ #include <rtl/ustrbuf.hxx> #include <osl/mutex.hxx> - // Defines - using namespace com::sun::star::uno; using namespace com::sun::star::lang; using namespace com::sun::star::frame; diff --git a/framework/source/uielement/imagebuttontoolbarcontroller.cxx b/framework/source/uielement/imagebuttontoolbarcontroller.cxx index 85d503893f55..8f32782e21a1 100644 --- a/framework/source/uielement/imagebuttontoolbarcontroller.cxx +++ b/framework/source/uielement/imagebuttontoolbarcontroller.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "uielement/imagebuttontoolbarcontroller.hxx" #include <framework/addonsoptions.hxx> @@ -60,8 +59,6 @@ namespace framework static uno::WeakReference< util::XMacroExpander > m_xMacroExpander; - - uno::Reference< util::XMacroExpander > GetMacroExpander() { uno::Reference< util::XMacroExpander > xMacroExpander( m_xMacroExpander ); @@ -96,8 +93,6 @@ static void SubstituteVariables( OUString& aURL ) } } - - ImageButtonToolbarController::ImageButtonToolbarController( const Reference< XComponentContext >& rxContext, const Reference< XFrame >& rFrame, @@ -114,14 +109,10 @@ ImageButtonToolbarController::ImageButtonToolbarController( m_pToolbar->SetItemImage( m_nID, aImage ); } - - ImageButtonToolbarController::~ImageButtonToolbarController() { } - - void SAL_CALL ImageButtonToolbarController::dispose() throw ( RuntimeException, std::exception ) { @@ -129,8 +120,6 @@ throw ( RuntimeException, std::exception ) ComplexToolbarController::dispose(); } - - void ImageButtonToolbarController::executeControlCommand( const ::com::sun::star::frame::ControlCommand& rControlCommand ) { SolarMutexGuard aSolarMutexGuard; diff --git a/framework/source/uielement/langselectionmenucontroller.cxx b/framework/source/uielement/langselectionmenucontroller.cxx index 1dea200e3f9a..2257e2a49a56 100644 --- a/framework/source/uielement/langselectionmenucontroller.cxx +++ b/framework/source/uielement/langselectionmenucontroller.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <uielement/langselectionmenucontroller.hxx> #include "services.h" @@ -51,7 +50,6 @@ #include <map> #include <set> - // Defines using namespace ::com::sun::star; @@ -61,7 +59,6 @@ using namespace com::sun::star::frame; using namespace com::sun::star::beans; using namespace com::sun::star::util; - namespace framework { @@ -277,7 +274,6 @@ void LanguageSelectionMenuController::fillPopupMenu( Reference< css::awt::XPopup pPopupMenu->SetItemCommand( nItemId, aCmd_Dialog ); } - void SAL_CALL LanguageSelectionMenuController::updatePopupMenu() throw ( ::com::sun::star::uno::RuntimeException, std::exception ) { svt::PopupMenuControllerBase::updatePopupMenu(); diff --git a/framework/source/uielement/langselectionstatusbarcontroller.cxx b/framework/source/uielement/langselectionstatusbarcontroller.cxx index cae7756f0276..a8b4f000f29f 100644 --- a/framework/source/uielement/langselectionstatusbarcontroller.cxx +++ b/framework/source/uielement/langselectionstatusbarcontroller.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <classes/fwkresid.hxx> #include <services.h> #include <classes/resource.hrc> @@ -121,7 +120,6 @@ private: LangSelectionStatusbarController(LangSelectionStatusbarController &); // not defined void operator =(LangSelectionStatusbarController &); // not defined - sal_Bool m_bShowMenu; // if the menu is to be displayed or not (depending on the selected object/text) sal_Int16 m_nScriptType; // the flags for the different script types available in the selection, LATIN = 0x0001, ASIAN = 0x0002, COMPLEX = 0x0004 OUString m_aCurLang; // the language of the current selection, "*" if there are more than one languages @@ -229,7 +227,6 @@ throw (css::uno::RuntimeException) xPopupMenu->insertItem( MID_LANG_PARA_STRING, FWK_RESSTR(STR_SET_LANGUAGE_FOR_PARAGRAPH), 0, MID_LANG_PARA_STRING ); xPopupMenu->setPopupMenu( MID_LANG_PARA_STRING, subPopupMenu ); - // now display the popup menu and execute every command ... Reference< awt::XWindowPeer > xParent( m_xParentWindow, UNO_QUERY ); diff --git a/framework/source/uielement/macrosmenucontroller.cxx b/framework/source/uielement/macrosmenucontroller.cxx index ed33743c3236..5138b9c797f8 100644 --- a/framework/source/uielement/macrosmenucontroller.cxx +++ b/framework/source/uielement/macrosmenucontroller.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <uielement/macrosmenucontroller.hxx> #include <uielement/menubarmanager.hxx> #include "services.h" @@ -139,7 +138,6 @@ void MacrosMenuController::impl_select(const Reference< XDispatch >& /*_xDispatc } } - IMPL_STATIC_LINK_NOINSTANCE( MacrosMenuController, ExecuteHdl_Impl, ExecuteInfo*, pExecuteInfo ) { try diff --git a/framework/source/uielement/menubarmanager.cxx b/framework/source/uielement/menubarmanager.cxx index 28aba5a5b385..e01bc9b31966 100644 --- a/framework/source/uielement/menubarmanager.cxx +++ b/framework/source/uielement/menubarmanager.cxx @@ -240,19 +240,16 @@ Any SAL_CALL MenuBarManager::queryInterface( const Type & rType ) throw ( Runtim return OWeakObject::queryInterface( rType ); } - void SAL_CALL MenuBarManager::acquire() throw() { OWeakObject::acquire(); } - void SAL_CALL MenuBarManager::release() throw() { OWeakObject::release(); } - Any SAL_CALL MenuBarManager::getMenuHandle( const Sequence< sal_Int8 >& /*ProcessId*/, sal_Int16 SystemType ) throw (RuntimeException, std::exception) { SolarMutexGuard aSolarGuard; @@ -708,7 +705,6 @@ void SAL_CALL MenuBarManager::disposing( const EventObject& Source ) throw ( Run m_xModuleImageManager.clear(); } - void MenuBarManager::CheckAndAddMenuExtension( Menu* pMenu ) { @@ -745,10 +741,8 @@ static void lcl_CheckForChildren(Menu* pMenu, sal_uInt16 nItemId) pMenu->EnableItem( nItemId, pThisPopup->GetItemCount() ? true : false ); } - // vcl handler - namespace { class QuietInteractionContext: @@ -976,7 +970,6 @@ IMPL_LINK( MenuBarManager, Activate, Menu *, pMenu ) return 1; } - IMPL_LINK( MenuBarManager, Deactivate, Menu *, pMenu ) { if ( pMenu == m_pVCLMenu ) @@ -1083,7 +1076,6 @@ IMPL_LINK( MenuBarManager, Select, Menu *, pMenu ) return 1; } - IMPL_LINK_NOARG(MenuBarManager, Highlight) { return 0; @@ -1137,7 +1129,6 @@ OUString MenuBarManager::RetrieveLabelFromCommand(const OUString& rCmdURL) return framework::RetrieveLabelFromCommand(rCmdURL, m_xContext, m_xUICommandLabels,m_xFrame,m_aModuleIdentifier,m_bModuleIdentified,"Label"); } - sal_Bool MenuBarManager::CreatePopupMenuController( MenuItemHandler* pMenuItemHandler ) { OUString aItemCommand( pMenuItemHandler->aMenuItemURL ); diff --git a/framework/source/uielement/menubarmerger.cxx b/framework/source/uielement/menubarmerger.cxx index 5083eb7e313e..8efee13f5f53 100644 --- a/framework/source/uielement/menubarmerger.cxx +++ b/framework/source/uielement/menubarmerger.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <uielement/menubarmerger.hxx> #include <framework/addonsoptions.hxx> @@ -33,7 +32,6 @@ static const char MERGECOMMAND_REMOVE[] = "Remove"; static const char MERGEFALLBACK_ADDPATH[] = "AddPath"; static const char MERGEFALLBACK_IGNORE[] = "Ignore"; - namespace framework { diff --git a/framework/source/uielement/menubarwrapper.cxx b/framework/source/uielement/menubarwrapper.cxx index 0261f6139899..66d3bb4c8d6f 100644 --- a/framework/source/uielement/menubarwrapper.cxx +++ b/framework/source/uielement/menubarwrapper.cxx @@ -236,7 +236,6 @@ void MenuBarWrapper::impl_fillNewData() pMenuBarManager->SetItemContainer( m_xConfigData ); } - void MenuBarWrapper::fillPopupControllerCache() { if ( m_bRefreshPopupControllerCache ) diff --git a/framework/source/uielement/newmenucontroller.cxx b/framework/source/uielement/newmenucontroller.cxx index 20f3260a3528..58e838cca1d1 100644 --- a/framework/source/uielement/newmenucontroller.cxx +++ b/framework/source/uielement/newmenucontroller.cxx @@ -45,10 +45,8 @@ #include <unotools/moduleoptions.hxx> #include <osl/mutex.hxx> - // Defines - using namespace com::sun::star::uno; using namespace com::sun::star::lang; using namespace com::sun::star::frame; diff --git a/framework/source/uielement/spinfieldtoolbarcontroller.cxx b/framework/source/uielement/spinfieldtoolbarcontroller.cxx index 4332ab363a52..093a082ebf91 100644 --- a/framework/source/uielement/spinfieldtoolbarcontroller.cxx +++ b/framework/source/uielement/spinfieldtoolbarcontroller.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <stdio.h> #include <wchar.h> @@ -51,8 +50,6 @@ using namespace ::com::sun::star::util; namespace framework { - - // Wrapper class to notify controller about events from combobox. // Unfortunaltly the events are notifed through virtual methods instead // of Listeners. @@ -171,8 +168,6 @@ bool SpinfieldControl::PreNotify( NotifyEvent& rNEvt ) return nRet; } - - SpinfieldToolbarController::SpinfieldToolbarController( const Reference< XComponentContext >& rxContext, const Reference< XFrame >& rFrame, @@ -201,14 +196,10 @@ SpinfieldToolbarController::SpinfieldToolbarController( m_pToolbar->SetItemWindow( m_nID, m_pSpinfieldControl ); } - - SpinfieldToolbarController::~SpinfieldToolbarController() { } - - void SAL_CALL SpinfieldToolbarController::dispose() throw ( RuntimeException, std::exception ) { @@ -222,7 +213,6 @@ throw ( RuntimeException, std::exception ) m_pSpinfieldControl = 0; } - Sequence<PropertyValue> SpinfieldToolbarController::getExecuteArgs(sal_Int16 KeyModifier) const { Sequence<PropertyValue> aArgs( 2 ); @@ -239,8 +229,6 @@ Sequence<PropertyValue> SpinfieldToolbarController::getExecuteArgs(sal_Int16 Key return aArgs; } - - void SpinfieldToolbarController::Up() { double nValue = m_nValue + m_nStep; @@ -336,8 +324,6 @@ bool SpinfieldToolbarController::PreNotify( NotifyEvent& rNEvt ) return false; } - - void SpinfieldToolbarController::executeControlCommand( const ::com::sun::star::frame::ControlCommand& rControlCommand ) { OUString aValue; diff --git a/framework/source/uielement/statusbarmerger.cxx b/framework/source/uielement/statusbarmerger.cxx index f62af3e51e35..4e7b9c7893f0 100644 --- a/framework/source/uielement/statusbarmerger.cxx +++ b/framework/source/uielement/statusbarmerger.cxx @@ -48,7 +48,6 @@ static const char MERGEFALLBACK_ADDLAST[] = "AddLast"; static const char MERGEFALLBACK_ADDFIRST[] = "AddFirst"; static const char MERGEFALLBACK_IGNORE[] = "Ignore"; - static void lcl_ConvertSequenceToValues( const Sequence< PropertyValue > &rSequence, AddonStatusbarItem &rItem ) @@ -254,7 +253,6 @@ bool StatusbarMerger::ProcessMergeFallback( return false; } - } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/framework/source/uielement/statusbarwrapper.cxx b/framework/source/uielement/statusbarwrapper.cxx index 2ebf4cd4982e..980ef49b3460 100644 --- a/framework/source/uielement/statusbarwrapper.cxx +++ b/framework/source/uielement/statusbarwrapper.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <uielement/statusbarwrapper.hxx> #include <framework/actiontriggerhelper.hxx> diff --git a/framework/source/uielement/statusindicatorinterfacewrapper.cxx b/framework/source/uielement/statusindicatorinterfacewrapper.cxx index 3bf2126e8c64..4c107009b189 100644 --- a/framework/source/uielement/statusindicatorinterfacewrapper.cxx +++ b/framework/source/uielement/statusindicatorinterfacewrapper.cxx @@ -31,7 +31,6 @@ using namespace com::sun::star::beans; namespace framework { - StatusIndicatorInterfaceWrapper::StatusIndicatorInterfaceWrapper( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent >& rStatusIndicatorImpl ) : m_xStatusIndicatorImpl( rStatusIndicatorImpl ) @@ -42,7 +41,6 @@ StatusIndicatorInterfaceWrapper::~StatusIndicatorInterfaceWrapper() { } - void SAL_CALL StatusIndicatorInterfaceWrapper::start( const OUString& sText, sal_Int32 nRange ) diff --git a/framework/source/uielement/togglebuttontoolbarcontroller.cxx b/framework/source/uielement/togglebuttontoolbarcontroller.cxx index c5b35ed9c737..5d73812ab615 100644 --- a/framework/source/uielement/togglebuttontoolbarcontroller.cxx +++ b/framework/source/uielement/togglebuttontoolbarcontroller.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "uielement/togglebuttontoolbarcontroller.hxx" #include <framework/addonsoptions.hxx> @@ -54,8 +53,6 @@ using namespace ::com::sun::star::util; namespace framework { - - ToggleButtonToolbarController::ToggleButtonToolbarController( const Reference< XComponentContext >& rxContext, const Reference< XFrame >& rFrame, @@ -72,14 +69,10 @@ ToggleButtonToolbarController::ToggleButtonToolbarController( m_pToolbar->SetItemBits( m_nID, TIB_DROPDOWN | m_pToolbar->GetItemBits( m_nID ) ); } - - ToggleButtonToolbarController::~ToggleButtonToolbarController() { } - - void SAL_CALL ToggleButtonToolbarController::dispose() throw ( RuntimeException, std::exception ) { @@ -87,7 +80,6 @@ throw ( RuntimeException, std::exception ) ComplexToolbarController::dispose(); } - Sequence<PropertyValue> ToggleButtonToolbarController::getExecuteArgs(sal_Int16 KeyModifier) const { Sequence<PropertyValue> aArgs( 2 ); @@ -100,8 +92,6 @@ Sequence<PropertyValue> ToggleButtonToolbarController::getExecuteArgs(sal_Int16 return aArgs; } - - uno::Reference< awt::XWindow > SAL_CALL ToggleButtonToolbarController::createPopupWindow() throw (::com::sun::star::uno::RuntimeException, std::exception) { @@ -133,8 +123,6 @@ throw (::com::sun::star::uno::RuntimeException, std::exception) return xWindow; } - - void ToggleButtonToolbarController::executeControlCommand( const ::com::sun::star::frame::ControlCommand& rControlCommand ) { SolarMutexGuard aSolarMutexGuard; diff --git a/framework/source/uielement/toolbarmanager.cxx b/framework/source/uielement/toolbarmanager.cxx index 3bb11f6458ce..ddef60f31805 100644 --- a/framework/source/uielement/toolbarmanager.cxx +++ b/framework/source/uielement/toolbarmanager.cxx @@ -74,11 +74,8 @@ #include <boost/bind.hpp> #include <svtools/acceleratorexecute.hxx> - // namespaces - - using namespace ::com::sun::star::awt; using namespace ::com::sun::star::beans; using namespace ::com::sun::star::uno; @@ -143,8 +140,6 @@ throw ( RuntimeException, std::exception ) m_xReceiver->statusChanged( Event ); } - - static sal_Int16 getImageTypeFromBools( sal_Bool bBig ) { sal_Int16 n( 0 ); @@ -177,10 +172,8 @@ static ::com::sun::star::uno::Reference< ::com::sun::star::frame::XLayoutManager return xLayoutManager; } - // XInterface, XTypeProvider, XServiceInfo - ToolBarManager::ToolBarManager( const Reference< XComponentContext >& rxContext, const Reference< XFrame >& rFrame, const OUString& rResourceName, @@ -475,7 +468,6 @@ void ToolBarManager::UpdateController( ::com::sun::star::uno::Reference< ::com:: { } - } m_bUpdateControllers = false; } @@ -750,7 +742,6 @@ void ToolBarManager::RemoveControllers() m_aSubToolBarControllerMap.clear(); - // i90033 // Remove item window pointers from the toolbar. They were // destroyed by the dispose() at the XComponent. This is needed @@ -2258,6 +2249,4 @@ bool ToolBarManager::RetrieveShortcut( const OUString& rCommandURL, OUString& rS } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/framework/source/uielement/toolbarmerger.cxx b/framework/source/uielement/toolbarmerger.cxx index 4b860e39153a..12f3a531123b 100644 --- a/framework/source/uielement/toolbarmerger.cxx +++ b/framework/source/uielement/toolbarmerger.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <uielement/toolbarmerger.hxx> #include <uielement/generictoolbarcontroller.hxx> #include <framework/imageproducer.hxx> diff --git a/framework/source/uielement/toolbarsmenucontroller.cxx b/framework/source/uielement/toolbarsmenucontroller.cxx index e45e5c2c87a9..73f1e3460793 100644 --- a/framework/source/uielement/toolbarsmenucontroller.cxx +++ b/framework/source/uielement/toolbarsmenucontroller.cxx @@ -55,10 +55,8 @@ #include <unotools/cmdoptions.hxx> #include <svtools/miscopt.hxx> - // Defines - using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::lang; diff --git a/framework/source/uielement/uicommanddescription.cxx b/framework/source/uielement/uicommanddescription.cxx index de2db99c284f..ee4360345c46 100644 --- a/framework/source/uielement/uicommanddescription.cxx +++ b/framework/source/uielement/uicommanddescription.cxx @@ -46,10 +46,8 @@ using namespace com::sun::star::configuration; using namespace com::sun::star::container; using namespace ::com::sun::star::frame; - // Namespace - struct ModuleToCommands { const char* pModuleId; @@ -78,10 +76,8 @@ const sal_Int32 COMMAND_PROPERTY_MIRROR = 4; namespace framework { - // Configuration access class for PopupMenuControllerFactory implementation - class ConfigurationAccess_UICommand : // Order is necessary for right initialization! public ::cppu::WeakImplHelper2<XNameAccess,XContainerListener> { @@ -179,7 +175,6 @@ class ConfigurationAccess_UICommand : // Order is necessary for right initializa sal_Bool m_bGenericDataRetrieved; }; - // XInterface, XTypeProvider ConfigurationAccess_UICommand::ConfigurationAccess_UICommand( const OUString& aModuleName, const Reference< XNameAccess >& rGenericUICommands, const Reference< XComponentContext>& rxContext ) : @@ -219,7 +214,6 @@ ConfigurationAccess_UICommand::~ConfigurationAccess_UICommand() xContainer->removeContainerListener(m_xConfigAccessListener); } - // XNameAccess Any SAL_CALL ConfigurationAccess_UICommand::getByNameImpl( const OUString& rCommandURL ) { diff --git a/framework/source/uifactory/factoryconfiguration.cxx b/framework/source/uifactory/factoryconfiguration.cxx index 0b2c2b1be14d..6836b3a82477 100644 --- a/framework/source/uifactory/factoryconfiguration.cxx +++ b/framework/source/uifactory/factoryconfiguration.cxx @@ -32,7 +32,6 @@ #include <rtl/ustrbuf.hxx> #include <cppuhelper/weak.hxx> - // Defines using namespace com::sun::star; @@ -41,10 +40,8 @@ using namespace com::sun::star::lang; using namespace com::sun::star::beans; using namespace com::sun::star::container; - // Namespace - namespace framework { OUString getHashKeyFromStrings( const OUString& aCommandURL, const OUString& aModuleName ) @@ -55,7 +52,6 @@ OUString getHashKeyFromStrings( const OUString& aCommandURL, const OUString& aMo return aKey.makeStringAndClear(); } - // XInterface, XTypeProvider ConfigurationAccess_ControllerFactory::ConfigurationAccess_ControllerFactory( const Reference< XComponentContext >& rxContext, const OUString& _sRoot,bool _bAskValue ) : @@ -117,7 +113,6 @@ OUString ConfigurationAccess_ControllerFactory::getValueFromCommandModule( const return OUString(); } - void ConfigurationAccess_ControllerFactory::addServiceToCommandModule( const OUString& rCommandURL, const OUString& rModule, diff --git a/framework/source/uifactory/uielementfactorymanager.cxx b/framework/source/uifactory/uielementfactorymanager.cxx index 871bccae8325..0cc8e9689cd2 100644 --- a/framework/source/uifactory/uielementfactorymanager.cxx +++ b/framework/source/uifactory/uielementfactorymanager.cxx @@ -64,7 +64,6 @@ static OUString getHashKeyFromStrings( const OUString& aType, const OUString& aN return aKey.makeStringAndClear(); } - ConfigurationAccess_FactoryManager::ConfigurationAccess_FactoryManager( const Reference< XComponentContext >& rxContext, const OUString& _sRoot ) : m_aPropType( "Type" ), m_aPropName( "Name" ), @@ -136,7 +135,6 @@ void ConfigurationAccess_FactoryManager::addFactorySpecifierToTypeNameModule( co m_aFactoryManagerMap.insert( FactoryManagerMap::value_type( aHashKey, rServiceSpecifier )); } - void ConfigurationAccess_FactoryManager::removeFactorySpecifierFromTypeNameModule( const OUString& rType, const OUString& rName, const OUString& rModule ) { // SAFE diff --git a/framework/source/xml/acceleratorconfigurationreader.cxx b/framework/source/xml/acceleratorconfigurationreader.cxx index a123265d824f..3759c82d44ac 100644 --- a/framework/source/xml/acceleratorconfigurationreader.cxx +++ b/framework/source/xml/acceleratorconfigurationreader.cxx @@ -30,10 +30,8 @@ #include <vcl/svapp.hxx> #include <rtl/ustrbuf.hxx> - namespace framework{ - /* Throws a SaxException in case a wrong formated XML structure was detected. @@ -56,7 +54,6 @@ namespace framework{ css::uno::Any()); \ } - AcceleratorConfigurationReader::AcceleratorConfigurationReader(AcceleratorCache& rContainer) : m_rContainer (rContainer ) , m_bInsideAcceleratorList(sal_False ) @@ -64,19 +61,16 @@ AcceleratorConfigurationReader::AcceleratorConfigurationReader(AcceleratorCache& { } - AcceleratorConfigurationReader::~AcceleratorConfigurationReader() { } - void SAL_CALL AcceleratorConfigurationReader::startDocument() throw(css::xml::sax::SAXException, css::uno::RuntimeException, std::exception ) { } - void SAL_CALL AcceleratorConfigurationReader::endDocument() throw(css::xml::sax::SAXException, css::uno::RuntimeException, std::exception ) @@ -93,7 +87,6 @@ void SAL_CALL AcceleratorConfigurationReader::endDocument() } } - void SAL_CALL AcceleratorConfigurationReader::startElement(const OUString& sElement , const css::uno::Reference< css::xml::sax::XAttributeList >& xAttributeList) throw(css::xml::sax::SAXException, @@ -185,7 +178,6 @@ void SAL_CALL AcceleratorConfigurationReader::startElement(const OUString& } } - void SAL_CALL AcceleratorConfigurationReader::endElement(const OUString& sElement) throw(css::xml::sax::SAXException, css::uno::RuntimeException, std::exception ) @@ -209,21 +201,18 @@ void SAL_CALL AcceleratorConfigurationReader::endElement(const OUString& sElemen } } - void SAL_CALL AcceleratorConfigurationReader::characters(const OUString&) throw(css::xml::sax::SAXException, css::uno::RuntimeException, std::exception ) { } - void SAL_CALL AcceleratorConfigurationReader::ignorableWhitespace(const OUString&) throw(css::xml::sax::SAXException, css::uno::RuntimeException, std::exception ) { } - void SAL_CALL AcceleratorConfigurationReader::processingInstruction(const OUString& /*sTarget*/, const OUString& /*sData*/ ) throw(css::xml::sax::SAXException, @@ -231,7 +220,6 @@ void SAL_CALL AcceleratorConfigurationReader::processingInstruction(const OUStri { } - void SAL_CALL AcceleratorConfigurationReader::setDocumentLocator(const css::uno::Reference< css::xml::sax::XLocator >& xLocator) throw(css::xml::sax::SAXException, css::uno::RuntimeException, std::exception ) @@ -239,7 +227,6 @@ void SAL_CALL AcceleratorConfigurationReader::setDocumentLocator(const css::uno: m_xLocator = xLocator; } - AcceleratorConfigurationReader::EXMLElement AcceleratorConfigurationReader::implst_classifyElement(const OUString& sElement) { AcceleratorConfigurationReader::EXMLElement eElement; @@ -256,7 +243,6 @@ AcceleratorConfigurationReader::EXMLElement AcceleratorConfigurationReader::impl return eElement; } - AcceleratorConfigurationReader::EXMLAttribute AcceleratorConfigurationReader::implst_classifyAttribute(const OUString& sAttribute) { AcceleratorConfigurationReader::EXMLAttribute eAttribute; @@ -281,7 +267,6 @@ AcceleratorConfigurationReader::EXMLAttribute AcceleratorConfigurationReader::im return eAttribute; } - OUString AcceleratorConfigurationReader::implts_getErrorLineString() { if (!m_xLocator.is()) diff --git a/framework/source/xml/acceleratorconfigurationwriter.cxx b/framework/source/xml/acceleratorconfigurationwriter.cxx index c495c29053a9..53dccc5978f8 100644 --- a/framework/source/xml/acceleratorconfigurationwriter.cxx +++ b/framework/source/xml/acceleratorconfigurationwriter.cxx @@ -30,11 +30,8 @@ #include <comphelper/attributelist.hxx> - namespace framework{ - - AcceleratorConfigurationWriter::AcceleratorConfigurationWriter(const AcceleratorCache& rContainer, const css::uno::Reference< css::xml::sax::XDocumentHandler >& xConfig ) : m_xConfig (xConfig ) @@ -42,12 +39,10 @@ AcceleratorConfigurationWriter::AcceleratorConfigurationWriter(const Accelerator { } - AcceleratorConfigurationWriter::~AcceleratorConfigurationWriter() { } - void AcceleratorConfigurationWriter::flush() { css::uno::Reference< css::xml::sax::XExtendedDocumentHandler > xExtendedCFG(m_xConfig, css::uno::UNO_QUERY_THROW); @@ -92,7 +87,6 @@ void AcceleratorConfigurationWriter::flush() xExtendedCFG->endDocument(); } - void AcceleratorConfigurationWriter::impl_ts_writeKeyCommandPair(const css::awt::KeyEvent& aKey , const OUString& sCommand, const css::uno::Reference< css::xml::sax::XDocumentHandler >& xConfig ) diff --git a/framework/source/xml/imagesconfiguration.cxx b/framework/source/xml/imagesconfiguration.cxx index 31bd8e6df753..e13b7adc79c2 100644 --- a/framework/source/xml/imagesconfiguration.cxx +++ b/framework/source/xml/imagesconfiguration.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <xml/imagesconfiguration.hxx> #include <services.h> @@ -38,7 +37,6 @@ using namespace ::com::sun::star::xml::sax; using namespace ::com::sun::star::lang; using namespace ::com::sun::star::io; - namespace framework { diff --git a/framework/source/xml/imagesdocumenthandler.cxx b/framework/source/xml/imagesdocumenthandler.cxx index 79bb0b6db6eb..2c8fb17d41c0 100644 --- a/framework/source/xml/imagesdocumenthandler.cxx +++ b/framework/source/xml/imagesdocumenthandler.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <stdio.h> #include <xml/imagesdocumenthandler.hxx> @@ -99,7 +98,6 @@ ImageXMLEntryProperty ImagesEntries[OReadImagesDocumentHandler::IMG_XML_ENTRY_CO { OReadImagesDocumentHandler::IMG_NS_IMAGE, ATTRIBUTE_HIGHCONTRASTMASKURL } }; - OReadImagesDocumentHandler::OReadImagesDocumentHandler( ImageListsDescriptor& aItems ) : m_aImageList( aItems ), m_pImages( 0 ), @@ -595,11 +593,8 @@ OUString OReadImagesDocumentHandler::getErrorLineString() return OUString(); } - - // OWriteImagesDocumentHandler - OWriteImagesDocumentHandler::OWriteImagesDocumentHandler( const ImageListsDescriptor& aItems, Reference< XDocumentHandler > rWriteDocumentHandler ) : @@ -670,10 +665,8 @@ void OWriteImagesDocumentHandler::WriteImagesDocument() throw m_xWriteDocumentHandler->endDocument(); } - // protected member functions - void OWriteImagesDocumentHandler::WriteImageList( const ImageListItemDescriptor* pImageList ) throw ( SAXException, RuntimeException ) { @@ -816,7 +809,4 @@ void OWriteImagesDocumentHandler::WriteExternalImage( const ExternalImageItemDes } // namespace framework - - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |