diff options
Diffstat (limited to 'include/unotools')
| -rw-r--r-- | include/unotools/accessiblerelationsethelper.hxx | 29 | ||||
| -rw-r--r-- | include/unotools/accessiblestatesethelper.hxx | 30 | ||||
| -rw-r--r-- | include/unotools/caserotate.hxx | 4 | ||||
| -rw-r--r-- | include/unotools/cmdoptions.hxx | 117 | ||||
| -rw-r--r-- | include/unotools/defaultoptions.hxx | 3 | ||||
| -rw-r--r-- | include/unotools/docinfohelper.hxx | 3 | ||||
| -rw-r--r-- | include/unotools/progresshandlerwrap.hxx | 19 | ||||
| -rw-r--r-- | include/unotools/unotoolsdllapi.h | 4 |
8 files changed, 105 insertions, 104 deletions
diff --git a/include/unotools/accessiblerelationsethelper.hxx b/include/unotools/accessiblerelationsethelper.hxx index b4edb6b95159..b3ab5b0e4b27 100644 --- a/include/unotools/accessiblerelationsethelper.hxx +++ b/include/unotools/accessiblerelationsethelper.hxx @@ -32,22 +32,22 @@ //... namespace utl ....................................................... namespace utl { - /** @descr This base class provides an implementation of the <code>AccessibleRelationSet</code> service. */ class UNOTOOLS_DLLPUBLIC AccessibleRelationSetHelper final - : public cppu::WeakImplHelper< css::accessibility::XAccessibleRelationSet > + : public cppu::WeakImplHelper<css::accessibility::XAccessibleRelationSet> { public: //===== internal ======================================================== - AccessibleRelationSetHelper (); - AccessibleRelationSetHelper (const AccessibleRelationSetHelper& rHelper); + AccessibleRelationSetHelper(); + AccessibleRelationSetHelper(const AccessibleRelationSetHelper& rHelper); + private: virtual ~AccessibleRelationSetHelper() override; -public: +public: //===== XAccessibleRelationSet ========================================== /** Returns the number of relations in this relation set. @@ -55,7 +55,7 @@ public: @return Returns the number of relations or zero if there are none. */ - virtual sal_Int32 SAL_CALL getRelationCount( ) override; + virtual sal_Int32 SAL_CALL getRelationCount() override; /** Returns the relation of this relation set that is specified by the given index. @@ -70,8 +70,7 @@ public: has the type INVALID. */ - virtual css::accessibility::AccessibleRelation SAL_CALL - getRelation( sal_Int32 nIndex ) override; + virtual css::accessibility::AccessibleRelation SAL_CALL getRelation(sal_Int32 nIndex) override; /** Tests whether the relation set contains a relation matching the specified key. @@ -85,7 +84,7 @@ public: Returns <TRUE/> if there is a (at least one) relation of the given type and <FALSE/> if there is no such relation in the set. */ - virtual sal_Bool SAL_CALL containsRelation( sal_Int16 aRelationType ) override; + virtual sal_Bool SAL_CALL containsRelation(sal_Int16 aRelationType) override; /** Retrieve and return the relation with the given relation type. @@ -99,23 +98,20 @@ public: type INVALID is returned. */ virtual css::accessibility::AccessibleRelation SAL_CALL - getRelationByType( sal_Int16 aRelationType ) override; + getRelationByType(sal_Int16 aRelationType) override; /// @throws uno::RuntimeException - void AddRelation( - const css::accessibility::AccessibleRelation& rRelation); + void AddRelation(const css::accessibility::AccessibleRelation& rRelation); //===== XTypeProvider =================================================== /** Returns a sequence of all supported interfaces. */ - virtual css::uno::Sequence< css::uno::Type> SAL_CALL - getTypes() override; + virtual css::uno::Sequence<css::uno::Type> SAL_CALL getTypes() override; /** Returns an implementation id. */ - virtual css::uno::Sequence<sal_Int8> SAL_CALL - getImplementationId() override; + virtual css::uno::Sequence<sal_Int8> SAL_CALL getImplementationId() override; private: /// Mutex guarding this object. @@ -123,7 +119,6 @@ private: /// The implementation of this helper interface. std::vector<css::accessibility::AccessibleRelation> maRelations; }; - } //... namespace utl ....................................................... #endif diff --git a/include/unotools/accessiblestatesethelper.hxx b/include/unotools/accessiblestatesethelper.hxx index b772a54af603..6fa66279f885 100644 --- a/include/unotools/accessiblestatesethelper.hxx +++ b/include/unotools/accessiblestatesethelper.hxx @@ -30,18 +30,17 @@ //... namespace utl ....................................................... namespace utl { - /** @descr This base class provides an implementation of the <code>AccessibleStateSet</code> service. */ class UNOTOOLS_DLLPUBLIC AccessibleStateSetHelper final - : public cppu::WeakImplHelper< css::accessibility::XAccessibleStateSet > + : public cppu::WeakImplHelper<css::accessibility::XAccessibleStateSet> { public: //===== internal ======================================================== - AccessibleStateSetHelper (); + AccessibleStateSetHelper(); /** constructs an object with some states initially set <p>This ctor is compatible with @@ -51,13 +50,14 @@ public: is a bit mask. Every bit 2^n means that the state number n (as got from the AccessibleStateType constants) should be set initially. */ - AccessibleStateSetHelper ( const sal_Int64 _nInitialStates ); + AccessibleStateSetHelper(const sal_Int64 _nInitialStates); + + AccessibleStateSetHelper(const AccessibleStateSetHelper& rHelper); - AccessibleStateSetHelper ( const AccessibleStateSetHelper& rHelper ); private: virtual ~AccessibleStateSetHelper() override; -public: +public: //===== XAccessibleStateSet ============================================== /** Checks whether the current state set is empty. @@ -66,7 +66,7 @@ public: Returns <TRUE/> if there is no state in this state set and <FALSE/> if there is at least one state set in it. */ - virtual sal_Bool SAL_CALL isEmpty () override; + virtual sal_Bool SAL_CALL isEmpty() override; /** Checks if the given state is a member of the state set of this object. @@ -79,7 +79,7 @@ public: Returns <TRUE/> if the given state is a member of this object's state set and <FALSE/> otherwise. */ - virtual sal_Bool SAL_CALL contains (sal_Int16 aState) override; + virtual sal_Bool SAL_CALL contains(sal_Int16 aState) override; /** Checks if all of the given states are in this object's state set. @@ -96,8 +96,7 @@ public: one of the states in the given state is not a member of this object's state set. */ - virtual sal_Bool SAL_CALL containsAll ( - const css::uno::Sequence<sal_Int16>& rStateSet) override; + virtual sal_Bool SAL_CALL containsAll(const css::uno::Sequence<sal_Int16>& rStateSet) override; /** Returns a sequence of all states. */ @@ -107,25 +106,23 @@ public: @throws css::uno::RuntimeException */ - void AddState(sal_Int16 aState); + void AddState(sal_Int16 aState); /** Removes a state from the set if the set contains the state, otherwise nothing is done. @throws css::uno::RuntimeException */ - void RemoveState(sal_Int16 aState); + void RemoveState(sal_Int16 aState); //===== XTypeProvider =================================================== /** Returns a sequence of all supported interfaces. */ - virtual css::uno::Sequence< css::uno::Type> SAL_CALL - getTypes() override; + virtual css::uno::Sequence<css::uno::Type> SAL_CALL getTypes() override; /** Returns an implementation id. */ - virtual css::uno::Sequence<sal_Int8> SAL_CALL - getImplementationId() override; + virtual css::uno::Sequence<sal_Int8> SAL_CALL getImplementationId() override; private: /// Mutex guarding this object. @@ -133,7 +130,6 @@ private: /// The implementation of this helper interface. sal_uInt64 maStates; }; - } //... namespace utl ....................................................... #endif diff --git a/include/unotools/caserotate.hxx b/include/unotools/caserotate.hxx index adc26a6eec8a..6e61785bedd7 100644 --- a/include/unotools/caserotate.hxx +++ b/include/unotools/caserotate.hxx @@ -21,8 +21,10 @@ class UNOTOOLS_DLLPUBLIC RotateTransliteration { private: int nF3ShiftCounter; + public: - RotateTransliteration() : nF3ShiftCounter(0) + RotateTransliteration() + : nF3ShiftCounter(0) { } TransliterationFlags getNextMode(); diff --git a/include/unotools/cmdoptions.hxx b/include/unotools/cmdoptions.hxx index 25bae43604fc..d0e6792ba8b9 100644 --- a/include/unotools/cmdoptions.hxx +++ b/include/unotools/cmdoptions.hxx @@ -25,22 +25,31 @@ #include <unotools/options.hxx> #include <memory> -namespace com::sun::star::uno { template <typename > class Reference; } +namespace com::sun::star::uno +{ +template <typename> class Reference; +} -namespace com::sun::star::frame { class XFrame; } -namespace osl { class Mutex; } +namespace com::sun::star::frame +{ +class XFrame; +} +namespace osl +{ +class Mutex; +} /*-************************************************************************************************************ @descr The method GetList() returns a list of property values. Use follow defines to separate values by names. -*//*-*************************************************************************************************************/ +**-***********************************************************************************************************/ /*-************************************************************************************************************ @short forward declaration to our private date container implementation @descr We use these class as internal member to support small memory requirements. You can create the container if it is necessary. The class which use these mechanism is faster and smaller then a complete implementation! -*//*-*************************************************************************************************************/ +**-***********************************************************************************************************/ class SvtCommandOptions_Impl; @@ -48,75 +57,73 @@ class SvtCommandOptions_Impl; @short collect information about dynamic menus @descr Make it possible to configure dynamic menu structures of menus like "new" or "wizard". @devstatus ready to use -*//*-*************************************************************************************************************/ +**-***********************************************************************************************************/ class SAL_WARN_UNUSED UNOTOOLS_DLLPUBLIC SvtCommandOptions final : public utl::detail::Options { friend class SvtCommandOptions_Impl; - public: - - enum CmdOption - { - CMDOPTION_DISABLED, - CMDOPTION_NONE - }; - - SvtCommandOptions(); - virtual ~SvtCommandOptions() override; +public: + enum CmdOption + { + CMDOPTION_DISABLED, + CMDOPTION_NONE + }; - /*-**************************************************************************************************** - @short return complete specified list - @descr Call it to get all entries of an dynamic menu. - We return a list of all nodes with its names and properties. - @param "eOption" select the list to retrieve. - @return A list of command strings is returned. + SvtCommandOptions(); + virtual ~SvtCommandOptions() override; - @onerror We return an empty list. - *//*-*****************************************************************************************************/ + /*-**************************************************************************************************** + @short return complete specified list + @descr Call it to get all entries of an dynamic menu. + We return a list of all nodes with its names and properties. + @param "eOption" select the list to retrieve. + @return A list of command strings is returned. - bool HasEntries( CmdOption eOption ) const; + @onerror We return an empty list. + **-***************************************************************************************************/ - /*-**************************************************************************************************** - @short Lookup if a command URL is inside a given list - @descr Lookup if a command URL is inside a given lst - @param "eOption" select right command list - @param "aCommandURL" a command URL that is used for the look up - @return "sal_True" if the command is inside the list otherwise "sal_False" - *//*-*****************************************************************************************************/ + bool HasEntries(CmdOption eOption) const; - bool Lookup( CmdOption eOption, const OUString& aCommandURL ) const; + /*-**************************************************************************************************** + @short Lookup if a command URL is inside a given list + @descr Lookup if a command URL is inside a given lst + @param "eOption" select right command list + @param "aCommandURL" a command URL that is used for the look up + @return "sal_True" if the command is inside the list otherwise "sal_False" + **-***************************************************************************************************/ - /*-**************************************************************************************************** - @short register an office frame, which must update its dispatches if - the underlying configuration was changed. + bool Lookup(CmdOption eOption, const OUString& aCommandURL) const; - @descr To avoid using of "dead" frame objects or implementing - deregistration mechanism too, we use weak references to - the given frames. + /*-**************************************************************************************************** + @short register an office frame, which must update its dispatches if + the underlying configuration was changed. - @param "xFrame" points to the frame, which wishes to be - notified, if configuration was changed. - *//*-*****************************************************************************************************/ + @descr To avoid using of "dead" frame objects or implementing + deregistration mechanism too, we use weak references to + the given frames. - void EstablishFrameCallback(const css::uno::Reference< css::frame::XFrame >& xFrame); + @param "xFrame" points to the frame, which wishes to be + notified, if configuration was changed. + **-***************************************************************************************************/ - private: + void EstablishFrameCallback(const css::uno::Reference<css::frame::XFrame>& xFrame); - /*-**************************************************************************************************** - @short return a reference to a static mutex - @descr These class is partially threadsafe (for de-/initialization only). - All access methods aren't safe! - We create a static mutex only for one ime and use at different times. - @return A reference to a static mutex member. - *//*-*****************************************************************************************************/ +private: + /*-**************************************************************************************************** + @short return a reference to a static mutex + @descr These class is partially threadsafe (for de-/initialization only). + All access methods aren't safe! + We create a static mutex only for one ime and use at different times. + @return A reference to a static mutex member. + **-***************************************************************************************************/ - UNOTOOLS_DLLPRIVATE static ::osl::Mutex& GetOwnStaticMutex(); + UNOTOOLS_DLLPRIVATE static ::osl::Mutex& GetOwnStaticMutex(); - private: - std::shared_ptr<SvtCommandOptions_Impl> m_pImpl; +private: + std::shared_ptr<SvtCommandOptions_Impl> m_pImpl; -}; // class SvtCmdOptions +}; // class SvtCmdOptions #endif // INCLUDED_UNOTOOLS_CMDOPTIONS_HXX diff --git a/include/unotools/defaultoptions.hxx b/include/unotools/defaultoptions.hxx index 8149361acc62..7d96f44f5034 100644 --- a/include/unotools/defaultoptions.hxx +++ b/include/unotools/defaultoptions.hxx @@ -32,11 +32,10 @@ private: std::shared_ptr<SvtDefaultOptions_Impl> pImpl; public: - SvtDefaultOptions(); virtual ~SvtDefaultOptions() override; - OUString GetDefaultPath( sal_uInt16 nId ) const; + OUString GetDefaultPath(sal_uInt16 nId) const; }; #endif // INCLUDED_UNOTOOLS_DEFAULTOPTIONS_HXX diff --git a/include/unotools/docinfohelper.hxx b/include/unotools/docinfohelper.hxx index 081bc3660c97..d6323cc9b9ad 100644 --- a/include/unotools/docinfohelper.hxx +++ b/include/unotools/docinfohelper.hxx @@ -28,9 +28,8 @@ class UNOTOOLS_DLLPUBLIC DocInfoHelper { public: static OUString GetGeneratorString(); - }; -} // namespace utl +} // namespace utl /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/unotools/progresshandlerwrap.hxx b/include/unotools/progresshandlerwrap.hxx index 3eac0e979840..207ba2af8c1b 100644 --- a/include/unotools/progresshandlerwrap.hxx +++ b/include/unotools/progresshandlerwrap.hxx @@ -25,25 +25,28 @@ #include <cppuhelper/implbase.hxx> #include <com/sun/star/ucb/XProgressHandler.hpp> -namespace com::sun::star::task { class XStatusIndicator; } +namespace com::sun::star::task +{ +class XStatusIndicator; +} namespace utl { - -class UNLESS_MERGELIBS(UNOTOOLS_DLLPUBLIC) ProgressHandlerWrap final : public ::cppu::WeakImplHelper< css::ucb::XProgressHandler > +class UNLESS_MERGELIBS(UNOTOOLS_DLLPUBLIC) ProgressHandlerWrap final + : public ::cppu::WeakImplHelper<css::ucb::XProgressHandler> { - css::uno::Reference< css::task::XStatusIndicator > m_xStatusIndicator; + css::uno::Reference<css::task::XStatusIndicator> m_xStatusIndicator; public: - ProgressHandlerWrap( css::uno::Reference< css::task::XStatusIndicator > const & xSI ); + ProgressHandlerWrap(css::uno::Reference<css::task::XStatusIndicator> const& xSI); // XProgressHandler - virtual void SAL_CALL push( const css::uno::Any& Status ) override; - virtual void SAL_CALL update( const css::uno::Any& Status ) override; + virtual void SAL_CALL push(const css::uno::Any& Status) override; + virtual void SAL_CALL update(const css::uno::Any& Status) override; virtual void SAL_CALL pop() override; }; -} // namespace utl +} // namespace utl #endif // INCLUDED_UNOTOOLS_PROGRESSHANDLERWRAP_HXX diff --git a/include/unotools/unotoolsdllapi.h b/include/unotools/unotoolsdllapi.h index 88f426b2fed3..86864b3f0df0 100644 --- a/include/unotools/unotoolsdllapi.h +++ b/include/unotools/unotoolsdllapi.h @@ -23,9 +23,9 @@ #include <sal/types.h> #if defined(UNOTOOLS_DLLIMPLEMENTATION) -#define UNOTOOLS_DLLPUBLIC SAL_DLLPUBLIC_EXPORT +#define UNOTOOLS_DLLPUBLIC SAL_DLLPUBLIC_EXPORT #else -#define UNOTOOLS_DLLPUBLIC SAL_DLLPUBLIC_IMPORT +#define UNOTOOLS_DLLPUBLIC SAL_DLLPUBLIC_IMPORT #endif #define UNOTOOLS_DLLPRIVATE SAL_DLLPRIVATE |