diff options
Diffstat (limited to 'framework/inc/helper')
| -rw-r--r-- | framework/inc/helper/dockingareadefaultacceptor.hxx | 10 | ||||
| -rw-r--r-- | framework/inc/helper/mischelper.hxx | 4 | ||||
| -rw-r--r-- | framework/inc/helper/ocomponentaccess.hxx | 15 | ||||
| -rw-r--r-- | framework/inc/helper/ocomponentenumeration.hxx | 15 | ||||
| -rw-r--r-- | framework/inc/helper/persistentwindowstate.hxx | 10 | ||||
| -rw-r--r-- | framework/inc/helper/statusindicator.hxx | 11 | ||||
| -rw-r--r-- | framework/inc/helper/statusindicatorfactory.hxx | 19 | ||||
| -rw-r--r-- | framework/inc/helper/tagwindowasmodified.hxx | 8 | ||||
| -rw-r--r-- | framework/inc/helper/titlebarupdate.hxx | 13 | ||||
| -rw-r--r-- | framework/inc/helper/uiconfigelementwrapperbase.hxx | 1 | ||||
| -rw-r--r-- | framework/inc/helper/uielementwrapperbase.hxx | 1 | ||||
| -rw-r--r-- | framework/inc/helper/vclstatusindicator.hxx | 4 | ||||
| -rw-r--r-- | framework/inc/helper/wakeupthread.hxx | 7 |
13 files changed, 0 insertions, 118 deletions
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: |