diff options
| author | Philipp Hofer <philipp.hofer@protonmail.com> | 2020-11-12 13:03:16 +0100 |
|---|---|---|
| committer | Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> | 2020-11-21 13:19:17 +0100 |
| commit | 01baeab99890e5650b3dabc15f8d900490a5a133 (patch) | |
| tree | 64a1b30b20a53262605312fff4d035876fc7c811 | |
| parent | 0108cd51faf942b3fc3a292522d4b2f421f1cf45 (diff) | |
tdf#123936 Formatting files in module include with clang-format
Change-Id: I0507dd797cd5a35e0ae14f4b69ee4e172d08a71a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105681
Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
Tested-by: Jenkins
313 files changed, 2345 insertions, 2632 deletions
diff --git a/include/LibreOfficeKit/LibreOfficeKitTypes.h b/include/LibreOfficeKit/LibreOfficeKitTypes.h index e12ddad19161..5f4e3d4d870f 100644 --- a/include/LibreOfficeKit/LibreOfficeKitTypes.h +++ b/include/LibreOfficeKit/LibreOfficeKitTypes.h @@ -13,8 +13,7 @@ #include <stddef.h> #ifdef __cplusplus -extern "C" -{ +extern "C" { #endif /** @see lok::Office::registerCallback(). diff --git a/include/apple_remote/RemoteMainController.h b/include/apple_remote/RemoteMainController.h index c4ee0ac6ed74..3d1951d31bde 100644 --- a/include/apple_remote/RemoteMainController.h +++ b/include/apple_remote/RemoteMainController.h @@ -42,15 +42,16 @@ //static void sendTheEvent( unichar, int ); -SAL_DLLPUBLIC_EXPORT @interface AppleRemoteMainController : NSObject { +SAL_DLLPUBLIC_EXPORT @interface AppleRemoteMainController : NSObject +{ @public // else remoteControl is not reachable from GetSalData()->mpMainController RemoteControl* remoteControl; @private MultiClickRemoteBehavior* remoteControlBehavior; } -- (RemoteControl*) remoteControl; -- (MultiClickRemoteBehavior*) remoteBehavior; +- (RemoteControl*)remoteControl; +- (MultiClickRemoteBehavior*)remoteBehavior; @end -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/avmedia/avmediadllapi.h b/include/avmedia/avmediadllapi.h index cca250a6e56b..abe4fb48c844 100644 --- a/include/avmedia/avmediadllapi.h +++ b/include/avmedia/avmediadllapi.h @@ -23,9 +23,9 @@ #include <sal/types.h> #if defined(AVMEDIA_DLLIMPLEMENTATION) -#define AVMEDIA_DLLPUBLIC SAL_DLLPUBLIC_EXPORT +#define AVMEDIA_DLLPUBLIC SAL_DLLPUBLIC_EXPORT #else -#define AVMEDIA_DLLPUBLIC SAL_DLLPUBLIC_IMPORT +#define AVMEDIA_DLLPUBLIC SAL_DLLPUBLIC_IMPORT #endif #define AVMEDIA_DLLPRIVATE SAL_DLLPRIVATE diff --git a/include/basegfx/basegfxdllapi.h b/include/basegfx/basegfxdllapi.h index 2aadbc3a4219..b1ef1709bc5e 100644 --- a/include/basegfx/basegfxdllapi.h +++ b/include/basegfx/basegfxdllapi.h @@ -40,5 +40,4 @@ #endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/basegfx/color/bcolortools.hxx b/include/basegfx/color/bcolortools.hxx index 5c16802cff4a..8af2b7c94715 100644 --- a/include/basegfx/color/bcolortools.hxx +++ b/include/basegfx/color/bcolortools.hxx @@ -21,11 +21,13 @@ #include <basegfx/basegfxdllapi.h> -namespace basegfx { class BColor; } +namespace basegfx +{ +class BColor; +} namespace basegfx::utils { - /// Transform from RGB to HSL BASEGFX_DLLPUBLIC BColor rgb2hsl(const BColor& rRGBColor); /// Transform from HSL to RGB diff --git a/include/basegfx/range/b2drectangle.hxx b/include/basegfx/range/b2drectangle.hxx index 9c1ad86c0f9e..ad8744b5dd5d 100644 --- a/include/basegfx/range/b2drectangle.hxx +++ b/include/basegfx/range/b2drectangle.hxx @@ -23,11 +23,11 @@ namespace basegfx { - // syntactic sugar: a B2DRange exactly models a Rectangle, thus, - // for interface clarity, we provide an alias name +// syntactic sugar: a B2DRange exactly models a Rectangle, thus, +// for interface clarity, we provide an alias name - /// Alias name for interface clarity (not everybody is aware of the identity) - typedef B2DRange B2DRectangle; +/// Alias name for interface clarity (not everybody is aware of the identity) +typedef B2DRange B2DRectangle; } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/basegfx/range/b2irectangle.hxx b/include/basegfx/range/b2irectangle.hxx index 2c6a932a2ede..6356fa6cf0a8 100644 --- a/include/basegfx/range/b2irectangle.hxx +++ b/include/basegfx/range/b2irectangle.hxx @@ -23,11 +23,11 @@ namespace basegfx { - // syntactic sugar: a B2IRange exactly models a Rectangle, thus, - // for interface clarity, we provide an alias name +// syntactic sugar: a B2IRange exactly models a Rectangle, thus, +// for interface clarity, we provide an alias name - /// Alias name for interface clarity (not everybody is aware of the identity) - typedef B2IRange B2IRectangle; +/// Alias name for interface clarity (not everybody is aware of the identity) +typedef B2IRange B2IRectangle; } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/basegfx/utils/zoomtools.hxx b/include/basegfx/utils/zoomtools.hxx index 4f347c3ba992..242c10e6dafc 100644 --- a/include/basegfx/utils/zoomtools.hxx +++ b/include/basegfx/utils/zoomtools.hxx @@ -14,12 +14,10 @@ namespace basegfx::zoomtools { - /** This namespace provides functions for optimized geometric zooming */ BASEGFX_DLLPUBLIC tools::Long zoomOut(tools::Long nCurrent); BASEGFX_DLLPUBLIC tools::Long zoomIn(tools::Long nCurrent); - } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/basegfx/vector/b2dsize.hxx b/include/basegfx/vector/b2dsize.hxx index 6ae6de5e8045..1179126991e0 100644 --- a/include/basegfx/vector/b2dsize.hxx +++ b/include/basegfx/vector/b2dsize.hxx @@ -23,11 +23,11 @@ namespace basegfx { - // syntactic sugar: a B2DVector exactly models a Size object, - // thus, for interface clarity, we provide an alias name +// syntactic sugar: a B2DVector exactly models a Size object, +// thus, for interface clarity, we provide an alias name - /// Alias name for interface clarity (not everybody is aware of the identity) - typedef B2DVector B2DSize; +/// Alias name for interface clarity (not everybody is aware of the identity) +typedef B2DVector B2DSize; } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/basegfx/vector/b2isize.hxx b/include/basegfx/vector/b2isize.hxx index 5d299f4fd8e5..926910b4827d 100644 --- a/include/basegfx/vector/b2isize.hxx +++ b/include/basegfx/vector/b2isize.hxx @@ -23,11 +23,11 @@ namespace basegfx { - // syntactic sugar: a B2IVector exactly models a Size object, - // thus, for interface clarity, we provide an alias name +// syntactic sugar: a B2IVector exactly models a Size object, +// thus, for interface clarity, we provide an alias name - /// Alias name for interface clarity (not everybody is aware of the identity) - typedef B2IVector B2ISize; +/// Alias name for interface clarity (not everybody is aware of the identity) +typedef B2IVector B2ISize; } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/basic/basicdllapi.h b/include/basic/basicdllapi.h index 3bdd9e519f36..90b1f786166c 100644 --- a/include/basic/basicdllapi.h +++ b/include/basic/basicdllapi.h @@ -12,9 +12,9 @@ #include <sal/types.h> #if defined(BASIC_DLLIMPLEMENTATION) -#define BASIC_DLLPUBLIC SAL_DLLPUBLIC_EXPORT +#define BASIC_DLLPUBLIC SAL_DLLPUBLIC_EXPORT #else -#define BASIC_DLLPUBLIC SAL_DLLPUBLIC_IMPORT +#define BASIC_DLLPUBLIC SAL_DLLPUBLIC_IMPORT #endif #define BASIC_DLLPRIVATE SAL_DLLPRIVATE diff --git a/include/basic/basrdll.hxx b/include/basic/basrdll.hxx index 53768deb5760..2748bf3fd37c 100644 --- a/include/basic/basrdll.hxx +++ b/include/basic/basrdll.hxx @@ -34,8 +34,8 @@ public: static void BasicBreak(); - static void EnableBreak( bool bEnable ); - static void SetDebugMode( bool bDebugMode ); + static void EnableBreak(bool bEnable); + static void SetDebugMode(bool bDebugMode); }; #endif // INCLUDED_BASIC_BASRDLL_HXX diff --git a/include/canvas/canvastoolsdllapi.h b/include/canvas/canvastoolsdllapi.h index 1f24c1e897ed..a3748371a9e2 100644 --- a/include/canvas/canvastoolsdllapi.h +++ b/include/canvas/canvastoolsdllapi.h @@ -24,9 +24,9 @@ #include <sal/types.h> #if defined(CANVASTOOLS_DLLIMPLEMENTATION) -#define CANVASTOOLS_DLLPUBLIC SAL_DLLPUBLIC_EXPORT +#define CANVASTOOLS_DLLPUBLIC SAL_DLLPUBLIC_EXPORT #else -#define CANVASTOOLS_DLLPUBLIC SAL_DLLPUBLIC_IMPORT +#define CANVASTOOLS_DLLPUBLIC SAL_DLLPUBLIC_IMPORT #endif #define CANVASTOOLS_DLLPRIVATE SAL_DLLPRIVATE diff --git a/include/codemaker/codemaker.hxx b/include/codemaker/codemaker.hxx index 81e4a5e370e1..cf22b8a1f47f 100644 --- a/include/codemaker/codemaker.hxx +++ b/include/codemaker/codemaker.hxx @@ -22,15 +22,15 @@ #include <sal/config.h> -namespace rtl { - class OString; - class OUString; +namespace rtl +{ +class OString; +class OUString; } -namespace codemaker { - -rtl::OString convertString(rtl::OUString const & string); - +namespace codemaker +{ +rtl::OString convertString(rtl::OUString const& string); } #endif // INCLUDED_CODEMAKER_CODEMAKER_HXX diff --git a/include/codemaker/generatedtypeset.hxx b/include/codemaker/generatedtypeset.hxx index d82c8fb1cb20..cc2827cb9aa7 100644 --- a/include/codemaker/generatedtypeset.hxx +++ b/include/codemaker/generatedtypeset.hxx @@ -26,15 +26,16 @@ /// @HTML -namespace codemaker { - +namespace codemaker +{ /** A simple class to track which types have already been processed by a code maker. <p>This class is not multi-thread–safe.</p> */ -class GeneratedTypeSet { +class GeneratedTypeSet +{ public: GeneratedTypeSet() {} @@ -45,7 +46,7 @@ public: @param type a UNO type registry name */ - void add(OString const & type) { m_set.insert(type); } + void add(OString const& type) { m_set.insert(type); } /** Checks whether a given type has already been generated. @@ -54,16 +55,14 @@ public: @return true iff the given type has already been generated */ - bool contains(OString const & type) const - { return m_set.find(type) != m_set.end(); } + bool contains(OString const& type) const { return m_set.find(type) != m_set.end(); } private: - GeneratedTypeSet(GeneratedTypeSet const &) = delete; - GeneratedTypeSet& operator =(GeneratedTypeSet const &) = delete; + GeneratedTypeSet(GeneratedTypeSet const&) = delete; + GeneratedTypeSet& operator=(GeneratedTypeSet const&) = delete; - std::unordered_set< OString > m_set; + std::unordered_set<OString> m_set; }; - } #endif // INCLUDED_CODEMAKER_GENERATEDTYPESET_HXX diff --git a/include/com/sun/star/uno/genfunc.h b/include/com/sun/star/uno/genfunc.h index eb1b028cce4a..f9c547421119 100644 --- a/include/com/sun/star/uno/genfunc.h +++ b/include/com/sun/star/uno/genfunc.h @@ -31,25 +31,23 @@ namespace star { namespace uno { - /** Function to acquire a C++ interface. @param pCppI C++ interface pointer */ -inline void SAL_CALL cpp_acquire( void * pCppI ); +inline void SAL_CALL cpp_acquire(void* pCppI); /** Function to release a C++ interface. @param pCppI C++ interface pointer */ -inline void SAL_CALL cpp_release( void * pCppI ); +inline void SAL_CALL cpp_release(void* pCppI); /** Function to query for a C++ interface. @param pCppI C++ interface pointer @param pType demanded interface type @return acquired C++ interface pointer or null */ -inline void * SAL_CALL cpp_queryInterface( void * pCppI, typelib_TypeDescriptionReference * pType ); - +inline void* SAL_CALL cpp_queryInterface(void* pCppI, typelib_TypeDescriptionReference* pType); } } } diff --git a/include/comphelper/anytostring.hxx b/include/comphelper/anytostring.hxx index 21afda1a6cd1..6d100221e7d8 100644 --- a/include/comphelper/anytostring.hxx +++ b/include/comphelper/anytostring.hxx @@ -23,11 +23,13 @@ #include <rtl/ustring.hxx> #include <comphelper/comphelperdllapi.h> -namespace com::sun::star::uno { class Any; } +namespace com::sun::star::uno +{ +class Any; +} namespace comphelper { - /** Creates a STRING representation out of an ANY value. @param value @@ -35,8 +37,7 @@ namespace comphelper @return STRING representation of given ANY value */ -COMPHELPER_DLLPUBLIC OUString anyToString( css::uno::Any const & value ); - +COMPHELPER_DLLPUBLIC OUString anyToString(css::uno::Any const& value); } #endif diff --git a/include/comphelper/base64.hxx b/include/comphelper/base64.hxx index d962aabacda0..a77ac4ebe3b2 100644 --- a/include/comphelper/base64.hxx +++ b/include/comphelper/base64.hxx @@ -26,10 +26,13 @@ #include <rtl/ustrbuf.hxx> #include <rtl/strbuf.hxx> -namespace com::sun::star::uno { template <class E> class Sequence; } - -namespace comphelper { +namespace com::sun::star::uno +{ +template <class E> class Sequence; +} +namespace comphelper +{ class COMPHELPER_DLLPUBLIC Base64 { public: @@ -47,7 +50,6 @@ public: static sal_Int32 decodeSomeChars(css::uno::Sequence<sal_Int8>& aPass, const OUString& sBuffer); }; - } #endif // INCLUDED_COMPHELPER_BASE64_HXX diff --git a/include/comphelper/comphelperdllapi.h b/include/comphelper/comphelperdllapi.h index 3416513b94eb..361326a4e406 100644 --- a/include/comphelper/comphelperdllapi.h +++ b/include/comphelper/comphelperdllapi.h @@ -22,9 +22,9 @@ #include <sal/types.h> #if defined(COMPHELPER_DLLIMPLEMENTATION) -#define COMPHELPER_DLLPUBLIC SAL_DLLPUBLIC_EXPORT +#define COMPHELPER_DLLPUBLIC SAL_DLLPUBLIC_EXPORT #else -#define COMPHELPER_DLLPUBLIC SAL_DLLPUBLIC_IMPORT +#define COMPHELPER_DLLPUBLIC SAL_DLLPUBLIC_IMPORT #endif #define COMPHELPER_DLLPRIVATE SAL_DLLPRIVATE diff --git a/include/comphelper/evtmethodhelper.hxx b/include/comphelper/evtmethodhelper.hxx index 7c900a1a8324..f420b1869422 100644 --- a/include/comphelper/evtmethodhelper.hxx +++ b/include/comphelper/evtmethodhelper.hxx @@ -24,9 +24,9 @@ namespace comphelper { - COMPHELPER_DLLPUBLIC css::uno::Sequence< OUString> getEventMethodsForType(const css::uno::Type& type); +COMPHELPER_DLLPUBLIC css::uno::Sequence<OUString> +getEventMethodsForType(const css::uno::Type& type); - -} // namespace comphelper +} // namespace comphelper /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/comphelper/extract.hxx b/include/comphelper/extract.hxx index 91682400d770..c8ab9c6e6e7b 100644 --- a/include/comphelper/extract.hxx +++ b/include/comphelper/extract.hxx @@ -30,7 +30,6 @@ namespace cppu { - /** * Sets enum from int32 value. This function does NOT check for valid enum values! * @@ -38,11 +37,10 @@ namespace cppu * @param rType enum type * @return enum or empty any. */ -inline css::uno::Any int2enum( - sal_Int32 nEnum, const css::uno::Type & rType ) +inline css::uno::Any int2enum(sal_Int32 nEnum, const css::uno::Type& rType) { assert(rType.getTypeClass() == css::uno::TypeClass_ENUM); - return css::uno::Any( &nEnum, rType ); + return css::uno::Any(&nEnum, rType); } /** @@ -53,11 +51,11 @@ inline css::uno::Any int2enum( * @retval true if enum or int value was set * @retval false otherwise */ -inline bool enum2int( sal_Int32 & rnEnum, const css::uno::Any & rAny ) +inline bool enum2int(sal_Int32& rnEnum, const css::uno::Any& rAny) { if (rAny.getValueTypeClass() == css::uno::TypeClass_ENUM) { - rnEnum = * static_cast< const sal_Int32 * >( rAny.getValue() ); + rnEnum = *static_cast<const sal_Int32*>(rAny.getValue()); return true; } @@ -72,15 +70,14 @@ inline bool enum2int( sal_Int32 & rnEnum, const css::uno::Any & rAny ) * @param rAny enum or int * @throws css::lang::IllegalArgumentException */ -template< typename E > -inline void any2enum( E & eRet, const css::uno::Any & rAny ) +template <typename E> inline void any2enum(E& eRet, const css::uno::Any& rAny) { // check for typesafe enum - if (! (rAny >>= eRet)) + if (!(rAny >>= eRet)) { // if not enum, maybe integer? sal_Int32 nValue = 0; - if (! (rAny >>= nValue)) + if (!(rAny >>= nValue)) throw css::lang::IllegalArgumentException(); eRet = static_cast<E>(nValue); @@ -94,7 +91,7 @@ inline void any2enum( E & eRet, const css::uno::Any & rAny ) * * @throws css::lang::IllegalArgumentException */ -inline bool any2bool( const css::uno::Any & rAny ) +inline bool any2bool(const css::uno::Any& rAny) { bool b; if (rAny >>= b) @@ -104,12 +101,11 @@ inline bool any2bool( const css::uno::Any & rAny ) else { sal_Int32 nValue = 0; - if (! (rAny >>= nValue)) + if (!(rAny >>= nValue)) throw css::lang::IllegalArgumentException(); return nValue != 0; } } - } #endif diff --git a/include/comphelper/fileformat.h b/include/comphelper/fileformat.h index fb9d8175f2e3..7eabf5829733 100644 --- a/include/comphelper/fileformat.h +++ b/include/comphelper/fileformat.h @@ -22,11 +22,11 @@ /* file format versions *************************************************/ -#define SOFFICE_FILEFORMAT_31 3450 -#define SOFFICE_FILEFORMAT_40 3580 -#define SOFFICE_FILEFORMAT_50 5050 -#define SOFFICE_FILEFORMAT_60 6200 -#define SOFFICE_FILEFORMAT_8 6800 +#define SOFFICE_FILEFORMAT_31 3450 +#define SOFFICE_FILEFORMAT_40 3580 +#define SOFFICE_FILEFORMAT_50 5050 +#define SOFFICE_FILEFORMAT_60 6200 +#define SOFFICE_FILEFORMAT_8 6800 #define SOFFICE_FILEFORMAT_CURRENT SOFFICE_FILEFORMAT_8 #endif diff --git a/include/comphelper/fileurl.hxx b/include/comphelper/fileurl.hxx index 9275d4abbfc4..27ac6b576b2e 100644 --- a/include/comphelper/fileurl.hxx +++ b/include/comphelper/fileurl.hxx @@ -25,11 +25,10 @@ #include <comphelper/comphelperdllapi.h> #include <rtl/ustring.hxx> -namespace comphelper { - +namespace comphelper +{ // Return true iff url is an absolute URL of "file" scheme: -COMPHELPER_DLLPUBLIC bool isFileUrl(OUString const & url); - +COMPHELPER_DLLPUBLIC bool isFileUrl(OUString const& url); } #endif diff --git a/include/comphelper/genericpropertyset.hxx b/include/comphelper/genericpropertyset.hxx index 8f61ac14befb..2450ef04799b 100644 --- a/include/comphelper/genericpropertyset.hxx +++ b/include/comphelper/genericpropertyset.hxx @@ -23,12 +23,19 @@ #include <com/sun/star/uno/Reference.h> #include <comphelper/comphelperdllapi.h> -namespace com::sun::star::beans { class XPropertySet; } -namespace comphelper { class PropertySetInfo; } +namespace com::sun::star::beans +{ +class XPropertySet; +} +namespace comphelper +{ +class PropertySetInfo; +} namespace comphelper { - COMPHELPER_DLLPUBLIC css::uno::Reference< css::beans::XPropertySet > GenericPropertySet_CreateInstance( PropertySetInfo* pInfo ); +COMPHELPER_DLLPUBLIC css::uno::Reference<css::beans::XPropertySet> +GenericPropertySet_CreateInstance(PropertySetInfo* pInfo); } #endif // INCLUDED_COMPHELPER_GENERICPROPERTYSET_HXX diff --git a/include/comphelper/getexpandeduri.hxx b/include/comphelper/getexpandeduri.hxx index 90eb101b7b2c..5b75c43d48fe 100644 --- a/include/comphelper/getexpandeduri.hxx +++ b/include/comphelper/getexpandeduri.hxx @@ -15,11 +15,17 @@ #include <comphelper/comphelperdllapi.h> #include <rtl/ustring.hxx> -namespace com::sun::star::uno { class XComponentContext; } -namespace com::sun::star::uno { template <typename > class Reference; } - -namespace comphelper { +namespace com::sun::star::uno +{ +class XComponentContext; +} +namespace com::sun::star::uno +{ +template <typename> class Reference; +} +namespace comphelper +{ /** A helper function to expand vnd.sun.star.expand URLs. @@ -28,9 +34,7 @@ namespace comphelper { is returned unchanged. */ COMPHELPER_DLLPUBLIC OUString getExpandedUri( - css::uno::Reference<css::uno::XComponentContext> const & context, - OUString const & uri); - + css::uno::Reference<css::uno::XComponentContext> const& context, OUString const& uri); } #endif diff --git a/include/comphelper/lok.hxx b/include/comphelper/lok.hxx index 2391ceab3661..07b8ef6aa426 100644 --- a/include/comphelper/lok.hxx +++ b/include/comphelper/lok.hxx @@ -20,16 +20,20 @@ class LanguageTag; namespace comphelper::LibreOfficeKit { - // Functions to be called only from the LibreOfficeKit implementation in desktop, not from other // places in LibreOffice code. COMPHELPER_DLLPUBLIC void setActive(bool bActive = true); -enum class statusIndicatorCallbackType { Start, SetValue, Finish }; - -COMPHELPER_DLLPUBLIC void setStatusIndicatorCallback(void (*callback)(void *data, statusIndicatorCallbackType type, int percent), void *data); +enum class statusIndicatorCallbackType +{ + Start, + SetValue, + Finish +}; +COMPHELPER_DLLPUBLIC void setStatusIndicatorCallback( + void (*callback)(void* data, statusIndicatorCallbackType type, int percent), void* data); // Functions that can be called from arbitrary places in LibreOffice. @@ -80,7 +84,6 @@ COMPHELPER_DLLPUBLIC void setCompatFlag(Compat flag); /// Get compatibility flags COMPHELPER_DLLPUBLIC bool isCompatFlagSet(Compat flag); - /// Check whether clients want viewId in visible cursor invalidation payload. COMPHELPER_DLLPUBLIC bool isViewIdForVisCursorInvalidation(); /// Set whether clients want viewId in visible cursor invalidation payload. @@ -104,7 +107,6 @@ COMPHELPER_DLLPUBLIC bool isAllowlistedLanguage(const OUString& lang); COMPHELPER_DLLPUBLIC void statusIndicatorStart(); COMPHELPER_DLLPUBLIC void statusIndicatorSetValue(int percent); COMPHELPER_DLLPUBLIC void statusIndicatorFinish(); - } #endif // INCLUDED_COMPHELPER_LOK_HXX diff --git a/include/comphelper/make_shared_from_uno.hxx b/include/comphelper/make_shared_from_uno.hxx index b30dde09d115..7075e300042c 100644 --- a/include/comphelper/make_shared_from_uno.hxx +++ b/include/comphelper/make_shared_from_uno.hxx @@ -21,13 +21,15 @@ #include <memory> -namespace comphelper { - +namespace comphelper +{ /// @internal -namespace detail { +namespace detail +{ /// @internal -template <typename T> struct ReleaseFunc { - void operator()( T * p ) const { p->release(); } +template <typename T> struct ReleaseFunc +{ + void operator()(T* p) const { p->release(); } }; } // namespace detail @@ -53,11 +55,10 @@ template <typename T> struct ReleaseFunc { @param p object pointer @return shared_ptr to object */ -template <typename T> -inline std::shared_ptr<T> make_shared_from_UNO( T * p ) +template <typename T> inline std::shared_ptr<T> make_shared_from_UNO(T* p) { p->acquire(); - return std::shared_ptr<T>( p, detail::ReleaseFunc<T>() ); + return std::shared_ptr<T>(p, detail::ReleaseFunc<T>()); } } // namespace comphelper diff --git a/include/comphelper/namecontainer.hxx b/include/comphelper/namecontainer.hxx index 86553e52ff6c..616b07f1a342 100644 --- a/include/comphelper/namecontainer.hxx +++ b/include/comphelper/namecontainer.hxx @@ -24,12 +24,15 @@ #include <com/sun/star/uno/Reference.h> #include <comphelper/comphelperdllapi.h> -namespace com::sun::star::container { class XNameContainer; } +namespace com::sun::star::container +{ +class XNameContainer; +} namespace comphelper { - COMPHELPER_DLLPUBLIC css::uno::Reference< css::container::XNameContainer > - NameContainer_createInstance( const css::uno::Type& aType ); +COMPHELPER_DLLPUBLIC css::uno::Reference<css::container::XNameContainer> +NameContainer_createInstance(const css::uno::Type& aType); } #endif // INCLUDED_COMPHELPER_NAMECONTAINER_HXX diff --git a/include/comphelper/profilezone.hxx b/include/comphelper/profilezone.hxx index 81294a4c41c6..f1276e64cd67 100644 --- a/include/comphelper/profilezone.hxx +++ b/include/comphelper/profilezone.hxx @@ -22,13 +22,11 @@ namespace comphelper { - namespace ProfileRecording { - COMPHELPER_DLLPUBLIC void startRecording(bool bRecording); -COMPHELPER_DLLPUBLIC long long addRecording(const char * aProfileId, long long aCreateTime); +COMPHELPER_DLLPUBLIC long long addRecording(const char* aProfileId, long long aCreateTime); COMPHELPER_DLLPUBLIC css::uno::Sequence<OUString> getRecordingAndClear(); @@ -37,11 +35,12 @@ COMPHELPER_DLLPUBLIC css::uno::Sequence<OUString> getRecordingAndClear(); class COMPHELPER_DLLPUBLIC ProfileZone { private: - const char * m_sProfileId; + const char* m_sProfileId; long long m_aCreateTime; bool m_bConsole; void startConsole(); void stopConsole(); + public: static std::atomic<bool> g_bRecording; // true during recording @@ -60,10 +59,10 @@ public: * Similar to the DEBUG macro in sal/log.hxx, don't forget to remove these lines before * committing. */ - ProfileZone(const char *sProfileId, bool bConsole = false) - : m_sProfileId(sProfileId), - m_aCreateTime(g_bRecording ? ProfileRecording::addRecording(sProfileId, 0) : 0), - m_bConsole(bConsole) + ProfileZone(const char* sProfileId, bool bConsole = false) + : m_sProfileId(sProfileId) + , m_aCreateTime(g_bRecording ? ProfileRecording::addRecording(sProfileId, 0) : 0) + , m_bConsole(bConsole) { if (m_bConsole) { @@ -83,7 +82,6 @@ public: } // namespace comphelper - #endif // INCLUDED_COMPHELPER_PROFILEZONE_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/comphelper/random.hxx b/include/comphelper/random.hxx index 4eee4ff2de1f..345d57c7158d 100644 --- a/include/comphelper/random.hxx +++ b/include/comphelper/random.hxx @@ -14,7 +14,6 @@ namespace comphelper::rng { - // These functions obey the SAL_RAND_REPEATABLE environment // variable: If it is set, use a fixed seed. diff --git a/include/comphelper/refcountedmutex.hxx b/include/comphelper/refcountedmutex.hxx index cda0c981890a..fcda72097988 100644 --- a/include/comphelper/refcountedmutex.hxx +++ b/include/comphelper/refcountedmutex.hxx @@ -26,10 +26,10 @@ namespace comphelper { - class COMPHELPER_DLLPUBLIC RefCountedMutex final : public salhelper::SimpleReferenceObject { osl::Mutex m_aMutex; + public: ~RefCountedMutex() override; diff --git a/include/comphelper/streamsection.hxx b/include/comphelper/streamsection.hxx index c4f945966ab5..fa1fe8ac93f2 100644 --- a/include/comphelper/streamsection.hxx +++ b/include/comphelper/streamsection.hxx @@ -24,13 +24,21 @@ #include <com/sun/star/uno/Reference.h> #include <comphelper/comphelperdllapi.h> -namespace com::sun::star::io { class XDataInputStream; } -namespace com::sun::star::io { class XDataOutputStream; } -namespace com::sun::star::io { class XMarkableStream; } +namespace com::sun::star::io +{ +class XDataInputStream; +} +namespace com::sun::star::io +{ +class XDataOutputStream; +} +namespace com::sun::star::io +{ +class XMarkableStream; +} namespace comphelper { - /** implements handling for compatibly reading/writing data from/into an input/output stream. data written in a block secured by this class should be readable by older versions which use the same mechanism. @@ -38,25 +46,25 @@ namespace comphelper class UNLESS_MERGELIBS(COMPHELPER_DLLPUBLIC) OStreamSection { - css::uno::Reference< css::io::XMarkableStream > m_xMarkStream; - css::uno::Reference< css::io::XDataInputStream > m_xInStream; - css::uno::Reference< css::io::XDataOutputStream > m_xOutStream; + css::uno::Reference<css::io::XMarkableStream> m_xMarkStream; + css::uno::Reference<css::io::XDataInputStream> m_xInStream; + css::uno::Reference<css::io::XDataOutputStream> m_xOutStream; - sal_Int32 m_nBlockStart; - sal_Int32 m_nBlockLen; + sal_Int32 m_nBlockStart; + sal_Int32 m_nBlockLen; public: /** starts reading of a "skippable" section of data within the given input stream<BR> @param _rxInput the stream to read from. Must support the css::io::XMarkableStream interface */ - OStreamSection(const css::uno::Reference< css::io::XDataInputStream >& _rxInput); + OStreamSection(const css::uno::Reference<css::io::XDataInputStream>& _rxInput); /** starts writing of a "skippable" section of data into the given output stream @param _rxOutput the stream the stream to write to. Must support the css::io::XMarkableStream interface */ - OStreamSection(const css::uno::Reference< css::io::XDataOutputStream >& _rxOutput); + OStreamSection(const css::uno::Reference<css::io::XDataOutputStream>& _rxOutput); /** dtor. <BR>If constructed for writing, the section "opened" by this object will be "closed".<BR> If constructed for reading, any remaining bytes 'til the end of the section will be skipped. @@ -64,7 +72,7 @@ public: ~OStreamSection(); }; -} // namespace comphelper +} // namespace comphelper #endif // INCLUDED_COMPHELPER_STREAMSECTION_HXX diff --git a/include/cppu/EnvDcp.hxx b/include/cppu/EnvDcp.hxx index 7f879573b42c..49f5d46ddc7c 100644 --- a/include/cppu/EnvDcp.hxx +++ b/include/cppu/EnvDcp.hxx @@ -23,7 +23,6 @@ #include "rtl/ustring.hxx" #include "uno/EnvDcp.h" - namespace cppu { namespace EnvDcp @@ -35,7 +34,7 @@ namespace EnvDcp @return the OBI type @since UDK 3.2.7 */ -inline rtl::OUString getTypeName(rtl::OUString const & rEnvDcp) +inline rtl::OUString getTypeName(rtl::OUString const& rEnvDcp) { rtl::OUString typeName; @@ -51,7 +50,7 @@ inline rtl::OUString getTypeName(rtl::OUString const & rEnvDcp) @return the purpose @since UDK 3.2.7 */ -inline rtl::OUString getPurpose(rtl::OUString const & rEnvDcp) +inline rtl::OUString getPurpose(rtl::OUString const& rEnvDcp) { rtl::OUString purpose; @@ -59,11 +58,9 @@ inline rtl::OUString getPurpose(rtl::OUString const & rEnvDcp) return purpose; } - } } - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/cppu/cppudllapi.h b/include/cppu/cppudllapi.h index c2bcc559bbea..fecbdca71164 100644 --- a/include/cppu/cppudllapi.h +++ b/include/cppu/cppudllapi.h @@ -5,15 +5,15 @@ #include "sal/types.h" #if defined(CPPU_DLLIMPLEMENTATION) -#define CPPU_DLLPUBLIC SAL_DLLPUBLIC_EXPORT +#define CPPU_DLLPUBLIC SAL_DLLPUBLIC_EXPORT #else -#define CPPU_DLLPUBLIC SAL_DLLPUBLIC_IMPORT +#define CPPU_DLLPUBLIC SAL_DLLPUBLIC_IMPORT #endif #if defined(PURPENV_DLLIMPLEMENTATION) -#define PURPENV_DLLPUBLIC SAL_DLLPUBLIC_EXPORT +#define PURPENV_DLLPUBLIC SAL_DLLPUBLIC_EXPORT #else -#define PURPENV_DLLPUBLIC SAL_DLLPUBLIC_IMPORT +#define PURPENV_DLLPUBLIC SAL_DLLPUBLIC_IMPORT #endif #endif // INCLUDED_CPPU_CPPUDLLAPI_H diff --git a/include/cppuhelper/cppuhelperdllapi.h b/include/cppuhelper/cppuhelperdllapi.h index 1eff7bedc313..00effe9b1ae6 100644 --- a/include/cppuhelper/cppuhelperdllapi.h +++ b/include/cppuhelper/cppuhelperdllapi.h @@ -23,9 +23,9 @@ #include "sal/types.h" #if defined(CPPUHELPER_DLLIMPLEMENTATION) -#define CPPUHELPER_DLLPUBLIC SAL_DLLPUBLIC_EXPORT +#define CPPUHELPER_DLLPUBLIC SAL_DLLPUBLIC_EXPORT #else -#define CPPUHELPER_DLLPUBLIC SAL_DLLPUBLIC_IMPORT +#define CPPUHELPER_DLLPUBLIC SAL_DLLPUBLIC_IMPORT #endif #define CPPUHELPER_DLLPRIVATE SAL_DLLPRIVATE diff --git a/include/cppuhelper/exc_hlp.hxx b/include/cppuhelper/exc_hlp.hxx index ea7353693936..570513ff38fa 100644 --- a/include/cppuhelper/exc_hlp.hxx +++ b/include/cppuhelper/exc_hlp.hxx @@ -25,7 +25,6 @@ namespace cppu { - /** This function throws the exception given by rExc. The given value has to be of typeclass EXCEPTION and must be derived from or of type com.sun.star.uno.Exception. @@ -33,7 +32,7 @@ namespace cppu @param rExc exception to be thrown. */ -CPPUHELPER_DLLPUBLIC void SAL_CALL throwException( const css::uno::Any & rExc ); +CPPUHELPER_DLLPUBLIC void SAL_CALL throwException(const css::uno::Any& rExc); /** Use this function to get the dynamic type of a caught C++-UNO exception; completes the above function throwing exceptions generically. @@ -85,7 +84,6 @@ CPPUHELPER_DLLPUBLIC void SAL_CALL throwException( const css::uno::Any & rExc ); same C++ compiler (and linking against one runtime library). */ CPPUHELPER_DLLPUBLIC css::uno::Any SAL_CALL getCaughtException(); - } #endif diff --git a/include/cppuhelper/unourl.hxx b/include/cppuhelper/unourl.hxx index 8771c0c44396..510002e406a8 100644 --- a/include/cppuhelper/unourl.hxx +++ b/include/cppuhelper/unourl.hxx @@ -24,10 +24,13 @@ #include "cppuhelper/cppuhelperdllapi.h" -namespace rtl { class OUString; } - -namespace cppu { +namespace rtl +{ +class OUString; +} +namespace cppu +{ /** A descriptor as part of a UNO URL (connection descriptor or protocol descriptor). @@ -48,13 +51,13 @@ public: @exception rtl::MalformedUriException Thrown when the given string representation is invalid. */ - explicit UnoUrlDescriptor(rtl::OUString const & rDescriptor); + explicit UnoUrlDescriptor(rtl::OUString const& rDescriptor); - UnoUrlDescriptor(UnoUrlDescriptor const & rOther); + UnoUrlDescriptor(UnoUrlDescriptor const& rOther); ~UnoUrlDescriptor(); - UnoUrlDescriptor & operator =(UnoUrlDescriptor const & rOther); + UnoUrlDescriptor& operator=(UnoUrlDescriptor const& rOther); /** Return the string representation of the descriptor. @@ -63,7 +66,7 @@ public: descriptor, without any modifications. The reference is valid for the lifetime of this URL object. */ - rtl::OUString const & getDescriptor() const; + rtl::OUString const& getDescriptor() const; /** Return the name component of the descriptor. @@ -71,7 +74,7 @@ public: A reference to the (case insensitive) name, in lower case form. The reference is valid for the lifetime of this URL object. */ - rtl::OUString const & getName() const; + rtl::OUString const& getName() const; /** Test whether the parameters contain a key. @@ -81,7 +84,7 @@ public: @return True if the parameters contain a matching key/value pair. */ - bool hasParameter(rtl::OUString const & rKey) const; + bool hasParameter(rtl::OUString const& rKey) const; /** Return the parameter value for a key. @@ -92,10 +95,10 @@ public: The (case sensitive) value associated with the given key, or an empty string if there is no matching key/value pair. */ - rtl::OUString getParameter(rtl::OUString const & rKey) const; + rtl::OUString getParameter(rtl::OUString const& rKey) const; private: - Impl * m_pImpl; + Impl* m_pImpl; }; /** Parse UNO URLs into their components. @@ -137,13 +140,13 @@ public: @exception rtl::MalformedUriException Thrown when the given string representation is invalid. */ - explicit UnoUrl(rtl::OUString const & rUrl); + explicit UnoUrl(rtl::OUString const& rUrl); - UnoUrl(UnoUrl const & rOther); + UnoUrl(UnoUrl const& rOther); ~UnoUrl(); - UnoUrl & operator =(UnoUrl const & rOther); + UnoUrl& operator=(UnoUrl const& rOther); /** Return the connection descriptor component of the URL. @@ -151,7 +154,7 @@ public: A reference to the connection descriptor. The reference is valid for the lifetime of this URL object. */ - UnoUrlDescriptor const & getConnection() const; + UnoUrlDescriptor const& getConnection() const; /** Return the protocol descriptor component of the URL. @@ -159,7 +162,7 @@ public: A reference to the protocol descriptor. The reference is valid for the lifetime of this URL object. */ - UnoUrlDescriptor const & getProtocol() const; + UnoUrlDescriptor const& getProtocol() const; /** Return the object-name component of the URL. @@ -167,14 +170,13 @@ public: A reference to the (case sensitive) object-name. The reference is valid for the lifetime of this URL object. */ - rtl::OUString const & getObjectName() const; + rtl::OUString const& getObjectName() const; private: class Impl; - Impl * m_pImpl; + Impl* m_pImpl; }; - } #endif // INCLUDED_RTL_UNOURL_HXX diff --git a/include/dbaccess/dbaccessdllapi.h b/include/dbaccess/dbaccessdllapi.h index 8f211a0ed67b..2f3771dcea80 100644 --- a/include/dbaccess/dbaccessdllapi.h +++ b/include/dbaccess/dbaccessdllapi.h @@ -23,9 +23,9 @@ #include <sal/types.h> #if defined(DBACCESS_DLLIMPLEMENTATION) -#define DBACCESS_DLLPUBLIC SAL_DLLPUBLIC_EXPORT +#define DBACCESS_DLLPUBLIC SAL_DLLPUBLIC_EXPORT #else -#define DBACCESS_DLLPUBLIC SAL_DLLPUBLIC_IMPORT +#define DBACCESS_DLLPUBLIC SAL_DLLPUBLIC_IMPORT #endif #define DBACCESS_DLLPRIVATE SAL_DLLPRIVATE diff --git a/include/desktop/dllapi.h b/include/desktop/dllapi.h index fd23aeb7f973..5cf948ce08a4 100644 --- a/include/desktop/dllapi.h +++ b/include/desktop/dllapi.h @@ -14,15 +14,15 @@ #include <sal/types.h> #if defined(DESKTOP_DLLIMPLEMENTATION) -# define DESKTOP_DLLPUBLIC SAL_DLLPUBLIC_EXPORT +#define DESKTOP_DLLPUBLIC SAL_DLLPUBLIC_EXPORT #else -# define DESKTOP_DLLPUBLIC SAL_DLLPUBLIC_IMPORT +#define DESKTOP_DLLPUBLIC SAL_DLLPUBLIC_IMPORT #endif #if defined(CRASHREPORT_DLLIMPLEMENTATION) -# define CRASHREPORT_DLLPUBLIC SAL_DLLPUBLIC_EXPORT +#define CRASHREPORT_DLLPUBLIC SAL_DLLPUBLIC_EXPORT #else -# define CRASHREPORT_DLLPUBLIC SAL_DLLPUBLIC_IMPORT +#define CRASHREPORT_DLLPUBLIC SAL_DLLPUBLIC_IMPORT #endif #endif diff --git a/include/desktop/exithelper.h b/include/desktop/exithelper.h index fbb37c583233..b4f618783e33 100644 --- a/include/desktop/exithelper.h +++ b/include/desktop/exithelper.h @@ -20,7 +20,8 @@ #ifndef INCLUDED_DESKTOP_EXITHELPER_H #define INCLUDED_DESKTOP_EXITHELPER_H -enum EExitCodes { +enum EExitCodes +{ /* e.g. used to force showing of the command line help */ EXITHELPER_NO_ERROR = 0, /* a uno exception was caught during startup */ diff --git a/include/desktop/minidump.hxx b/include/desktop/minidump.hxx index 6ed0e18277f8..0f49075fad5e 100644 --- a/include/desktop/minidump.hxx +++ b/include/desktop/minidump.hxx @@ -14,8 +14,8 @@ #include <desktop/dllapi.h> -namespace crashreport { - +namespace crashreport +{ // when response = nullptr only make test /** Read+Send, Test and send info from the Dump.ini . @@ -27,8 +27,7 @@ namespace crashreport { @retval false Read+Send, Test is a error */ -CRASHREPORT_DLLPUBLIC bool readConfig(const std::string& iniPath, std::string * response); - +CRASHREPORT_DLLPUBLIC bool readConfig(const std::string& iniPath, std::string* response); } #endif diff --git a/include/editeng/AccessibleComponentBase.hxx b/include/editeng/AccessibleComponentBase.hxx index d3c5805ef75a..80b0c2b95030 100644 --- a/include/editeng/AccessibleComponentBase.hxx +++ b/include/editeng/AccessibleComponentBase.hxx @@ -17,18 +17,19 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #ifndef INCLUDED_EDITENG_ACCESSIBLECOMPONENTBASE_HXX #define INCLUDED_EDITENG_ACCESSIBLECOMPONENTBASE_HXX - #include <com/sun/star/accessibility/XAccessibleExtendedComponent.hpp> #include <editeng/editengdllapi.h> -namespace com::sun::star::accessibility { class XAccessible; } - -namespace accessibility { +namespace com::sun::star::accessibility +{ +class XAccessible; +} +namespace accessibility +{ /** @descr This base class provides (will provide) a base implementation of the XAccessibleComponent and the @@ -39,28 +40,25 @@ namespace accessibility { XServiceInfo, and <type>XTypeProvider</type>. */ class EDITENG_DLLPUBLIC AccessibleComponentBase - : public css::accessibility::XAccessibleExtendedComponent + : public css::accessibility::XAccessibleExtendedComponent { public: //===== internal ======================================================== AccessibleComponentBase(); virtual ~AccessibleComponentBase(); - //===== XAccessibleComponent ================================================ /** The default implementation uses the result of <member>getBounds</member> to determine whether the given point lies inside this object. */ - virtual sal_Bool SAL_CALL containsPoint ( - const css::awt::Point& aPoint) override; + virtual sal_Bool SAL_CALL containsPoint(const css::awt::Point& aPoint) override; /** The default implementation returns an empty reference. */ - virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL - getAccessibleAtPoint ( - const css::awt::Point& aPoint) override; + virtual css::uno::Reference<css::accessibility::XAccessible> + SAL_CALL getAccessibleAtPoint(const css::awt::Point& aPoint) override; /** The default implementation returns an empty rectangle. */ @@ -94,18 +92,14 @@ public: virtual sal_Int32 SAL_CALL getBackground() override; //===== XAccessibleExtendedComponent ==================================== - virtual css::uno::Reference< css::awt::XFont > SAL_CALL - getFont() override; + virtual css::uno::Reference<css::awt::XFont> SAL_CALL getFont() override; virtual OUString SAL_CALL getTitledBorderText() override; virtual OUString SAL_CALL getToolTipText() override; - //===== XTypeProvider =================================================== /// @throws css::uno::RuntimeException - virtual css::uno::Sequence< css::uno::Type> SAL_CALL - getTypes(); - + virtual css::uno::Sequence<css::uno::Type> SAL_CALL getTypes(); }; } // end of namespace accessibility diff --git a/include/editeng/Trie.hxx b/include/editeng/Trie.hxx index 87d4a54ecdb3..e6ee659c3c99 100644 --- a/include/editeng/Trie.hxx +++ b/include/editeng/Trie.hxx @@ -17,7 +17,6 @@ namespace editeng { - struct TrieNode; class EDITENG_DLLPUBLIC Trie final @@ -33,7 +32,6 @@ public: void findSuggestions(const OUString& sWordPart, std::vector<OUString>& rSuggestionList) const; size_t size() const; }; - } #endif // INCLUDED_EDITENG_TRIE_HXX diff --git a/include/editeng/editengdllapi.h b/include/editeng/editengdllapi.h index 896dea0705d3..5d77e453e0d9 100644 --- a/include/editeng/editengdllapi.h +++ b/include/editeng/editengdllapi.h @@ -23,9 +23,9 @@ #include <sal/types.h> #if defined(EDITENG_DLLIMPLEMENTATION) -#define EDITENG_DLLPUBLIC SAL_DLLPUBLIC_EXPORT +#define EDITENG_DLLPUBLIC SAL_DLLPUBLIC_EXPORT #else -#define EDITENG_DLLPUBLIC SAL_DLLPUBLIC_IMPORT +#define EDITENG_DLLPUBLIC SAL_DLLPUBLIC_IMPORT #endif #define EDITENG_DLLPRIVATE SAL_DLLPRIVATE diff --git a/include/editeng/editerr.hxx b/include/editeng/editerr.hxx index 23cc549a9cdb..e88b7b0f134f 100644 --- a/include/editeng/editerr.hxx +++ b/include/editeng/editerr.hxx @@ -21,8 +21,8 @@ #include <vcl/errcode.hxx> -#define ERRCODE_SVX_LINGU_LANGUAGENOTEXISTS ErrCode(ErrCodeArea::Svx, 2) -#define ERRCODE_SVX_GRAPHIC_WRONG_FILEFORMAT ErrCode(ErrCodeArea::Svx, ErrCodeClass::Read, 8) +#define ERRCODE_SVX_LINGU_LANGUAGENOTEXISTS ErrCode(ErrCodeArea::Svx, 2) +#define ERRCODE_SVX_GRAPHIC_WRONG_FILEFORMAT ErrCode(ErrCodeArea::Svx, ErrCodeClass::Read, 8) #endif diff --git a/include/editeng/editund2.hxx b/include/editeng/editund2.hxx index bac1178648f1..7ed52849ed05 100644 --- a/include/editeng/editund2.hxx +++ b/include/editeng/editund2.hxx @@ -34,6 +34,7 @@ class UNLESS_MERGELIBS(EDITENG_DLLPUBLIC) EditUndoManager : public SfxUndoManage EditEngine* mpEditEngine; void SetEditEngine(EditEngine* pNew); + public: EditUndoManager(sal_uInt16 nMaxUndoActionCount = 20); @@ -41,33 +42,31 @@ public: virtual bool Redo() override; }; - // EditUndo class EDITENG_DLLPUBLIC EditUndo : public SfxUndoAction { private: - sal_uInt16 nId; - ViewShellId mnViewShellId; - EditEngine* mpEditEngine; + sal_uInt16 nId; + ViewShellId mnViewShellId; + EditEngine* mpEditEngine; public: EditUndo(sal_uInt16 nI, EditEngine* pEE); virtual ~EditUndo() override; - EditEngine* GetEditEngine() { return mpEditEngine;} + EditEngine* GetEditEngine() { return mpEditEngine; } - virtual void Undo() override = 0; - virtual void Redo() override = 0; + virtual void Undo() override = 0; + virtual void Redo() override = 0; - virtual bool CanRepeat(SfxRepeatTarget&) const override; + virtual bool CanRepeat(SfxRepeatTarget&) const override; virtual OUString GetComment() const override; /// See SfxUndoAction::GetViewShellId(). ViewShellId GetViewShellId() const override; - sal_uInt16 GetId() const; + sal_uInt16 GetId() const; }; #endif // INCLUDED_EDITENG_EDITUND2_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/editeng/eerdll.hxx b/include/editeng/eerdll.hxx index ba31c72380d9..d57ad101fcfd 100644 --- a/include/editeng/eerdll.hxx +++ b/include/editeng/eerdll.hxx @@ -27,10 +27,10 @@ class GlobalEditData; namespace editeng { - class SharedVclResources; +class SharedVclResources; } -OUString EDITENG_DLLPUBLIC EditResId(const char *pId); +OUString EDITENG_DLLPUBLIC EditResId(const char* pId); class EditDLL { @@ -41,7 +41,7 @@ public: EditDLL(); ~EditDLL(); - GlobalEditData* GetGlobalData() const { return pGlobalData.get(); } + GlobalEditData* GetGlobalData() const { return pGlobalData.get(); } std::shared_ptr<editeng::SharedVclResources> GetSharedVclResources(); static EditDLL& Get(); }; diff --git a/include/editeng/fieldupdater.hxx b/include/editeng/fieldupdater.hxx index b6057015f592..aba367653308 100644 --- a/include/editeng/fieldupdater.hxx +++ b/include/editeng/fieldupdater.hxx @@ -15,8 +15,8 @@ class EditTextObject; -namespace editeng { - +namespace editeng +{ class FieldUpdaterImpl; /** @@ -28,7 +28,7 @@ class EDITENG_DLLPUBLIC FieldUpdater std::unique_ptr<FieldUpdaterImpl> mpImpl; public: - FieldUpdater(EditTextObject const & rObj); + FieldUpdater(EditTextObject const& rObj); FieldUpdater(const FieldUpdater& r); ~FieldUpdater(); @@ -39,7 +39,6 @@ public: */ void updateTableFields(int nTab); }; - } #endif diff --git a/include/editeng/frmdir.hxx b/include/editeng/frmdir.hxx index f8801cc77020..ca3cc615b773 100644 --- a/include/editeng/frmdir.hxx +++ b/include/editeng/frmdir.hxx @@ -58,5 +58,4 @@ const char* getFrmDirResId(size_t nIndex); #endif // INCLUDED_EDITENG_FRMDIR_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/editeng/misspellrange.hxx b/include/editeng/misspellrange.hxx index 611546c99c6d..d67fc82f592c 100644 --- a/include/editeng/misspellrange.hxx +++ b/include/editeng/misspellrange.hxx @@ -14,8 +14,8 @@ #include <vector> -namespace editeng { - +namespace editeng +{ struct MisspellRange { size_t mnStart; @@ -31,7 +31,6 @@ struct MisspellRanges MisspellRanges(sal_Int32 nParagraph, const std::vector<MisspellRange>& rRanges); }; - } #endif diff --git a/include/editeng/mutxhelp.hxx b/include/editeng/mutxhelp.hxx index 2b8aacb518c8..7487fee48e46 100644 --- a/include/editeng/mutxhelp.hxx +++ b/include/editeng/mutxhelp.hxx @@ -33,5 +33,4 @@ public: #endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/editeng/numdef.hxx b/include/editeng/numdef.hxx index 152e7566e8cf..6039ec555783 100644 --- a/include/editeng/numdef.hxx +++ b/include/editeng/numdef.hxx @@ -20,8 +20,8 @@ #ifndef INCLUDED_EDITENG_NUMDEF_HXX #define INCLUDED_EDITENG_NUMDEF_HXX -#define SVX_MAX_NUM 10 // max. possible numbering level -#define SVX_DEF_BULLET (0xF000 + 149)// Character for lists +#define SVX_MAX_NUM 10 // max. possible numbering level +#define SVX_DEF_BULLET (0xF000 + 149) // Character for lists #endif // INCLUDED_EDITENG_NUMDEF_HXX diff --git a/include/editeng/section.hxx b/include/editeng/section.hxx index 19a506a12d0f..d14189c241da 100644 --- a/include/editeng/section.hxx +++ b/include/editeng/section.hxx @@ -16,8 +16,8 @@ class SfxPoolItem; -namespace editeng { - +namespace editeng +{ struct Section { sal_Int32 mnParagraph; @@ -28,7 +28,6 @@ struct Section Section(sal_Int32 nPara, sal_Int32 nStart, sal_Int32 nEnd); }; - } #endif diff --git a/include/editeng/unofdesc.hxx b/include/editeng/unofdesc.hxx index 218ce288b603..fbc94b09ca6e 100644 --- a/include/editeng/unofdesc.hxx +++ b/include/editeng/unofdesc.hxx @@ -23,24 +23,28 @@ #include <svl/itemset.hxx> #include <editeng/editengdllapi.h> -namespace com::sun::star::awt { struct FontDescriptor; } -namespace vcl { class Font; } +namespace com::sun::star::awt +{ +struct FontDescriptor; +} +namespace vcl +{ +class Font; +} class EDITENG_DLLPUBLIC SvxUnoFontDescriptor { public: - static void ConvertToFont( const css::awt::FontDescriptor& rDesc, vcl::Font& rFont ); - static void ConvertFromFont( const vcl::Font& rFont, css::awt::FontDescriptor& rDesc ); + static void ConvertToFont(const css::awt::FontDescriptor& rDesc, vcl::Font& rFont); + static void ConvertFromFont(const vcl::Font& rFont, css::awt::FontDescriptor& rDesc); - static void FillItemSet( const css::awt::FontDescriptor& rDesc, SfxItemSet& rSet ); - static void FillFromItemSet( const SfxItemSet& rSet, css::awt::FontDescriptor& rDesc ); - - static void setPropertyToDefault( SfxItemSet& rSet ); - static css::uno::Any getPropertyDefault( SfxItemPool* pPool ); + static void FillItemSet(const css::awt::FontDescriptor& rDesc, SfxItemSet& rSet); + static void FillFromItemSet(const SfxItemSet& rSet, css::awt::FontDescriptor& rDesc); + static void setPropertyToDefault(SfxItemSet& rSet); + static css::uno::Any getPropertyDefault(SfxItemPool* pPool); }; - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/filter/msfilter/svxmsbas.hxx b/include/filter/msfilter/svxmsbas.hxx index 10d6784675d4..190e289c42bf 100644 --- a/include/filter/msfilter/svxmsbas.hxx +++ b/include/filter/msfilter/svxmsbas.hxx @@ -43,27 +43,29 @@ class SfxObjectShell; * probably what the user expects to see when viewing the code */ - class MSFILTER_DLLPUBLIC SvxImportMSVBasic { public: - SvxImportMSVBasic( SfxObjectShell &rDocS, SotStorage &rRoot ) - : xRoot(&rRoot), rDocSh(rDocS) - {} + SvxImportMSVBasic(SfxObjectShell& rDocS, SotStorage& rRoot) + : xRoot(&rRoot) + , rDocSh(rDocS) + { + } // only for the export - copy or delete the saved VBA-macro-storage // form the ObjectShell // - returns a warning code if a modified basic exist, in all other // cases return ERRCODE_NONE. - ErrCode SaveOrDelMSVBAStorage( bool bSaveInto, const OUString& rStorageName ); + ErrCode SaveOrDelMSVBAStorage(bool bSaveInto, const OUString& rStorageName); // check if the MS-VBA-Storage exist in the RootStorage of the DocShell. // If it exist, then return the WarningId for losing the information. - static ErrCode GetSaveWarningOfMSVBAStorage( SfxObjectShell &rDocS ); + static ErrCode GetSaveWarningOfMSVBAStorage(SfxObjectShell& rDocS); static OUString GetMSBasicStorageName(); + private: tools::SvRef<SotStorage> xRoot; - SfxObjectShell &rDocSh; + SfxObjectShell& rDocSh; }; #endif diff --git a/include/formula/formuladllapi.h b/include/formula/formuladllapi.h index 7b011a6d7ade..ae408fd42f89 100644 --- a/include/formula/formuladllapi.h +++ b/include/formula/formuladllapi.h @@ -23,9 +23,9 @@ #include <sal/types.h> #if defined(FORMULA_DLLIMPLEMENTATION) -#define FORMULA_DLLPUBLIC SAL_DLLPUBLIC_EXPORT +#define FORMULA_DLLPUBLIC SAL_DLLPUBLIC_EXPORT #else -#define FORMULA_DLLPUBLIC SAL_DLLPUBLIC_IMPORT +#define FORMULA_DLLPUBLIC SAL_DLLPUBLIC_IMPORT #endif #define FORMULA_DLLPRIVATE SAL_DLLPRIVATE diff --git a/include/formula/funcvarargs.h b/include/formula/funcvarargs.h index ed529ee98680..7a1f1e4e7f5f 100644 --- a/include/formula/funcvarargs.h +++ b/include/formula/funcvarargs.h @@ -32,7 +32,7 @@ functionDescription.isInfiniteParameterCount() which though looks like it could be easily adapted. */ -#define VAR_ARGS 255 +#define VAR_ARGS 255 /** Used to indicate a variable number of paired parameters for the Function Wizard. @@ -42,7 +42,7 @@ @see VAR_ARGS */ -#define PAIRED_VAR_ARGS (VAR_ARGS + VAR_ARGS) +#define PAIRED_VAR_ARGS (VAR_ARGS + VAR_ARGS) #endif diff --git a/include/formula/types.hxx b/include/formula/types.hxx index c9e29929b9c5..c0c8b64c2498 100644 --- a/include/formula/types.hxx +++ b/include/formula/types.hxx @@ -22,12 +22,11 @@ #include <boost/intrusive_ptr.hpp> -namespace formula { - +namespace formula +{ class FormulaToken; -typedef ::boost::intrusive_ptr<FormulaToken> FormulaTokenRef; -typedef ::boost::intrusive_ptr<const FormulaToken> FormulaConstTokenRef; - +typedef ::boost::intrusive_ptr<FormulaToken> FormulaTokenRef; +typedef ::boost::intrusive_ptr<const FormulaToken> FormulaConstTokenRef; } #endif diff --git a/include/framework/interaction.hxx b/include/framework/interaction.hxx index 4e3df9e8afba..d02c5cd99067 100644 --- a/include/framework/interaction.hxx +++ b/include/framework/interaction.hxx @@ -26,12 +26,21 @@ #include <com/sun/star/uno/Reference.hxx> #include <framework/fwkdllapi.h> -namespace com::sun::star::task { class XInteractionContinuation; } -namespace com::sun::star::task { class XInteractionRequest; } -namespace com::sun::star::uno { template <class E> class Sequence; } - -namespace framework{ +namespace com::sun::star::task +{ +class XInteractionContinuation; +} +namespace com::sun::star::task +{ +class XInteractionRequest; +} +namespace com::sun::star::uno +{ +template <class E> class Sequence; +} +namespace framework +{ /*-************************************************************************************************************ @short special request for interaction to ask user for right filter @descr These helper can be used to ask user for right filter, if filter detection failed. @@ -51,22 +60,22 @@ namespace framework{ @devstatus ready to use @threadsafe no (used on once position only!) -*//*-*************************************************************************************************************/ +*/ /*-*************************************************************************************************************/ class RequestFilterSelect_Impl; class UNLESS_MERGELIBS(FWK_DLLPUBLIC) RequestFilterSelect { rtl::Reference<RequestFilterSelect_Impl> mxImpl; public: - RequestFilterSelect( const OUString& sURL ); + RequestFilterSelect(const OUString& sURL); ~RequestFilterSelect(); - RequestFilterSelect& operator=(RequestFilterSelect const &) = delete; // MSVC2019 workaround - RequestFilterSelect(RequestFilterSelect const &) = delete; // MSVC2019 workaround + RequestFilterSelect& operator=(RequestFilterSelect const&) = delete; // MSVC2019 workaround + RequestFilterSelect(RequestFilterSelect const&) = delete; // MSVC2019 workaround - bool isAbort () const; + bool isAbort() const; OUString getFilter() const; - css::uno::Reference < css::task::XInteractionRequest > GetRequest(); + css::uno::Reference<css::task::XInteractionRequest> GetRequest(); }; /*-************************************************************************************************************ @@ -79,18 +88,18 @@ public: @devstatus ready to use @threadsafe no (used on once position only!) -*//*-*************************************************************************************************************/ +*/ /*-*************************************************************************************************************/ class FWK_DLLPUBLIC InteractionRequest { public: - static css::uno::Reference < css::task::XInteractionRequest > CreateRequest( + static css::uno::Reference<css::task::XInteractionRequest> CreateRequest( const css::uno::Any& aRequest, - const css::uno::Sequence< css::uno::Reference< css::task::XInteractionContinuation > >& lContinuations ); + const css::uno::Sequence<css::uno::Reference<css::task::XInteractionContinuation>>& + lContinuations); }; +} // namespace framework -} // namespace framework - -#endif // #define INCLUDED_FRAMEWORK_INTERACTION_HXX +#endif // #define INCLUDED_FRAMEWORK_INTERACTION_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/i18nlangtag/i18nlangtagdllapi.h b/include/i18nlangtag/i18nlangtagdllapi.h index 74d548468cb9..4222c0e95cbb 100644 --- a/include/i18nlangtag/i18nlangtagdllapi.h +++ b/include/i18nlangtag/i18nlangtagdllapi.h @@ -23,9 +23,9 @@ #include <sal/types.h> #if defined(I18NLANGTAG_DLLIMPLEMENTATION) -#define I18NLANGTAG_DLLPUBLIC SAL_DLLPUBLIC_EXPORT +#define I18NLANGTAG_DLLPUBLIC SAL_DLLPUBLIC_EXPORT #else -#define I18NLANGTAG_DLLPUBLIC SAL_DLLPUBLIC_IMPORT +#define I18NLANGTAG_DLLPUBLIC SAL_DLLPUBLIC_IMPORT #endif #define I18NLANGTAG_DLLPRIVATE SAL_DLLPRIVATE diff --git a/include/i18nutil/i18nutildllapi.h b/include/i18nutil/i18nutildllapi.h index 7cd2d5e36563..9797e87a3613 100644 --- a/include/i18nutil/i18nutildllapi.h +++ b/include/i18nutil/i18nutildllapi.h @@ -23,9 +23,9 @@ #include <sal/types.h> #if defined(I18NUTIL_DLLIMPLEMENTATION) -#define I18NUTIL_DLLPUBLIC SAL_DLLPUBLIC_EXPORT +#define I18NUTIL_DLLPUBLIC SAL_DLLPUBLIC_EXPORT #else -#define I18NUTIL_DLLPUBLIC SAL_DLLPUBLIC_IMPORT +#define I18NUTIL_DLLPUBLIC SAL_DLLPUBLIC_IMPORT #endif #define I18NUTIL_DLLPRIVATE SAL_DLLPRIVATE diff --git a/include/i18nutil/paper.hxx b/include/i18nutil/paper.hxx index 5c64d646d7f7..1fc09f1f1267 100644 --- a/include/i18nutil/paper.hxx +++ b/include/i18nutil/paper.hxx @@ -24,7 +24,10 @@ #include <rtl/string.hxx> #include <tools/long.hxx> -namespace com::sun::star::lang { struct Locale; } +namespace com::sun::star::lang +{ +struct Locale; +} //!! The values of the following enumerators must correspond to the array position //!! of the respective paper size in the file i18nutil/source/utility/paper.cxx @@ -116,14 +119,13 @@ enum Paper : unsigned }; // defined for 'equal size' test with the implementation array -#define NUM_PAPER_ENTRIES (PAPER_16K_197x273 - PAPER_A0 + 1) - +#define NUM_PAPER_ENTRIES (PAPER_16K_197x273 - PAPER_A0 + 1) class I18NUTIL_DLLPUBLIC PaperInfo { Paper m_eType; - tools::Long m_nPaperWidth; // width in 100thMM - tools::Long m_nPaperHeight; // height in 100thMM + tools::Long m_nPaperWidth; // width in 100thMM + tools::Long m_nPaperHeight; // height in 100thMM public: PaperInfo(Paper eType); PaperInfo(tools::Long nPaperWidth, tools::Long nPaperHeight); @@ -131,13 +133,13 @@ public: Paper getPaper() const { return m_eType; } tools::Long getWidth() const { return m_nPaperWidth; } tools::Long getHeight() const { return m_nPaperHeight; } - bool sloppyEqual(const PaperInfo &rOther) const; + bool sloppyEqual(const PaperInfo& rOther) const; void doSloppyFit(); static PaperInfo getSystemDefaultPaper(); - static PaperInfo getDefaultPaperForLocale(const css::lang::Locale & rLocale); + static PaperInfo getDefaultPaperForLocale(const css::lang::Locale& rLocale); - static Paper fromPSName(const OString &rName); + static Paper fromPSName(const OString& rName); static OString toPSName(Paper eType); static tools::Long sloppyFitPageDimension(tools::Long nDimension); diff --git a/include/i18nutil/unicode.hxx b/include/i18nutil/unicode.hxx index f0db87095f71..0ca14290981e 100644 --- a/include/i18nutil/unicode.hxx +++ b/include/i18nutil/unicode.hxx @@ -27,7 +27,8 @@ class LanguageTag; -struct ScriptTypeList { +struct ScriptTypeList +{ css::i18n::UnicodeScript from; css::i18n::UnicodeScript to; sal_Int16 value; @@ -36,16 +37,16 @@ struct ScriptTypeList { class I18NUTIL_DLLPUBLIC unicode { public: - - static sal_Int16 getUnicodeType( const sal_Unicode ch ); - static sal_Int16 getUnicodeScriptType( const sal_Unicode ch, const ScriptTypeList *typeList, sal_Int16 unknownType = 0 ); + static sal_Int16 getUnicodeType(const sal_Unicode ch); + static sal_Int16 getUnicodeScriptType(const sal_Unicode ch, const ScriptTypeList* typeList, + sal_Int16 unknownType = 0); static sal_Unicode getUnicodeScriptStart(css::i18n::UnicodeScript type); static sal_Unicode getUnicodeScriptEnd(css::i18n::UnicodeScript type); - static sal_uInt8 getUnicodeDirection( const sal_Unicode ch ); - static bool isControl( const sal_Unicode ch); - static bool isAlpha( const sal_Unicode ch); - static bool isSpace( const sal_Unicode ch); - static bool isWhiteSpace( const sal_Unicode ch); + static sal_uInt8 getUnicodeDirection(const sal_Unicode ch); + static bool isControl(const sal_Unicode ch); + static bool isAlpha(const sal_Unicode ch); + static bool isSpace(const sal_Unicode ch); + static bool isWhiteSpace(const sal_Unicode ch); /** Check for Unicode variation sequence selectors @@ -55,8 +56,8 @@ public: */ static bool isIVSSelector(sal_uInt32 nCode) { - return (nCode >= 0xFE00 && nCode <= 0xFE0F) // Variation Selectors block - || (nCode >= 0xE0100 && nCode <= 0xE01EF);// Variation Selectors Supplement block + return (nCode >= 0xFE00 && nCode <= 0xFE0F) // Variation Selectors block + || (nCode >= 0xE0100 && nCode <= 0xE01EF); // Variation Selectors Supplement block } /** Check for base characters of a CJK ideographic variation sequence (IVS) @@ -67,9 +68,9 @@ public: */ static bool isCJKIVSCharacter(sal_uInt32 nCode) { - return (nCode >= 0x4E00 && nCode <= 0x9FFF) // CJK Unified Ideographs - || (nCode >= 0x3400 && nCode <= 0x4DBF) // CJK Unified Ideographs Extension A - || (nCode >= 0x20000 && nCode <= 0x2A6DF); // CJK Unified Ideographs Extension B + return (nCode >= 0x4E00 && nCode <= 0x9FFF) // CJK Unified Ideographs + || (nCode >= 0x3400 && nCode <= 0x4DBF) // CJK Unified Ideographs Extension A + || (nCode >= 0x20000 && nCode <= 0x2A6DF); // CJK Unified Ideographs Extension B } //Map an ISO 15924 script code to Latin/Asian/Complex/Weak @@ -80,8 +81,7 @@ public: //Format a number as a percentage according to the rules of the given //language, e.g. 100 -> "100%" for en-US vs "100 %" for de-DE - static OUString formatPercent(double dNumber, - const LanguageTag &rLangTag); + static OUString formatPercent(double dNumber, const LanguageTag& rLangTag); }; /* @@ -128,5 +128,4 @@ public: #endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/jvmaccess/classpath.hxx b/include/jvmaccess/classpath.hxx index 9882a42ce25e..d1e1c658a44c 100644 --- a/include/jvmaccess/classpath.hxx +++ b/include/jvmaccess/classpath.hxx @@ -27,19 +27,23 @@ #include <jvmaccess/jvmaccessdllapi.h> #include <rtl/ustring.hxx> -namespace com::sun::star::uno { - class XComponentContext; +namespace com::sun::star::uno +{ +class XComponentContext; } -namespace com::sun::star::uno { template <typename > class Reference; } - -namespace jvmaccess { +namespace com::sun::star::uno +{ +template <typename> class Reference; +} +namespace jvmaccess +{ /** Helper functions for class path handling. */ -namespace ClassPath { - +namespace ClassPath +{ /** translates a class path into a java.net.URL[] instance. @@ -65,12 +69,10 @@ namespace ClassPath { @throws com::sun::star::uno::RuntimeException */ -JVMACCESS_DLLPUBLIC jobjectArray translateToUrls( - css::uno::Reference<css::uno::XComponentContext> const & context, - JNIEnv * environment, OUString const & classPath); - +JVMACCESS_DLLPUBLIC jobjectArray +translateToUrls(css::uno::Reference<css::uno::XComponentContext> const& context, + JNIEnv* environment, OUString const& classPath); } - } #endif diff --git a/include/jvmaccess/jvmaccessdllapi.h b/include/jvmaccess/jvmaccessdllapi.h index 0f6651b5dbf8..1c57d1484266 100644 --- a/include/jvmaccess/jvmaccessdllapi.h +++ b/include/jvmaccess/jvmaccessdllapi.h @@ -13,9 +13,9 @@ #include <sal/types.h> #if defined JVMACCESS_DLLIMPLEMENTATION -# define JVMACCESS_DLLPUBLIC SAL_DLLPUBLIC_EXPORT +#define JVMACCESS_DLLPUBLIC SAL_DLLPUBLIC_EXPORT #else -# define JVMACCESS_DLLPUBLIC SAL_DLLPUBLIC_IMPORT +#define JVMACCESS_DLLPUBLIC SAL_DLLPUBLIC_IMPORT #endif #define JVMACCESS_DLLPRIVATE SAL_DLLPRIVATE diff --git a/include/jvmaccess/unovirtualmachine.hxx b/include/jvmaccess/unovirtualmachine.hxx index c412b34b959f..ac7cf107f4d4 100644 --- a/include/jvmaccess/unovirtualmachine.hxx +++ b/include/jvmaccess/unovirtualmachine.hxx @@ -25,14 +25,15 @@ #include <salhelper/simplereferenceobject.hxx> #include <rtl/ref.hxx> -namespace jvmaccess { - +namespace jvmaccess +{ class VirtualMachine; /** An encapsulating wrapper around a Java virtual machine and an appropriate UNO class loader. */ -class JVMACCESS_DLLPUBLIC UnoVirtualMachine final : public salhelper::SimpleReferenceObject { +class JVMACCESS_DLLPUBLIC UnoVirtualMachine final : public salhelper::SimpleReferenceObject +{ public: /** An exception indicating failure to create a UnoVirtualMachine. */ @@ -41,11 +42,11 @@ public: public: CreationException(); - CreationException(CreationException const &); + CreationException(CreationException const&); ~CreationException(); - CreationException & operator =(CreationException const &); + CreationException& operator=(CreationException const&); }; /** Create a wrapper around a Java virtual machine and an appropriate UNO @@ -65,16 +66,15 @@ public: @exception CreationException Thrown in case creation fails (due to a JNI problem). */ - UnoVirtualMachine( - rtl::Reference< jvmaccess::VirtualMachine > const & virtualMachine, - void * classLoader); + UnoVirtualMachine(rtl::Reference<jvmaccess::VirtualMachine> const& virtualMachine, + void* classLoader); /** Get the Java virtual machine wrapper. @return The Java virtual machine wrapper. Will never be null. */ - const rtl::Reference< jvmaccess::VirtualMachine >& getVirtualMachine() const; + const rtl::Reference<jvmaccess::VirtualMachine>& getVirtualMachine() const; /** Get the UNO class loader. @@ -85,18 +85,17 @@ public: different for different JDK versions, so that the mangled C++ name of the function would depend on the JDK version used at compile time. */ - void * getClassLoader() const { return m_classLoader;} + void* getClassLoader() const { return m_classLoader; } private: - UnoVirtualMachine(UnoVirtualMachine const &) = delete; - UnoVirtualMachine& operator =(UnoVirtualMachine const &) = delete; + UnoVirtualMachine(UnoVirtualMachine const&) = delete; + UnoVirtualMachine& operator=(UnoVirtualMachine const&) = delete; virtual ~UnoVirtualMachine() override; - rtl::Reference< jvmaccess::VirtualMachine > m_virtualMachine; - void * m_classLoader; + rtl::Reference<jvmaccess::VirtualMachine> m_virtualMachine; + void* m_classLoader; }; - } #endif diff --git a/include/jvmaccess/virtualmachine.hxx b/include/jvmaccess/virtualmachine.hxx index 2076a02577bd..a95668cdfa32 100644 --- a/include/jvmaccess/virtualmachine.hxx +++ b/include/jvmaccess/virtualmachine.hxx @@ -26,8 +26,8 @@ #include <jni.h> -namespace jvmaccess { - +namespace jvmaccess +{ /** An encapsulating wrapper around a Java virtual machine. */ class JVMACCESS_DLLPUBLIC VirtualMachine final : public salhelper::SimpleReferenceObject @@ -53,11 +53,11 @@ public: public: CreationException(); - CreationException(CreationException const &); + CreationException(CreationException const&); ~CreationException(); - CreationException & operator =(CreationException const &); + CreationException& operator=(CreationException const&); }; /** Attach the current thread to a virtual machine. @@ -68,7 +68,7 @@ public: @exception CreationException Thrown in case attaching fails (due to a JNI problem). */ - explicit AttachGuard(rtl::Reference< VirtualMachine > const & rMachine); + explicit AttachGuard(rtl::Reference<VirtualMachine> const& rMachine); /** Detach the current thread from the virtual machine again. */ @@ -79,14 +79,14 @@ public: @return A valid JNI environment pointer. Will never be null. */ - JNIEnv * getEnvironment() const { return m_pEnvironment; } + JNIEnv* getEnvironment() const { return m_pEnvironment; } private: - AttachGuard(AttachGuard const &) = delete; - AttachGuard& operator =(AttachGuard const &) = delete; + AttachGuard(AttachGuard const&) = delete; + AttachGuard& operator=(AttachGuard const&) = delete; - rtl::Reference< VirtualMachine > m_xMachine; - JNIEnv * m_pEnvironment; + rtl::Reference<VirtualMachine> m_xMachine; + JNIEnv* m_pEnvironment; bool m_bDetach; }; @@ -124,26 +124,24 @@ public: anyway). This parameter is currently unused (but may be used again in the future). */ - VirtualMachine(JavaVM * pVm, int nVersion, bool bDestroy, - JNIEnv const * pMainThreadEnv); + VirtualMachine(JavaVM* pVm, int nVersion, bool bDestroy, JNIEnv const* pMainThreadEnv); private: - VirtualMachine(VirtualMachine const &) = delete; - VirtualMachine& operator =(VirtualMachine const & ) = delete; + VirtualMachine(VirtualMachine const&) = delete; + VirtualMachine& operator=(VirtualMachine const&) = delete; virtual ~VirtualMachine() override; - JNIEnv * attachThread(bool * pAttached) const; + JNIEnv* attachThread(bool* pAttached) const; void detachThread() const; - JavaVM * m_pVm; + JavaVM* m_pVm; jint m_nVersion; bool m_bDestroy; friend class AttachGuard; // to access attachThread, detachThread }; - } #endif // INCLUDED_JVMACCESS_VIRTUALMACHINE_HXX diff --git a/include/jvmfwk/framework.hxx b/include/jvmfwk/framework.hxx index 08baf8f23d67..8b2e36e935fc 100644 --- a/include/jvmfwk/framework.hxx +++ b/include/jvmfwk/framework.hxx @@ -164,7 +164,7 @@ <p>Therefore, when a Java is selected in OO then the office must be restarted, so that the changes can take effect.</p> */ -#define JFW_REQUIRE_NEEDRESTART 0x1l +#define JFW_REQUIRE_NEEDRESTART 0x1l /** error codes which are returned by functions of this API. */ @@ -251,8 +251,7 @@ struct JavaInfo true - both object represent the same JRE.</br> false - the objects represent different JREs */ -JVMFWK_DLLPUBLIC bool jfw_areEqualJavaInfo( - JavaInfo const * pInfoA,JavaInfo const * pInfoB); +JVMFWK_DLLPUBLIC bool jfw_areEqualJavaInfo(JavaInfo const* pInfoA, JavaInfo const* pInfoB); /** determines if a Java Virtual Machine is already running. @@ -314,7 +313,7 @@ JVMFWK_DLLPUBLIC bool jfw_isVMRunning(); JFW_E_CONFIGURATION mode was not properly set or their prerequisites were not met. */ -JVMFWK_DLLPUBLIC javaFrameworkError jfw_findAndSelectJRE(std::unique_ptr<JavaInfo> *pInfo); +JVMFWK_DLLPUBLIC javaFrameworkError jfw_findAndSelectJRE(std::unique_ptr<JavaInfo>* pInfo); /** provides information about all available JRE installations. @@ -336,8 +335,8 @@ JVMFWK_DLLPUBLIC javaFrameworkError jfw_findAndSelectJRE(std::unique_ptr<JavaInf JFW_E_CONFIGURATION mode was not properly set or their prerequisites were not met. */ -JVMFWK_DLLPUBLIC javaFrameworkError jfw_findAllJREs( - std::vector<std::unique_ptr<JavaInfo>> *parInfo); +JVMFWK_DLLPUBLIC javaFrameworkError +jfw_findAllJREs(std::vector<std::unique_ptr<JavaInfo>>* parInfo); /** determines if a path points to a Java installation. @@ -367,9 +366,8 @@ JVMFWK_DLLPUBLIC javaFrameworkError jfw_findAllJREs( JFW_E_FAILED_VERSION a JRE was detected but if failed the version requirements as determined by the javavendors.xml */ -JVMFWK_DLLPUBLIC javaFrameworkError jfw_getJavaInfoByPath( - OUString const & pPath, std::unique_ptr<JavaInfo> *ppInfo); - +JVMFWK_DLLPUBLIC javaFrameworkError jfw_getJavaInfoByPath(OUString const& pPath, + std::unique_ptr<JavaInfo>* ppInfo); /** starts a Java Virtual Machine (JVM). @@ -431,9 +429,9 @@ JVMFWK_DLLPUBLIC javaFrameworkError jfw_getJavaInfoByPath( JFW_E_FAILED_VERSION the "Default Mode" is active. The JRE determined by <code>JAVA_HOME</code>does not meet the version requirements. */ -JVMFWK_DLLPUBLIC javaFrameworkError jfw_startVM( - JavaInfo const * pInfo, std::vector<OUString> const & arOptions, - JavaVM ** ppVM, JNIEnv ** ppEnv); +JVMFWK_DLLPUBLIC javaFrameworkError jfw_startVM(JavaInfo const* pInfo, + std::vector<OUString> const& arOptions, + JavaVM** ppVM, JNIEnv** ppEnv); /** determines the JRE that is to be used. @@ -461,8 +459,7 @@ JVMFWK_DLLPUBLIC javaFrameworkError jfw_startVM( were not met.<br/> JFW_E_DIRECT_MODE the function cannot be used in this mode. */ -JVMFWK_DLLPUBLIC javaFrameworkError jfw_setSelectedJRE(JavaInfo const *pInfo); - +JVMFWK_DLLPUBLIC javaFrameworkError jfw_setSelectedJRE(JavaInfo const* pInfo); /** provides information about the JRE that is to be used. @@ -489,8 +486,7 @@ JVMFWK_DLLPUBLIC javaFrameworkError jfw_setSelectedJRE(JavaInfo const *pInfo); JFW_E_INVALID_SETTINGS the javavendors.xml has been changed and no JRE has been selected afterwards. <br/> */ -JVMFWK_DLLPUBLIC javaFrameworkError jfw_getSelectedJRE(std::unique_ptr<JavaInfo> *ppInfo); - +JVMFWK_DLLPUBLIC javaFrameworkError jfw_getSelectedJRE(std::unique_ptr<JavaInfo>* ppInfo); /** determines if Java can be used. @@ -522,7 +518,7 @@ JVMFWK_DLLPUBLIC javaFrameworkError jfw_setEnabled(bool bEnabled); were not met.<br/> JFW_E_DIRECT_MODE the function cannot be used in this mode. */ -JVMFWK_DLLPUBLIC javaFrameworkError jfw_getEnabled(bool *pbEnabled); +JVMFWK_DLLPUBLIC javaFrameworkError jfw_getEnabled(bool* pbEnabled); /** determines parameters which are passed to VM during its creation. @@ -543,8 +539,7 @@ JVMFWK_DLLPUBLIC javaFrameworkError jfw_getEnabled(bool *pbEnabled); were not met.<br/> JFW_E_DIRECT_MODE the function cannot be used in this mode. */ -JVMFWK_DLLPUBLIC javaFrameworkError jfw_setVMParameters( - std::vector<OUString> const & arArgs); +JVMFWK_DLLPUBLIC javaFrameworkError jfw_setVMParameters(std::vector<OUString> const& arArgs); /** obtains the currently used start parameters. @@ -558,8 +553,7 @@ JVMFWK_DLLPUBLIC javaFrameworkError jfw_setVMParameters( were not met.<br/> JFW_E_DIRECT_MODE the function cannot be used in this mode. */ -JVMFWK_DLLPUBLIC javaFrameworkError jfw_getVMParameters( - std::vector<OUString> * parParameters); +JVMFWK_DLLPUBLIC javaFrameworkError jfw_getVMParameters(std::vector<OUString>* parParameters); /** sets the user class path. @@ -578,7 +572,7 @@ JVMFWK_DLLPUBLIC javaFrameworkError jfw_getVMParameters( were not met.<br/> JFW_E_DIRECT_MODE the function cannot be used in this mode. */ -JVMFWK_DLLPUBLIC javaFrameworkError jfw_setUserClassPath(OUString const & pCP); +JVMFWK_DLLPUBLIC javaFrameworkError jfw_setUserClassPath(OUString const& pCP); /** provides the value of the current user class path. <p>The function returns an empty string if no user class path is set. @@ -594,7 +588,7 @@ JVMFWK_DLLPUBLIC javaFrameworkError jfw_setUserClassPath(OUString const & pCP); were not met.<br/> JFW_E_DIRECT_MODE the function cannot be used in this mode. */ -JVMFWK_DLLPUBLIC javaFrameworkError jfw_getUserClassPath(OUString * ppCP); +JVMFWK_DLLPUBLIC javaFrameworkError jfw_getUserClassPath(OUString* ppCP); /** saves the location of a JRE. @@ -621,8 +615,7 @@ JVMFWK_DLLPUBLIC javaFrameworkError jfw_getUserClassPath(OUString * ppCP); were not met.<br/> JFW_E_DIRECT_MODE the function cannot be used in this mode. */ -JVMFWK_DLLPUBLIC javaFrameworkError jfw_addJRELocation( - OUString const & sLocation); +JVMFWK_DLLPUBLIC javaFrameworkError jfw_addJRELocation(OUString const& sLocation); /** checks if the installation of the jre still exists. @@ -640,8 +633,7 @@ JVMFWK_DLLPUBLIC javaFrameworkError jfw_addJRELocation( JFW_E_NONE the function ran successfully.</br> JFW_E_ERROR an error occurred during execution.</br> */ -JVMFWK_DLLPUBLIC javaFrameworkError jfw_existJRE(const JavaInfo *pInfo, bool *exist); - +JVMFWK_DLLPUBLIC javaFrameworkError jfw_existJRE(const JavaInfo* pInfo, bool* exist); /** locks this API so that it cannot be used by other threads. diff --git a/include/jvmfwk/jvmfwkdllapi.hxx b/include/jvmfwk/jvmfwkdllapi.hxx index 67be38afb6f8..bd59abb74d81 100644 --- a/include/jvmfwk/jvmfwkdllapi.hxx +++ b/include/jvmfwk/jvmfwkdllapi.hxx @@ -13,9 +13,9 @@ #include <sal/types.h> #if defined JVMFWK_DLLIMPLEMENTATION -# define JVMFWK_DLLPUBLIC SAL_DLLPUBLIC_EXPORT +#define JVMFWK_DLLPUBLIC SAL_DLLPUBLIC_EXPORT #else -# define JVMFWK_DLLPUBLIC SAL_DLLPUBLIC_IMPORT +#define JVMFWK_DLLPUBLIC SAL_DLLPUBLIC_IMPORT #endif #endif diff --git a/include/linguistic/lngdllapi.h b/include/linguistic/lngdllapi.h index b03f294a20f6..3944d47cfe22 100644 --- a/include/linguistic/lngdllapi.h +++ b/include/linguistic/lngdllapi.h @@ -24,9 +24,9 @@ #include <sal/types.h> #if defined(LNG_DLLIMPLEMENTATION) -#define LNG_DLLPUBLIC SAL_DLLPUBLIC_EXPORT +#define LNG_DLLPUBLIC SAL_DLLPUBLIC_EXPORT #else -#define LNG_DLLPUBLIC SAL_DLLPUBLIC_IMPORT +#define LNG_DLLPUBLIC SAL_DLLPUBLIC_IMPORT #endif #define LNG_DLLPRIVATE SAL_DLLPRIVATE diff --git a/include/linguistic/lngprops.hxx b/include/linguistic/lngprops.hxx index 94278fd16947..9861a384b3bd 100644 --- a/include/linguistic/lngprops.hxx +++ b/include/linguistic/lngprops.hxx @@ -22,7 +22,7 @@ // maximal number of suggestions to be returned in spelling context-menu // (may not include results added by looking up user dictionaries) -#define UPN_MAX_NUMBER_OF_SUGGESTIONS "MaxNumberOfSuggestions" +#define UPN_MAX_NUMBER_OF_SUGGESTIONS "MaxNumberOfSuggestions" #endif diff --git a/include/o3tl/deleter.hxx b/include/o3tl/deleter.hxx index a886acb03d3c..7cb9145eb2a1 100644 --- a/include/o3tl/deleter.hxx +++ b/include/o3tl/deleter.hxx @@ -17,15 +17,15 @@ #include <com/sun/star/uno/Exception.hpp> #include <sal/log.hxx> -namespace o3tl { - +namespace o3tl +{ /** To markup std::unique_ptr that coverity warns might throw exceptions which won't throw in practice, or where std::terminate is an acceptable response if they do */ -template<typename T> struct default_delete +template <typename T> struct default_delete { - void operator() (T* p) noexcept + void operator()(T* p) noexcept { #if defined(__COVERITY__) try @@ -53,7 +53,7 @@ struct free_delete void operator()(void* p) { std::free(p); } }; -template<typename uniqueptr> void reset_preserve_ptr_during(uniqueptr& ptr) +template <typename uniqueptr> void reset_preserve_ptr_during(uniqueptr& ptr) { // HACK: for the case where the dtor of the obj held by ptr will trigger // functions which expect ptr to still be set during the dtor. @@ -62,7 +62,6 @@ template<typename uniqueptr> void reset_preserve_ptr_during(uniqueptr& ptr) delete ptr.get(); (void)ptr.release(); } - } #endif diff --git a/include/o3tl/lru_map.hxx b/include/o3tl/lru_map.hxx index e822fde0294c..c7132fd079c4 100644 --- a/include/o3tl/lru_map.hxx +++ b/include/o3tl/lru_map.hxx @@ -17,7 +17,6 @@ namespace o3tl { - /** LRU map * * Similar to unordered_map (it actually uses it) with additionally functionality @@ -31,7 +30,8 @@ namespace o3tl * for most of the operations with a combination unordered map and linked list. * **/ -template<typename Key, typename Value, class KeyHash = std::hash<Key>, class KeyEqual = std::equal_to<Key>> +template <typename Key, typename Value, class KeyHash = std::hash<Key>, + class KeyEqual = std::equal_to<Key>> class lru_map final { public: @@ -68,7 +68,8 @@ public: // a size of 0 effectively disables the LRU cleanup code lru_map(size_t nMaxSize) : mMaxSize(nMaxSize ? nMaxSize : std::min(mLruMap.max_size(), mLruList.max_size())) - {} + { + } ~lru_map() { // Some code .e.g. SalBitmap likes to remove itself from a cache during it's destructor, which means we @@ -139,8 +140,7 @@ public: } // reverse-iterates the list removing all items matching the predicate - template<class UnaryPredicate> - void remove_if(UnaryPredicate pred) + template <class UnaryPredicate> void remove_if(UnaryPredicate pred) { auto it = mLruList.rbegin(); while (it != mLruList.rend()) @@ -155,15 +155,9 @@ public: } } - list_const_iterator_t begin() const - { - return mLruList.cbegin(); - } + list_const_iterator_t begin() const { return mLruList.cbegin(); } - list_const_iterator_t end() const - { - return mLruList.cend(); - } + list_const_iterator_t end() const { return mLruList.cend(); } size_t size() const { @@ -177,7 +171,6 @@ public: mLruList.clear(); } }; - } #endif /* INCLUDED_O3TL_LRU_MAP_HXX */ diff --git a/include/o3tl/make_shared.hxx b/include/o3tl/make_shared.hxx index 9d7998fd5a36..5d4d98e42b3a 100644 --- a/include/o3tl/make_shared.hxx +++ b/include/o3tl/make_shared.hxx @@ -14,14 +14,13 @@ #include <memory> #include <type_traits> -namespace o3tl { - +namespace o3tl +{ /** Allocate an array stored in a shared_ptr, calling operator delete[]. Note that this is only allowed for arithmetic types because shared_ptr implicitly converts to sub-types. */ -template<typename T> -std::shared_ptr<T> make_shared_array(size_t const size) +template <typename T> std::shared_ptr<T> make_shared_array(size_t const size) { static_assert(std::is_arithmetic<T>::value, "only arrays of arithmetic types allowed"); return std::shared_ptr<T>(new T[size], std::default_delete<T[]>()); @@ -31,8 +30,7 @@ std::shared_ptr<T> make_shared_array(size_t const size) which won't throw in practice, or where std::terminate is an acceptable response if they do */ -template<class T, class... Args> -std::shared_ptr<T> make_shared(Args&&... args) +template <class T, class... Args> std::shared_ptr<T> make_shared(Args&&... args) { #if defined(__COVERITY__) return std::shared_ptr<T>(new T(std::forward<Args>(args)...), o3tl::default_delete<T>()); diff --git a/include/o3tl/runtimetooustring.hxx b/include/o3tl/runtimetooustring.hxx index 7f2015805722..6d6f27ac186e 100644 --- a/include/o3tl/runtimetooustring.hxx +++ b/include/o3tl/runtimetooustring.hxx @@ -20,8 +20,8 @@ #include <rtl/ustring.h> #include <rtl/ustring.hxx> -namespace o3tl { - +namespace o3tl +{ /** Convert an NTBS from the C++ runtime to an OUString. This is used to convert an NTBS as provided by std::exception::what or @@ -29,18 +29,17 @@ namespace o3tl { is done using RTL_TEXTENCODING_ISO_8859_1, so each char in the input maps to one Unicode character in the output. */ -inline OUString runtimeToOUString(char const * runtimeString) { +inline OUString runtimeToOUString(char const* runtimeString) +{ OUString s; bool ok = rtl_convertStringToUString( - &s.pData, runtimeString, std::strlen(runtimeString), - RTL_TEXTENCODING_ISO_8859_1, - (RTL_TEXTTOUNICODE_FLAGS_UNDEFINED_ERROR - | RTL_TEXTTOUNICODE_FLAGS_MBUNDEFINED_ERROR + &s.pData, runtimeString, std::strlen(runtimeString), RTL_TEXTENCODING_ISO_8859_1, + (RTL_TEXTTOUNICODE_FLAGS_UNDEFINED_ERROR | RTL_TEXTTOUNICODE_FLAGS_MBUNDEFINED_ERROR | RTL_TEXTTOUNICODE_FLAGS_INVALID_ERROR)); - assert(ok); (void) ok; + assert(ok); + (void)ok; return s; } - } #endif diff --git a/include/onlineupdate/mozilla/Likely.h b/include/onlineupdate/mozilla/Likely.h index 4f2160929544..5625bb226e40 100644 --- a/include/onlineupdate/mozilla/Likely.h +++ b/include/onlineupdate/mozilla/Likely.h @@ -13,11 +13,11 @@ #define mozilla_Likely_h #if defined(__clang__) || defined(__GNUC__) -# define MOZ_LIKELY(x) (__builtin_expect(!!(x), 1)) -# define MOZ_UNLIKELY(x) (__builtin_expect(!!(x), 0)) +#define MOZ_LIKELY(x) (__builtin_expect(!!(x), 1)) +#define MOZ_UNLIKELY(x) (__builtin_expect(!!(x), 0)) #else -# define MOZ_LIKELY(x) (!!(x)) -# define MOZ_UNLIKELY(x) (!!(x)) +#define MOZ_LIKELY(x) (!!(x)) +#define MOZ_UNLIKELY(x) (!!(x)) #endif #endif /* mozilla_Likely_h */ diff --git a/include/oox/mathml/importutils.hxx b/include/oox/mathml/importutils.hxx index 07144c4575a0..851b2564a100 100644 --- a/include/oox/mathml/importutils.hxx +++ b/include/oox/mathml/importutils.hxx @@ -18,13 +18,16 @@ #include <rtl/ustring.hxx> #include <sal/types.h> -namespace com::sun::star { - namespace xml::sax { class XFastAttributeList; } +namespace com::sun::star +{ +namespace xml::sax +{ +class XFastAttributeList; +} } namespace oox::formulaimport { - // used to differentiate between tags that opening or closing const int TAG_OPENING = 1 << 29; const int TAG_CLOSING = 1 << 30; @@ -32,8 +35,8 @@ const int TAG_CLOSING = 1 << 30; // you probably want to #define these to something shorter in the .cxx file, // but they must be done as macros, otherwise they wouldn't be usable for case values, // and macros cannot be namespaced -#define XML_STREAM_OPENING( token ) ( TAG_OPENING | token ) -#define XML_STREAM_CLOSING( token ) ( TAG_CLOSING | token ) +#define XML_STREAM_OPENING(token) (TAG_OPENING | token) +#define XML_STREAM_CLOSING(token) (TAG_CLOSING | token) /** Class for storing a stream of xml tokens. @@ -116,23 +119,23 @@ public: // which means using oox::AttributeList would make them all point to the one instance. struct OOX_DLLPUBLIC AttributeList { - OUString& operator[] (int token); - OUString attribute( int token, const OUString& def) const; - bool attribute( int token, bool def ) const; - sal_Unicode attribute( int token, sal_Unicode def ) const; + OUString& operator[](int token); + OUString attribute(int token, const OUString& def) const; + bool attribute(int token, bool def) const; + sal_Unicode attribute(int token, sal_Unicode def) const; // when adding more attribute() overloads, add also to XmlStream itself protected: - std::map< int, OUString > attrs; + std::map<int, OUString> attrs; }; /** Structure representing a tag, including its attributes and content text immediately following it. */ struct OOX_DLLPUBLIC Tag { - Tag( int token = XML_TOKEN_INVALID, - const css::uno::Reference< css::xml::sax::XFastAttributeList >& attributes = css::uno::Reference< css::xml::sax::XFastAttributeList >()); - Tag( int token, - const AttributeList& attribs); + Tag(int token = XML_TOKEN_INVALID, + const css::uno::Reference<css::xml::sax::XFastAttributeList>& attributes + = css::uno::Reference<css::xml::sax::XFastAttributeList>()); + Tag(int token, const AttributeList& attribs); int token; ///< tag type, or XML_TOKEN_INVALID AttributeList attributes; OUString text; @@ -140,15 +143,15 @@ public: This function returns value of the given attribute, or the passed default value if not found. The type of the default value selects the return type (OUString here). */ - OUString attribute( int token, const OUString& def = OUString()) const; + OUString attribute(int token, const OUString& def = OUString()) const; /** @overload */ - bool attribute( int token, bool def ) const; + bool attribute(int token, bool def) const; /** @overload */ - sal_Unicode attribute( int token, sal_Unicode def ) const; + sal_Unicode attribute(int token, sal_Unicode def) const; // when adding more attribute() overloads, add also to XmlStream::AttributeList and inline below /** Converts to true if the tag has a valid token, false otherwise. Allows simple @@ -178,34 +181,35 @@ public: If found, the position in the stream is afterwards moved to the next tag. @return the matching found opening tag, or empty tag if not found */ - Tag ensureOpeningTag( int token ); + Tag ensureOpeningTag(int token); /** Tries to find an opening tag with the given token. Works similarly like ensureOpeningTag(), but if a matching tag is not found, the position in the stream is not altered. The primary use of this function is to check for optional elements. @return the matching found opening tag, or empty tag if not found */ - Tag checkOpeningTag( int token ); + Tag checkOpeningTag(int token); /** Ensures that a closing tag with the given token is read. Like ensureOpeningTag(), if not, writes out a warning and tries to recover by skipping tags until found (or until the current element would end). If found, the position in the stream is afterwards moved to the next tag. */ - void ensureClosingTag( int token ); + void ensureClosingTag(int token); /** Tries to find the given token, until either found (returns true) or end of current element. Position in the stream is set to make the tag current (i.e. it will be the next one read). */ - bool findTag( int token ); + bool findTag(int token); /** Handle the current (unexpected) tag. */ void handleUnexpectedTag(); + protected: - Tag checkTag( int token, bool optional ); - bool findTagInternal( int token, bool silent ); - void skipElementInternal( int token, bool silent ); - std::vector< Tag > tags; + Tag checkTag(int token, bool optional); + bool findTagInternal(int token, bool silent); + void skipElementInternal(int token, bool silent); + std::vector<Tag> tags; unsigned int pos; }; @@ -216,35 +220,31 @@ protected: @since 3.5.0 */ -class OOX_DLLPUBLIC XmlStreamBuilder -: public XmlStream +class OOX_DLLPUBLIC XmlStreamBuilder : public XmlStream { public: - void appendOpeningTag( int token, - const css::uno::Reference< css::xml::sax::XFastAttributeList >& attributes = css::uno::Reference< css::xml::sax::XFastAttributeList >()); - void appendOpeningTag( int token, - const AttributeList& attribs ); - void appendClosingTag( int token ); + void appendOpeningTag(int token, + const css::uno::Reference<css::xml::sax::XFastAttributeList>& attributes + = css::uno::Reference<css::xml::sax::XFastAttributeList>()); + void appendOpeningTag(int token, const AttributeList& attribs); + void appendClosingTag(int token); // appends the characters after the last appended token - void appendCharacters( const OUString& characters ); + void appendCharacters(const OUString& characters); }; -inline -OUString XmlStream::Tag::attribute( int t, const OUString& def ) const +inline OUString XmlStream::Tag::attribute(int t, const OUString& def) const { - return attributes.attribute( t, def ); + return attributes.attribute(t, def); } -inline -bool XmlStream::Tag::attribute( int t, bool def ) const +inline bool XmlStream::Tag::attribute(int t, bool def) const { - return attributes.attribute( t, def ); + return attributes.attribute(t, def); } -inline -sal_Unicode XmlStream::Tag::attribute( int t, sal_Unicode def ) const +inline sal_Unicode XmlStream::Tag::attribute(int t, sal_Unicode def) const { - return attributes.attribute( t, def ); + return attributes.attribute(t, def); } } // namespace diff --git a/include/oox/token/namespacemap.hxx b/include/oox/token/namespacemap.hxx index b8068bb0bd8c..26e4fdce95f7 100644 --- a/include/oox/token/namespacemap.hxx +++ b/include/oox/token/namespacemap.hxx @@ -26,24 +26,24 @@ #include <rtl/ustring.hxx> #include <sal/types.h> -namespace oox { - - +namespace oox +{ /** A map that contains all XML namespace URLs used in the filters. */ struct NamespaceMap { - std::map< sal_Int32, OUString > maTransitionalNamespaceMap; - std::map< sal_Int32, OUString > maStrictNamespaceMap; + std::map<sal_Int32, OUString> maTransitionalNamespaceMap; + std::map<sal_Int32, OUString> maStrictNamespaceMap; NamespaceMap(); - typedef std::map< sal_Int32, OUString >::iterator iterator; - typedef std::map< sal_Int32, OUString >::const_iterator const_iterator; + typedef std::map<sal_Int32, OUString>::iterator iterator; + typedef std::map<sal_Int32, OUString>::const_iterator const_iterator; }; /** Thread-save singleton of a map of all supported XML namespace URLs. */ -struct StaticNamespaceMap : public ::rtl::Static< NamespaceMap, StaticNamespaceMap > {}; - +struct StaticNamespaceMap : public ::rtl::Static<NamespaceMap, StaticNamespaceMap> +{ +}; } // namespace oox diff --git a/include/oox/token/propertynames.hxx b/include/oox/token/propertynames.hxx index 1f5f3341dd53..84077359e1fe 100644 --- a/include/oox/token/propertynames.hxx +++ b/include/oox/token/propertynames.hxx @@ -25,15 +25,18 @@ #include <rtl/instance.hxx> #include <rtl/ustring.hxx> -namespace oox { - - +namespace oox +{ /** A vector that contains all predefined property names used in the filters. */ -struct PropertyNameVector : public ::std::vector< OUString > { PropertyNameVector(); }; +struct PropertyNameVector : public ::std::vector<OUString> +{ + PropertyNameVector(); +}; /** Thread-save singleton of a vector of all supported property names. */ -struct StaticPropertyNameVector : public ::rtl::Static< PropertyNameVector, StaticPropertyNameVector > {}; - +struct StaticPropertyNameVector : public ::rtl::Static<PropertyNameVector, StaticPropertyNameVector> +{ +}; } // namespace oox diff --git a/include/oox/token/relationship.hxx b/include/oox/token/relationship.hxx index adc25f4a73b6..adffd4b6617e 100644 --- a/include/oox/token/relationship.hxx +++ b/include/oox/token/relationship.hxx @@ -14,8 +14,8 @@ #include <rtl/ustring.hxx> -namespace oox { - +namespace oox +{ enum class Relationship { ACTIVEXCONTROLBINARY, @@ -66,7 +66,6 @@ enum class Relationship }; OUString OOX_DLLPUBLIC getRelationship(Relationship eRelationship); - } #endif // INCLUDED_OOX_TOKEN_RELATIONSHIP_HXX diff --git a/include/opencl/OpenCLZone.hxx b/include/opencl/OpenCLZone.hxx index 1bbf3a46161c..8247e667d0c8 100644 --- a/include/opencl/OpenCLZone.hxx +++ b/include/opencl/OpenCLZone.hxx @@ -16,14 +16,14 @@ #include <comphelper/crashzone.hxx> -class OPENCL_DLLPUBLIC OpenCLZone : public CrashZone< OpenCLZone > +class OPENCL_DLLPUBLIC OpenCLZone : public CrashZone<OpenCLZone> { public: static void hardDisable(); }; // Used during initial testing of OpenCL. -class OPENCL_DLLPUBLIC OpenCLInitialZone : public CrashZone< OpenCLInitialZone > +class OPENCL_DLLPUBLIC OpenCLInitialZone : public CrashZone<OpenCLInitialZone> { }; diff --git a/include/opencl/opencldllapi.h b/include/opencl/opencldllapi.h index f62b94cb77fc..99bfd6cb9e79 100644 --- a/include/opencl/opencldllapi.h +++ b/include/opencl/opencldllapi.h @@ -23,9 +23,9 @@ #include <sal/types.h> #if defined(OPENCL_DLLIMPLEMENTATION) -#define OPENCL_DLLPUBLIC SAL_DLLPUBLIC_EXPORT +#define OPENCL_DLLPUBLIC SAL_DLLPUBLIC_EXPORT #else -#define OPENCL_DLLPUBLIC SAL_DLLPUBLIC_IMPORT +#define OPENCL_DLLPUBLIC SAL_DLLPUBLIC_IMPORT #endif #define OPENCL_DLLPRIVATE SAL_DLLPRIVATE diff --git a/include/osl/detail/file.h b/include/osl/detail/file.h index 23c41efbe77c..acc308b8f9ef 100644 --- a/include/osl/detail/file.h +++ b/include/osl/detail/file.h @@ -21,9 +21,9 @@ /* More flags needed for semantics that match the open() call that used to be in SvFileStream::Open(), and for temp files: */ -#define osl_File_OpenFlag_Trunc 0x00000010L -#define osl_File_OpenFlag_NoExcl 0x00000020L -#define osl_File_OpenFlag_Private 0x00000040L +#define osl_File_OpenFlag_Trunc 0x00000010L +#define osl_File_OpenFlag_NoExcl 0x00000020L +#define osl_File_OpenFlag_Private 0x00000040L /** @endcond */ diff --git a/include/osl/getglobalmutex.hxx b/include/osl/getglobalmutex.hxx index 4fbd32a3e4b5..628fe97c98f8 100644 --- a/include/osl/getglobalmutex.hxx +++ b/include/osl/getglobalmutex.hxx @@ -22,8 +22,8 @@ #include "osl/mutex.hxx" -namespace osl { - +namespace osl +{ /** A helper functor for the rtl_Instance template. See the rtl_Instance template for examples of how this class is used. @@ -31,12 +31,8 @@ namespace osl { class GetGlobalMutex { public: - ::osl::Mutex * operator()() - { - return ::osl::Mutex::getGlobalMutex(); - } + ::osl::Mutex* operator()() { return ::osl::Mutex::getGlobalMutex(); } }; - } #endif // INCLUDED_OSL_GETGLOBALMUTEX_HXX diff --git a/include/osl/pipe_decl.hxx b/include/osl/pipe_decl.hxx index 57f2c76b1c7c..7f35e1155b48 100644 --- a/include/osl/pipe_decl.hxx +++ b/include/osl/pipe_decl.hxx @@ -20,11 +20,11 @@ #define INCLUDED_OSL_PIPE_DECL_HXX #include "osl/pipe.h" -# include "osl/security.hxx" +#include "osl/security.hxx" #include "rtl/ustring.hxx" -namespace osl { - +namespace osl +{ class StreamPipe; /** Represents a pipe. @@ -35,7 +35,6 @@ protected: oslPipe m_handle; public: - /** Does not create a pipe. Use assignment operator to make this a usable pipe. */ @@ -52,19 +51,19 @@ public: @param Options @param rSecurity */ - inline Pipe(const ::rtl::OUString& strName, oslPipeOptions Options,const Security & rSecurity); + inline Pipe(const ::rtl::OUString& strName, oslPipeOptions Options, const Security& rSecurity); /** Copy constructor. */ inline Pipe(const Pipe& pipe); #if defined LIBO_INTERNAL_ONLY - inline Pipe(Pipe && other) noexcept; + inline Pipe(Pipe&& other) noexcept; #endif /** Constructs a Pipe reference without acquiring the handle */ - inline Pipe( oslPipe pipe, __sal_NoAcquire noacquire ); + inline Pipe(oslPipe pipe, __sal_NoAcquire noacquire); /** Creates pipe as wrapper around the underlying oslPipe. @param Pipe @@ -85,8 +84,8 @@ public: @param rSec @return True if socket was successfully created. */ - inline bool create( const ::rtl::OUString & strName, - oslPipeOptions Options, const Security &rSec ); + inline bool create(const ::rtl::OUString& strName, oslPipeOptions Options, + const Security& rSec); /** Creates a secure that access rights depend on the umask settings with the given attributes. @@ -96,7 +95,7 @@ public: @param Options @return True if socket was successfully created. */ - inline bool create( const ::rtl::OUString & strName, oslPipeOptions Options = osl_Pipe_OPEN ); + inline bool create(const ::rtl::OUString& strName, oslPipeOptions Options = osl_Pipe_OPEN); /** releases the underlying handle */ @@ -105,23 +104,23 @@ public: /** Assignment operator. If pipe was already created, the old one will be discarded. */ - inline Pipe& SAL_CALL operator= (const Pipe& pipe); + inline Pipe& SAL_CALL operator=(const Pipe& pipe); #if defined LIBO_INTERNAL_ONLY - inline Pipe & operator =(Pipe && other) noexcept; + inline Pipe& operator=(Pipe&& other) noexcept; #endif /** Assignment operator. If pipe was already created, the old one will be discarded. */ - inline Pipe& SAL_CALL operator= (const oslPipe pipe ); + inline Pipe& SAL_CALL operator=(const oslPipe pipe); /** Checks if the pipe is valid. @return True if the object represents a valid pipe. */ inline bool SAL_CALL isValid() const; - inline bool SAL_CALL operator==( const Pipe& rPipe ) const; + inline bool SAL_CALL operator==(const Pipe& rPipe) const; /** Closes the pipe. */ @@ -131,7 +130,6 @@ public: */ inline oslPipeError SAL_CALL accept(StreamPipe& Connection); - /** Delivers a constant describing the last error for the pipe system. @return ENONE if no error occurred, invalid_PipeError if an unknown (unmapped) error occurred, otherwise an enum describing the @@ -147,7 +145,6 @@ public: class StreamPipe : public Pipe { public: - /** Creates an unattached pipe. You must attach the pipe to an oslPipe e.g. by using the operator=(oslPipe), before you can use the stream- functionality of the object. @@ -173,11 +170,11 @@ public: @param[in] Options Pipe options @param[in] rSec Security for the pipe */ - inline StreamPipe(const ::rtl::OUString& strName, oslPipeOptions Options, const Security &rSec ); + inline StreamPipe(const ::rtl::OUString& strName, oslPipeOptions Options, const Security& rSec); /** Constructs a Pipe reference without acquiring the handle */ - inline StreamPipe( oslPipe pipe, __sal_NoAcquire noacquire ); + inline StreamPipe(oslPipe pipe, __sal_NoAcquire noacquire); /** Attaches the oslPipe to this object. If the object already was attached to an oslPipe, the old one will @@ -185,7 +182,7 @@ public: @param[in] Pipe Pipe to attach to this object */ - inline StreamPipe & SAL_CALL operator=(oslPipe Pipe); + inline StreamPipe& SAL_CALL operator=(oslPipe Pipe); /** Assignment operator */ @@ -235,7 +232,6 @@ public: */ sal_Int32 SAL_CALL write(const void* pBuffer, sal_Int32 n) const; }; - } #endif diff --git a/include/package/packagedllapi.hxx b/include/package/packagedllapi.hxx index 71b5c82aaacc..3db98fe34960 100644 --- a/include/package/packagedllapi.hxx +++ b/include/package/packagedllapi.hxx @@ -12,9 +12,9 @@ #include <sal/types.h> #if defined(DLLIMPLEMENTATION_PACKAGE) -#define DLLPUBLIC_PACKAGE SAL_DLLPUBLIC_EXPORT +#define DLLPUBLIC_PACKAGE SAL_DLLPUBLIC_EXPORT #else -#define DLLPUBLIC_PACKAGE SAL_DLLPUBLIC_IMPORT +#define DLLPUBLIC_PACKAGE SAL_DLLPUBLIC_IMPORT #endif #endif // INCLUDED_PACKAGE_PACKAGEDLLAPI_HXX diff --git a/include/prewin.h b/include/prewin.h index ebdf4aaf518f..d6f2274451d5 100644 --- a/include/prewin.h +++ b/include/prewin.h @@ -21,18 +21,18 @@ #if defined(_WIN32) -#define Folder WIN_Folder -#define GradientStyle_RECT WIN_GradientStyle_RECT +#define Folder WIN_Folder +#define GradientStyle_RECT WIN_GradientStyle_RECT #ifndef IN -# define IN +#define IN #endif #ifndef OUT -# define OUT +#define OUT #endif #if !defined STRICT -# define STRICT +#define STRICT #endif #define WIN32_LEAN_AND_MEAN diff --git a/include/registry/refltype.hxx b/include/registry/refltype.hxx index a9d1da0dcf4d..0ca5803cd11c 100644 --- a/include/registry/refltype.hxx +++ b/include/registry/refltype.hxx @@ -43,7 +43,7 @@ class RTConstValue { public: /// stores the type of the constant value. - RTValueType m_type; + RTValueType m_type; /// stores the value of the constant. RTConstValueUnion m_value; @@ -70,7 +70,7 @@ struct RTUik }; /// specifies the calling convention for type reader/writer api -#define TYPEREG_CALLTYPE SAL_CALL +#define TYPEREG_CALLTYPE SAL_CALL #endif diff --git a/include/registry/regdllapi.h b/include/registry/regdllapi.h index e4904e50f0c5..603eea11dba8 100644 --- a/include/registry/regdllapi.h +++ b/include/registry/regdllapi.h @@ -23,9 +23,9 @@ #include <sal/types.h> #if defined(REG_DLLIMPLEMENTATION) -#define REG_DLLPUBLIC SAL_DLLPUBLIC_EXPORT +#define REG_DLLPUBLIC SAL_DLLPUBLIC_EXPORT #else -#define REG_DLLPUBLIC SAL_DLLPUBLIC_IMPORT +#define REG_DLLPUBLIC SAL_DLLPUBLIC_IMPORT #endif #endif // INCLUDED_REGISTRY_REGDLLAPI_H diff --git a/include/registry/regtype.h b/include/registry/regtype.h index 218e915f5edd..89fdcc940aaf 100644 --- a/include/registry/regtype.h +++ b/include/registry/regtype.h @@ -24,13 +24,13 @@ #include <o3tl/typed_flags_set.hxx> /// defines the type of a registry handle used in the C API. -typedef void* RegHandle; +typedef void* RegHandle; /// defines the type of a registry key handle used in the C API. -typedef void* RegKeyHandle; +typedef void* RegKeyHandle; /// defines the type of a registry key value handle used in the C API. -typedef void* RegValue; +typedef void* RegValue; /** defines the open/access mode of the registry. @@ -40,12 +40,14 @@ typedef void* RegValue; */ enum class RegAccessMode { - READONLY = 0x0001, /// This mode allows readonly access. - READWRITE = 0x0002 /// This mode allows read and write access. + READONLY = 0x0001, /// This mode allows readonly access. + READWRITE = 0x0002 /// This mode allows read and write access. }; namespace o3tl { - template<> struct typed_flags<RegAccessMode> : is_typed_flags<RegAccessMode, 0x03> {}; +template <> struct typed_flags<RegAccessMode> : is_typed_flags<RegAccessMode, 0x03> +{ +}; } /** defines the type of a key value. @@ -132,7 +134,7 @@ enum class SAL_DLLPUBLIC_RTTI RegError }; /// specify the calling convention for the registry API -#define REGISTRY_CALLTYPE SAL_CALL +#define REGISTRY_CALLTYPE SAL_CALL #endif diff --git a/include/registry/types.hxx b/include/registry/types.hxx index babebbcec79b..a9763f5ea6bb 100644 --- a/include/registry/types.hxx +++ b/include/registry/types.hxx @@ -28,7 +28,8 @@ The general structure of a binary type blob is always the same. It depends on the typeclass which parts of the blob are filled with data or not. */ -enum RTTypeClass { +enum RTTypeClass +{ /** specifies that the structure of the given blob is unknown and can't be read. */ @@ -131,37 +132,37 @@ enum RTTypeClass { */ enum class RTFieldAccess { - NONE = 0x0000, + NONE = 0x0000, /// specifies an unknown flag - INVALID = 0x0000, + INVALID = 0x0000, /// specifies a readonly property/attribute - READONLY = 0x0001, + READONLY = 0x0001, /// specifies a property as optional that means that it must not be implemented. - OPTIONAL = 0x0002, + OPTIONAL = 0x0002, /// @see com::sun::star::beans::PropertyAttribute - MAYBEVOID = 0x0004, + MAYBEVOID = 0x0004, /// @see com::sun::star::beans::PropertyAttribute - BOUND = 0x0008, + BOUND = 0x0008, /// @see com::sun::star::beans::PropertyAttribute CONSTRAINED = 0x0010, /// @see com::sun::star::beans::PropertyAttribute - TRANSIENT = 0x0020, + TRANSIENT = 0x0020, /// @see com::sun::star::beans::PropertyAttribute MAYBEAMBIGUOUS = 0x0040, /// @see com::sun::star::beans::PropertyAttribute MAYBEDEFAULT = 0x0080, /// @see com::sun::star::beans::PropertyAttribute - REMOVABLE = 0x0100, + REMOVABLE = 0x0100, /// @see com::sun::star::beans::PropertyAttribute - ATTRIBUTE = 0x0200, + ATTRIBUTE = 0x0200, /// specifies that the field is a property - PROPERTY = 0x0400, + PROPERTY = 0x0400, /// specifies that the field is a constant or enum value - CONST = 0x0800, + CONST = 0x0800, /// specifies that the property/attribute has read/write access - READWRITE = 0x1000, + READWRITE = 0x1000, /// only to describe a union default label - DEFAULT = 0x2000, + DEFAULT = 0x2000, /** Indicates that a member of a polymorphic struct type template is of a parameterized type. @@ -185,14 +186,17 @@ enum class RTFieldAccess }; namespace o3tl { - template<> struct typed_flags<RTFieldAccess> : is_typed_flags<RTFieldAccess, 0xffff> {}; +template <> struct typed_flags<RTFieldAccess> : is_typed_flags<RTFieldAccess, 0xffff> +{ +}; } /** specifies the type of a field value. A field can have a value if it represents a constant or an enum value. */ -enum RTValueType { +enum RTValueType +{ RT_TYPE_NONE, RT_TYPE_BOOL, RT_TYPE_BYTE, @@ -220,7 +224,7 @@ union RTConstValueUnion { sal_uInt64 aUHyper; float aFloat; double aDouble; - sal_Unicode const * aString; + sal_Unicode const* aString; }; /** specifies the mode of a method. @@ -228,7 +232,8 @@ union RTConstValueUnion { A method can be synchron or asynchron (oneway). The const attribute for methods was removed so that the const values are deprecated. */ -enum class RTMethodMode { +enum class RTMethodMode +{ /// indicates an invalid mode INVALID, @@ -266,7 +271,8 @@ enum class RTMethodMode { There are three parameter modes which have impact of the handling of the parameter in the UNO bridges and the UNO code generation. */ -enum RTParamMode { +enum RTParamMode +{ /// indicates an invalid parameter mode RT_PARAM_INVALID = 0, @@ -294,7 +300,8 @@ enum RTParamMode { /** specifies the type of a reference used in a service description. */ -enum class RTReferenceType { +enum class RTReferenceType +{ /// the reference type is unknown INVALID, diff --git a/include/rtl/character.hxx b/include/rtl/character.hxx index a18d05d6a5e8..4bab490441ef 100644 --- a/include/rtl/character.hxx +++ b/include/rtl/character.hxx @@ -29,7 +29,6 @@ namespace rtl { - /** Check for Unicode code point. @param code An integer. @@ -38,10 +37,7 @@ namespace rtl @since LibreOffice 5.2 */ -inline bool isUnicodeCodePoint(sal_uInt32 code) -{ - return code <= 0x10FFFF; -} +inline bool isUnicodeCodePoint(sal_uInt32 code) { return code <= 0x10FFFF; } /** Check for ASCII character. @@ -60,8 +56,7 @@ inline bool isAscii(sal_uInt32 code) #if defined LIBO_INTERNAL_ONLY bool isAscii(char) = delete; bool isAscii(signed char) = delete; -template<typename T> inline bool isAscii(T code) -{ return isAscii(sal_uInt32(code)); } +template <typename T> inline bool isAscii(T code) { return isAscii(sal_uInt32(code)); } #endif /** Check for ASCII lower case character. @@ -82,8 +77,10 @@ inline bool isAsciiLowerCase(sal_uInt32 code) #if defined LIBO_INTERNAL_ONLY bool isAsciiLowerCase(char) = delete; bool isAsciiLowerCase(signed char) = delete; -template<typename T> inline bool isAsciiLowerCase(T code) -{ return isAsciiLowerCase(sal_uInt32(code)); } +template <typename T> inline bool isAsciiLowerCase(T code) +{ + return isAsciiLowerCase(sal_uInt32(code)); +} #endif /** Check for ASCII upper case character. @@ -104,8 +101,10 @@ inline bool isAsciiUpperCase(sal_uInt32 code) #if defined LIBO_INTERNAL_ONLY bool isAsciiUpperCase(char) = delete; bool isAsciiUpperCase(signed char) = delete; -template<typename T> inline bool isAsciiUpperCase(T code) -{ return isAsciiUpperCase(sal_uInt32(code)); } +template <typename T> inline bool isAsciiUpperCase(T code) +{ + return isAsciiUpperCase(sal_uInt32(code)); +} #endif /** Check for ASCII alphabetic character. @@ -126,8 +125,7 @@ inline bool isAsciiAlpha(sal_uInt32 code) #if defined LIBO_INTERNAL_ONLY bool isAsciiAlpha(char) = delete; bool isAsciiAlpha(signed char) = delete; -template<typename T> inline bool isAsciiAlpha(T code) -{ return isAsciiAlpha(sal_uInt32(code)); } +template <typename T> inline bool isAsciiAlpha(T code) { return isAsciiAlpha(sal_uInt32(code)); } #endif /** Check for ASCII digit character. @@ -148,8 +146,7 @@ inline bool isAsciiDigit(sal_uInt32 code) #if defined LIBO_INTERNAL_ONLY bool isAsciiDigit(char) = delete; bool isAsciiDigit(signed char) = delete; -template<typename T> inline bool isAsciiDigit(T code) -{ return isAsciiDigit(sal_uInt32(code)); } +template <typename T> inline bool isAsciiDigit(T code) { return isAsciiDigit(sal_uInt32(code)); } #endif /** Check for ASCII alphanumeric character. @@ -170,8 +167,10 @@ inline bool isAsciiAlphanumeric(sal_uInt32 code) #if defined LIBO_INTERNAL_ONLY bool isAsciiAlphanumeric(char) = delete; bool isAsciiAlphanumeric(signed char) = delete; -template<typename T> inline bool isAsciiAlphanumeric(T code) -{ return isAsciiAlphanumeric(sal_uInt32(code)); } +template <typename T> inline bool isAsciiAlphanumeric(T code) +{ + return isAsciiAlphanumeric(sal_uInt32(code)); +} #endif /** Check for ASCII canonic hexadecimal digit character. @@ -192,8 +191,10 @@ inline bool isAsciiCanonicHexDigit(sal_uInt32 code) #if defined LIBO_INTERNAL_ONLY bool isAsciiCanonicHexDigit(char) = delete; bool isAsciiCanonicHexDigit(signed char) = delete; -template<typename T> inline bool isAsciiCanonicHexDigit(T code) -{ return isAsciiCanonicHexDigit(sal_uInt32(code)); } +template <typename T> inline bool isAsciiCanonicHexDigit(T code) +{ + return isAsciiCanonicHexDigit(sal_uInt32(code)); +} #endif /** Check for ASCII hexadecimal digit character. @@ -214,8 +215,10 @@ inline bool isAsciiHexDigit(sal_uInt32 code) #if defined LIBO_INTERNAL_ONLY bool isAsciiHexDigit(char) = delete; bool isAsciiHexDigit(signed char) = delete; -template<typename T> inline bool isAsciiHexDigit(T code) -{ return isAsciiHexDigit(sal_uInt32(code)); } +template <typename T> inline bool isAsciiHexDigit(T code) +{ + return isAsciiHexDigit(sal_uInt32(code)); +} #endif /** Check for ASCII octal digit character. @@ -235,8 +238,10 @@ inline bool isAsciiOctalDigit(sal_uInt32 code) #if defined LIBO_INTERNAL_ONLY bool isAsciiOctalDigit(char) = delete; bool isAsciiOctalDigit(signed char) = delete; -template<typename T> inline bool isAsciiOctalDigit(T code) -{ return isAsciiOctalDigit(sal_uInt32(code)); } +template <typename T> inline bool isAsciiOctalDigit(T code) +{ + return isAsciiOctalDigit(sal_uInt32(code)); +} #endif /** Check for ASCII white space character. @@ -251,15 +256,17 @@ template<typename T> inline bool isAsciiOctalDigit(T code) inline bool isAsciiWhiteSpace(sal_uInt32 code) { assert(isUnicodeCodePoint(code)); - return code == ' ' || code == '\f' || code == '\n' || code == '\r' - || code == '\t' || code == '\v'; + return code == ' ' || code == '\f' || code == '\n' || code == '\r' || code == '\t' + || code == '\v'; } #if defined LIBO_INTERNAL_ONLY bool isAsciiWhiteSpace(char) = delete; bool isAsciiWhiteSpace(signed char) = delete; -template<typename T> inline bool isAsciiWhiteSpace(T code) -{ return isAsciiWhiteSpace(sal_uInt32(code)); } +template <typename T> inline bool isAsciiWhiteSpace(T code) +{ + return isAsciiWhiteSpace(sal_uInt32(code)); +} #endif /** Convert a character, if ASCII, to upper case. @@ -279,8 +286,10 @@ inline sal_uInt32 toAsciiUpperCase(sal_uInt32 code) #if defined LIBO_INTERNAL_ONLY sal_uInt32 toAsciiUpperCase(char) = delete; sal_uInt32 toAsciiUpperCase(signed char) = delete; -template<typename T> inline sal_uInt32 toAsciiUpperCase(T code) -{ return toAsciiUpperCase(sal_uInt32(code)); } +template <typename T> inline sal_uInt32 toAsciiUpperCase(T code) +{ + return toAsciiUpperCase(sal_uInt32(code)); +} #endif /** Convert a character, if ASCII, to lower case. @@ -300,8 +309,10 @@ inline sal_uInt32 toAsciiLowerCase(sal_uInt32 code) #if defined LIBO_INTERNAL_ONLY sal_uInt32 toAsciiLowerCase(char) = delete; sal_uInt32 toAsciiLowerCase(signed char) = delete; -template<typename T> inline sal_uInt32 toAsciiLowerCase(T code) -{ return toAsciiLowerCase(sal_uInt32(code)); } +template <typename T> inline sal_uInt32 toAsciiLowerCase(T code) +{ + return toAsciiLowerCase(sal_uInt32(code)); +} #endif /** Compare two characters ignoring ASCII case. @@ -321,17 +332,16 @@ inline sal_Int32 compareIgnoreAsciiCase(sal_uInt32 code1, sal_uInt32 code2) assert(isUnicodeCodePoint(code1)); assert(isUnicodeCodePoint(code2)); return static_cast<sal_Int32>(toAsciiLowerCase(code1)) - - static_cast<sal_Int32>(toAsciiLowerCase(code2)); + - static_cast<sal_Int32>(toAsciiLowerCase(code2)); } /// @cond INTERNAL -namespace detail { - +namespace detail +{ sal_uInt32 const surrogatesHighFirst = 0xD800; sal_uInt32 const surrogatesHighLast = 0xDBFF; sal_uInt32 const surrogatesLowFirst = 0xDC00; sal_uInt32 const surrogatesLowLast = 0xDFFF; - } /// @endcond @@ -343,10 +353,10 @@ sal_uInt32 const surrogatesLowLast = 0xDFFF; @since LibreOffice 6.0 */ -inline bool isSurrogate(sal_uInt32 code) { +inline bool isSurrogate(sal_uInt32 code) +{ assert(isUnicodeCodePoint(code)); - return code >= detail::surrogatesHighFirst - && code <= detail::surrogatesLowLast; + return code >= detail::surrogatesHighFirst && code <= detail::surrogatesLowLast; } /** Check for high surrogate. @@ -357,10 +367,10 @@ inline bool isSurrogate(sal_uInt32 code) { @since LibreOffice 5.0 */ -inline bool isHighSurrogate(sal_uInt32 code) { +inline bool isHighSurrogate(sal_uInt32 code) +{ assert(isUnicodeCodePoint(code)); - return code >= detail::surrogatesHighFirst - && code <= detail::surrogatesHighLast; + return code >= detail::surrogatesHighFirst && code <= detail::surrogatesHighLast; } /** Check for low surrogate. @@ -371,10 +381,10 @@ inline bool isHighSurrogate(sal_uInt32 code) { @since LibreOffice 5.0 */ -inline bool isLowSurrogate(sal_uInt32 code) { +inline bool isLowSurrogate(sal_uInt32 code) +{ assert(isUnicodeCodePoint(code)); - return code >= detail::surrogatesLowFirst - && code <= detail::surrogatesLowLast; + return code >= detail::surrogatesLowFirst && code <= detail::surrogatesLowLast; } /** Get high surrogate half of a non-BMP Unicode code point. @@ -385,7 +395,8 @@ inline bool isLowSurrogate(sal_uInt32 code) { @since LibreOffice 5.0 */ -inline sal_Unicode getHighSurrogate(sal_uInt32 code) { +inline sal_Unicode getHighSurrogate(sal_uInt32 code) +{ assert(isUnicodeCodePoint(code)); assert(code >= 0x10000); return static_cast<sal_Unicode>(((code - 0x10000) >> 10) | detail::surrogatesHighFirst); @@ -399,7 +410,8 @@ inline sal_Unicode getHighSurrogate(sal_uInt32 code) { @since LibreOffice 5.0 */ -inline sal_Unicode getLowSurrogate(sal_uInt32 code) { +inline sal_Unicode getLowSurrogate(sal_uInt32 code) +{ assert(isUnicodeCodePoint(code)); assert(code >= 0x10000); return static_cast<sal_Unicode>(((code - 0x10000) & 0x3FF) | detail::surrogatesLowFirst); @@ -415,11 +427,12 @@ inline sal_Unicode getLowSurrogate(sal_uInt32 code) { @since LibreOffice 5.0 */ -inline sal_uInt32 combineSurrogates(sal_uInt32 high, sal_uInt32 low) { +inline sal_uInt32 combineSurrogates(sal_uInt32 high, sal_uInt32 low) +{ assert(isHighSurrogate(high)); assert(isLowSurrogate(low)); - return ((high - detail::surrogatesHighFirst) << 10) - + (low - detail::surrogatesLowFirst) + 0x10000; + return ((high - detail::surrogatesHighFirst) << 10) + (low - detail::surrogatesLowFirst) + + 0x10000; } /** Split a Unicode code point into UTF-16 code units. @@ -434,13 +447,17 @@ inline sal_uInt32 combineSurrogates(sal_uInt32 high, sal_uInt32 low) { @since LibreOffice 5.3 */ -inline std::size_t splitSurrogates(sal_uInt32 code, sal_Unicode * output) { +inline std::size_t splitSurrogates(sal_uInt32 code, sal_Unicode* output) +{ assert(isUnicodeCodePoint(code)); assert(output != NULL); - if (code < 0x10000) { + if (code < 0x10000) + { output[0] = code; return 1; - } else { + } + else + { output[0] = getHighSurrogate(code); output[1] = getLowSurrogate(code); return 2; @@ -459,7 +476,6 @@ inline bool isUnicodeScalarValue(sal_uInt32 code) { return isUnicodeCodePoint(code) && !isSurrogate(code); } - } #endif diff --git a/include/sal/alloca.h b/include/sal/alloca.h index 801a7b35e034..bb4c3e0e0c05 100644 --- a/include/sal/alloca.h +++ b/include/sal/alloca.h @@ -20,21 +20,22 @@ #ifndef INCLUDED_SAL_ALLOCA_H #define INCLUDED_SAL_ALLOCA_H -#if defined (__sun) || defined (LINUX) || defined(AIX) || defined(ANDROID) || defined(HAIKU) || defined(MACOSX) || defined(IOS) +#if defined(__sun) || defined(LINUX) || defined(AIX) || defined(ANDROID) || defined(HAIKU) \ + || defined(MACOSX) || defined(IOS) #ifndef INCLUDED_ALLOCA_H #include <alloca.h> #define INCLUDED_ALLOCA_H #endif -#elif defined (FREEBSD) || defined(NETBSD) || defined(OPENBSD) || defined(DRAGONFLY) +#elif defined(FREEBSD) || defined(NETBSD) || defined(OPENBSD) || defined(DRAGONFLY) #ifndef INCLUDED_STDLIB_H #include <stdlib.h> #define INCLUDED_STDLIB_H #endif -#elif defined (_WIN32) +#elif defined(_WIN32) #ifndef INCLUDED_MALLOC_H #include <malloc.h> @@ -47,6 +48,6 @@ #endif -#endif /* INCLUDED_SAL_ALLOCA_H */ +#endif /* INCLUDED_SAL_ALLOCA_H */ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/sal/backtrace.hxx b/include/sal/backtrace.hxx index 62dfb590fae7..5f44e5e01d2d 100644 --- a/include/sal/backtrace.hxx +++ b/include/sal/backtrace.hxx @@ -28,19 +28,18 @@ */ #if defined LIBO_INTERNAL_ONLY -namespace sal { - -struct BacktraceState { +namespace sal +{ +struct BacktraceState +{ void** buffer; int nDepth; - ~BacktraceState() {delete[] buffer;} + ~BacktraceState() { delete[] buffer; } }; -SAL_DLLPUBLIC std::unique_ptr<BacktraceState> backtrace_get( - sal_uInt32 backtraceDepth); +SAL_DLLPUBLIC std::unique_ptr<BacktraceState> backtrace_get(sal_uInt32 backtraceDepth); SAL_DLLPUBLIC OUString backtrace_to_string(BacktraceState* backtraceState); - } #endif diff --git a/include/sal/config.h b/include/sal/config.h index 335c4174e3ae..f8504b3c1129 100644 --- a/include/sal/config.h +++ b/include/sal/config.h @@ -31,7 +31,7 @@ #define SAL_PATHSEPARATOR ';' #define SAL_PATHDELIMITER '\\' #define SAL_NEWLINE_STRING "\r\n" -#define SAL_CONFIGFILE( name ) name ".ini" +#define SAL_CONFIGFILE(name) name ".ini" #ifdef _MSC_VER @@ -43,9 +43,8 @@ #endif /* defined _WIN32 */ -#if defined(__sun) || defined(LINUX) || defined(NETBSD) || defined(FREEBSD) || \ - defined(AIX) || defined(OPENBSD) || defined(DRAGONFLY) || defined(ANDROID) || \ - defined(HAIKU) +#if defined(__sun) || defined(LINUX) || defined(NETBSD) || defined(FREEBSD) || defined(AIX) \ + || defined(OPENBSD) || defined(DRAGONFLY) || defined(ANDROID) || defined(HAIKU) #define SAL_UNX #define SAL_DLLEXTENSION ".so" #define SAL_EXEEXTENSION "" @@ -53,7 +52,7 @@ #define SAL_PATHSEPARATOR ':' #define SAL_PATHDELIMITER '/' #define SAL_NEWLINE_STRING "\n" -#define SAL_CONFIGFILE( name ) name "rc" +#define SAL_CONFIGFILE(name) name "rc" #endif #ifdef MACOSX @@ -64,7 +63,7 @@ #define SAL_PATHSEPARATOR ':' #define SAL_PATHDELIMITER '/' #define SAL_NEWLINE_STRING "\n" -#define SAL_CONFIGFILE( name ) name "rc" +#define SAL_CONFIGFILE(name) name "rc" #endif #ifdef IOS @@ -77,7 +76,7 @@ #define SAL_PATHSEPARATOR ':' #define SAL_PATHDELIMITER '/' #define SAL_NEWLINE_STRING "\n" -#define SAL_CONFIGFILE( name ) name "rc" +#define SAL_CONFIGFILE(name) name "rc" #endif /* The following spell is for Solaris and its descendants. diff --git a/include/sal/saldllapi.h b/include/sal/saldllapi.h index 2eca05de7e18..b9c3250f52c3 100644 --- a/include/sal/saldllapi.h +++ b/include/sal/saldllapi.h @@ -25,9 +25,9 @@ #include "sal/types.h" #if defined(SAL_DLLIMPLEMENTATION) -#define SAL_DLLPUBLIC SAL_DLLPUBLIC_EXPORT +#define SAL_DLLPUBLIC SAL_DLLPUBLIC_EXPORT #else -#define SAL_DLLPUBLIC SAL_DLLPUBLIC_IMPORT +#define SAL_DLLPUBLIC SAL_DLLPUBLIC_IMPORT #endif #endif // INCLUDED_SAL_SALDLLAPI_H diff --git a/include/salhelper/salhelperdllapi.h b/include/salhelper/salhelperdllapi.h index 3fec057609f4..64a259d51dae 100644 --- a/include/salhelper/salhelperdllapi.h +++ b/include/salhelper/salhelperdllapi.h @@ -23,9 +23,9 @@ #include "sal/types.h" #if defined(SALHELPER_DLLIMPLEMENTATION) -#define SALHELPER_DLLPUBLIC SAL_DLLPUBLIC_EXPORT +#define SALHELPER_DLLPUBLIC SAL_DLLPUBLIC_EXPORT #else -#define SALHELPER_DLLPUBLIC SAL_DLLPUBLIC_IMPORT +#define SALHELPER_DLLPUBLIC SAL_DLLPUBLIC_IMPORT #endif #define SALHELPER_DLLPRIVATE SAL_DLLPRIVATE diff --git a/include/salhelper/thread.hxx b/include/salhelper/thread.hxx index b4fac5493a6a..70172a313b35 100644 --- a/include/salhelper/thread.hxx +++ b/include/salhelper/thread.hxx @@ -19,22 +19,21 @@ #include "salhelper/salhelperdllapi.h" #include "salhelper/simplereferenceobject.hxx" -namespace salhelper { - +namespace salhelper +{ /** A safe encapsulation of ::osl::Thread. @since LibreOffice 3.6 */ -class SALHELPER_DLLPUBLIC Thread: - public salhelper::SimpleReferenceObject, private osl::Thread +class SALHELPER_DLLPUBLIC Thread : public salhelper::SimpleReferenceObject, private osl::Thread { public: /** @param name the thread name, see ::osl_setThreadName; must be a non-null null terminated string */ - Thread(char const * name); + Thread(char const* name); /** Launch the thread. @@ -62,11 +61,12 @@ public: using osl::Thread::wait; using osl::Thread::yield; - static void * operator new(std::size_t size) - { return SimpleReferenceObject::operator new(size); } + static void* operator new(std::size_t size) + { + return SimpleReferenceObject::operator new(size); + } - static void operator delete(void * pointer) - { SimpleReferenceObject::operator delete(pointer); } + static void operator delete(void* pointer) { SimpleReferenceObject::operator delete(pointer); } protected: virtual ~Thread() SAL_OVERRIDE; @@ -83,9 +83,8 @@ private: virtual void SAL_CALL onTerminated() SAL_OVERRIDE; - char const * name_; + char const* name_; }; - } #endif diff --git a/include/sfx2/QuerySaveDocument.hxx b/include/sfx2/QuerySaveDocument.hxx index b006074b4efa..06eecdf1df83 100644 --- a/include/sfx2/QuerySaveDocument.hxx +++ b/include/sfx2/QuerySaveDocument.hxx @@ -26,7 +26,10 @@ #include <rtl/ustring.hxx> #include <sfx2/dllapi.h> -namespace weld { class Widget; } +namespace weld +{ +class Widget; +} /** Opens the general query save document dialog. @param _pParent @@ -34,8 +37,7 @@ namespace weld { class Widget; } @_rTitle The title of the document. */ -SFX2_DLLPUBLIC short ExecuteQuerySaveDocument( - weld::Widget* _pParent, std::u16string_view _rTitle); +SFX2_DLLPUBLIC short ExecuteQuerySaveDocument(weld::Widget* _pParent, std::u16string_view _rTitle); #endif // INCLUDED_SFX2_QUERYSAVEDOCUMENT_HXX diff --git a/include/sfx2/brokenpackageint.hxx b/include/sfx2/brokenpackageint.hxx index 8f6b4a580340..e7a1e3876257 100644 --- a/include/sfx2/brokenpackageint.hxx +++ b/include/sfx2/brokenpackageint.hxx @@ -26,31 +26,36 @@ #include <com/sun/star/uno/Reference.hxx> -namespace com::sun::star::task { class XInteractionRequest; } +namespace com::sun::star::task +{ +class XInteractionRequest; +} class RequestPackageReparation_Impl; class SFX2_DLLPUBLIC RequestPackageReparation { rtl::Reference<RequestPackageReparation_Impl> mxImpl; + public: - RequestPackageReparation( const OUString& aName ); + RequestPackageReparation(const OUString& aName); ~RequestPackageReparation(); - RequestPackageReparation( const RequestPackageReparation&) = delete; - RequestPackageReparation& operator=( const RequestPackageReparation&) = delete; - bool isApproved() const; - css::uno::Reference < css::task::XInteractionRequest > GetRequest(); + RequestPackageReparation(const RequestPackageReparation&) = delete; + RequestPackageReparation& operator=(const RequestPackageReparation&) = delete; + bool isApproved() const; + css::uno::Reference<css::task::XInteractionRequest> GetRequest(); }; class NotifyBrokenPackage_Impl; class SFX2_DLLPUBLIC NotifyBrokenPackage { rtl::Reference<NotifyBrokenPackage_Impl> mxImpl; + public: - NotifyBrokenPackage( const OUString& aName ); + NotifyBrokenPackage(const OUString& aName); ~NotifyBrokenPackage(); - NotifyBrokenPackage( const NotifyBrokenPackage&) = delete; - NotifyBrokenPackage& operator=( const NotifyBrokenPackage&) = delete; - css::uno::Reference < css::task::XInteractionRequest > GetRequest(); + NotifyBrokenPackage(const NotifyBrokenPackage&) = delete; + NotifyBrokenPackage& operator=(const NotifyBrokenPackage&) = delete; + css::uno::Reference<css::task::XInteractionRequest> GetRequest(); }; #endif // INCLUDED_SFX2_BROKENPACKAGEINT_HXX diff --git a/include/sfx2/charmappopup.hxx b/include/sfx2/charmappopup.hxx index a82665563516..28540d58e941 100644 --- a/include/sfx2/charmappopup.hxx +++ b/include/sfx2/charmappopup.hxx @@ -28,7 +28,7 @@ public: CharmapPopup(const css::uno::Reference<css::uno::XComponentContext>& rContext); virtual ~CharmapPopup() override; - virtual VclPtr<vcl::Window> createVclPopupWindow( vcl::Window* pParent ) override; + virtual VclPtr<vcl::Window> createVclPopupWindow(vcl::Window* pParent) override; virtual std::unique_ptr<WeldToolbarPopup> weldPopupWindow() override; // XServiceInfo @@ -36,7 +36,7 @@ public: virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override; // XInitialization - virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& rArguments ) override; + virtual void SAL_CALL initialize(const css::uno::Sequence<css::uno::Any>& rArguments) override; }; #endif diff --git a/include/sfx2/classificationhelper.hxx b/include/sfx2/classificationhelper.hxx index 777001fd9de9..f5c47064c9af 100644 --- a/include/sfx2/classificationhelper.hxx +++ b/include/sfx2/classificationhelper.hxx @@ -17,8 +17,14 @@ #include <sfx2/dllapi.h> #include <sfx2/infobar.hxx> -namespace com::sun::star::beans { class XPropertyContainer; } -namespace com::sun::star::document { class XDocumentProperties; } +namespace com::sun::star::beans +{ +class XPropertyContainer; +} +namespace com::sun::star::document +{ +class XDocumentProperties; +} class SfxViewFrame; @@ -46,14 +52,18 @@ class SFX2_DLLPUBLIC SfxClassificationHelper public: /// Does the document have any BAILS properties? - static bool IsClassified(const css::uno::Reference<css::document::XDocumentProperties>& xDocumentProperties); + static bool IsClassified( + const css::uno::Reference<css::document::XDocumentProperties>& xDocumentProperties); /// Checks if pasting from xSource to xDestination would leak information. - static SfxClassificationCheckPasteResult CheckPaste(const css::uno::Reference<css::document::XDocumentProperties>& xSource, - const css::uno::Reference<css::document::XDocumentProperties>& xDestination); + static SfxClassificationCheckPasteResult + CheckPaste(const css::uno::Reference<css::document::XDocumentProperties>& xSource, + const css::uno::Reference<css::document::XDocumentProperties>& xDestination); /// Wrapper around CheckPaste(): informs the user if necessary and finds out if the paste can be continued or not. static bool ShowPasteInfo(SfxClassificationCheckPasteResult eResult); - SfxClassificationHelper(const css::uno::Reference<css::document::XDocumentProperties>& xDocumentProperties, bool bUseLocalizedPolicy = true); + SfxClassificationHelper( + const css::uno::Reference<css::document::XDocumentProperties>& xDocumentProperties, + bool bUseLocalizedPolicy = true); ~SfxClassificationHelper(); /// Get the currently selected category for eType. const OUString& GetBACName(SfxClassificationPolicyType eType) const; @@ -85,9 +95,9 @@ public: bool HasDocumentFooter(); void UpdateInfobar(SfxViewFrame& rViewFrame); - std::vector<OUString> const & GetMarkings() const; - std::vector<OUString> const & GetIntellectualPropertyParts() const; - std::vector<OUString> const & GetIntellectualPropertyPartNumbers() const; + std::vector<OUString> const& GetMarkings() const; + std::vector<OUString> const& GetIntellectualPropertyParts() const; + std::vector<OUString> const& GetIntellectualPropertyPartNumbers() const; /// Does a best-effort conversion of rType to SfxClassificationPolicyType. static SfxClassificationPolicyType stringToPolicyType(const OUString& rType); @@ -108,7 +118,6 @@ public: namespace sfx { - /// Specifies the origin: either defined by the BAF policy or manual via. the advanced classification dialog enum class ClassificationCreationOrigin { @@ -126,10 +135,8 @@ private: sal_Int32 m_nIPPartNumber; sal_Int32 m_nMarkingNumber; - OUString const & getPolicyKey() const - { - return m_sPolicy; - } + OUString const& getPolicyKey() const { return m_sPolicy; } + public: ClassificationKeyCreator(SfxClassificationPolicyType ePolicyType) : m_ePolicyType(ePolicyType) @@ -137,29 +144,24 @@ public: , m_nTextNumber(1) , m_nIPPartNumber(1) , m_nMarkingNumber(1) - {} - - OUString makeTextKey() const { - return getPolicyKey() + "Custom:Text"; } + OUString makeTextKey() const { return getPolicyKey() + "Custom:Text"; } + OUString makeNumberedTextKey() { return makeTextKey() + ":n" + OUString::number(m_nTextNumber++); } - bool isMarkingTextKey(OUString const & aKey) const - { - return aKey.startsWith(makeTextKey()); - } + bool isMarkingTextKey(OUString const& aKey) const { return aKey.startsWith(makeTextKey()); } OUString makeCategoryNameKey() const { return getPolicyKey() + "BusinessAuthorizationCategory:Name"; } - bool isCategoryNameKey(OUString const & aKey) const + bool isCategoryNameKey(OUString const& aKey) const { return aKey.startsWith(makeCategoryNameKey()); } @@ -169,25 +171,19 @@ public: return getPolicyKey() + "BusinessAuthorizationCategory:Identifier"; } - bool isCategoryIdentifierKey(OUString const & aKey) const + bool isCategoryIdentifierKey(OUString const& aKey) const { return aKey.startsWith(makeCategoryIdentifierKey()); } - OUString makeMarkingKey() const - { - return getPolicyKey() + "Custom:Marking"; - } + OUString makeMarkingKey() const { return getPolicyKey() + "Custom:Marking"; } OUString makeNumberedMarkingKey() { return makeMarkingKey() + ":n" + OUString::number(m_nMarkingNumber++); } - bool isMarkingKey(OUString const & aKey) const - { - return aKey.startsWith(makeMarkingKey()); - } + bool isMarkingKey(OUString const& aKey) const { return aKey.startsWith(makeMarkingKey()); } OUString makeIntellectualPropertyPartKey() const { @@ -199,7 +195,7 @@ public: return makeIntellectualPropertyPartKey() + ":n" + OUString::number(m_nIPPartNumber++); } - bool isIntellectualPropertyPartKey(OUString const & aKey) const + bool isIntellectualPropertyPartKey(OUString const& aKey) const { return aKey.startsWith(makeIntellectualPropertyPartKey()); } @@ -210,16 +206,12 @@ public: } /// Classification creation origin key - OUString makeCreationOriginKey() const - { - return getPolicyKey() + "CreationOrigin"; - } + OUString makeCreationOriginKey() const { return getPolicyKey() + "CreationOrigin"; } }; SFX2_DLLPUBLIC sfx::ClassificationCreationOrigin getCreationOriginProperty( - css::uno::Reference<css::beans::XPropertyContainer> const & rxPropertyContainer, - sfx::ClassificationKeyCreator const & rKeyCreator); - + css::uno::Reference<css::beans::XPropertyContainer> const& rxPropertyContainer, + sfx::ClassificationKeyCreator const& rKeyCreator); } #endif diff --git a/include/sfx2/dialoghelper.hxx b/include/sfx2/dialoghelper.hxx index c18545a75c49..a4ff3a5681a3 100644 --- a/include/sfx2/dialoghelper.hxx +++ b/include/sfx2/dialoghelper.hxx @@ -16,7 +16,10 @@ class DateTime; class LocaleDataWrapper; -namespace vcl { class Window; } +namespace vcl +{ +class Window; +} class OutputDevice; //when two tab pages both have the same basic layout with a preview on the diff --git a/include/sfx2/emojipopup.hxx b/include/sfx2/emojipopup.hxx index aecdcbab5b81..0005c467fe1a 100644 --- a/include/sfx2/emojipopup.hxx +++ b/include/sfx2/emojipopup.hxx @@ -28,7 +28,7 @@ public: EmojiPopup(const css::uno::Reference<css::uno::XComponentContext>& rContext); virtual ~EmojiPopup() override; - virtual VclPtr<vcl::Window> createVclPopupWindow( vcl::Window* pParent ) override; + virtual VclPtr<vcl::Window> createVclPopupWindow(vcl::Window* pParent) override; virtual std::unique_ptr<WeldToolbarPopup> weldPopupWindow() override; // XServiceInfo @@ -36,7 +36,7 @@ public: virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override; // XInitialization - virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& rArguments ) override; + virtual void SAL_CALL initialize(const css::uno::Sequence<css::uno::Any>& rArguments) override; }; #endif diff --git a/include/sfx2/flatpak.hxx b/include/sfx2/flatpak.hxx index cb5d758b51fe..cf71475fb6d8 100644 --- a/include/sfx2/flatpak.hxx +++ b/include/sfx2/flatpak.hxx @@ -17,16 +17,15 @@ // Functionality related to the Flatpak version of LibreOffice. -namespace flatpak { - +namespace flatpak +{ bool isFlatpak(); // Must only be called with SolarMutex locked: -bool createTemporaryHtmlDirectory(OUString ** url); +bool createTemporaryHtmlDirectory(OUString** url); // Must only be called with SolarMutex locked: SFX2_DLLPUBLIC void removeTemporaryHtmlDirectory(); - } #endif diff --git a/include/sfx2/frmhtml.hxx b/include/sfx2/frmhtml.hxx index 25f470a2d24f..6b6ff228b5c9 100644 --- a/include/sfx2/frmhtml.hxx +++ b/include/sfx2/frmhtml.hxx @@ -29,9 +29,8 @@ class SfxFrameDescriptor; namespace SfxFrameHTMLParser { - // These methods can also be used by other parsers. - SFX2_DLLPUBLIC void ParseFrameOptions(SfxFrameDescriptor*, const HTMLOptions&, const OUString& ); - +// These methods can also be used by other parsers. +SFX2_DLLPUBLIC void ParseFrameOptions(SfxFrameDescriptor*, const HTMLOptions&, const OUString&); }; #endif diff --git a/include/sfx2/groupid.hxx b/include/sfx2/groupid.hxx index 7829fa8c0298..fd31785ae3b4 100644 --- a/include/sfx2/groupid.hxx +++ b/include/sfx2/groupid.hxx @@ -26,7 +26,8 @@ // !! If you add a new group, please change sfxbasecontroller.cxx and // !! com.sun.star.frame.CommandGroup accordingly! -enum class SfxGroupId { +enum class SfxGroupId +{ NONE = 0, Intern = 32700, Application, @@ -59,14 +60,13 @@ enum class SfxGroupId { // make it hashable for storing in maps namespace std { - template <> - struct hash<SfxGroupId> - { +template <> struct hash<SfxGroupId> +{ std::size_t operator()(const SfxGroupId& k) const { - return std::hash<sal_uInt16>()(static_cast<sal_uInt16>(k)); + return std::hash<sal_uInt16>()(static_cast<sal_uInt16>(k)); } - }; +}; } #endif diff --git a/include/sfx2/htmlmode.hxx b/include/sfx2/htmlmode.hxx index 4888c48e4564..cd2b7d1fedd4 100644 --- a/include/sfx2/htmlmode.hxx +++ b/include/sfx2/htmlmode.hxx @@ -19,7 +19,8 @@ #ifndef INCLUDED_SFX2_HTMLMODE_HXX #define INCLUDED_SFX2_HTMLMODE_HXX -enum { +enum +{ HTMLMODE_ON = 0x0001, HTMLMODE_SOME_STYLES = 0x0020, /* mind. MS IE */ HTMLMODE_FULL_STYLES = 0x0040 /* == SW */ diff --git a/include/sfx2/inputdlg.hxx b/include/sfx2/inputdlg.hxx index d578407ad2e0..1ca2b9b39461 100644 --- a/include/sfx2/inputdlg.hxx +++ b/include/sfx2/inputdlg.hxx @@ -21,7 +21,7 @@ private: std::unique_ptr<weld::Button> m_xHelp; public: - InputDialog(weld::Widget* pParent, const OUString &rLabelText); + InputDialog(weld::Widget* pParent, const OUString& rLabelText); OUString GetEntryText() const; void SetEntryText(const OUString& rStr); void HideHelpBtn(); diff --git a/include/sfx2/mieclip.hxx b/include/sfx2/mieclip.hxx index 103f93a3f68e..bc2a431b3a24 100644 --- a/include/sfx2/mieclip.hxx +++ b/include/sfx2/mieclip.hxx @@ -29,16 +29,15 @@ class SFX2_DLLPUBLIC MSE40HTMLClipFormatObj { std::unique_ptr<SvStream> pStrm; - OUString sBaseURL; + OUString sBaseURL; public: MSE40HTMLClipFormatObj() {} ~MSE40HTMLClipFormatObj(); - SvStream* IsValid( SvStream& ); + SvStream* IsValid(SvStream&); }; - #endif // INCLUDED_SFX2_MIECLIP_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/sfx2/newstyle.hxx b/include/sfx2/newstyle.hxx index 28cfec9e8e55..23dbfa61210d 100644 --- a/include/sfx2/newstyle.hxx +++ b/include/sfx2/newstyle.hxx @@ -28,7 +28,7 @@ class SFX2_DLLPUBLIC SfxNewStyleDlg final : public weld::GenericDialogController { private: - SfxStyleSheetBasePool& m_rPool; + SfxStyleSheetBasePool& m_rPool; SfxStyleFamily m_eSearchFamily; std::unique_ptr<weld::EntryTreeView> m_xColBox; @@ -44,7 +44,10 @@ public: SfxNewStyleDlg(weld::Widget* pParent, SfxStyleSheetBasePool& rPool, SfxStyleFamily eFam); virtual ~SfxNewStyleDlg() override; - OUString GetName() const { return comphelper::string::stripStart(m_xColBox->get_active_text(), ' '); } + OUString GetName() const + { + return comphelper::string::stripStart(m_xColBox->get_active_text(), ' '); + } }; #endif diff --git a/include/sfx2/notebookbar/SfxNotebookBar.hxx b/include/sfx2/notebookbar/SfxNotebookBar.hxx index 53d028bcd9b8..acc5a9c50250 100644 --- a/include/sfx2/notebookbar/SfxNotebookBar.hxx +++ b/include/sfx2/notebookbar/SfxNotebookBar.hxx @@ -14,8 +14,14 @@ #include <rtl/ustring.hxx> #include <map> -namespace com::sun::star::frame { class XFrame; } -namespace com::sun::star::uno { template <typename > class Reference; } +namespace com::sun::star::frame +{ +class XFrame; +} +namespace com::sun::star::uno +{ +template <typename> class Reference; +} class SfxBindings; class SfxViewFrame; @@ -23,8 +29,8 @@ class SfxViewShell; class SystemWindow; class WeldedTabbedNotebookbar; -namespace sfx2 { - +namespace sfx2 +{ /** Helpers for easier access to NotebookBar via the sfx2 infrastructure. */ class SFX2_DLLPUBLIC SfxNotebookBar @@ -50,12 +56,12 @@ public: /// Method restores normal behaviour of the Notebookbar static void UnlockNotebookBar(); - static void RemoveListeners(SystemWindow const * pSysWindow); + static void RemoveListeners(SystemWindow const* pSysWindow); /** Show menu bar in all frames of current application */ static void ShowMenubar(bool bShow); /** Show menu bar only in current frame */ - static void ShowMenubar(SfxViewFrame const * pViewFrame, bool bShow); + static void ShowMenubar(SfxViewFrame const* pViewFrame, bool bShow); static void ToggleMenubar(); static void ReloadNotebookBar(const OUString& sUIPath); @@ -63,7 +69,8 @@ private: static bool m_bLock; static bool m_bHide; - static std::map<const SfxViewShell*, std::shared_ptr<WeldedTabbedNotebookbar>> m_pNotebookBarWeldedWrapper; + static std::map<const SfxViewShell*, std::shared_ptr<WeldedTabbedNotebookbar>> + m_pNotebookBarWeldedWrapper; DECL_STATIC_LINK(SfxNotebookBar, VclDisposeHdl, const SfxViewShell*, void); }; diff --git a/include/sfx2/safemode.hxx b/include/sfx2/safemode.hxx index 47034f62130a..34602c4ea68c 100644 --- a/include/sfx2/safemode.hxx +++ b/include/sfx2/safemode.hxx @@ -14,8 +14,8 @@ #include <rtl/ustring.hxx> -namespace sfx2 { - +namespace sfx2 +{ class SFX2_DLLPUBLIC SafeMode { public: @@ -66,7 +66,6 @@ private: /** Returns the path of the safe mode flag file.*/ static OUString getFilePath(const OUString& sFilename); }; - } #endif diff --git a/include/sfx2/sidebar/AsynchronousCall.hxx b/include/sfx2/sidebar/AsynchronousCall.hxx index dfdf9d6d946a..0f2377abc511 100644 --- a/include/sfx2/sidebar/AsynchronousCall.hxx +++ b/include/sfx2/sidebar/AsynchronousCall.hxx @@ -24,8 +24,8 @@ struct ImplSVEvent; -namespace sfx2::sidebar { - +namespace sfx2::sidebar +{ /** A simple asynchronous call via Application::PostUserCall. */ class AsynchronousCall @@ -33,7 +33,7 @@ class AsynchronousCall public: typedef ::std::function<void()> Action; - AsynchronousCall (const Action& rAction); + AsynchronousCall(const Action& rAction); ~AsynchronousCall(); void RequestCall(); @@ -42,7 +42,7 @@ public: private: Action maAction; - ImplSVEvent * mnCallId; + ImplSVEvent* mnCallId; DECL_LINK(HandleUserCall, void*, void); }; diff --git a/include/sfx2/sidebar/Context.hxx b/include/sfx2/sidebar/Context.hxx index b6a369f66c61..a7d87fdbc11d 100644 --- a/include/sfx2/sidebar/Context.hxx +++ b/include/sfx2/sidebar/Context.hxx @@ -20,8 +20,8 @@ #include <rtl/ustring.hxx> -namespace sfx2::sidebar { - +namespace sfx2::sidebar +{ class Context { public: @@ -29,9 +29,7 @@ public: OUString msContext; Context(); - Context ( - const OUString& rsApplication, - const OUString& rsContext); + Context(const OUString& rsApplication, const OUString& rsContext); /** When two contexts are matched against each other, then application or context name may have the wildcard value 'any'. @@ -47,10 +45,10 @@ public: between two contexts is. Smaller values represent better matches. */ - sal_Int32 EvaluateMatch (const Context& rOther) const; + sal_Int32 EvaluateMatch(const Context& rOther) const; - bool operator== (const Context& rOther) const; - bool operator!= (const Context& rOther) const; + bool operator==(const Context& rOther) const; + bool operator!=(const Context& rOther) const; }; } // end of namespace sfx2::sidebar diff --git a/include/sfx2/sidebar/Deck.hxx b/include/sfx2/sidebar/Deck.hxx index 2be908141e82..5122e915da14 100644 --- a/include/sfx2/sidebar/Deck.hxx +++ b/include/sfx2/sidebar/Deck.hxx @@ -24,8 +24,8 @@ class ScrollBar; -namespace sfx2::sidebar { - +namespace sfx2::sidebar +{ class DeckDescriptor; class DeckTitleBar; @@ -38,20 +38,19 @@ class DeckTitleBar; class Deck final : public vcl::Window { public: - Deck(const DeckDescriptor& rDeckDescriptor, - vcl::Window* pParentWindow, + Deck(const DeckDescriptor& rDeckDescriptor, vcl::Window* pParentWindow, const std::function<void()>& rCloserAction); virtual ~Deck() override; virtual void dispose() override; const OUString& GetId() const { return msId; } - VclPtr<DeckTitleBar> const & GetTitleBar() const; + VclPtr<DeckTitleBar> const& GetTitleBar() const; tools::Rectangle GetContentArea() const; - void ResetPanels (const SharedPanelContainer& rPanels); - const SharedPanelContainer& GetPanels() const { return maPanels; } + void ResetPanels(const SharedPanelContainer& rPanels); + const SharedPanelContainer& GetPanels() const { return maPanels; } - Panel* GetPanel(OUString const & panelId); + Panel* GetPanel(OUString const& panelId); void RequestLayout(); vcl::Window* GetPanelParentWindow(); @@ -60,17 +59,18 @@ public: When the whole panel does not fit then make its top visible and it off at the bottom. */ - void ShowPanel (const Panel& rPanel); + void ShowPanel(const Panel& rPanel); virtual void ApplySettings(vcl::RenderContext& rRenderContext) override; - virtual void Paint(vcl::RenderContext& rRenderContext, const tools::Rectangle& rUpdateArea) override; - virtual void DataChanged (const DataChangedEvent& rEvent) override; + virtual void Paint(vcl::RenderContext& rRenderContext, + const tools::Rectangle& rUpdateArea) override; + virtual void DataChanged(const DataChangedEvent& rEvent) override; virtual bool EventNotify(NotifyEvent& rEvent) override; virtual void Resize() override; virtual void DumpAsPropertyTree(tools::JsonWriter&) override; - static void PrintWindowSubTree (vcl::Window* pRoot, int nIndentation); + static void PrintWindowSubTree(vcl::Window* pRoot, int nIndentation); sal_Int32 GetMinimalWidth() const { return mnMinimalWidth; } @@ -78,8 +78,10 @@ public: { public: ScrollContainerWindow(vcl::Window* pParentWindow); - virtual void Paint(vcl::RenderContext& rRenderContext, const tools::Rectangle& rUpdateArea) override; + virtual void Paint(vcl::RenderContext& rRenderContext, + const tools::Rectangle& rUpdateArea) override; void SetSeparators(const ::std::vector<sal_Int32>& rSeparators); + private: std::vector<sal_Int32> maSeparators; }; @@ -99,8 +101,7 @@ private: VclPtr<ScrollBar> mpVerticalScrollBar; DECL_LINK(HandleVerticalScrollBarChange, ScrollBar*, void); - bool ProcessWheelEvent(CommandEvent const * pCommandEvent); - + bool ProcessWheelEvent(CommandEvent const* pCommandEvent); }; } // end of namespace sfx2::sidebar diff --git a/include/sfx2/sidebar/IContextChangeReceiver.hxx b/include/sfx2/sidebar/IContextChangeReceiver.hxx index 12ed5e6fce8a..784193c0496d 100644 --- a/include/sfx2/sidebar/IContextChangeReceiver.hxx +++ b/include/sfx2/sidebar/IContextChangeReceiver.hxx @@ -20,18 +20,19 @@ #include <sfx2/dllapi.h> -namespace vcl { class EnumContext; } - - -namespace sfx2::sidebar { - +namespace vcl +{ +class EnumContext; +} +namespace sfx2::sidebar +{ class SFX2_DLLPUBLIC IContextChangeReceiver { public: - virtual ~IContextChangeReceiver (); + virtual ~IContextChangeReceiver(); - virtual void HandleContextChange (const vcl::EnumContext& rContext) = 0; + virtual void HandleContextChange(const vcl::EnumContext& rContext) = 0; }; } // end of namespace ::sd::sidebar diff --git a/include/sfx2/sidebar/ILayoutableWindow.hxx b/include/sfx2/sidebar/ILayoutableWindow.hxx index 4eb3158a64d7..344e7fd4fe55 100644 --- a/include/sfx2/sidebar/ILayoutableWindow.hxx +++ b/include/sfx2/sidebar/ILayoutableWindow.hxx @@ -22,9 +22,8 @@ #include <sal/types.h> #include <com/sun/star/ui/LayoutSize.hpp> -namespace sfx2::sidebar { - - +namespace sfx2::sidebar +{ class SFX2_DLLPUBLIC ILayoutableWindow { public: @@ -33,10 +32,9 @@ public: /** Return the preferred height with the constraint, that the window will be set to the given width. */ - virtual css::ui::LayoutSize GetHeightForWidth (const sal_Int32 nWidth) = 0; + virtual css::ui::LayoutSize GetHeightForWidth(const sal_Int32 nWidth) = 0; }; - } // end of namespace ::sd::sidebar /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/sfx2/sidebar/Panel.hxx b/include/sfx2/sidebar/Panel.hxx index 1df3802c2f48..c934f3e58169 100644 --- a/include/sfx2/sidebar/Panel.hxx +++ b/include/sfx2/sidebar/Panel.hxx @@ -24,13 +24,25 @@ #include <vector> -namespace com::sun::star::frame { class XFrame; } -namespace com::sun::star::ui { class XSidebarPanel; } -namespace com::sun::star::ui { class XUIElement; } -namespace com::sun::star::awt { class XWindow; } - -namespace sfx2::sidebar { +namespace com::sun::star::frame +{ +class XFrame; +} +namespace com::sun::star::ui +{ +class XSidebarPanel; +} +namespace com::sun::star::ui +{ +class XUIElement; +} +namespace com::sun::star::awt +{ +class XWindow; +} +namespace sfx2::sidebar +{ class PanelDescriptor; class PanelTitleBar; class Context; @@ -50,15 +62,18 @@ public: virtual ~Panel() override; virtual void dispose() override; - VclPtr<PanelTitleBar> const & GetTitleBar() const; - bool IsTitleBarOptional() const { return mbIsTitleBarOptional;} - void SetUIElement (const css::uno::Reference<css::ui::XUIElement>& rxElement); - const css::uno::Reference<css::ui::XSidebarPanel>& GetPanelComponent() const { return mxPanelComponent;} + VclPtr<PanelTitleBar> const& GetTitleBar() const; + bool IsTitleBarOptional() const { return mbIsTitleBarOptional; } + void SetUIElement(const css::uno::Reference<css::ui::XUIElement>& rxElement); + const css::uno::Reference<css::ui::XSidebarPanel>& GetPanelComponent() const + { + return mxPanelComponent; + } css::uno::Reference<css::awt::XWindow> GetElementWindow(); - void SetExpanded (const bool bIsExpanded); - bool IsExpanded() const { return mbIsExpanded;} - bool HasIdPredicate (const OUString& rsId) const; - const OUString& GetId() const { return msPanelId;} + void SetExpanded(const bool bIsExpanded); + bool IsExpanded() const { return mbIsExpanded; } + bool HasIdPredicate(const OUString& rsId) const; + const OUString& GetId() const { return msPanelId; } void TriggerDeckLayouting() { maDeckLayoutTrigger(); } /// Set whether a panel should be present but invisible / inactive @@ -66,7 +81,7 @@ public: bool IsLurking() const { return mbLurking; } virtual void Resize() override; - virtual void DataChanged (const DataChangedEvent& rEvent) override; + virtual void DataChanged(const DataChangedEvent& rEvent) override; virtual void ApplySettings(vcl::RenderContext& rRenderContext) override; virtual void DumpAsPropertyTree(tools::JsonWriter&) override; @@ -81,9 +96,8 @@ private: const std::function<Context()> maContextAccess; const css::uno::Reference<css::frame::XFrame>& mxFrame; VclPtr<PanelTitleBar> mpTitleBar; - }; -typedef std::vector<VclPtr<Panel> > SharedPanelContainer; +typedef std::vector<VclPtr<Panel>> SharedPanelContainer; } // end of namespace sfx2::sidebar diff --git a/include/sfx2/sidebar/SidebarModelUpdate.hxx b/include/sfx2/sidebar/SidebarModelUpdate.hxx index fde6f4110d7c..988478bce7ab 100644 --- a/include/sfx2/sidebar/SidebarModelUpdate.hxx +++ b/include/sfx2/sidebar/SidebarModelUpdate.hxx @@ -11,18 +11,23 @@ #include <sfx2/dllapi.h> -namespace com::sun::star::frame { class XModel; } -namespace com::sun::star::uno { template <typename > class Reference; } - -namespace sfx2::sidebar { +namespace com::sun::star::frame +{ +class XModel; +} +namespace com::sun::star::uno +{ +template <typename> class Reference; +} +namespace sfx2::sidebar +{ class SFX2_DLLPUBLIC SidebarModelUpdate { public: virtual ~SidebarModelUpdate(); virtual void updateModel(css::uno::Reference<css::frame::XModel> xModel) = 0; }; - } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/sfx2/signaturestate.hxx b/include/sfx2/signaturestate.hxx index e480e56b059e..d63498d1cbe4 100644 --- a/include/sfx2/signaturestate.hxx +++ b/include/sfx2/signaturestate.hxx @@ -27,17 +27,17 @@ enum class SignatureState { // FIXME: Do these values have to be these, and given at all, or is this just cargo cult? - UNKNOWN = 0xffff, // used to be -1 when this was a sal_uInt16 - NOSIGNATURES = 0, - OK = 1, - BROKEN = 2, + UNKNOWN = 0xffff, // used to be -1 when this was a sal_uInt16 + NOSIGNATURES = 0, + OK = 1, + BROKEN = 2, // State was SignatureState::OK, but doc is modified now - INVALID = 3, + INVALID = 3, // signature is OK, but certificate could not be validated - NOTVALIDATED = 4, + NOTVALIDATED = 4, // signature and certificate are ok, but not all files are signed, as it was the case in // OOo 2.x - OOo 3.1.1. This state is only used together with document signatures. - PARTIAL_OK = 5, + PARTIAL_OK = 5, /// Certificate could not be validated and the document is only partially signed. NOTVALIDATED_PARTIAL_OK = 6 }; diff --git a/include/sfx2/templatedlg.hxx b/include/sfx2/templatedlg.hxx index b9544652e540..76d7d98eced5 100644 --- a/include/sfx2/templatedlg.hxx +++ b/include/sfx2/templatedlg.hxx @@ -24,33 +24,33 @@ class TemplateSearchView; class ThumbnailViewItem; -namespace com { - namespace sun::star::frame { - class XDesktop2; - class XModel; - } +namespace com +{ +namespace sun::star::frame +{ +class XDesktop2; +class XModel; +} } class SFX2_DLLPUBLIC SfxTemplateManagerDlg : public weld::GenericDialogController { - typedef bool (*selection_cmp_fn)(const ThumbnailViewItem*,const ThumbnailViewItem*); + typedef bool (*selection_cmp_fn)(const ThumbnailViewItem*, const ThumbnailViewItem*); public: - - SfxTemplateManagerDlg(weld::Window *parent); + SfxTemplateManagerDlg(weld::Window* parent); virtual ~SfxTemplateManagerDlg() override; virtual short run() override; - void setDocumentModel (const css::uno::Reference<css::frame::XModel> &rModel); + void setDocumentModel(const css::uno::Reference<css::frame::XModel>& rModel); protected: - void getApplicationSpecificSettings(); - void readSettings (); + void readSettings(); - void writeSettings (); + void writeSettings(); void fillFolderComboBox(); @@ -84,17 +84,17 @@ protected: DECL_LINK(KeyInputHdl, const KeyEvent&, bool); void OnTemplateImportCategory(const OUString& sCategory); -// static void OnTemplateLink (); - void OnTemplateOpen (); - void OnTemplateExport (); + // static void OnTemplateLink (); + void OnTemplateOpen(); + void OnTemplateExport(); - void OnTemplateState (const ThumbnailViewItem *pItem); + void OnTemplateState(const ThumbnailViewItem* pItem); - void OnCategoryNew (); + void OnCategoryNew(); void OnCategoryRename(); void OnCategoryDelete(); - void createDefaultTemplateMenu (); + void createDefaultTemplateMenu(); /** * @@ -102,7 +102,7 @@ protected: * **/ - void localMoveTo (sal_uInt16 nMenuId); + void localMoveTo(sal_uInt16 nMenuId); /** * @@ -110,15 +110,15 @@ protected: * **/ - void localSearchMoveTo (sal_uInt16 nMenuId); + void localSearchMoveTo(sal_uInt16 nMenuId); /// Return filter according to the currently selected application filter. FILTER_APPLICATION getCurrentApplicationFilter() const; protected: - std::set<const ThumbnailViewItem*,selection_cmp_fn> maSelTemplates; - css::uno::Reference< css::frame::XModel > m_xModel; - css::uno::Reference< css::frame::XDesktop2 > mxDesktop; + std::set<const ThumbnailViewItem*, selection_cmp_fn> maSelTemplates; + css::uno::Reference<css::frame::XModel> m_xModel; + css::uno::Reference<css::frame::XDesktop2> mxDesktop; Timer m_aUpdateDataTimer; @@ -145,8 +145,8 @@ protected: class SfxTemplateCategoryDialog final : public weld::GenericDialogController { private: - OUString msSelectedCategory; - bool mbIsNewCategory; + OUString msSelectedCategory; + bool mbIsNewCategory; std::unique_ptr<weld::TreeView> mxLBCategory; std::unique_ptr<weld::Label> mxSelectLabel; @@ -162,37 +162,29 @@ public: void HideNewCategoryOption(); - const OUString& GetSelectedCategory() const { - return msSelectedCategory; - }; + const OUString& GetSelectedCategory() const { return msSelectedCategory; }; - void SetSelectLabelText(OUString const & sText) const { - mxSelectLabel->set_label(sText); - }; + void SetSelectLabelText(OUString const& sText) const { mxSelectLabel->set_label(sText); }; - bool IsNewCategoryCreated() const { - return mbIsNewCategory; - } + bool IsNewCategoryCreated() const { return mbIsNewCategory; } public: - explicit SfxTemplateCategoryDialog(weld::Window* pParent); virtual ~SfxTemplateCategoryDialog() override; }; - // class SfxTemplateSelectionDialog ------------------------------------------------------------------- class SFX2_DLLPUBLIC SfxTemplateSelectionDlg final : public SfxTemplateManagerDlg { public: - SfxTemplateSelectionDlg(weld::Window *parent); + SfxTemplateSelectionDlg(weld::Window* parent); virtual ~SfxTemplateSelectionDlg() override; virtual short run() override; - OUString const & getTemplatePath() const { return msTemplatePath; }; + OUString const& getTemplatePath() const { return msTemplatePath; }; bool IsStartWithTemplate() const { return mxCBXHideDlg->get_active(); }; private: diff --git a/include/sfx2/templateproperties.hxx b/include/sfx2/templateproperties.hxx index ea2831ba223e..2c1de01257e3 100644 --- a/include/sfx2/templateproperties.hxx +++ b/include/sfx2/templateproperties.hxx @@ -15,8 +15,8 @@ struct TemplateItemProperties { - sal_uInt16 nId; ///< Index for ThumbnailView - sal_uInt16 nDocId; ///< Index based on SfxTemplateDocument + sal_uInt16 nId; ///< Index for ThumbnailView + sal_uInt16 nDocId; ///< Index based on SfxTemplateDocument sal_uInt16 nRegionId; OUString aName; OUString aPath; diff --git a/include/sot/filelist.hxx b/include/sot/filelist.hxx index b94eb84d7e9c..e95ea38cce02 100644 --- a/include/sot/filelist.hxx +++ b/include/sot/filelist.hxx @@ -36,7 +36,7 @@ private: public: // import / export - SOT_DLLPUBLIC friend SvStream& ReadFileList( SvStream& rIStm, FileList& rFileList ); + SOT_DLLPUBLIC friend SvStream& ReadFileList(SvStream& rIStm, FileList& rFileList); // fill in / interrogate list void AppendFile(const OUString& rStr); diff --git a/include/sot/object.hxx b/include/sot/object.hxx index 8b1d7e3d8968..1657986c8490 100644 --- a/include/sot/object.hxx +++ b/include/sot/object.hxx @@ -44,8 +44,8 @@ public: bool IsInClose() const { return bInClose; } private: - SotObject & operator= (const SotObject &) = delete; - SotObject(const SotObject &) = delete; + SotObject& operator=(const SotObject&) = delete; + SotObject(const SotObject&) = delete; }; #endif diff --git a/include/sot/sotdllapi.h b/include/sot/sotdllapi.h index 5219dd43a746..c01d6ed3a1e7 100644 --- a/include/sot/sotdllapi.h +++ b/include/sot/sotdllapi.h @@ -23,9 +23,9 @@ #include <sal/types.h> #if defined(SOT_DLLIMPLEMENTATION) -#define SOT_DLLPUBLIC SAL_DLLPUBLIC_EXPORT +#define SOT_DLLPUBLIC SAL_DLLPUBLIC_EXPORT #else -#define SOT_DLLPUBLIC SAL_DLLPUBLIC_IMPORT +#define SOT_DLLPUBLIC SAL_DLLPUBLIC_IMPORT #endif #define SOT_DLLPRIVATE SAL_DLLPRIVATE diff --git a/include/sot/storinfo.hxx b/include/sot/storinfo.hxx index ad1e185e1986..213e6635b494 100644 --- a/include/sot/storinfo.hxx +++ b/include/sot/storinfo.hxx @@ -31,11 +31,11 @@ class SvStream; class SvStorageInfo { -friend class SotStorage; + friend class SotStorage; OUString aName; sal_uLong nSize; bool bStream; - bool bStorage; + bool bStorage; public: SvStorageInfo(const StgDirEntry&); @@ -44,9 +44,10 @@ public: , nSize(nSz) , bStream(!bIsStorage) , bStorage(bIsStorage) - {} + { + } - const OUString & GetName() const { return aName; } + const OUString& GetName() const { return aName; } bool IsStream() const { return bStream; } bool IsStorage() const { return bStorage; } sal_uLong GetSize() const { return nSize; } @@ -54,8 +55,8 @@ public: typedef std::vector<SvStorageInfo> SvStorageInfoList; -SotClipboardFormatId ReadClipboardFormat(SvStream & rStm); -SOT_DLLPUBLIC void WriteClipboardFormat(SvStream & rStm, SotClipboardFormatId nFormat); +SotClipboardFormatId ReadClipboardFormat(SvStream& rStm); +SOT_DLLPUBLIC void WriteClipboardFormat(SvStream& rStm, SotClipboardFormatId nFormat); #endif // _STORINFO_HXX diff --git a/include/store/storedllapi.h b/include/store/storedllapi.h index 548794dfe11d..0b07462adb30 100644 --- a/include/store/storedllapi.h +++ b/include/store/storedllapi.h @@ -22,9 +22,9 @@ #include <sal/types.h> #if defined(STORE_DLLIMPLEMENTATION) -#define STORE_DLLPUBLIC SAL_DLLPUBLIC_EXPORT +#define STORE_DLLPUBLIC SAL_DLLPUBLIC_EXPORT #else -#define STORE_DLLPUBLIC SAL_DLLPUBLIC_IMPORT +#define STORE_DLLPUBLIC SAL_DLLPUBLIC_IMPORT #endif #endif // INCLUDED_STORE_STOREDLLAPI_H diff --git a/include/svl/IndexedStyleSheets.hxx b/include/svl/IndexedStyleSheets.hxx index 2393073af04b..910acd9e2566 100644 --- a/include/svl/IndexedStyleSheets.hxx +++ b/include/svl/IndexedStyleSheets.hxx @@ -19,12 +19,13 @@ #include <unordered_map> #include <vector> -namespace svl { - +namespace svl +{ /** Function object to check whether a style sheet a fulfills specific criteria. * Derive from this class and override the Check() method. */ -struct StyleSheetPredicate { +struct StyleSheetPredicate +{ virtual bool Check(const SfxStyleSheetBase& styleSheet) = 0; virtual ~StyleSheetPredicate() {} }; @@ -32,7 +33,8 @@ struct StyleSheetPredicate { /** Function object for cleanup-Strategy for IndexedSfxStyleSheets::Clear(). * Derive from it and do what is necessary to dispose of a style sheet in Dispose(). */ -struct StyleSheetDisposer { +struct StyleSheetDisposer +{ virtual void Dispose(rtl::Reference<SfxStyleSheetBase> styleSheet) = 0; virtual ~StyleSheetDisposer() {} }; @@ -40,7 +42,8 @@ struct StyleSheetDisposer { /** Function object to apply a method on all style sheets. * Derive from it and do whatever you want to with the style sheet in the DoIt() method. */ -struct StyleSheetCallback { +struct StyleSheetCallback +{ virtual void DoIt(const SfxStyleSheetBase& styleSheet) = 0; virtual ~StyleSheetCallback() {} }; @@ -81,24 +84,19 @@ public: * * If the style sheet is already contained, this call has no effect. */ - void - AddStyleSheet(const rtl::Reference< SfxStyleSheetBase >& style); + void AddStyleSheet(const rtl::Reference<SfxStyleSheetBase>& style); /** Removes a style sheet. */ - bool - RemoveStyleSheet(const rtl::Reference< SfxStyleSheetBase >& style); + bool RemoveStyleSheet(const rtl::Reference<SfxStyleSheetBase>& style); /** Check whether a specified style sheet is stored. */ - bool - HasStyleSheet(const rtl::Reference< SfxStyleSheetBase >& style) const; + bool HasStyleSheet(const rtl::Reference<SfxStyleSheetBase>& style) const; /** Obtain the number of style sheets which are held */ - sal_Int32 - GetNumberOfStyleSheets() const; + sal_Int32 GetNumberOfStyleSheets() const; /** Obtain the number of style sheets for which a certain condition holds */ - sal_Int32 - GetNumberOfStyleSheetsWithPredicate(StyleSheetPredicate& predicate) const; + sal_Int32 GetNumberOfStyleSheetsWithPredicate(StyleSheetPredicate& predicate) const; /** Return the stylesheet by its position. * You can obtain the position by, e.g., FindStyleSheetPosition() @@ -111,43 +109,41 @@ public: * * @throws std::runtime_error if the style has not been found. */ - sal_Int32 - FindStyleSheetPosition(const SfxStyleSheetBase& style) const; + sal_Int32 FindStyleSheetPosition(const SfxStyleSheetBase& style) const; /** Obtain the positions of all styles which have a given name */ - std::vector<sal_Int32> - FindPositionsByName(const OUString& name) const; + std::vector<sal_Int32> FindPositionsByName(const OUString& name) const; - enum class SearchBehavior { ReturnAll, ReturnFirst }; + enum class SearchBehavior + { + ReturnAll, + ReturnFirst + }; /** Obtain the positions of all styles which have a certain name and fulfill a certain condition. * * This method is fast because it can use the name-based index */ std::vector<sal_Int32> FindPositionsByNameAndPredicate(const OUString& name, StyleSheetPredicate& predicate, - SearchBehavior behavior = SearchBehavior::ReturnAll) const; + SearchBehavior behavior = SearchBehavior::ReturnAll) const; /** Obtain the positions of all styles which fulfill a certain condition. * * This method is slow because it cannot use the name-based index */ - std::vector<sal_Int32> - FindPositionsByPredicate(StyleSheetPredicate& predicate) const; + std::vector<sal_Int32> FindPositionsByPredicate(StyleSheetPredicate& predicate) const; /** Execute a callback on all style sheets */ - void - ApplyToAllStyleSheets(StyleSheetCallback& callback) const; + void ApplyToAllStyleSheets(StyleSheetCallback& callback) const; /** Clear the contents of the index. * The StyleSheetDisposer::Dispose() method is called on each style sheet, e.g., if you want to broadcast * changes. */ - void - Clear(StyleSheetDisposer& cleanup); + void Clear(StyleSheetDisposer& cleanup); - void - Reindex(); + void Reindex(); /** Warning: counting for n starts at 0, i.e., the 0th style sheet is the first that is found. */ SfxStyleSheetBase* GetNthStyleSheetThatMatchesPredicate(sal_Int32 n, @@ -156,14 +152,13 @@ public: /** Get the positions of the style sheets which belong to a certain family. */ - const std::vector<sal_Int32>& - GetStyleSheetPositionsByFamily(SfxStyleFamily) const; + const std::vector<sal_Int32>& GetStyleSheetPositionsByFamily(SfxStyleFamily) const; private: /** Register the position of a styleName in the index */ void Register(const SfxStyleSheetBase& style, sal_Int32 pos); - typedef std::vector<rtl::Reference<SfxStyleSheetBase> > VectorType; + typedef std::vector<rtl::Reference<SfxStyleSheetBase>> VectorType; /** Vector with the stylesheets to allow for index-based access. */ VectorType mStyleSheets; diff --git a/include/svl/cjkoptions.hxx b/include/svl/cjkoptions.hxx index 7b646d118e0c..a371d74389ab 100644 --- a/include/svl/cjkoptions.hxx +++ b/include/svl/cjkoptions.hxx @@ -30,10 +30,9 @@ class SvtCJKOptions_Impl; class SVL_DLLPUBLIC SvtCJKOptions final : public utl::detail::Options { private: - std::shared_ptr<SvtCJKOptions_Impl> pImpl; + std::shared_ptr<SvtCJKOptions_Impl> pImpl; public: - enum EOption { E_CJKFONT, @@ -45,7 +44,7 @@ public: E_DOUBLELINES, E_EMPHASISMARKS, E_VERTICALCALLOUT, - E_ALL // special one for IsAnyEnabled()/SetAll() functionality + E_ALL // special one for IsAnyEnabled()/SetAll() functionality }; // bDontLoad is for referencing purposes only @@ -60,9 +59,9 @@ public: bool IsChangeCaseMapEnabled() const; bool IsDoubleLinesEnabled() const; - void SetAll(bool bSet); - bool IsAnyEnabled() const; - bool IsReadOnly(EOption eOption) const; + void SetAll(bool bSet); + bool IsAnyEnabled() const; + bool IsReadOnly(EOption eOption) const; }; #endif // INCLUDED_SVL_CJKOPTIONS_HXX diff --git a/include/svl/converter.hxx b/include/svl/converter.hxx index 0aeceeac2132..7b2000c88e5a 100644 --- a/include/svl/converter.hxx +++ b/include/svl/converter.hxx @@ -30,5 +30,4 @@ public: #endif //_CONVERTER_HXX_ - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svl/currencytable.hxx b/include/svl/currencytable.hxx index 275391649ff5..2214b1903a6a 100644 --- a/include/svl/currencytable.hxx +++ b/include/svl/currencytable.hxx @@ -31,8 +31,8 @@ public: iterator begin(); - NfCurrencyEntry& operator[] ( size_t i ); - const NfCurrencyEntry& operator[] ( size_t i ) const; + NfCurrencyEntry& operator[](size_t i); + const NfCurrencyEntry& operator[](size_t i) const; size_t size() const; diff --git a/include/svl/gridprinter.hxx b/include/svl/gridprinter.hxx index 52a01e33b9fa..e69d9f50ca8f 100644 --- a/include/svl/gridprinter.hxx +++ b/include/svl/gridprinter.hxx @@ -14,8 +14,8 @@ #include <svl/svldllapi.h> #include <memory> -namespace svl { - +namespace svl +{ /** * Print 2-dimensional data in a nice and pleasant fashion. Useful when * debugging grid layout data. @@ -26,12 +26,11 @@ class SVL_DLLPUBLIC GridPrinter std::unique_ptr<Impl> mpImpl; public: - GridPrinter( size_t nRows, size_t nCols, bool bPrint ); + GridPrinter(size_t nRows, size_t nCols, bool bPrint); ~GridPrinter(); - void set( size_t nRow, size_t nCol, const OUString& rStr ); - void print( const char* pHeader ) const; + void set(size_t nRow, size_t nCol, const OUString& rStr); + void print(const char* pHeader) const; }; - } #endif diff --git a/include/svl/inettype.hxx b/include/svl/inettype.hxx index 6d5d01852072..9bea57d26da0 100644 --- a/include/svl/inettype.hxx +++ b/include/svl/inettype.hxx @@ -23,7 +23,6 @@ #include <svl/svldllapi.h> #include <tools/inetmime.hxx> - /** Definitions for frequently used media type names. */ #define CONTENT_TYPE_STR_APP_OCTSTREAM "application/octet-stream" @@ -111,7 +110,6 @@ #define CONTENT_TYPE_STR_APP_VND_SUN_XML_WRITER_GLOBAL "application/vnd.sun.xml.writer-global" #define CONTENT_TYPE_STR_APP_VND_SUN_XML_IMPRESSPACKED "application/vnd.sun.xml.impress-packed" - /** Definitions for matching parts of URIs. */ #define INETTYPE_URL_PROT_DATA "data" @@ -212,23 +210,21 @@ enum INetContentType CONTENT_TYPE_LAST = CONTENT_TYPE_APP_VND_SUN_XML_IMPRESSPACKED }; - class SVL_DLLPUBLIC INetContentTypes { public: - static INetContentType GetContentType(OUString const & rTypeName); + static INetContentType GetContentType(OUString const& rTypeName); static OUString GetContentType(INetContentType eTypeID); - static INetContentType GetContentType4Extension(OUString const & rExtension); + static INetContentType GetContentType4Extension(OUString const& rExtension); - static INetContentType GetContentTypeFromURL(OUString const & rURL); + static INetContentType GetContentTypeFromURL(OUString const& rURL); - static bool GetExtensionFromURL(OUString const & rURL, OUString & rExtension); + static bool GetExtensionFromURL(OUString const& rURL, OUString& rExtension); - static bool parse(OUString const & rMediaType, OUString & rType, - OUString & rSubType, - INetContentTypeParameterList * pParameters = nullptr); + static bool parse(OUString const& rMediaType, OUString& rType, OUString& rSubType, + INetContentTypeParameterList* pParameters = nullptr); }; #endif // INCLUDED_SVL_INETTYPE_HXX diff --git a/include/svl/itemiter.hxx b/include/svl/itemiter.hxx index 3d690c98890d..c6d82e41b621 100644 --- a/include/svl/itemiter.hxx +++ b/include/svl/itemiter.hxx @@ -26,13 +26,13 @@ class SfxPoolItem; class SVL_DLLPUBLIC SfxItemIter { - const SfxItemSet& m_rSet; + const SfxItemSet& m_rSet; sal_uInt16 m_nStart; sal_uInt16 m_nEnd; sal_uInt16 m_nCurrent; public: - SfxItemIter( const SfxItemSet& rSet ); + SfxItemIter(const SfxItemSet& rSet); ~SfxItemIter(); /// get item, or null if no items @@ -42,15 +42,14 @@ public: } const SfxPoolItem* NextItem() { return (m_nCurrent < m_nEnd) ? ImplNextItem() : nullptr; } - bool IsAtEnd() const { return m_nCurrent == m_nEnd; } + bool IsAtEnd() const { return m_nCurrent == m_nEnd; } - sal_uInt16 GetCurPos() const { return m_nCurrent; } + sal_uInt16 GetCurPos() const { return m_nCurrent; } sal_uInt16 GetFirstPos() const { return m_nStart; } - sal_uInt16 GetLastPos() const { return m_nEnd; } + sal_uInt16 GetLastPos() const { return m_nEnd; } private: const SfxPoolItem* ImplNextItem(); - }; #endif diff --git a/include/svl/outstrm.hxx b/include/svl/outstrm.hxx index f4e736542586..ff694a5c97a5 100644 --- a/include/svl/outstrm.hxx +++ b/include/svl/outstrm.hxx @@ -24,18 +24,18 @@ #include <com/sun/star/uno/Reference.h> #include <tools/stream.hxx> -namespace com::sun::star::io { - class XOutputStream; +namespace com::sun::star::io +{ +class XOutputStream; } - class SVL_DLLPUBLIC SvOutputStream final : public SvStream { - css::uno::Reference< css::io::XOutputStream > m_xStream; + css::uno::Reference<css::io::XOutputStream> m_xStream; - SVL_DLLPRIVATE virtual std::size_t GetData(void *, std::size_t) override; + SVL_DLLPRIVATE virtual std::size_t GetData(void*, std::size_t) override; - SVL_DLLPRIVATE virtual std::size_t PutData(void const * pData, std::size_t nSize) override; + SVL_DLLPRIVATE virtual std::size_t PutData(void const* pData, std::size_t nSize) override; SVL_DLLPRIVATE virtual sal_uInt64 SeekPos(sal_uInt64) override; @@ -44,7 +44,7 @@ class SVL_DLLPUBLIC SvOutputStream final : public SvStream SVL_DLLPRIVATE virtual void SetSize(sal_uInt64) override; public: - SvOutputStream(css::uno::Reference< css::io::XOutputStream > const & rTheStream); + SvOutputStream(css::uno::Reference<css::io::XOutputStream> const& rTheStream); virtual ~SvOutputStream() override; }; diff --git a/include/svl/sharedstringpool.hxx b/include/svl/sharedstringpool.hxx index a2cae3a9a08c..ff270eef5aa6 100644 --- a/include/svl/sharedstringpool.hxx +++ b/include/svl/sharedstringpool.hxx @@ -16,8 +16,8 @@ class CharClass; -namespace svl { - +namespace svl +{ class SharedString; /** @@ -30,11 +30,11 @@ class SVL_DLLPUBLIC SharedStringPool struct Impl; std::unique_ptr<Impl> mpImpl; - SharedStringPool( const SharedStringPool& ) = delete; - SharedStringPool& operator=( const SharedStringPool& ) = delete; + SharedStringPool(const SharedStringPool&) = delete; + SharedStringPool& operator=(const SharedStringPool&) = delete; public: - SharedStringPool( const CharClass& rCharClass ); + SharedStringPool(const CharClass& rCharClass); ~SharedStringPool(); /** @@ -45,7 +45,7 @@ public: * @return a pointer to the string object stored inside the pool, or NULL * if the insertion fails. */ - SharedString intern( const OUString& rStr ); + SharedString intern(const OUString& rStr); /** * Go through all string objects in the pool, and clear those that are no @@ -57,7 +57,6 @@ public: size_t getCountIgnoreCase() const; }; - } #endif diff --git a/include/svl/stylesheetuser.hxx b/include/svl/stylesheetuser.hxx index 86975f6b25f6..ba69268da809 100644 --- a/include/svl/stylesheetuser.hxx +++ b/include/svl/stylesheetuser.hxx @@ -16,7 +16,6 @@ namespace svl { - /** Test whether object that uses a stylesheet is used itself. This interface should be implemented by all classes that use @@ -31,10 +30,10 @@ public: @return true, if the object is used, false otherwise */ virtual bool isUsedByModel() const = 0; + protected: ~StyleSheetUser() {} }; - } #endif diff --git a/include/svl/svldllapi.h b/include/svl/svldllapi.h index 0e62d3f3b177..31402a7b19eb 100644 --- a/include/svl/svldllapi.h +++ b/include/svl/svldllapi.h @@ -23,9 +23,9 @@ #include <sal/types.h> #if defined(SVL_DLLIMPLEMENTATION) -#define SVL_DLLPUBLIC SAL_DLLPUBLIC_EXPORT +#define SVL_DLLPUBLIC SAL_DLLPUBLIC_EXPORT #else -#define SVL_DLLPUBLIC SAL_DLLPUBLIC_IMPORT +#define SVL_DLLPUBLIC SAL_DLLPUBLIC_IMPORT #endif #define SVL_DLLPRIVATE SAL_DLLPRIVATE diff --git a/include/svl/whiter.hxx b/include/svl/whiter.hxx index db4f3ccda7d8..be584fc23911 100644 --- a/include/svl/whiter.hxx +++ b/include/svl/whiter.hxx @@ -26,15 +26,15 @@ class SfxItemSet; class SVL_DLLPUBLIC SfxWhichIter { const sal_uInt16* const pStart; - const sal_uInt16* pRanges; - sal_uInt16 nOffset; + const sal_uInt16* pRanges; + sal_uInt16 nOffset; public: - SfxWhichIter( const SfxItemSet& rSet ); + SfxWhichIter(const SfxItemSet& rSet); - sal_uInt16 GetCurWhich() const { return pRanges[0] + nOffset; } - sal_uInt16 NextWhich(); - sal_uInt16 FirstWhich(); + sal_uInt16 GetCurWhich() const { return pRanges[0] + nOffset; } + sal_uInt16 NextWhich(); + sal_uInt16 FirstWhich(); }; #endif diff --git a/include/svtools/PlaceEditDialog.hxx b/include/svtools/PlaceEditDialog.hxx index 33374b766d60..9bb68e804e0e 100644 --- a/include/svtools/PlaceEditDialog.hxx +++ b/include/svtools/PlaceEditDialog.hxx @@ -22,14 +22,14 @@ class DetailsContainer; class UNLESS_MERGELIBS(SVT_DLLPUBLIC) PlaceEditDialog final : public weld::GenericDialogController { private: - std::shared_ptr< DetailsContainer > m_xCurrentDetails; + std::shared_ptr<DetailsContainer> m_xCurrentDetails; /** Vector holding the details UI control for each server type. The elements in this vector need to match the order in the type listbox, e.g. the m_aDetailsContainer[0] will be shown for the type corresponding to entry 0 in the listbox. */ - std::vector< std::shared_ptr< DetailsContainer > > m_aDetailsContainers; + std::vector<std::shared_ptr<DetailsContainer>> m_aDetailsContainers; sal_Int32 m_nCurrentType; @@ -70,7 +70,7 @@ public: public: PlaceEditDialog(weld::Window* pParent); - PlaceEditDialog(weld::Window* pParent, const std::shared_ptr<Place> &rPlace ); + PlaceEditDialog(weld::Window* pParent, const std::shared_ptr<Place>& rPlace); virtual ~PlaceEditDialog() override; // Returns a place instance with given information @@ -80,23 +80,21 @@ public: OUString GetServerUrl(); OUString GetPassword() const { return m_xEDPassword->get_text(); }; OUString GetUser() const { return m_xEDUsername->get_text(); }; - bool IsRememberChecked() const { return m_xCBPassword->get_active(); } + bool IsRememberChecked() const { return m_xCBPassword->get_active(); } void ShowPasswordControl() { m_bShowPassword = true; } private: + void InitDetails(); - void InitDetails( ); - - DECL_LINK ( OKHdl, weld::Button&, void ); - DECL_LINK ( DelHdl, weld::Button&, void ); - DECL_LINK ( EditHdl, DetailsContainer*, void ); - DECL_LINK ( ModifyHdl, weld::Entry&, void ); + DECL_LINK(OKHdl, weld::Button&, void); + DECL_LINK(DelHdl, weld::Button&, void); + DECL_LINK(EditHdl, DetailsContainer*, void); + DECL_LINK(ModifyHdl, weld::Entry&, void); void SelectType(bool bSkipSeparator); - DECL_LINK ( SelectTypeHdl, weld::ComboBox&, void ); - DECL_LINK ( EditLabelHdl, weld::Entry&, void ); - DECL_LINK ( EditUsernameHdl, weld::Entry&, void ); - + DECL_LINK(SelectTypeHdl, weld::ComboBox&, void); + DECL_LINK(EditLabelHdl, weld::Entry&, void); + DECL_LINK(EditUsernameHdl, weld::Entry&, void); }; /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svtools/collatorres.hxx b/include/svtools/collatorres.hxx index cfc0e550917a..9da09b152e2d 100644 --- a/include/svtools/collatorres.hxx +++ b/include/svtools/collatorres.hxx @@ -30,9 +30,11 @@ private: class CollatorResourceData { friend class CollatorResource; + private: OUString m_aName; OUString m_aTranslation; + public: CollatorResourceData(const OUString& rAlgorithm, const OUString& rTranslation) : m_aName(rAlgorithm) @@ -43,6 +45,7 @@ private: const OUString& GetTranslation() const { return m_aTranslation; } }; std::vector<CollatorResourceData> m_aData; + public: CollatorResource(); const OUString& GetTranslation(const OUString& rAlgorithm); diff --git a/include/svtools/htmlkywd.hxx b/include/svtools/htmlkywd.hxx index 4abccfd46817..1594dbc6b829 100644 --- a/include/svtools/htmlkywd.hxx +++ b/include/svtools/htmlkywd.hxx @@ -21,10 +21,9 @@ #include <sal/config.h> -#define OOO_STRING_SVTOOLS_HTML_doctype40 \ - "HTML PUBLIC \"-//W3C//DTD HTML 4.0 Transitional//EN\"" -#define OOO_STRING_SVTOOLS_XHTML_doctype11 \ - "html PUBLIC \"-//W3C//DTD XHTML 1.1 plus MathML 2.0//EN\" " \ +#define OOO_STRING_SVTOOLS_HTML_doctype40 "HTML PUBLIC \"-//W3C//DTD HTML 4.0 Transitional//EN\"" +#define OOO_STRING_SVTOOLS_XHTML_doctype11 \ + "html PUBLIC \"-//W3C//DTD XHTML 1.1 plus MathML 2.0//EN\" " \ "\"http://www.w3.org/Math/DTD/mathml2/xhtml-math11-f.dtd\"" // these are only switched on diff --git a/include/svtools/imgdef.hxx b/include/svtools/imgdef.hxx index 3dd59cf07c5e..44212cc471a2 100644 --- a/include/svtools/imgdef.hxx +++ b/include/svtools/imgdef.hxx @@ -21,10 +21,10 @@ enum SfxSymbolsSize { - SFX_SYMBOLS_SIZE_SMALL = 0, - SFX_SYMBOLS_SIZE_LARGE = 1, - SFX_SYMBOLS_SIZE_32 = 3, // keep the numbers as they are written into the profile - SFX_SYMBOLS_SIZE_AUTO = 2, + SFX_SYMBOLS_SIZE_SMALL = 0, + SFX_SYMBOLS_SIZE_LARGE = 1, + SFX_SYMBOLS_SIZE_32 = 3, // keep the numbers as they are written into the profile + SFX_SYMBOLS_SIZE_AUTO = 2, }; /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svtools/indexentryres.hxx b/include/svtools/indexentryres.hxx index 2cea22ff00f9..42e809ad87f4 100644 --- a/include/svtools/indexentryres.hxx +++ b/include/svtools/indexentryres.hxx @@ -30,19 +30,22 @@ private: class IndexEntryResourceData { friend class IndexEntryResource; + private: OUString m_aName; OUString m_aTranslation; + public: IndexEntryResourceData(const OUString& rAlgorithm, const OUString& rTranslation) : m_aName(rAlgorithm) , m_aTranslation(rTranslation) { } - const OUString& GetAlgorithm () const { return m_aName; } - const OUString& GetTranslation () const { return m_aTranslation; } + const OUString& GetAlgorithm() const { return m_aName; } + const OUString& GetTranslation() const { return m_aTranslation; } }; std::vector<IndexEntryResourceData> m_aData; + public: IndexEntryResource(); const OUString& GetTranslation(const OUString& rAlgorithm); diff --git a/include/svtools/menuoptions.hxx b/include/svtools/menuoptions.hxx index 5f8d7882331e..1a08c736325c 100644 --- a/include/svtools/menuoptions.hxx +++ b/include/svtools/menuoptions.hxx @@ -24,65 +24,67 @@ #include <unotools/options.hxx> #include <memory> -namespace osl { class Mutex; } +namespace osl +{ +class Mutex; +} /*-************************************************************************************************************ @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 SvtMenuOptions_Impl; /*-************************************************************************************************************ @short collect information about menu features @devstatus ready to use -*//*-*************************************************************************************************************/ +**-***********************************************************************************************************/ class SAL_WARN_UNUSED SVT_DLLPUBLIC SvtMenuOptions final : public utl::detail::Options { - public: - SvtMenuOptions(); - virtual ~SvtMenuOptions() override; - - /*-**************************************************************************************************** - @short interface methods to get and set value of config key "org.openoffice.Office.Common/View/Menu/..." - @descr These options describe internal states to enable/disable features of installed office. - - IsEntryHidingEnabled() - SetEntryHidingState() => Activate this field for viewing all deactivated menu entries. - Menu commands that are normally not necessary are hidden by default. - Default=false - - IsFollowMouseEnabled() - SetFollowMouseState() => Automatic selection while moving the mouse on a menu. - Default=true - - @seealso configuration package "org.openoffice.Office.Common/View/Menu" - *//*-*****************************************************************************************************/ - - bool IsEntryHidingEnabled() const; - TriState GetMenuIconsState() const; - void SetMenuIconsState(TriState eState); - TriState GetContextMenuShortcuts() const; - void SetContextMenuShortcuts(TriState eState); - - 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. - *//*-*****************************************************************************************************/ - - SVT_DLLPRIVATE static ::osl::Mutex& GetOwnStaticMutex(); - - private: - std::shared_ptr<SvtMenuOptions_Impl> m_pImpl; - -}; // class SvtMenuOptions +public: + SvtMenuOptions(); + virtual ~SvtMenuOptions() override; + + /*-**************************************************************************************************** + @short interface methods to get and set value of config key "org.openoffice.Office.Common/View/Menu/..." + @descr These options describe internal states to enable/disable features of installed office. + + IsEntryHidingEnabled() + SetEntryHidingState() => Activate this field for viewing all deactivated menu entries. + Menu commands that are normally not necessary are hidden by default. + Default=false + + IsFollowMouseEnabled() + SetFollowMouseState() => Automatic selection while moving the mouse on a menu. + Default=true + + @seealso configuration package "org.openoffice.Office.Common/View/Menu" + **-***************************************************************************************************/ + + bool IsEntryHidingEnabled() const; + TriState GetMenuIconsState() const; + void SetMenuIconsState(TriState eState); + TriState GetContextMenuShortcuts() const; + void SetContextMenuShortcuts(TriState eState); + +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. + **-***************************************************************************************************/ + + SVT_DLLPRIVATE static ::osl::Mutex& GetOwnStaticMutex(); + +private: + std::shared_ptr<SvtMenuOptions_Impl> m_pImpl; + +}; // class SvtMenuOptions /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svtools/popupwindowcontroller.hxx b/include/svtools/popupwindowcontroller.hxx index 893ad11ca82d..4d77d084f442 100644 --- a/include/svtools/popupwindowcontroller.hxx +++ b/include/svtools/popupwindowcontroller.hxx @@ -29,7 +29,10 @@ #include <svtools/toolboxcontroller.hxx> #include <vcl/vclptr.hxx> -namespace vcl { class Window; } +namespace vcl +{ +class Window; +} class InterimToolbarPopup; class ToolbarPopupContainer; @@ -40,8 +43,8 @@ namespace svt class PopupWindowControllerImpl; //HACK to avoid duplicate ImplInheritanceHelper symbols with MSVC: -class SAL_DLLPUBLIC_TEMPLATE PopupWindowController_Base: - public cppu::ImplInheritanceHelper<svt::ToolboxController, css::lang::XServiceInfo> +class SAL_DLLPUBLIC_TEMPLATE PopupWindowController_Base + : public cppu::ImplInheritanceHelper<svt::ToolboxController, css::lang::XServiceInfo> { using ImplInheritanceHelper::ImplInheritanceHelper; }; @@ -49,30 +52,30 @@ class SAL_DLLPUBLIC_TEMPLATE PopupWindowController_Base: class SVT_DLLPUBLIC PopupWindowController : public PopupWindowController_Base { public: - PopupWindowController( const css::uno::Reference< css::uno::XComponentContext >& rxContext, - const css::uno::Reference< css::frame::XFrame >& xFrame, - const OUString& aCommandURL ); + PopupWindowController(const css::uno::Reference<css::uno::XComponentContext>& rxContext, + const css::uno::Reference<css::frame::XFrame>& xFrame, + const OUString& aCommandURL); virtual ~PopupWindowController() override; void EndPopupMode(); - virtual VclPtr<vcl::Window> createVclPopupWindow( vcl::Window* pParent ) = 0; + virtual VclPtr<vcl::Window> createVclPopupWindow(vcl::Window* pParent) = 0; virtual std::unique_ptr<WeldToolbarPopup> weldPopupWindow(); // XServiceInfo virtual OUString SAL_CALL getImplementationName() override = 0; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override = 0; + virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) override; + virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override = 0; // XComponent virtual void SAL_CALL dispose() override; // XStatusListener - virtual void SAL_CALL statusChanged( const css::frame::FeatureStateEvent& Event ) override; + virtual void SAL_CALL statusChanged(const css::frame::FeatureStateEvent& Event) override; // XToolbarController - virtual css::uno::Reference< css::awt::XWindow > SAL_CALL createPopupWindow() override; + virtual css::uno::Reference<css::awt::XWindow> SAL_CALL createPopupWindow() override; virtual void SAL_CALL click() override; protected: @@ -80,7 +83,8 @@ protected: VclPtr<InterimToolbarPopup> mxInterimPopover; private: - std::unique_ptr<PopupWindowControllerImpl, o3tl::default_delete<PopupWindowControllerImpl>> mxImpl; + std::unique_ptr<PopupWindowControllerImpl, o3tl::default_delete<PopupWindowControllerImpl>> + mxImpl; }; } // namespace svt diff --git a/include/svtools/sampletext.hxx b/include/svtools/sampletext.hxx index 3027f384f289..d85391b5b04d 100644 --- a/include/svtools/sampletext.hxx +++ b/include/svtools/sampletext.hxx @@ -14,24 +14,27 @@ #include <vcl/fontcapabilities.hxx> class OutputDevice; -namespace vcl { class Font; } +namespace vcl +{ +class Font; +} UScriptCode otCoverageToScript(vcl::UnicodeCoverage::UnicodeCoverageEnum eOTCoverage); -bool isSymbolFont(const vcl::Font &rFont); +bool isSymbolFont(const vcl::Font& rFont); -bool canRenderNameOfSelectedFont(OutputDevice const &rDevice); +bool canRenderNameOfSelectedFont(OutputDevice const& rDevice); //These ones are typically for use in the font dropdown box beside the //fontname, so say things roughly like "Script/Alphabet/Name-Of-Major-Language" -OUString makeShortRepresentativeSymbolTextForSelectedFont(OutputDevice const &rDevice); -OUString makeShortRepresentativeTextForSelectedFont(OutputDevice const &rDevice); +OUString makeShortRepresentativeSymbolTextForSelectedFont(OutputDevice const& rDevice); +OUString makeShortRepresentativeTextForSelectedFont(OutputDevice const& rDevice); OUString makeShortRepresentativeTextForScript(UScriptCode eScript); //For the cases where the font doesn't fully support a script, but has partial support //for a useful subset OUString makeShortMinimalTextForScript(UScriptCode eScript); //These ones are typically for use in the font preview window in format character -SVT_DLLPUBLIC OUString makeRepresentativeTextForFont(sal_Int16 nScriptType, const vcl::Font &rFont); +SVT_DLLPUBLIC OUString makeRepresentativeTextForFont(sal_Int16 nScriptType, const vcl::Font& rFont); /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svtools/svtdllapi.h b/include/svtools/svtdllapi.h index 8f5061aff9b8..ce301e9f8b5b 100644 --- a/include/svtools/svtdllapi.h +++ b/include/svtools/svtdllapi.h @@ -22,9 +22,9 @@ #include <sal/types.h> #if defined(SVT_DLLIMPLEMENTATION) -#define SVT_DLLPUBLIC SAL_DLLPUBLIC_EXPORT +#define SVT_DLLPUBLIC SAL_DLLPUBLIC_EXPORT #else -#define SVT_DLLPUBLIC SAL_DLLPUBLIC_IMPORT +#define SVT_DLLPUBLIC SAL_DLLPUBLIC_IMPORT #endif #define SVT_DLLPRIVATE SAL_DLLPRIVATE diff --git a/include/svx/AccessibleTextHelper.hxx b/include/svx/AccessibleTextHelper.hxx index 5f646d83253c..d57736e14f26 100644 --- a/include/svx/AccessibleTextHelper.hxx +++ b/include/svx/AccessibleTextHelper.hxx @@ -27,10 +27,20 @@ #include <sal/types.h> #include <svx/svxdllapi.h> -namespace com::sun::star { - namespace accessibility { class XAccessible; } - namespace accessibility { class XAccessibleEventListener; } - namespace awt { struct Point; } +namespace com::sun::star +{ +namespace accessibility +{ +class XAccessible; +} +namespace accessibility +{ +class XAccessibleEventListener; +} +namespace awt +{ +struct Point; +} } class Point; @@ -38,326 +48,324 @@ class SvxEditSource; namespace accessibility { +class AccessibleTextHelper_Impl; + +/** Helper class for objects containing EditEngine/Outliner text + + This class provides the methods from the XAccessibleContext, + XAccessibleEventBroadcaster and XAccessibleComponent + interfaces, that are common to all accessible objects + containing an edit engine. + + The text contained in the EditEngine/Outliner is presented as + children of this class, namely for every text paragraph a + AccessibleEditableTextPara child object is generated. As this + class manages these children for itself, it has to send out + AccessibleEventId::CHILD events on your + behalf. Thus, you must forward every call to your + addEventListener()/removeEventListener() methods to the + AccessibleTextHelper (methods + AddEventListener/RemoveEventListener), otherwise none or not + everyone of your event listener will notice child changes. + + You have to implement the SvxEditSource, SvxTextForwarder, + SvxViewForwarder and SvxEditViewForwarder interfaces in order + to enable your object to cooperate with this + class. SvxTextForwarder encapsulates the fact that text + objects do not necessarily have an EditEngine at their + disposal, SvxViewForwarder and SvxEditViewForwarder do the + same for the document and the edit view. The three mentioned + forwarder objects are not stored by the AccessibleTextHelper, + but fetched every time from the SvxEditSource. So you are best + off making your SvxEditSource::Get*Forwarder methods cache the + current forwarder. + + To support changes in edit mode or conversion of fixed text + into EditEngine text, you can change the SvxEditSource this + class is referring to. This might render all children invalid + and change the child count, since the AccessibleTextHelper + reinitializes itself from scratch. + + This class registers itself at the SvxEditSource as a state + listener and manages the state of its children (i.e. the + paragraphs). See the method documentation of + AccessibleTextHelper::SetEditSource for the expected + events. Generally, be prepared that when sending any of these + events via SvxEditSource::GetBroadcaster() broadcaster, the + AccessibleTextHelper will call the SvxEditSource and their + forwarder to update it's state. Avoid being inconsistent in + the facts you tell in the events, e.g. when sending a + SfxHintId::TextParaInserted event, the + SvxEditSource::GetTextForwarder().GetParagraphCount() should + already include the newly inserted paragraph. + + @attention All public methods must not be called with any + mutex hold, except when calling from the main thread (with + holds the solar mutex), unless stated otherwise. This is + because they themselves might need the solar mutex in addition + to the object mutex, and the ordering of the locking must be: + first solar mutex, then object mutex. Furthermore, state + change events might be fired internally. + + @derive Use this class in an aggregation and forward, or + derive from it and overwrite. + too. + + @see SvxEditSource + @see SvxTextForwarder + @see SvxViewForwarder + @see SvxEditViewForwarder +*/ +class SVX_DLLPUBLIC AccessibleTextHelper final +{ +public: + typedef ::std::vector<sal_Int16> VectorOfStates; + + /** Create accessible text object for given edit source + + @param pEditSource + The edit source to use. Object ownership is transferred + from the caller to the callee. The object listens on the + SvxEditSource for object disposal, so no provisions have + to be taken if the caller destroys the data (e.g. the + model) contained in the given SvxEditSource. + + */ + explicit AccessibleTextHelper(::std::unique_ptr<SvxEditSource>&& pEditSource); + + ~AccessibleTextHelper(); + + AccessibleTextHelper(const AccessibleTextHelper&) = delete; + AccessibleTextHelper& operator=(const AccessibleTextHelper&) = delete; + + /** Query the current edit source - class AccessibleTextHelper_Impl; - - /** Helper class for objects containing EditEngine/Outliner text - - This class provides the methods from the XAccessibleContext, - XAccessibleEventBroadcaster and XAccessibleComponent - interfaces, that are common to all accessible objects - containing an edit engine. - - The text contained in the EditEngine/Outliner is presented as - children of this class, namely for every text paragraph a - AccessibleEditableTextPara child object is generated. As this - class manages these children for itself, it has to send out - AccessibleEventId::CHILD events on your - behalf. Thus, you must forward every call to your - addEventListener()/removeEventListener() methods to the - AccessibleTextHelper (methods - AddEventListener/RemoveEventListener), otherwise none or not - everyone of your event listener will notice child changes. - - You have to implement the SvxEditSource, SvxTextForwarder, - SvxViewForwarder and SvxEditViewForwarder interfaces in order - to enable your object to cooperate with this - class. SvxTextForwarder encapsulates the fact that text - objects do not necessarily have an EditEngine at their - disposal, SvxViewForwarder and SvxEditViewForwarder do the - same for the document and the edit view. The three mentioned - forwarder objects are not stored by the AccessibleTextHelper, - but fetched every time from the SvxEditSource. So you are best - off making your SvxEditSource::Get*Forwarder methods cache the - current forwarder. - - To support changes in edit mode or conversion of fixed text - into EditEngine text, you can change the SvxEditSource this - class is referring to. This might render all children invalid - and change the child count, since the AccessibleTextHelper - reinitializes itself from scratch. - - This class registers itself at the SvxEditSource as a state - listener and manages the state of its children (i.e. the - paragraphs). See the method documentation of - AccessibleTextHelper::SetEditSource for the expected - events. Generally, be prepared that when sending any of these - events via SvxEditSource::GetBroadcaster() broadcaster, the - AccessibleTextHelper will call the SvxEditSource and their - forwarder to update it's state. Avoid being inconsistent in - the facts you tell in the events, e.g. when sending a - SfxHintId::TextParaInserted event, the - SvxEditSource::GetTextForwarder().GetParagraphCount() should - already include the newly inserted paragraph. - - @attention All public methods must not be called with any - mutex hold, except when calling from the main thread (with - holds the solar mutex), unless stated otherwise. This is - because they themselves might need the solar mutex in addition - to the object mutex, and the ordering of the locking must be: - first solar mutex, then object mutex. Furthermore, state - change events might be fired internally. - - @derive Use this class in an aggregation and forward, or - derive from it and overwrite. - too. - - @see SvxEditSource - @see SvxTextForwarder - @see SvxViewForwarder - @see SvxEditViewForwarder + @attention This method returns by reference, so you are + responsible for serialization (typically, you acquired the + solar mutex when calling this method). Thus, the method + should only be called from the main office thread. + + */ + const SvxEditSource& GetEditSource() const; + + /** Set the current edit source + + @attention Might fire state change events, therefore, + don't hold any mutex except solar mutex, which you are + required to lock before. This method should only be called + from the main office thread. + + The EditSource set here is required to broadcast out the + following hints: SfxHintId::EditSourceParasMoved, + SfxHintId::EditSourceSelectionChanged, SfxHintId::TextModified, + SfxHintId::TextParaInserted, SfxHintId::TextParaRemoved, + SfxHintId::TextHeightChanged, + SfxHintId::TextViewScrolled. Otherwise, not all state changes + will get noticed by the accessibility object. Further + more, when the corresponding core object or the model is + dying, either the edit source must be set to NULL or it + has to broadcast a SfxHintId::Dying hint. + + If the SvxEditSource's managed text can change between + edit/non-edit mode (i.e. there are times when + SvxEditSource::GetEditViewForwarder(sal_False) returns + NULL), then the two additional hints are required: + SdrHintKind::BeginEdit and SdrHintKind::EndEdit. When the + AccessibleTextHelper receives a SdrHintKind::BeginEdit, it expects + the SvxEditSource already in edit mode. On a SdrHintKind::EndEdit, + edit mode must already been left. The rationale for these + events are the fact that focus and selection have to be + updated in edit mode, and completely relinquished and + reset to the parent (for the focus) in non-edit mode. + + This class does not have a dispose method, since it is not + a UNO component. Nevertheless, it holds C++ references to + several core objects, so you should issue a + SetEditSource(::std::unique_ptr<SvxEditSource>()) in + your dispose() method. + + @param pEditSource + The new edit source to set. Object ownership is transferred + from the caller to the callee. */ - class SVX_DLLPUBLIC AccessibleTextHelper final - { - - public: - typedef ::std::vector< sal_Int16 > VectorOfStates; - - /** Create accessible text object for given edit source - - @param pEditSource - The edit source to use. Object ownership is transferred - from the caller to the callee. The object listens on the - SvxEditSource for object disposal, so no provisions have - to be taken if the caller destroys the data (e.g. the - model) contained in the given SvxEditSource. - - */ - explicit AccessibleTextHelper( ::std::unique_ptr< SvxEditSource > && pEditSource ); - - ~AccessibleTextHelper(); - - AccessibleTextHelper( const AccessibleTextHelper& ) = delete; - AccessibleTextHelper& operator= ( const AccessibleTextHelper& ) = delete; - - /** Query the current edit source - - @attention This method returns by reference, so you are - responsible for serialization (typically, you acquired the - solar mutex when calling this method). Thus, the method - should only be called from the main office thread. - - */ - const SvxEditSource& GetEditSource() const; - - /** Set the current edit source - - @attention Might fire state change events, therefore, - don't hold any mutex except solar mutex, which you are - required to lock before. This method should only be called - from the main office thread. - - The EditSource set here is required to broadcast out the - following hints: SfxHintId::EditSourceParasMoved, - SfxHintId::EditSourceSelectionChanged, SfxHintId::TextModified, - SfxHintId::TextParaInserted, SfxHintId::TextParaRemoved, - SfxHintId::TextHeightChanged, - SfxHintId::TextViewScrolled. Otherwise, not all state changes - will get noticed by the accessibility object. Further - more, when the corresponding core object or the model is - dying, either the edit source must be set to NULL or it - has to broadcast a SfxHintId::Dying hint. - - If the SvxEditSource's managed text can change between - edit/non-edit mode (i.e. there are times when - SvxEditSource::GetEditViewForwarder(sal_False) returns - NULL), then the two additional hints are required: - SdrHintKind::BeginEdit and SdrHintKind::EndEdit. When the - AccessibleTextHelper receives a SdrHintKind::BeginEdit, it expects - the SvxEditSource already in edit mode. On a SdrHintKind::EndEdit, - edit mode must already been left. The rationale for these - events are the fact that focus and selection have to be - updated in edit mode, and completely relinquished and - reset to the parent (for the focus) in non-edit mode. - - This class does not have a dispose method, since it is not - a UNO component. Nevertheless, it holds C++ references to - several core objects, so you should issue a - SetEditSource(::std::unique_ptr<SvxEditSource>()) in - your dispose() method. - - @param pEditSource - The new edit source to set. Object ownership is transferred - from the caller to the callee. - */ - void SetEditSource( ::std::unique_ptr< SvxEditSource > && pEditSource ); - - /** Set the event source - - You should set the event source before registering any - event listener and before requesting any child. Children - of this object receive the event source as their parent - accessible object. That is, the event source is best set - in your object's init method. - - @attention When setting a reference here, you should call - Dispose() when you as the owner are disposing, since until - then this object will hold that reference - - @param rInterface - The interface that should be set as the source for - accessibility events sent by this object. - */ - void SetEventSource( const css::uno::Reference< css::accessibility::XAccessible >& rInterface ); - - /** Set offset of EditEngine/Outliner from parent - - If the origin of the underlying EditEngine/Outliner does - not correspond to the upper left corner of the object - using this class, you have to specify the offset. - - @attention Might fire state change events, therefore, - don't hold any mutex except solar mutex, which you are - required to lock before. This method should only be called - from the main office thread. - - @param rPoint - The offset in screen coordinates (i.e. pixel) - */ - void SetOffset( const Point& rPoint ); - - /** Set offset the object adds to all children's indices - - This can be used if the owner of this object has children - handled by itself. Setting an offset different from 0 - leads to this object mimicking that all its children are - within the range [nOffset, GetChildCount()+nOffset). That - means, GetChild() also expects the index to be in this - range. - - @attention Might fire state change events, therefore, - don't hold any mutex except solar mutex, which you are - required to lock before. This method should only be called - from the main office thread. - - @param nOffset - The offset to add to every children's index. - */ - void SetStartIndex( sal_Int32 nOffset ); - - /** Query offset the object adds to all children's indices - - @return the offset to add to every children's index. - */ - sal_Int32 GetStartIndex() const; - - /** Sets a vector of additional accessible states. - - The states are passed to every created child object - (text paragraph). The state values are defined in - css::accessibility::AccessibleStateType. - - This function has to be called before querying for - any children (e.g. with GetChild()). - */ - void SetAdditionalChildStates( const VectorOfStates& rChildStates ); - - /** Update the visible children - - @attention Might fire state change events, therefore, - don't hold any mutex except solar mutex, which you are - required to lock before. This method should only be called - from the main office thread. - - This method reevaluates the visibility of all - children. Call this method if your visibility state has - changed somehow, e.g. if the visible area has changed and - the AccessibleTextHelper isn't notified internally - (e.g. via SfxHintId::TextViewScrolled). Normally, there should - not be a need to call this method. - */ - void UpdateChildren(); + void SetEditSource(::std::unique_ptr<SvxEditSource>&& pEditSource); - /** Drop all references and enter disposed state + /** Set the event source - This method drops all references to external objects (also - the event source reference set via SetEventSource()) and - sets the object into the disposed state (i.e. the methods - return default values or throw a uno::DisposedException - exception). - */ - void Dispose(); + You should set the event source before registering any + event listener and before requesting any child. Children + of this object receive the event source as their parent + accessible object. That is, the event source is best set + in your object's init method. - /** Set the focus state of the accessibility object + @attention When setting a reference here, you should call + Dispose() when you as the owner are disposing, since until + then this object will hold that reference - Since this class handles children which also might get the - focus, the user of this class is encouraged to delegate - focus handling. Whenever the focus state of the - surrounding object changes, this method has to be called. + @param rInterface + The interface that should be set as the source for + accessibility events sent by this object. + */ + void SetEventSource(const css::uno::Reference<css::accessibility::XAccessible>& rInterface); - The protocol of focus handling for a user of this class is - then to call SetFocus() with the appropriate focus state, - and HaveFocus() to determine the focus state you tell the - outside. + /** Set offset of EditEngine/Outliner from parent - @attention Might fire state change events, therefore, - don't hold any mutex except solar mutex, which you are - required to lock before. This method should only be called - from the main office thread. + If the origin of the underlying EditEngine/Outliner does + not correspond to the upper left corner of the object + using this class, you have to specify the offset. - @param bHaveFocus - Whether we got or we lost the focus. Set to true if - focus is gotten, false otherwise. + @attention Might fire state change events, therefore, + don't hold any mutex except solar mutex, which you are + required to lock before. This method should only be called + from the main office thread. - @see HaveFocus() - */ - void SetFocus( bool bHaveFocus = true ); + @param rPoint + The offset in screen coordinates (i.e. pixel) + */ + void SetOffset(const Point& rPoint); - /** Query the focus state of the surrounding object + /** Set offset the object adds to all children's indices - If focus handling is delegated to this class, determine - focus state with this method. Be prepared that even if you - set the focus with SetFocus(true), this method might - return false. This is the case if one of the children - actually got the focus. + This can be used if the owner of this object has children + handled by itself. Setting an offset different from 0 + leads to this object mimicking that all its children are + within the range [nOffset, GetChildCount()+nOffset). That + means, GetChild() also expects the index to be in this + range. - @return the state of the focus ownership - */ - bool HaveFocus(); + @attention Might fire state change events, therefore, + don't hold any mutex except solar mutex, which you are + required to lock before. This method should only be called + from the main office thread. - // XAccessibleContext child handling methods + @param nOffset + The offset to add to every children's index. + */ + void SetStartIndex(sal_Int32 nOffset); - /** Implements getAccessibleChildCount + /** Query offset the object adds to all children's indices - @attention Don't call with locked mutexes. You may hold - the solar mutex, but this method acquires it anyway. - */ - sal_Int32 GetChildCount() const; - /** Implements getAccessibleChild + @return the offset to add to every children's index. + */ + sal_Int32 GetStartIndex() const; - @attention Don't call with locked mutexes. You may hold - the solar mutex, but this method acquires it anyway. - */ - css::uno::Reference< css::accessibility::XAccessible > GetChild( sal_Int32 i ); + /** Sets a vector of additional accessible states. - // XAccessibleEventBroadcaster child related methods + The states are passed to every created child object + (text paragraph). The state values are defined in + css::accessibility::AccessibleStateType. - /** Implements addEventListener + This function has to be called before querying for + any children (e.g. with GetChild()). + */ + void SetAdditionalChildStates(const VectorOfStates& rChildStates); - @attention Don't call with locked mutexes - */ - void AddEventListener( const css::uno::Reference< css::accessibility::XAccessibleEventListener >& xListener ); - /** Implements removeEventListener + /** Update the visible children - @attention Don't call with locked mutexes - */ - void RemoveEventListener( const css::uno::Reference< css::accessibility::XAccessibleEventListener >& xListener ); + @attention Might fire state change events, therefore, + don't hold any mutex except solar mutex, which you are + required to lock before. This method should only be called + from the main office thread. - // XAccessibleComponent child related methods + This method reevaluates the visibility of all + children. Call this method if your visibility state has + changed somehow, e.g. if the visible area has changed and + the AccessibleTextHelper isn't notified internally + (e.g. via SfxHintId::TextViewScrolled). Normally, there should + not be a need to call this method. + */ + void UpdateChildren(); - /** Implements getAccessibleAt + /** Drop all references and enter disposed state - @attention Don't call with locked mutexes. You may hold - the solar mutex, but this method acquires it anyway. - */ - css::uno::Reference< css::accessibility::XAccessible > GetAt( const css::awt::Point& aPoint ); + This method drops all references to external objects (also + the event source reference set via SetEventSource()) and + sets the object into the disposed state (i.e. the methods + return default values or throw a uno::DisposedException + exception). + */ + void Dispose(); - private: + /** Set the focus state of the accessibility object - /// @dyn - const std::unique_ptr< AccessibleTextHelper_Impl > mpImpl; + Since this class handles children which also might get the + focus, the user of this class is encouraged to delegate + focus handling. Whenever the focus state of the + surrounding object changes, this method has to be called. + + The protocol of focus handling for a user of this class is + then to call SetFocus() with the appropriate focus state, + and HaveFocus() to determine the focus state you tell the + outside. + + @attention Might fire state change events, therefore, + don't hold any mutex except solar mutex, which you are + required to lock before. This method should only be called + from the main office thread. + + @param bHaveFocus + Whether we got or we lost the focus. Set to true if + focus is gotten, false otherwise. + + @see HaveFocus() + */ + void SetFocus(bool bHaveFocus = true); + + /** Query the focus state of the surrounding object + + If focus handling is delegated to this class, determine + focus state with this method. Be prepared that even if you + set the focus with SetFocus(true), this method might + return false. This is the case if one of the children + actually got the focus. + + @return the state of the focus ownership + */ + bool HaveFocus(); + + // XAccessibleContext child handling methods + + /** Implements getAccessibleChildCount + + @attention Don't call with locked mutexes. You may hold + the solar mutex, but this method acquires it anyway. + */ + sal_Int32 GetChildCount() const; + /** Implements getAccessibleChild + + @attention Don't call with locked mutexes. You may hold + the solar mutex, but this method acquires it anyway. + */ + css::uno::Reference<css::accessibility::XAccessible> GetChild(sal_Int32 i); + + // XAccessibleEventBroadcaster child related methods + + /** Implements addEventListener + + @attention Don't call with locked mutexes + */ + void AddEventListener( + const css::uno::Reference<css::accessibility::XAccessibleEventListener>& xListener); + /** Implements removeEventListener + + @attention Don't call with locked mutexes + */ + void RemoveEventListener( + const css::uno::Reference<css::accessibility::XAccessibleEventListener>& xListener); + + // XAccessibleComponent child related methods + + /** Implements getAccessibleAt + + @attention Don't call with locked mutexes. You may hold + the solar mutex, but this method acquires it anyway. + */ + css::uno::Reference<css::accessibility::XAccessible> GetAt(const css::awt::Point& aPoint); - }; +private: + /// @dyn + const std::unique_ptr<AccessibleTextHelper_Impl> mpImpl; +}; } // end of namespace accessibility diff --git a/include/svx/ChildrenManager.hxx b/include/svx/ChildrenManager.hxx index f7cdd01c0cfc..feed19117895 100644 --- a/include/svx/ChildrenManager.hxx +++ b/include/svx/ChildrenManager.hxx @@ -27,14 +27,24 @@ #include <svx/svxdllapi.h> #include <tools/long.hxx> -namespace com::sun::star { - namespace accessibility { class XAccessible; } - namespace drawing { class XShape; } - namespace drawing { class XShapes; } +namespace com::sun::star +{ +namespace accessibility +{ +class XAccessible; +} +namespace drawing +{ +class XShape; +} +namespace drawing +{ +class XShapes; +} } -namespace accessibility { - +namespace accessibility +{ class AccessibleContextBase; class AccessibleShapeTreeInfo; class ChildrenManagerImpl; @@ -95,12 +105,9 @@ public: for new and deleted children, i.e. that holds a list of listeners to be informed. */ - ChildrenManager (const css::uno::Reference< - css::accessibility::XAccessible>& rxParent, - const css::uno::Reference< - css::drawing::XShapes>& rxShapeList, - const AccessibleShapeTreeInfo& rShapeTreeInfo, - AccessibleContextBase& rContext); + ChildrenManager(const css::uno::Reference<css::accessibility::XAccessible>& rxParent, + const css::uno::Reference<css::drawing::XShapes>& rxShapeList, + const AccessibleShapeTreeInfo& rShapeTreeInfo, AccessibleContextBase& rContext); /** If there still are managed children these are marked as DEFUNC and released. @@ -111,7 +118,7 @@ public: @return If there are no children a 0 is returned. */ - tools::Long GetChildCount() const throw (); + tools::Long GetChildCount() const throw(); /** Return the requested accessible child or throw and IndexOutOfBoundsException if the given index is invalid. @@ -126,12 +133,10 @@ public: @throws Throws an IndexOutOfBoundsException if the index is not valid. */ - css::uno::Reference< - css::accessibility::XAccessible> - GetChild (tools::Long nIndex); + css::uno::Reference<css::accessibility::XAccessible> GetChild(tools::Long nIndex); /// @throws css::lang::IndexOutOfBoundsException /// @throws css::uno::RuntimeException - css::uno::Reference< css::drawing::XShape> GetChildShape (tools::Long nIndex); + css::uno::Reference<css::drawing::XShape> GetChildShape(tools::Long nIndex); /** Update the child manager. Take care of a modified set of children and modified visible area. This method can optimize the update @@ -144,14 +149,13 @@ public: before this method returns and events are sent to inform the listeners of the new object. */ - void Update (bool bCreateNewObjectsOnDemand = true); + void Update(bool bCreateNewObjectsOnDemand = true); /** Replace the list of UNO shapes by the specified list. @param xShapeList The new list of shapes. */ - void SetShapeList (const css::uno::Reference< - css::drawing::XShapes>& xShapeList); + void SetShapeList(const css::uno::Reference<css::drawing::XShapes>& xShapeList); /** Add an accessible shape. The difference to the UNO shapes in the list passed to the constructor the specified object does not have to @@ -160,7 +164,7 @@ public: @param shape must be non-null */ - void AddAccessibleShape (css::uno::Reference<css::accessibility::XAccessible> const & shape); + void AddAccessibleShape(css::uno::Reference<css::accessibility::XAccessible> const& shape); /** Clear the list of accessible shapes which have been added by previous calls to <member>AddAccessibleShape</member>. @@ -172,7 +176,7 @@ public: @param rShapeTreeInfo The new info that replaces the current one. */ - void SetInfo (AccessibleShapeTreeInfo const & rShapeTreeInfo); + void SetInfo(AccessibleShapeTreeInfo const& rShapeTreeInfo); /** Update the SELECTED and FOCUSED states of all visible children according to the given selection. This includes setting @@ -199,8 +203,8 @@ public: private: rtl::Reference<ChildrenManagerImpl> mpImpl; - ChildrenManager (const ChildrenManager&) = delete; - ChildrenManager& operator= (const ChildrenManager&) = delete; + ChildrenManager(const ChildrenManager&) = delete; + ChildrenManager& operator=(const ChildrenManager&) = delete; }; } // end of namespace accessibility diff --git a/include/svx/ClassificationDialog.hxx b/include/svx/ClassificationDialog.hxx index d03445c77730..8259b64617fd 100644 --- a/include/svx/ClassificationDialog.hxx +++ b/include/svx/ClassificationDialog.hxx @@ -17,11 +17,17 @@ #include <sfx2/classificationhelper.hxx> #include <svx/ClassificationField.hxx> -namespace svx { class ClassificationEditView; } -namespace weld { class CustomWeld; } - -namespace svx { +namespace svx +{ +class ClassificationEditView; +} +namespace weld +{ +class CustomWeld; +} +namespace svx +{ class SVX_DLLPUBLIC ClassificationDialog final : public weld::GenericDialogController { private: @@ -66,20 +72,22 @@ private: DECL_STATIC_LINK(ClassificationDialog, KeyInput, const KeyEvent&, bool); DECL_LINK(OnAsyncExpandHdl, void*, void); - void insertField(ClassificationType eType, OUString const & rString, OUString const & rFullString, OUString const & rIdentifier = OUString()); + void insertField(ClassificationType eType, OUString const& rString, OUString const& rFullString, + OUString const& rIdentifier = OUString()); void insertCategoryField(sal_Int32 nID); - void readIn(std::vector<ClassificationResult> const & rInput); + void readIn(std::vector<ClassificationResult> const& rInput); void readRecentlyUsed(); void writeRecentlyUsed(); void toggleWidgetsDependingOnCategory(); public: - ClassificationDialog(weld::Window* pParent, bool bPerParagraph, const std::function<void()>& rParagraphSignHandler = [](){}); + ClassificationDialog(weld::Window* pParent, bool bPerParagraph, + const std::function<void()>& rParagraphSignHandler = []() {}); ~ClassificationDialog() override; std::vector<ClassificationResult> getResult(); - void setupValues(std::vector<ClassificationResult> const & rInput); + void setupValues(std::vector<ClassificationResult> const& rInput); }; } // end svx namespace diff --git a/include/svx/EnhancedCustomShapeTypeNames.hxx b/include/svx/EnhancedCustomShapeTypeNames.hxx index 2e5f49da0c89..fb6efdd731df 100644 --- a/include/svx/EnhancedCustomShapeTypeNames.hxx +++ b/include/svx/EnhancedCustomShapeTypeNames.hxx @@ -25,9 +25,9 @@ namespace EnhancedCustomShapeTypeNames { - SVXCORE_DLLPUBLIC MSO_SPT Get( const OUString& ); - SVXCORE_DLLPUBLIC OUString Get( const MSO_SPT ); - SVXCORE_DLLPUBLIC OUString GetAccName( const OUString& ); +SVXCORE_DLLPUBLIC MSO_SPT Get(const OUString&); +SVXCORE_DLLPUBLIC OUString Get(const MSO_SPT); +SVXCORE_DLLPUBLIC OUString GetAccName(const OUString&); } #endif diff --git a/include/svx/IAccessibleViewForwarder.hxx b/include/svx/IAccessibleViewForwarder.hxx index 247e29c416d2..fd9a5f638941 100644 --- a/include/svx/IAccessibleViewForwarder.hxx +++ b/include/svx/IAccessibleViewForwarder.hxx @@ -22,10 +22,8 @@ #include <tools/gen.hxx> - -namespace accessibility { - - +namespace accessibility +{ /** <p>This interface provides the means to transform between internal coordinates in 100th of mm and screen coordinates without giving direct access to the underlying view. Each view forwarder represents a @@ -51,10 +49,10 @@ class IAccessibleViewForwarder { public: IAccessibleViewForwarder() = default; - IAccessibleViewForwarder(IAccessibleViewForwarder const &) = default; - IAccessibleViewForwarder(IAccessibleViewForwarder &&) = default; - IAccessibleViewForwarder & operator =(IAccessibleViewForwarder const &) = default; - IAccessibleViewForwarder & operator =(IAccessibleViewForwarder &&) = default; + IAccessibleViewForwarder(IAccessibleViewForwarder const&) = default; + IAccessibleViewForwarder(IAccessibleViewForwarder&&) = default; + IAccessibleViewForwarder& operator=(IAccessibleViewForwarder const&) = default; + IAccessibleViewForwarder& operator=(IAccessibleViewForwarder&&) = default; virtual ~IAccessibleViewForwarder(){}; @@ -78,7 +76,7 @@ public: The same point but in screen coordinates relative to the upper left corner of the (current) screen. */ - virtual Point LogicToPixel (const Point& rPoint) const = 0; + virtual Point LogicToPixel(const Point& rPoint) const = 0; /** Transform the specified size from internal coordinates in 100th of mm to a screen oriented pixel size. @@ -89,8 +87,7 @@ public: @return The same size but in screen coordinates. */ - virtual Size LogicToPixel (const Size& rSize) const = 0; - + virtual Size LogicToPixel(const Size& rSize) const = 0; }; } // end of namespace accessibility diff --git a/include/svx/IAccessibleViewForwarderListener.hxx b/include/svx/IAccessibleViewForwarderListener.hxx index d22c0db568c8..bd2265b9694f 100644 --- a/include/svx/IAccessibleViewForwarderListener.hxx +++ b/include/svx/IAccessibleViewForwarderListener.hxx @@ -20,9 +20,8 @@ #ifndef INCLUDED_SVX_IACCESSIBLEVIEWFORWARDERLISTENER_HXX #define INCLUDED_SVX_IACCESSIBLEVIEWFORWARDERLISTENER_HXX - -namespace accessibility { - +namespace accessibility +{ /** <p>The purpose of this interface is to notify a user of an IAccessibleViewForwarder when that view forwarder changes its properties. Such a change may be one of the following: @@ -35,7 +34,6 @@ namespace accessibility { class IAccessibleViewForwarderListener { public: - /** This method is called to indicate a change of the specified view forwarder, specifically, a change in visible area. */ diff --git a/include/svx/ParaLineSpacingPopup.hxx b/include/svx/ParaLineSpacingPopup.hxx index b76b3adfcb2e..dfbfac9ef2fb 100644 --- a/include/svx/ParaLineSpacingPopup.hxx +++ b/include/svx/ParaLineSpacingPopup.hxx @@ -21,17 +21,18 @@ #include <svtools/popupwindowcontroller.hxx> -namespace svx { - +namespace svx +{ class SvxLineSpacingToolBoxControl final : public svt::PopupWindowController { public: - explicit SvxLineSpacingToolBoxControl( const css::uno::Reference<css::uno::XComponentContext>& rContext ); + explicit SvxLineSpacingToolBoxControl( + const css::uno::Reference<css::uno::XComponentContext>& rContext); virtual ~SvxLineSpacingToolBoxControl() override; virtual void SAL_CALL execute(sal_Int16 KeyModifier) override; - virtual VclPtr<vcl::Window> createVclPopupWindow( vcl::Window* pParent ) override; + virtual VclPtr<vcl::Window> createVclPopupWindow(vcl::Window* pParent) override; virtual std::unique_ptr<WeldToolbarPopup> weldPopupWindow() override; // XServiceInfo @@ -39,12 +40,10 @@ public: virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override; // XInitialization - virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& rArguments ) override; + virtual void SAL_CALL initialize(const css::uno::Sequence<css::uno::Any>& rArguments) override; }; - } #endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svx/ParaSpacingControl.hxx b/include/svx/ParaSpacingControl.hxx index cd13bb7d582e..f6403e45207b 100644 --- a/include/svx/ParaSpacingControl.hxx +++ b/include/svx/ParaSpacingControl.hxx @@ -23,12 +23,21 @@ #include <svx/svxdllapi.h> #include <com/sun/star/ui/XContextChangeEventListener.hpp> -namespace com::sun::star::ui { class XContextChangeEventMultiplexer; } -namespace com::sun::star::ui { struct ContextChangeEventObject; } -namespace vcl { class Window; } - -namespace svx { +namespace com::sun::star::ui +{ +class XContextChangeEventMultiplexer; +} +namespace com::sun::star::ui +{ +struct ContextChangeEventObject; +} +namespace vcl +{ +class Window; +} +namespace svx +{ class ParaULSpacingControl : public SfxToolBoxControl { public: @@ -58,8 +67,7 @@ public: virtual VclPtr<InterimItemWindow> CreateItemWindow(vcl::Window* pParent) override; }; -class ParaLRSpacingControl : public SfxToolBoxControl, - public css::ui::XContextChangeEventListener +class ParaLRSpacingControl : public SfxToolBoxControl, public css::ui::XContextChangeEventListener { public: ParaLRSpacingControl(sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx); @@ -72,15 +80,16 @@ public: virtual VclPtr<InterimItemWindow> CreateItemWindow(vcl::Window* pParent) override = 0; // XContextChangeEventListener - virtual void SAL_CALL notifyContextChangeEvent(const css::ui::ContextChangeEventObject& rEvent) override; + virtual void SAL_CALL + notifyContextChangeEvent(const css::ui::ContextChangeEventObject& rEvent) override; virtual ::css::uno::Any SAL_CALL queryInterface(const ::css::uno::Type& aType) override; - virtual void SAL_CALL acquire() throw () override; + virtual void SAL_CALL acquire() throw() override; virtual void SAL_CALL disposing(const ::css::lang::EventObject&) override; - virtual void SAL_CALL release() throw () override; + virtual void SAL_CALL release() throw() override; private: css::uno::Reference<css::ui::XContextChangeEventMultiplexer> m_xMultiplexer; @@ -112,10 +121,8 @@ public: ParaFirstLineSpacingControl(sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx); virtual VclPtr<InterimItemWindow> CreateItemWindow(vcl::Window* pParent) override; }; - } #endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svx/SpellDialogChildWindow.hxx b/include/svx/SpellDialogChildWindow.hxx index 4b6df6e997c8..21ebd227c176 100644 --- a/include/svx/SpellDialogChildWindow.hxx +++ b/include/svx/SpellDialogChildWindow.hxx @@ -26,8 +26,8 @@ class AbstractSpellDialog; -namespace svx { - +namespace svx +{ /** The child window wrapper of the actual spelling dialog. To use the spelling dialog in an application you have to do the usual things: <ol> @@ -41,17 +41,14 @@ namespace svx { description of the view shell.</li> </ol> */ -class SVX_DLLPUBLIC SpellDialogChildWindow - : public SfxChildWindow +class SVX_DLLPUBLIC SpellDialogChildWindow : public SfxChildWindow { friend class SpellDialog; VclPtr<AbstractSpellDialog> m_xAbstractSpellDialog; + public: - SpellDialogChildWindow ( - vcl::Window*pParent, - sal_uInt16 nId, - SfxBindings* pBindings); - virtual ~SpellDialogChildWindow () override; + SpellDialogChildWindow(vcl::Window* pParent, sal_uInt16 nId, SfxBindings* pBindings); + virtual ~SpellDialogChildWindow() override; protected: /** This abstract method has to be defined by a derived class. It @@ -59,7 +56,7 @@ protected: @return returns an empty vector if no error could be found */ - virtual SpellPortions GetNextWrongSentence (bool bRecheck) = 0; + virtual SpellPortions GetNextWrongSentence(bool bRecheck) = 0; /** This abstract method applies the changes made in the spelling dialog to the document. @@ -71,13 +68,14 @@ protected: manual changes in the edit field, and in order to not miss the still following errors in that sentence. */ - virtual void ApplyChangedSentence(const SpellPortions& rChanged, bool bRecheck ) = 0; + virtual void ApplyChangedSentence(const SpellPortions& rChanged, bool bRecheck) = 0; /** This methods determines whether the application supports AutoCorrection */ virtual bool HasAutoCorrection(); /** This method adds a word pair to the AutoCorrection - if available */ - virtual void AddAutoCorrection(const OUString& rOld, const OUString& rNew, LanguageType eLanguage); + virtual void AddAutoCorrection(const OUString& rOld, const OUString& rNew, + LanguageType eLanguage); /** Return the sfx bindings for this child window. They are retrieved from the dialog so they do not have to be stored in this class as well. The bindings may be necessary to be used @@ -99,15 +97,15 @@ protected: current state which results in disabling most of the dialog controls and presenting a "Resume" button that initiates a reinitialization. */ - void InvalidateSpellDialog(); + void InvalidateSpellDialog(); /** Notifies the ChildWindow about the get focus event. The ChildWindow should no check if the spelling dialog should be set to the 'Resume' state by calling InvalidateSpellDialog() */ - virtual void GetFocus() = 0; + virtual void GetFocus() = 0; /** Notifies the ChildWindow about the lose focus event. The ChildWindow should use it to save the current selection/state. */ - virtual void LoseFocus() = 0; + virtual void LoseFocus() = 0; }; } // end of namespace ::svx diff --git a/include/svx/SvxShapeTypes.hxx b/include/svx/SvxShapeTypes.hxx index 65bfa0414927..84429198b3d3 100644 --- a/include/svx/SvxShapeTypes.hxx +++ b/include/svx/SvxShapeTypes.hxx @@ -20,8 +20,8 @@ #ifndef INCLUDED_SVX_SVXSHAPETYPES_HXX #define INCLUDED_SVX_SVXSHAPETYPES_HXX -namespace accessibility { - +namespace accessibility +{ /** Register the SVX draw shape types with the ShapeTypeHandler singleton. This method is usually called from the shape type handler constructor. */ diff --git a/include/svx/TextCharacterSpacingPopup.hxx b/include/svx/TextCharacterSpacingPopup.hxx index 4ed191942084..dbc9ad2fee87 100644 --- a/include/svx/TextCharacterSpacingPopup.hxx +++ b/include/svx/TextCharacterSpacingPopup.hxx @@ -21,8 +21,8 @@ #include <svtools/popupwindowcontroller.hxx> -namespace svx { - +namespace svx +{ class TextCharacterSpacingPopup final : public svt::PopupWindowController { public: @@ -30,14 +30,14 @@ public: virtual ~TextCharacterSpacingPopup() override; virtual std::unique_ptr<WeldToolbarPopup> weldPopupWindow() override; - virtual VclPtr<vcl::Window> createVclPopupWindow( vcl::Window* pParent ) override; + virtual VclPtr<vcl::Window> createVclPopupWindow(vcl::Window* pParent) override; // XServiceInfo virtual OUString SAL_CALL getImplementationName() override; virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override; // XInitialization - virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& rArguments ) override; + virtual void SAL_CALL initialize(const css::uno::Sequence<css::uno::Any>& rArguments) override; }; } // end of namespace svx diff --git a/include/svx/TextUnderlinePopup.hxx b/include/svx/TextUnderlinePopup.hxx index 530b486a5c7f..301052aac823 100644 --- a/include/svx/TextUnderlinePopup.hxx +++ b/include/svx/TextUnderlinePopup.hxx @@ -21,8 +21,8 @@ #include <svtools/popupwindowcontroller.hxx> -namespace svx { - +namespace svx +{ class TextUnderlinePopup final : public svt::PopupWindowController { public: @@ -30,19 +30,18 @@ public: virtual ~TextUnderlinePopup() override; virtual std::unique_ptr<WeldToolbarPopup> weldPopupWindow() override; - virtual VclPtr<vcl::Window> createVclPopupWindow( vcl::Window* pParent ) override; + virtual VclPtr<vcl::Window> createVclPopupWindow(vcl::Window* pParent) override; // XServiceInfo virtual OUString SAL_CALL getImplementationName() override; virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override; // XInitialization - virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& rArguments ) override; + virtual void SAL_CALL initialize(const css::uno::Sequence<css::uno::Any>& rArguments) override; }; } // end of namespace svx #endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svx/UnoNamespaceMap.hxx b/include/svx/UnoNamespaceMap.hxx index 47fa2d474473..b20cf44a6fcd 100644 --- a/include/svx/UnoNamespaceMap.hxx +++ b/include/svx/UnoNamespaceMap.hxx @@ -25,10 +25,10 @@ class SfxItemPool; -namespace svx { - -SVX_DLLPUBLIC css::uno::Reference< css::uno::XInterface > NamespaceMap_createInstance( sal_uInt16* pWhichIds, SfxItemPool* pPool ); - +namespace svx +{ +SVX_DLLPUBLIC css::uno::Reference<css::uno::XInterface> +NamespaceMap_createInstance(sal_uInt16* pWhichIds, SfxItemPool* pPool); } #endif // INCLUDED_SVX_UNONAMESPACEMAP_HXX diff --git a/include/svx/XPropertyEntry.hxx b/include/svx/XPropertyEntry.hxx index 22514d2b86fd..c697ee915d0c 100644 --- a/include/svx/XPropertyEntry.hxx +++ b/include/svx/XPropertyEntry.hxx @@ -23,8 +23,6 @@ #include <svx/svxdllapi.h> #include <vcl/bitmapex.hxx> - - class SVXCORE_DLLPUBLIC XPropertyEntry { private: @@ -34,14 +32,14 @@ private: protected: XPropertyEntry(const OUString& rPropEntryName); - XPropertyEntry(XPropertyEntry const &) = default; - XPropertyEntry(XPropertyEntry &&) = default; + XPropertyEntry(XPropertyEntry const&) = default; + XPropertyEntry(XPropertyEntry&&) = default; public: virtual ~XPropertyEntry(); - XPropertyEntry & operator =(XPropertyEntry const &) = default; - XPropertyEntry & operator =(XPropertyEntry &&) = default; + XPropertyEntry& operator=(XPropertyEntry const&) = default; + XPropertyEntry& operator=(XPropertyEntry&&) = default; void SetName(const OUString& rPropEntryName) { maPropEntryName = rPropEntryName; } const OUString& GetName() const { return maPropEntryName; } diff --git a/include/svx/camera3d.hxx b/include/svx/camera3d.hxx index 4cd21601b5dd..e151f2883a91 100644 --- a/include/svx/camera3d.hxx +++ b/include/svx/camera3d.hxx @@ -33,10 +33,10 @@ class SAL_WARN_UNUSED SVXCORE_DLLPUBLIC Camera3D final : public Viewport3D { - basegfx::B3DPoint aPosition; - basegfx::B3DPoint aLookAt; - double fFocalLength; - double fBankAngle; + basegfx::B3DPoint aPosition; + basegfx::B3DPoint aLookAt; + double fFocalLength; + double fBankAngle; bool bAutoAdjustProjection; @@ -53,14 +53,13 @@ public: void SetPosAndLookAt(const basegfx::B3DPoint& rNewPos, const basegfx::B3DPoint& rNewLookAt); // Focal length in mm - void SetFocalLength(double fLen); - double GetFocalLength() const { return fFocalLength; } + void SetFocalLength(double fLen); + double GetFocalLength() const { return fFocalLength; } // Bank angle left/right - void SetBankAngle(double fAngle); + void SetBankAngle(double fAngle); - void SetAutoAdjustProjection(bool bAdjust) - { bAutoAdjustProjection = bAdjust; } + void SetAutoAdjustProjection(bool bAdjust) { bAutoAdjustProjection = bAdjust; } }; #endif // INCLUDED_SVX_CAMERA3D_HXX diff --git a/include/svx/clipfmtitem.hxx b/include/svx/clipfmtitem.hxx index 180c4eeccd7a..f2fe10aceb59 100644 --- a/include/svx/clipfmtitem.hxx +++ b/include/svx/clipfmtitem.hxx @@ -33,25 +33,25 @@ struct SvxClipboardFormatItem_Impl; class SAL_WARN_UNUSED SVXCORE_DLLPUBLIC SvxClipboardFormatItem final : public SfxPoolItem { - virtual bool operator==( const SfxPoolItem& ) const override; - virtual SvxClipboardFormatItem* Clone( SfxItemPool *pPool = nullptr ) const override; + virtual bool operator==(const SfxPoolItem&) const override; + virtual SvxClipboardFormatItem* Clone(SfxItemPool* pPool = nullptr) const override; public: static SfxPoolItem* CreateDefault(); - SvxClipboardFormatItem( sal_uInt16 nId ); - SvxClipboardFormatItem( const SvxClipboardFormatItem& ); + SvxClipboardFormatItem(sal_uInt16 nId); + SvxClipboardFormatItem(const SvxClipboardFormatItem&); virtual ~SvxClipboardFormatItem() override; - virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; - virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override; + virtual bool QueryValue(css::uno::Any& rVal, sal_uInt8 nMemberId = 0) const override; + virtual bool PutValue(const css::uno::Any& rVal, sal_uInt8 nMemberId) override; - void AddClipbrdFormat( SotClipboardFormatId nId ); - void AddClipbrdFormat( SotClipboardFormatId nId, const OUString& rName, - sal_uInt16 nPos = USHRT_MAX ); + void AddClipbrdFormat(SotClipboardFormatId nId); + void AddClipbrdFormat(SotClipboardFormatId nId, const OUString& rName, + sal_uInt16 nPos = USHRT_MAX); sal_uInt16 Count() const; - SotClipboardFormatId GetClipbrdFormatId( sal_uInt16 nPos ) const; - OUString const & GetClipbrdFormatName( sal_uInt16 nPos ) const; + SotClipboardFormatId GetClipbrdFormatId(sal_uInt16 nPos) const; + OUString const& GetClipbrdFormatName(sal_uInt16 nPos) const; private: std::unique_ptr<SvxClipboardFormatItem_Impl> pImpl; diff --git a/include/svx/colorbox.hxx b/include/svx/colorbox.hxx index db33156e1f0b..a8d5f368daac 100644 --- a/include/svx/colorbox.hxx +++ b/include/svx/colorbox.hxx @@ -20,8 +20,8 @@ class ListBoxColorWrapper { public: ListBoxColorWrapper(ColorListBox* pControl); - void operator()(const OUString& rCommand, const NamedColor& rColor); - // ColorSelectFunction signature + void operator()(const OUString& rCommand, + const NamedColor& rColor); // ColorSelectFunction signature private: ColorListBox* mpControl; }; @@ -55,15 +55,12 @@ public: ColorListBox(std::unique_ptr<weld::MenuButton> pControl, weld::Window* pTopLevelWindow); ~ColorListBox(); - void SetSelectHdl(const Link<ColorListBox&, void>& rLink) - { - m_aSelectedLink = rLink; - } + void SetSelectHdl(const Link<ColorListBox&, void>& rLink) { m_aSelectedLink = rLink; } void SetSlotId(sal_uInt16 nSlotId, bool bShowNoneButton = false); - Color const & GetSelectEntryColor() const { return m_aSelectedColor.first; } - NamedColor const & GetSelectedEntry() const { return m_aSelectedColor; } + Color const& GetSelectEntryColor() const { return m_aSelectedColor.first; } + NamedColor const& GetSelectedEntry() const { return m_aSelectedColor; } void SelectEntry(const NamedColor& rColor); void SelectEntry(const Color& rColor); @@ -71,9 +68,9 @@ public: void SetNoSelection() { getColorWindow()->SetNoSelection(); } bool IsNoSelection() const { return getColorWindow()->IsNoSelection(); } - void SetAutoDisplayColor(const Color &rColor) { m_aAutoDisplayColor = rColor; } + void SetAutoDisplayColor(const Color& rColor) { m_aAutoDisplayColor = rColor; } - void ShowPreview(const NamedColor &rColor); + void ShowPreview(const NamedColor& rColor); void EnsurePaletteManager(); void SaveValue() { m_aSaveColor = GetSelectEntryColor(); } @@ -85,8 +82,14 @@ public: void hide() { m_xButton->hide(); } void set_visible(bool bShow) { m_xButton->set_visible(bShow); } void set_help_id(const OString& rHelpId) { m_xButton->set_help_id(rHelpId); } - void connect_focus_in(const Link<weld::Widget&, void>& rLink) { m_xButton->connect_focus_in(rLink); } - void connect_focus_out(const Link<weld::Widget&, void>& rLink) { m_xButton->connect_focus_out(rLink); } + void connect_focus_in(const Link<weld::Widget&, void>& rLink) + { + m_xButton->connect_focus_in(rLink); + } + void connect_focus_out(const Link<weld::Widget&, void>& rLink) + { + m_xButton->connect_focus_out(rLink); + } weld::MenuButton& get_widget() { return *m_xButton; } }; diff --git a/include/svx/def3d.hxx b/include/svx/def3d.hxx index d765bb162b49..41537519af50 100644 --- a/include/svx/def3d.hxx +++ b/include/svx/def3d.hxx @@ -30,14 +30,16 @@ const double fPiDiv180 = 0.01745329251994; enum class E3dDragConstraint { - X = 0x0001, - Y = 0x0002, - Z = 0x0004, + X = 0x0001, + Y = 0x0002, + Z = 0x0004, XYZ = X | Y | Z }; namespace o3tl { - template<> struct typed_flags<E3dDragConstraint> : is_typed_flags<E3dDragConstraint, 0x7> {}; +template <> struct typed_flags<E3dDragConstraint> : is_typed_flags<E3dDragConstraint, 0x7> +{ +}; } #endif diff --git a/include/svx/dlgutil.hxx b/include/svx/dlgutil.hxx index 0359321e4030..f4ab804bf7f9 100644 --- a/include/svx/dlgutil.hxx +++ b/include/svx/dlgutil.hxx @@ -26,12 +26,14 @@ class SfxItemSet; -SVXCORE_DLLPUBLIC FieldUnit GetModuleFieldUnit( const SfxItemSet& ); +SVXCORE_DLLPUBLIC FieldUnit GetModuleFieldUnit(const SfxItemSet&); SVXCORE_DLLPUBLIC FieldUnit GetModuleFieldUnit(); -SVXCORE_DLLPUBLIC bool GetApplyCharUnit( const SfxItemSet& ); +SVXCORE_DLLPUBLIC bool GetApplyCharUnit(const SfxItemSet&); constexpr DrawModeFlags OUTPUT_DRAWMODE_COLOR = DrawModeFlags::Default; -constexpr DrawModeFlags OUTPUT_DRAWMODE_CONTRAST = DrawModeFlags::SettingsLine | DrawModeFlags::SettingsFill | DrawModeFlags::SettingsText | DrawModeFlags::SettingsGradient; +constexpr DrawModeFlags OUTPUT_DRAWMODE_CONTRAST + = DrawModeFlags::SettingsLine | DrawModeFlags::SettingsFill | DrawModeFlags::SettingsText + | DrawModeFlags::SettingsGradient; #endif diff --git a/include/svx/e3dsceneupdater.hxx b/include/svx/e3dsceneupdater.hxx index dd7954180cac..5538eb163076 100644 --- a/include/svx/e3dsceneupdater.hxx +++ b/include/svx/e3dsceneupdater.hxx @@ -26,8 +26,9 @@ class SdrObject; class E3dScene; -namespace drawinglayer::geometry { - class ViewInformation3D; +namespace drawinglayer::geometry +{ +class ViewInformation3D; } /** Helper for 3d object changes affecting 2d geometry @@ -50,11 +51,11 @@ class SVXCORE_DLLPUBLIC E3DModifySceneSnapRectUpdater // of the to-be-changed 3D object when the scene has a 3d transformation // stack at construction time. In all other cases it's set to zero and // no action needs to be taken - E3dScene* mpScene; + E3dScene* mpScene; // the 3d transformation stack at the time of construction, valid when // mpScene is not zero - std::unique_ptr<drawinglayer::geometry::ViewInformation3D> mpViewInformation3D; + std::unique_ptr<drawinglayer::geometry::ViewInformation3D> mpViewInformation3D; public: // the constructor evaluates and sets the members at construction time diff --git a/include/svx/extrusionbar.hxx b/include/svx/extrusionbar.hxx index eec86cebfa5e..c3bf86ad03ba 100644 --- a/include/svx/extrusionbar.hxx +++ b/include/svx/extrusionbar.hxx @@ -31,8 +31,7 @@ class SdrView; namespace svx { - -SVXCORE_DLLPUBLIC bool checkForSelectedCustomShapes( SdrView const * pSdrView, bool bOnlyExtruded ); +SVXCORE_DLLPUBLIC bool checkForSelectedCustomShapes(SdrView const* pSdrView, bool bOnlyExtruded); class SAL_WARN_UNUSED SVXCORE_DLLPUBLIC ExtrusionBar final : public SfxShell { @@ -47,10 +46,9 @@ public: ExtrusionBar(SfxViewShell* pViewShell); virtual ~ExtrusionBar() override; - static void execute( SdrView* pSdrView, SfxRequest const & rReq, SfxBindings& rBindings ); - static void getState( SdrView const * pSdrView, SfxItemSet& rSet ); + static void execute(SdrView* pSdrView, SfxRequest const& rReq, SfxBindings& rBindings); + static void getState(SdrView const* pSdrView, SfxItemSet& rSet); }; - } #endif // INCLUDED_SVX_EXTRUSIONBAR_HXX diff --git a/include/svx/f3dchild.hxx b/include/svx/f3dchild.hxx index c43f74304dfc..1cd46695bef7 100644 --- a/include/svx/f3dchild.hxx +++ b/include/svx/f3dchild.hxx @@ -17,11 +17,9 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #ifndef INCLUDED_SVX_F3DCHILD_HXX #define INCLUDED_SVX_F3DCHILD_HXX - #include <sfx2/childwin.hxx> #include <svx/svxdllapi.h> @@ -33,8 +31,8 @@ class SAL_WARN_UNUSED SVX_DLLPUBLIC Svx3DChildWindow final : public SfxChildWindow { - public: - Svx3DChildWindow( vcl::Window*, sal_uInt16, SfxBindings*, SfxChildWinInfo* ); +public: + Svx3DChildWindow(vcl::Window*, sal_uInt16, SfxBindings*, SfxChildWinInfo*); SFX_DECL_CHILDWINDOW_WITHID(Svx3DChildWindow); }; diff --git a/include/svx/fmdmod.hxx b/include/svx/fmdmod.hxx index d5447879e317..69ef27704040 100644 --- a/include/svx/fmdmod.hxx +++ b/include/svx/fmdmod.hxx @@ -24,14 +24,14 @@ class SVXCORE_DLLPUBLIC SvxFmMSFactory : public SvxUnoDrawMSFactory { - public: - SvxFmMSFactory() {}; + SvxFmMSFactory(){}; virtual ~SvxFmMSFactory() {} - virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstance(const OUString& ServiceSpecifier) override; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getAvailableServiceNames() override; + virtual ::com::sun::star::uno::Reference<::com::sun::star::uno::XInterface> + SAL_CALL createInstance(const OUString& ServiceSpecifier) override; + virtual ::com::sun::star::uno::Sequence<OUString> SAL_CALL getAvailableServiceNames() override; }; #endif // INCLUDED_SVX_FMDMOD_HXX diff --git a/include/svx/fmobjfac.hxx b/include/svx/fmobjfac.hxx index 1e3bd7f82827..8109e87ceae5 100644 --- a/include/svx/fmobjfac.hxx +++ b/include/svx/fmobjfac.hxx @@ -32,9 +32,9 @@ public: FmFormObjFactory(); ~FmFormObjFactory(); - DECL_STATIC_LINK(FmFormObjFactory, MakeObject, SdrObjCreatorParams, SdrObject* ); + DECL_STATIC_LINK(FmFormObjFactory, MakeObject, SdrObjCreatorParams, SdrObject*); }; -#endif // _FM_FMOBJFAC_HXX +#endif // _FM_FMOBJFAC_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svx/fontworkbar.hxx b/include/svx/fontworkbar.hxx index a11e015e9750..1f3a81a9a79c 100644 --- a/include/svx/fontworkbar.hxx +++ b/include/svx/fontworkbar.hxx @@ -31,8 +31,7 @@ class SdrView; namespace svx { - -bool SVXCORE_DLLPUBLIC checkForSelectedFontWork( SdrView const * pSdrView, sal_uInt32& nCheckStatus ); +bool SVXCORE_DLLPUBLIC checkForSelectedFontWork(SdrView const* pSdrView, sal_uInt32& nCheckStatus); class SAL_WARN_UNUSED SVXCORE_DLLPUBLIC FontworkBar final : public SfxShell { @@ -47,10 +46,9 @@ public: FontworkBar(SfxViewShell* pViewShell); virtual ~FontworkBar() override; - static void execute( SdrView& rSdrView, SfxRequest const & rReq, SfxBindings& rBindings ); - static void getState( SdrView const * pSdrView, SfxItemSet& rSet ); + static void execute(SdrView& rSdrView, SfxRequest const& rReq, SfxBindings& rBindings); + static void getState(SdrView const* pSdrView, SfxItemSet& rSet); }; - } #endif // INCLUDED_SVX_FONTWORKBAR_HXX diff --git a/include/svx/frmdirlbox.hxx b/include/svx/frmdirlbox.hxx index 4a508eea55bd..84160d84665e 100644 --- a/include/svx/frmdirlbox.hxx +++ b/include/svx/frmdirlbox.hxx @@ -24,8 +24,8 @@ #include <editeng/frmdir.hxx> #include <svx/svxdllapi.h> -namespace svx { - +namespace svx +{ /** This listbox contains entries to select horizontal text direction. The control works on the SvxFrameDirection enumeration (i.e. left-to-right, @@ -35,14 +35,21 @@ class SAL_WARN_UNUSED SVX_DLLPUBLIC FrameDirectionListBox { private: std::unique_ptr<weld::ComboBox> m_xControl; + public: explicit FrameDirectionListBox(std::unique_ptr<weld::ComboBox> pControl); virtual ~FrameDirectionListBox(); bool get_visible() const { return m_xControl->get_visible(); } void save_value() { m_xControl->save_value(); } bool get_value_changed_from_saved() const { return m_xControl->get_value_changed_from_saved(); } - SvxFrameDirection get_active_id() const { return static_cast<SvxFrameDirection>(m_xControl->get_active_id().toUInt32()); } - void set_active_id(SvxFrameDirection eDir) { m_xControl->set_active_id(OUString::number(static_cast<sal_uInt32>(eDir))); } + SvxFrameDirection get_active_id() const + { + return static_cast<SvxFrameDirection>(m_xControl->get_active_id().toUInt32()); + } + void set_active_id(SvxFrameDirection eDir) + { + m_xControl->set_active_id(OUString::number(static_cast<sal_uInt32>(eDir))); + } void remove_id(SvxFrameDirection eDir) { int nPos = m_xControl->find_id(OUString::number(static_cast<sal_uInt32>(eDir))); @@ -61,9 +68,11 @@ public: { m_xControl->append(OUString::number(static_cast<sal_uInt32>(eDirection)), rString); } - void connect_changed(const Link<weld::ComboBox&, void>& rLink) { m_xControl->connect_changed(rLink); } + void connect_changed(const Link<weld::ComboBox&, void>& rLink) + { + m_xControl->connect_changed(rLink); + } }; - } #endif diff --git a/include/svx/insctrl.hxx b/include/svx/insctrl.hxx index e25090f66820..1e02601350dd 100644 --- a/include/svx/insctrl.hxx +++ b/include/svx/insctrl.hxx @@ -26,17 +26,17 @@ class SVX_DLLPUBLIC SvxInsertStatusBarControl final : public SfxStatusBarControl { public: - virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, - const SfxPoolItem* pState ) override; - virtual void Paint( const UserDrawEvent& rEvt ) override; + virtual void StateChanged(sal_uInt16 nSID, SfxItemState eState, + const SfxPoolItem* pState) override; + virtual void Paint(const UserDrawEvent& rEvt) override; SFX_DECL_STATUSBAR_CONTROL(); - SvxInsertStatusBarControl( sal_uInt16 nSlotId, sal_uInt16 nId, StatusBar& rStb ); + SvxInsertStatusBarControl(sal_uInt16 nSlotId, sal_uInt16 nId, StatusBar& rStb); virtual ~SvxInsertStatusBarControl() override; private: - bool bInsert; + bool bInsert; SVX_DLLPRIVATE void DrawItemText_Impl(); }; diff --git a/include/svx/ipolypolygoneditorcontroller.hxx b/include/svx/ipolypolygoneditorcontroller.hxx index 4e1ef9124821..22f7871216a6 100644 --- a/include/svx/ipolypolygoneditorcontroller.hxx +++ b/include/svx/ipolypolygoneditorcontroller.hxx @@ -24,28 +24,27 @@ #include <sal/types.h> - // Defines enum class SdrPathSmoothKind { - DontCare, // only for status query - Angular, // angular + DontCare, // only for status query + Angular, // angular Asymmetric, // asymmetric, normal Smooth - Symmetric // symmetric + Symmetric // symmetric }; enum class SdrPathSegmentKind { - DontCare, // only for status query - Line, // straight path segment - Curve, // curve path segment (Bezier) - Toggle // only for Set: Toggle + DontCare, // only for status query + Line, // straight path segment + Curve, // curve path segment (Bezier) + Toggle // only for Set: Toggle }; enum class SdrObjClosedKind { - DontCare, // only for status query - Open, // non-closed object (line, polyline, ...) - Closed // closed object (polygon, ...) + DontCare, // only for status query + Open, // non-closed object (line, polyline, ...) + Closed // closed object (polygon, ...) }; class SAL_DLLPUBLIC_RTTI IPolyPolygonEditorController diff --git a/include/svx/itemwin.hxx b/include/svx/itemwin.hxx index 32e5f5bcc06c..5d434d1ae9b8 100644 --- a/include/svx/itemwin.hxx +++ b/include/svx/itemwin.hxx @@ -35,7 +35,7 @@ class SvxLineBox final : public WeldToolbarPopup std::unique_ptr<weld::CustomWeld> mxLineStyleSetWin; void FillControl(); - void Fill(const XDashListRef &pList); + void Fill(const XDashListRef& pList); DECL_LINK(SelectHdl, ValueSet*, void); @@ -48,15 +48,15 @@ public: namespace SvxFillTypeBox { - SVX_DLLPUBLIC void Fill(weld::ComboBox& rListBox); +SVX_DLLPUBLIC void Fill(weld::ComboBox& rListBox); } namespace SvxFillAttrBox { - SVX_DLLPUBLIC void Fill(weld::ComboBox&, const XHatchListRef &pList); - SVX_DLLPUBLIC void Fill(weld::ComboBox&, const XGradientListRef &pList); - SVX_DLLPUBLIC void Fill(weld::ComboBox&, const XBitmapListRef &pList); - SVX_DLLPUBLIC void Fill(weld::ComboBox&, const XPatternListRef &pList); +SVX_DLLPUBLIC void Fill(weld::ComboBox&, const XHatchListRef& pList); +SVX_DLLPUBLIC void Fill(weld::ComboBox&, const XGradientListRef& pList); +SVX_DLLPUBLIC void Fill(weld::ComboBox&, const XBitmapListRef& pList); +SVX_DLLPUBLIC void Fill(weld::ComboBox&, const XPatternListRef& pList); } #endif // INCLUDED_SVX_ITEMWIN_HXX diff --git a/include/svx/layctrl.hxx b/include/svx/layctrl.hxx index a6caf1e18dcb..10e870b19b7c 100644 --- a/include/svx/layctrl.hxx +++ b/include/svx/layctrl.hxx @@ -28,14 +28,14 @@ public: virtual ~SvxTableToolBoxControl() override; virtual std::unique_ptr<WeldToolbarPopup> weldPopupWindow() override; - virtual VclPtr<vcl::Window> createVclPopupWindow( vcl::Window* pParent ) override; + virtual VclPtr<vcl::Window> createVclPopupWindow(vcl::Window* pParent) override; // XServiceInfo virtual OUString SAL_CALL getImplementationName() override; virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override; // XInitialization - virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& rArguments ) override; + virtual void SAL_CALL initialize(const css::uno::Sequence<css::uno::Any>& rArguments) override; void TableDialog(const css::uno::Sequence<css::beans::PropertyValue>& rArgs); void CloseAndShowTableDialog(); @@ -48,14 +48,14 @@ public: virtual ~SvxColumnsToolBoxControl() override; virtual std::unique_ptr<WeldToolbarPopup> weldPopupWindow() override; - virtual VclPtr<vcl::Window> createVclPopupWindow( vcl::Window* pParent ) override; + virtual VclPtr<vcl::Window> createVclPopupWindow(vcl::Window* pParent) override; // XServiceInfo virtual OUString SAL_CALL getImplementationName() override; virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override; // XInitialization - virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& rArguments ) override; + virtual void SAL_CALL initialize(const css::uno::Sequence<css::uno::Any>& rArguments) override; void InsertColumns(const css::uno::Sequence<css::beans::PropertyValue>& rArgs); }; diff --git a/include/svx/lboxctrl.hxx b/include/svx/lboxctrl.hxx index 6799078f20a8..031115dc65b5 100644 --- a/include/svx/lboxctrl.hxx +++ b/include/svx/lboxctrl.hxx @@ -29,22 +29,22 @@ class SvxPopupWindowListBox; class SvxUndoRedoControl final : public svt::PopupWindowController { - std::vector< OUString > aUndoRedoList; - OUString aDefaultTooltip; + std::vector<OUString> aUndoRedoList; + OUString aDefaultTooltip; public: SvxUndoRedoControl(const css::uno::Reference<css::uno::XComponentContext>& rContext); virtual ~SvxUndoRedoControl() override; virtual std::unique_ptr<WeldToolbarPopup> weldPopupWindow() override; - virtual VclPtr<vcl::Window> createVclPopupWindow( vcl::Window* pParent ) override; + virtual VclPtr<vcl::Window> createVclPopupWindow(vcl::Window* pParent) override; // XServiceInfo virtual OUString SAL_CALL getImplementationName() override; virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override; // XInitialization - virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& rArguments ) override; + virtual void SAL_CALL initialize(const css::uno::Sequence<css::uno::Any>& rArguments) override; virtual void SAL_CALL statusChanged(const css::frame::FeatureStateEvent& rEvent) override; diff --git a/include/svx/measctrl.hxx b/include/svx/measctrl.hxx index 362ac85aeae1..ccdcab46f5fd 100644 --- a/include/svx/measctrl.hxx +++ b/include/svx/measctrl.hxx @@ -30,7 +30,7 @@ class SdrModel; class SVX_DLLPUBLIC SvxXMeasurePreview final : public weld::CustomWidgetController { - friend class SvxMeasurePage; + friend class SvxMeasurePage; private: MapMode m_aMapMode; @@ -38,6 +38,7 @@ private: std::unique_ptr<SdrMeasureObj, SdrObjectFreeOp> pMeasureObj; void ResizeImpl(const Size& rSize); + public: SvxXMeasurePreview(); virtual void SetDrawingArea(weld::DrawingArea* pDrawingArea) override; diff --git a/include/svx/modctrl.hxx b/include/svx/modctrl.hxx index 6ce84931bc35..64423c920d71 100644 --- a/include/svx/modctrl.hxx +++ b/include/svx/modctrl.hxx @@ -30,17 +30,17 @@ class Timer; class SVX_DLLPUBLIC SvxModifyControl final : public SfxStatusBarControl { public: - virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, - const SfxPoolItem* pState ) override; - virtual void Paint( const UserDrawEvent& rUsrEvt ) override; - virtual void Click() override; + virtual void StateChanged(sal_uInt16 nSID, SfxItemState eState, + const SfxPoolItem* pState) override; + virtual void Paint(const UserDrawEvent& rUsrEvt) override; + virtual void Click() override; SFX_DECL_STATUSBAR_CONTROL(); - SvxModifyControl( sal_uInt16 nSlotId, sal_uInt16 nId, StatusBar& rStb ); + SvxModifyControl(sal_uInt16 nSlotId, sal_uInt16 nId, StatusBar& rStb); private: // Links - DECL_LINK( OnTimer, Timer *, void ); + DECL_LINK(OnTimer, Timer*, void); private: // Functions void _repaint(); diff --git a/include/svx/nbdtmgfact.hxx b/include/svx/nbdtmgfact.hxx index 3928be1e6f36..5b7ff5bf4782 100644 --- a/include/svx/nbdtmgfact.hxx +++ b/include/svx/nbdtmgfact.hxx @@ -21,8 +21,9 @@ #include <svx/nbdtmg.hxx> -namespace svx::sidebar::NBOutlineTypeMgrFact { - SVX_DLLPUBLIC NBOTypeMgrBase* CreateInstance(const NBOType aType); +namespace svx::sidebar::NBOutlineTypeMgrFact +{ +SVX_DLLPUBLIC NBOTypeMgrBase* CreateInstance(const NBOType aType); } #endif diff --git a/include/svx/objfac3d.hxx b/include/svx/objfac3d.hxx index e5defce5d9c8..c06c2af4434d 100644 --- a/include/svx/objfac3d.hxx +++ b/include/svx/objfac3d.hxx @@ -23,7 +23,6 @@ #include <svx/svxdllapi.h> #include <tools/link.hxx> - /************************************************************************* |* |* Factory for chart-specific objects @@ -42,7 +41,6 @@ public: DECL_STATIC_LINK(E3dObjFactory, MakeObject, SdrObjCreatorParams, SdrObject*); }; - #endif // INCLUDED_SVX_OBJFAC3D_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svx/papersizelistbox.hxx b/include/svx/papersizelistbox.hxx index a80425ba8423..589dccda33c2 100644 --- a/include/svx/papersizelistbox.hxx +++ b/include/svx/papersizelistbox.hxx @@ -34,6 +34,7 @@ class SVXCORE_DLLPUBLIC SvxPaperSizeListBox { private: std::unique_ptr<weld::ComboBox> m_xControl; + public: SvxPaperSizeListBox(std::unique_ptr<weld::ComboBox> pControl); @@ -41,7 +42,10 @@ public: void set_active_id(Paper eSize); Paper get_active_id() const; - void connect_changed(const Link<weld::ComboBox&, void>& rLink) { m_xControl->connect_changed(rLink); } + void connect_changed(const Link<weld::ComboBox&, void>& rLink) + { + m_xControl->connect_changed(rLink); + } int get_active() const { return m_xControl->get_active(); } void clear() { m_xControl->clear(); } void save_value() { return m_xControl->save_value(); } diff --git a/include/svx/rectenum.hxx b/include/svx/rectenum.hxx index 59e9c1475b99..5a67dfbbb8a3 100644 --- a/include/svx/rectenum.hxx +++ b/include/svx/rectenum.hxx @@ -29,7 +29,7 @@ enum class RectPoint RM, // right center LB, // bottom left MB, // bottom center - RB // bottom right + RB // bottom right }; #endif diff --git a/include/svx/samecontentlistbox.hxx b/include/svx/samecontentlistbox.hxx index 1f5a503e98cf..f3553d43e327 100644 --- a/include/svx/samecontentlistbox.hxx +++ b/include/svx/samecontentlistbox.hxx @@ -25,7 +25,7 @@ namespace SameContentListBox { - void SVXCORE_DLLPUBLIC Fill(weld::ComboBox& rComboBox); +void SVXCORE_DLLPUBLIC Fill(weld::ComboBox& rComboBox); }; #endif diff --git a/include/svx/sderitm.hxx b/include/svx/sderitm.hxx index 9a41860f5c83..954e2286d6e5 100644 --- a/include/svx/sderitm.hxx +++ b/include/svx/sderitm.hxx @@ -22,7 +22,8 @@ #include <svx/sdmetitm.hxx> #include <svx/svddef.hxx> -inline SdrMetricItem makeSdrEckenradiusItem(tools::Long nRadius) { +inline SdrMetricItem makeSdrEckenradiusItem(tools::Long nRadius) +{ return SdrMetricItem(SDRATTR_ECKENRADIUS, nRadius); } diff --git a/include/svx/sdr/contact/viewcontact.hxx b/include/svx/sdr/contact/viewcontact.hxx index de3ceb316332..c5cc61883a49 100644 --- a/include/svx/sdr/contact/viewcontact.hxx +++ b/include/svx/sdr/contact/viewcontact.hxx @@ -28,8 +28,8 @@ class SdrLayerIDSet; class SdrPage; class SdrObject; -namespace sdr::contact { - +namespace sdr::contact +{ class ObjectContact; class ViewObjectContact; @@ -44,12 +44,12 @@ private: // with this VC. Since the VOCs remember a reference to this VC, this list needs // to be kept and is used e.g. at destructor to destroy all VOCs. // Registering and de-registering is done in the VOC constructors/destructors. - std::vector< ViewObjectContact* > maViewObjectContactVector; + std::vector<ViewObjectContact*> maViewObjectContactVector; // Primitive2DContainer of the ViewContact. This contains all necessary information // for the graphical visualisation and needs to be supported by all VCs which // can be visualized. - drawinglayer::primitive2d::Primitive2DContainer mxViewIndependentPrimitive2DSequence; + drawinglayer::primitive2d::Primitive2DContainer mxViewIndependentPrimitive2DSequence; // A new ViewObjectContact was created and shall be remembered. void AddViewObjectContact(ViewObjectContact& rVOContact); @@ -63,7 +63,10 @@ private: protected: // Interface to allow derivates to travel over the registered VOC's sal_uInt32 getViewObjectContactCount() const { return maViewObjectContactVector.size(); } - ViewObjectContact* getViewObjectContact(sal_uInt32 a) const { return maViewObjectContactVector[a]; } + ViewObjectContact* getViewObjectContact(sal_uInt32 a) const + { + return maViewObjectContactVector[a]; + } // Create an Object-Specific ViewObjectContact, set ViewContact and // ObjectContact. Always needs to return something. Default is to create @@ -77,7 +80,8 @@ protected: // visualisation method and will also be used for BoundRect computations in the long run. // This means it's always an error when the default implementation is called and thus gets // asserted there - virtual drawinglayer::primitive2d::Primitive2DContainer createViewIndependentPrimitive2DSequence() const; + virtual drawinglayer::primitive2d::Primitive2DContainer + createViewIndependentPrimitive2DSequence() const; // basic constructor. Since this is a base class only, it shall // never be called directly @@ -119,19 +123,23 @@ public: // access to the local primitive. This will ensure that the primitive is // current in comparing the local one with a fresh created incarnation - drawinglayer::primitive2d::Primitive2DContainer const & getViewIndependentPrimitive2DContainer() const; + drawinglayer::primitive2d::Primitive2DContainer const& + getViewIndependentPrimitive2DContainer() const; // add Gluepoints (if available) - virtual drawinglayer::primitive2d::Primitive2DContainer createGluePointPrimitive2DSequence() const; + virtual drawinglayer::primitive2d::Primitive2DContainer + createGluePointPrimitive2DSequence() const; // Allow embedding if needed (e.g. for SdrObjects, evtl. Name, Title and description get added). This // is a helper normally used from getViewIndependentPrimitive2DContainer(), but there is one exception // for 3D scenes. // We take the param by value, since, for the common case, we can just std::move into the param, and // std::move the result out, avoiding copying. - virtual drawinglayer::primitive2d::Primitive2DContainer embedToObjectSpecificInformation(drawinglayer::primitive2d::Primitive2DContainer rSource) const; + virtual drawinglayer::primitive2d::Primitive2DContainer + embedToObjectSpecificInformation(drawinglayer::primitive2d::Primitive2DContainer rSource) const; - virtual basegfx::B2DRange getRange( const drawinglayer::geometry::ViewInformation2D& rViewInfo2D ) const; + virtual basegfx::B2DRange + getRange(const drawinglayer::geometry::ViewInformation2D& rViewInfo2D) const; // delete all existing VOCs including DrawHierarchy which will invalidate all // visualisations, too. Used mostly at object removal from DrawHierarchy to @@ -139,10 +147,8 @@ public: // It is always possible to delete the VOCs, these are re-created on demand void flushViewObjectContacts(bool bWithHierarchy = true); }; - } - #endif // INCLUDED_SVX_SDR_CONTACT_VIEWCONTACT_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svx/sdr/contact/viewcontactofsdrmediaobj.hxx b/include/svx/sdr/contact/viewcontactofsdrmediaobj.hxx index cb2953200da4..44e9e435afbe 100644 --- a/include/svx/sdr/contact/viewcontactofsdrmediaobj.hxx +++ b/include/svx/sdr/contact/viewcontactofsdrmediaobj.hxx @@ -25,51 +25,51 @@ #include <svx/svdomedia.hxx> #include <tools/gen.hxx> -namespace avmedia { class MediaItem; } - -namespace sdr::contact { +namespace avmedia +{ +class MediaItem; +} +namespace sdr::contact +{ class SVXCORE_DLLPUBLIC ViewContactOfSdrMediaObj : public ViewContactOfSdrObj { friend class ViewObjectContactOfSdrMediaObj; public: - // basic constructor, used from SdrObject. - explicit ViewContactOfSdrMediaObj( SdrMediaObj& rMediaObj ); + explicit ViewContactOfSdrMediaObj(SdrMediaObj& rMediaObj); virtual ~ViewContactOfSdrMediaObj() override; public: - // access to SdrMediaObj const SdrMediaObj& GetSdrMediaObj() const { return static_cast<const SdrMediaObj&>(GetSdrObject()); } - Size getPreferredSize() const; + Size getPreferredSize() const; - void updateMediaItem( ::avmedia::MediaItem& rItem ) const; - void executeMediaItem( const ::avmedia::MediaItem& rItem ); + void updateMediaItem(::avmedia::MediaItem& rItem) const; + void executeMediaItem(const ::avmedia::MediaItem& rItem); protected: - // Create an Object-Specific ViewObjectContact, set ViewContact and // ObjectContact. Always needs to return something. - virtual ViewObjectContact& CreateObjectSpecificViewObjectContact(ObjectContact& rObjectContact) override; + virtual ViewObjectContact& + CreateObjectSpecificViewObjectContact(ObjectContact& rObjectContact) override; // get notified if some properties have changed - void mediaPropertiesChanged( const ::avmedia::MediaItem& rNewState ); + void mediaPropertiesChanged(const ::avmedia::MediaItem& rNewState); protected: // This method is responsible for creating the graphical visualisation data // ONLY based on model data - virtual drawinglayer::primitive2d::Primitive2DContainer createViewIndependentPrimitive2DSequence() const override; + virtual drawinglayer::primitive2d::Primitive2DContainer + createViewIndependentPrimitive2DSequence() const override; }; - } - #endif // INCLUDED_SVX_SDR_CONTACT_VIEWCONTACTOFSDRMEDIAOBJ_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svx/sdr/contact/viewcontactofvirtobj.hxx b/include/svx/sdr/contact/viewcontactofvirtobj.hxx index f1374c7fb669..189a93382fc9 100644 --- a/include/svx/sdr/contact/viewcontactofvirtobj.hxx +++ b/include/svx/sdr/contact/viewcontactofvirtobj.hxx @@ -24,8 +24,8 @@ class SdrVirtObj; -namespace sdr::contact { - +namespace sdr::contact +{ class SVXCORE_DLLPUBLIC ViewContactOfVirtObj : public ViewContactOfSdrObj { protected: @@ -44,9 +44,9 @@ public: protected: // This method is responsible for creating the graphical visualisation data // ONLY based on model data - virtual drawinglayer::primitive2d::Primitive2DContainer createViewIndependentPrimitive2DSequence() const override; + virtual drawinglayer::primitive2d::Primitive2DContainer + createViewIndependentPrimitive2DSequence() const override; }; - } #endif // INCLUDED_SVX_SDR_CONTACT_VIEWCONTACTOFVIRTOBJ_HXX diff --git a/include/svx/sdr/contact/viewobjectcontactofsdrobj.hxx b/include/svx/sdr/contact/viewobjectcontactofsdrobj.hxx index 07e748651ad3..5989559c758e 100644 --- a/include/svx/sdr/contact/viewobjectcontactofsdrobj.hxx +++ b/include/svx/sdr/contact/viewobjectcontactofsdrobj.hxx @@ -26,8 +26,8 @@ class SdrObject; class SdrLayerIDSet; class OutputDevice; -namespace sdr::contact { - +namespace sdr::contact +{ class SVXCORE_DLLPUBLIC ViewObjectContactOfSdrObj : public ViewObjectContact { /** Test whether the primitive is visible on any layer from @c aLayers @@ -57,7 +57,6 @@ public: */ const OutputDevice* getPageViewOutputDevice() const; }; - } #endif // INCLUDED_SVX_SDR_CONTACT_VIEWOBJECTCONTACTOFSDROBJ_HXX diff --git a/include/svx/sdr/table/tabledesign.hxx b/include/svx/sdr/table/tabledesign.hxx index 8c03ee67b3ea..118ebefcc0c4 100644 --- a/include/svx/sdr/table/tabledesign.hxx +++ b/include/svx/sdr/table/tabledesign.hxx @@ -24,8 +24,8 @@ #include <com/sun/star/container/XNameAccess.hpp> -namespace sdr::table { - +namespace sdr::table +{ const sal_Int32 first_row_style = 0; const sal_Int32 last_row_style = 1; const sal_Int32 first_column_style = 2; @@ -38,11 +38,9 @@ const sal_Int32 body_style = 8; const sal_Int32 background_style = 9; const sal_Int32 style_count = 10; -extern SVX_DLLPUBLIC css::uno::Reference< css::container::XNameAccess > CreateTableDesignFamily(); - +extern SVX_DLLPUBLIC css::uno::Reference<css::container::XNameAccess> CreateTableDesignFamily(); } - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svx/sdrundomanager.hxx b/include/svx/sdrundomanager.hxx index ab92c931cf8f..12fa1c7b3852 100644 --- a/include/svx/sdrundomanager.hxx +++ b/include/svx/sdrundomanager.hxx @@ -31,11 +31,12 @@ private: using EditUndoManager::Undo; using EditUndoManager::Redo; - Link<SdrUndoManager*,void> maEndTextEditHdl; - SfxUndoAction* mpLastUndoActionBeforeTextEdit; - bool mbEndTextEditTriggeredFromUndo; + Link<SdrUndoManager*, void> maEndTextEditHdl; + SfxUndoAction* mpLastUndoActionBeforeTextEdit; + bool mbEndTextEditTriggeredFromUndo; SfxObjectShell* m_pDocSh; + protected: // call to check for TextEdit active bool isTextEditActive() const; @@ -56,7 +57,7 @@ public: // activate (start text edit) and empty link to reset (end text edit). On // reset all text edit actions will be removed from this undo manager to // restore the state before activation - void SetEndTextEditHdl(const Link<SdrUndoManager*,void>& rLink); + void SetEndTextEditHdl(const Link<SdrUndoManager*, void>& rLink); // check from outside if we are inside a callback for ending text edit. This // is needed to detect inside end text edit if it is a regular one or triggered diff --git a/include/svx/sdshcitm.hxx b/include/svx/sdshcitm.hxx index 01c474127c8d..a35b8988c0cf 100644 --- a/include/svx/sdshcitm.hxx +++ b/include/svx/sdshcitm.hxx @@ -22,7 +22,8 @@ #include <svx/xcolit.hxx> #include <svx/svddef.hxx> -inline XColorItem makeSdrShadowColorItem(const Color& rTheColor) { +inline XColorItem makeSdrShadowColorItem(const Color& rTheColor) +{ return XColorItem(SDRATTR_SHADOWCOLOR, rTheColor); } diff --git a/include/svx/sdshitm.hxx b/include/svx/sdshitm.hxx index ab8a2b868a4d..7dcbecc30ea0 100644 --- a/include/svx/sdshitm.hxx +++ b/include/svx/sdshitm.hxx @@ -22,7 +22,8 @@ #include <svx/sdooitm.hxx> #include <svx/svddef.hxx> -inline SdrOnOffItem makeSdrShadowItem(bool bShadow) { +inline SdrOnOffItem makeSdrShadowItem(bool bShadow) +{ return SdrOnOffItem(SDRATTR_SHADOW, bShadow); } diff --git a/include/svx/sdshtitm.hxx b/include/svx/sdshtitm.hxx index e1035077be43..2287e9703b80 100644 --- a/include/svx/sdshtitm.hxx +++ b/include/svx/sdshtitm.hxx @@ -22,7 +22,8 @@ #include <svx/sdprcitm.hxx> #include <svx/svddef.hxx> -inline SdrPercentItem makeSdrShadowTransparenceItem(sal_uInt16 nTransp) { +inline SdrPercentItem makeSdrShadowTransparenceItem(sal_uInt16 nTransp) +{ return SdrPercentItem(SDRATTR_SHADOWTRANSPARENCE, nTransp); } diff --git a/include/svx/sdsxyitm.hxx b/include/svx/sdsxyitm.hxx index ac270699d22d..a0baac5d341f 100644 --- a/include/svx/sdsxyitm.hxx +++ b/include/svx/sdsxyitm.hxx @@ -22,11 +22,13 @@ #include <svx/sdmetitm.hxx> #include <svx/svddef.hxx> -inline SdrMetricItem makeSdrShadowXDistItem(tools::Long nDist) { +inline SdrMetricItem makeSdrShadowXDistItem(tools::Long nDist) +{ return SdrMetricItem(SDRATTR_SHADOWXDIST, nDist); } -inline SdrMetricItem makeSdrShadowYDistItem(tools::Long nDist) { +inline SdrMetricItem makeSdrShadowYDistItem(tools::Long nDist) +{ return SdrMetricItem(SDRATTR_SHADOWYDIST, nDist); } diff --git a/include/svx/sdtagitm.hxx b/include/svx/sdtagitm.hxx index df186107f697..88cf77bf1ccd 100644 --- a/include/svx/sdtagitm.hxx +++ b/include/svx/sdtagitm.hxx @@ -22,11 +22,13 @@ #include <svx/sdooitm.hxx> #include <svx/svddef.hxx> -inline SdrOnOffItem makeSdrTextAutoGrowHeightItem(bool bAuto) { +inline SdrOnOffItem makeSdrTextAutoGrowHeightItem(bool bAuto) +{ return SdrOnOffItem(SDRATTR_TEXT_AUTOGROWHEIGHT, bAuto); } -inline SdrOnOffItem makeSdrTextAutoGrowWidthItem(bool bAuto) { +inline SdrOnOffItem makeSdrTextAutoGrowWidthItem(bool bAuto) +{ return SdrOnOffItem(SDRATTR_TEXT_AUTOGROWWIDTH, bAuto); } diff --git a/include/svx/sdtcfitm.hxx b/include/svx/sdtcfitm.hxx index aca6298d8f67..7b4ef6e2ad9f 100644 --- a/include/svx/sdtcfitm.hxx +++ b/include/svx/sdtcfitm.hxx @@ -22,7 +22,8 @@ #include <svx/sdooitm.hxx> #include <svx/svddef.hxx> -inline SdrOnOffItem makeSdrTextContourFrameItem(bool bOn) { +inline SdrOnOffItem makeSdrTextContourFrameItem(bool bOn) +{ return SdrOnOffItem(SDRATTR_TEXT_CONTOURFRAME, bOn); } diff --git a/include/svx/sdtditm.hxx b/include/svx/sdtditm.hxx index d9b1d3ab3e9b..6fe41a43754f 100644 --- a/include/svx/sdtditm.hxx +++ b/include/svx/sdtditm.hxx @@ -22,19 +22,23 @@ #include <svx/sdmetitm.hxx> #include <svx/svddef.hxx> -inline SdrMetricItem makeSdrTextLeftDistItem(tools::Long mnHeight) { +inline SdrMetricItem makeSdrTextLeftDistItem(tools::Long mnHeight) +{ return SdrMetricItem(SDRATTR_TEXT_LEFTDIST, mnHeight); } -inline SdrMetricItem makeSdrTextRightDistItem(tools::Long mnHeight) { +inline SdrMetricItem makeSdrTextRightDistItem(tools::Long mnHeight) +{ return SdrMetricItem(SDRATTR_TEXT_RIGHTDIST, mnHeight); } -inline SdrMetricItem makeSdrTextUpperDistItem(tools::Long mnHeight) { +inline SdrMetricItem makeSdrTextUpperDistItem(tools::Long mnHeight) +{ return SdrMetricItem(SDRATTR_TEXT_UPPERDIST, mnHeight); } -inline SdrMetricItem makeSdrTextLowerDistItem(tools::Long mnHeight) { +inline SdrMetricItem makeSdrTextLowerDistItem(tools::Long mnHeight) +{ return SdrMetricItem(SDRATTR_TEXT_LOWERDIST, mnHeight); } diff --git a/include/svx/sdtmfitm.hxx b/include/svx/sdtmfitm.hxx index 25890361accf..23046442bcf9 100644 --- a/include/svx/sdtmfitm.hxx +++ b/include/svx/sdtmfitm.hxx @@ -22,19 +22,23 @@ #include <svx/sdmetitm.hxx> #include <svx/svddef.hxx> -inline SdrMetricItem makeSdrTextMinFrameHeightItem(tools::Long mnHeight) { +inline SdrMetricItem makeSdrTextMinFrameHeightItem(tools::Long mnHeight) +{ return SdrMetricItem(SDRATTR_TEXT_MINFRAMEHEIGHT, mnHeight); } -inline SdrMetricItem makeSdrTextMaxFrameHeightItem(tools::Long mnHeight) { +inline SdrMetricItem makeSdrTextMaxFrameHeightItem(tools::Long mnHeight) +{ return SdrMetricItem(SDRATTR_TEXT_MAXFRAMEHEIGHT, mnHeight); } -inline SdrMetricItem makeSdrTextMinFrameWidthItem(tools::Long mnWidth) { +inline SdrMetricItem makeSdrTextMinFrameWidthItem(tools::Long mnWidth) +{ return SdrMetricItem(SDRATTR_TEXT_MINFRAMEWIDTH, mnWidth); }; -inline SdrMetricItem makeSdrTextMaxFrameWidthItem(tools::Long mnWidth) { +inline SdrMetricItem makeSdrTextMaxFrameWidthItem(tools::Long mnWidth) +{ return SdrMetricItem(SDRATTR_TEXT_MAXFRAMEWIDTH, mnWidth); } diff --git a/include/svx/selctrl.hxx b/include/svx/selctrl.hxx index 1767c918fb28..2b32e56ede70 100644 --- a/include/svx/selctrl.hxx +++ b/include/svx/selctrl.hxx @@ -29,16 +29,16 @@ class SVX_DLLPUBLIC SvxSelectionModeControl final : public SfxStatusBarControl public: SFX_DECL_STATUSBAR_CONTROL(); - SvxSelectionModeControl( sal_uInt16 nSlotId, sal_uInt16 nId, StatusBar& rStb ); + SvxSelectionModeControl(sal_uInt16 nSlotId, sal_uInt16 nId, StatusBar& rStb); - virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, - const SfxPoolItem* pState ) override; - virtual bool MouseButtonDown( const MouseEvent& rEvt ) override; - virtual void Paint( const UserDrawEvent& rEvt ) override; + virtual void StateChanged(sal_uInt16 nSID, SfxItemState eState, + const SfxPoolItem* pState) override; + virtual bool MouseButtonDown(const MouseEvent& rEvt) override; + virtual void Paint(const UserDrawEvent& rEvt) override; private: - sal_uInt16 mnState; - Image maImage; + sal_uInt16 mnState; + Image maImage; }; #endif diff --git a/include/svx/sidebar/AreaTransparencyGradientPopup.hxx b/include/svx/sidebar/AreaTransparencyGradientPopup.hxx index 29e6b4f841a1..2f5dcedec5c6 100644 --- a/include/svx/sidebar/AreaTransparencyGradientPopup.hxx +++ b/include/svx/sidebar/AreaTransparencyGradientPopup.hxx @@ -23,8 +23,8 @@ class XFillFloatTransparenceItem; -namespace svx::sidebar { - +namespace svx::sidebar +{ class AreaTransparencyGradientControl; class AreaPropertyPanelBase; @@ -45,7 +45,7 @@ private: std::unique_ptr<weld::MetricSpinButton> mxMtrTrgrEndValue; std::unique_ptr<weld::MetricSpinButton> mxMtrTrgrBorder; - void InitStatus(XFillFloatTransparenceItem const * pGradientItem); + void InitStatus(XFillFloatTransparenceItem const* pGradientItem); void ExecuteValueModify(sal_uInt8 nStartCol, sal_uInt8 nEndCol); DECL_LINK(ModifiedTrgrHdl_Impl, weld::MetricSpinButton&, void); DECL_LINK(Left_Click45_Impl, const OString&, void); @@ -58,7 +58,7 @@ public: weld::Container* getTopLevel() const { return mxTopLevel.get(); } - void Rearrange(XFillFloatTransparenceItem const * pItem); + void Rearrange(XFillFloatTransparenceItem const* pItem); }; } // end of namespace svx::sidebar diff --git a/include/svx/sidebar/LinePropertyPanelBase.hxx b/include/svx/sidebar/LinePropertyPanelBase.hxx index 0442510d7537..1905e66d7c2c 100644 --- a/include/svx/sidebar/LinePropertyPanelBase.hxx +++ b/include/svx/sidebar/LinePropertyPanelBase.hxx @@ -40,7 +40,6 @@ class XDashList; namespace svx::sidebar { - class DisableArrowsWrapper; class SVX_DLLPUBLIC LinePropertyPanelBase : public PanelLayout @@ -56,9 +55,8 @@ public: void EndLineWidthPopup(); // constructor/destructor - LinePropertyPanelBase( - vcl::Window* pParent, - const css::uno::Reference<css::frame::XFrame>& rxFrame); + LinePropertyPanelBase(vcl::Window* pParent, + const css::uno::Reference<css::frame::XFrame>& rxFrame); virtual void setLineWidth(const XLineWidthItem& rItem) = 0; @@ -72,7 +70,6 @@ public: } protected: - void ActivateControls(); virtual void setLineTransparency(const XLineTransparenceItem& rItem) = 0; @@ -90,7 +87,6 @@ protected: void disableArrowHead(); protected: - std::unique_ptr<weld::Toolbar> mxTBColor; std::unique_ptr<ToolbarUnoDispatcher> mxColorDispatch; @@ -114,9 +110,9 @@ private: std::unique_ptr<DisableArrowsWrapper> mxDisableArrowsWrapper; - sal_uInt16 mnTrans; - MapUnit meMapUnit; - sal_Int32 mnWidthCoreValue; + sal_uInt16 mnTrans; + MapUnit meMapUnit; + sal_Int32 mnWidthCoreValue; // images from resource OUString maIMGNone; @@ -124,14 +120,14 @@ private: // multi-images OUString maIMGWidthIcon[8]; - bool mbWidthValuable : 1; + bool mbWidthValuable : 1; bool mbArrowSupported; bool mbNoneLineStyle; void Initialize(); DECL_LINK(ToolboxWidthSelectHdl, const OString&, void); - DECL_LINK(ChangeTransparentHdl, weld::MetricSpinButton&, void ); + DECL_LINK(ChangeTransparentHdl, weld::MetricSpinButton&, void); DECL_LINK(ChangeEdgeStyleHdl, weld::ComboBox&, void); DECL_LINK(ChangeCapStyleHdl, weld::ComboBox&, void); }; diff --git a/include/svx/sidebar/LineWidthPopup.hxx b/include/svx/sidebar/LineWidthPopup.hxx index 718ff68ce24a..d16f49b60389 100644 --- a/include/svx/sidebar/LineWidthPopup.hxx +++ b/include/svx/sidebar/LineWidthPopup.hxx @@ -27,8 +27,8 @@ class ValueSet; -namespace svx::sidebar { - +namespace svx::sidebar +{ class LinePropertyPanelBase; class LineWidthValueSet; @@ -38,19 +38,19 @@ public: LineWidthPopup(weld::Widget* pParent, LinePropertyPanelBase& rParent); ~LineWidthPopup(); - void SetWidthSelect (tools::Long lValue, bool bValuable, MapUnit eMapUnit); + void SetWidthSelect(tools::Long lValue, bool bValuable, MapUnit eMapUnit); weld::Container* getTopLevel() const { return m_xTopLevel.get(); } private: LinePropertyPanelBase& m_rParent; - std::array<OUString,9> maStrUnits; + std::array<OUString, 9> maStrUnits; OUString m_sPt; MapUnit m_eMapUnit; bool m_bVSFocus; bool m_bCustom; tools::Long m_nCustomWidth; - Image m_aIMGCus; + Image m_aIMGCus; Image m_aIMGCusGray; std::unique_ptr<weld::Builder> m_xBuilder; diff --git a/include/svx/sidebar/ValueSetWithTextControl.hxx b/include/svx/sidebar/ValueSetWithTextControl.hxx index 5dd075a28458..e45649b17624 100644 --- a/include/svx/sidebar/ValueSetWithTextControl.hxx +++ b/include/svx/sidebar/ValueSetWithTextControl.hxx @@ -25,8 +25,8 @@ #include <vector> -namespace svx::sidebar { - +namespace svx::sidebar +{ /** Specialization of class <ValueSet>. This specialization allows is a one-columned ValueSet which allow items containing an image and a text or a text and a second text. @@ -40,11 +40,9 @@ public: virtual void SetDrawingArea(weld::DrawingArea* pDrawingArea) override; - void AddItem( - const OUString& rItemText, - const OUString& rItemText2 ); + void AddItem(const OUString& rItemText, const OUString& rItemText2); - virtual void UserDraw( const UserDrawEvent& rUDEvt ) override; + virtual void UserDraw(const UserDrawEvent& rUDEvt) override; private: struct ValueSetWithTextItem @@ -53,7 +51,7 @@ private: OUString maItemText2; }; - ::std::vector< ValueSetWithTextItem > maItems; + ::std::vector<ValueSetWithTextItem> maItems; }; } // end of namespace svx::sidebar diff --git a/include/svx/spacinglistbox.hxx b/include/svx/spacinglistbox.hxx index 455a5729c843..125da36d0767 100644 --- a/include/svx/spacinglistbox.hxx +++ b/include/svx/spacinglistbox.hxx @@ -23,12 +23,18 @@ #include <svx/svxdllapi.h> #include <vcl/weld.hxx> -enum class SpacingType { SPACING_INCH, MARGINS_INCH, SPACING_CM, MARGINS_CM }; +enum class SpacingType +{ + SPACING_INCH, + MARGINS_INCH, + SPACING_CM, + MARGINS_CM +}; /// Custom Widget ListBox to hold entries for Spacing & Margin settings of Header/Footer namespace SpacingListBox { - void SVXCORE_DLLPUBLIC Fill(SpacingType eType, weld::ComboBox&); +void SVXCORE_DLLPUBLIC Fill(SpacingType eType, weld::ComboBox&); } #endif diff --git a/include/svx/svdogrp.hxx b/include/svx/svdogrp.hxx index b63cf4b63d53..355b19242400 100644 --- a/include/svx/svdogrp.hxx +++ b/include/svx/svdogrp.hxx @@ -33,9 +33,10 @@ class SVXCORE_DLLPUBLIC SdrObjGroup final : public SdrObject, public SdrObjList { private: virtual std::unique_ptr<sdr::contact::ViewContact> CreateObjectSpecificViewContact() override; - virtual std::unique_ptr<sdr::properties::BaseProperties> CreateObjectSpecificProperties() override; + virtual std::unique_ptr<sdr::properties::BaseProperties> + CreateObjectSpecificProperties() override; - Point aRefPoint; // Reference point inside the object group + Point aRefPoint; // Reference point inside the object group private: // protected destructor - due to final, make private @@ -83,7 +84,8 @@ public: virtual tools::Long GetShearAngle(bool bVertical = false) const override; virtual void Move(const Size& rSiz) override; - virtual void Resize(const Point& rRef, const Fraction& xFact, const Fraction& yFact, bool bUnsetRelative = true) override; + virtual void Resize(const Point& rRef, const Fraction& xFact, const Fraction& yFact, + bool bUnsetRelative = true) override; virtual void Rotate(const Point& rRef, tools::Long nAngle, double sn, double cs) override; virtual void Mirror(const Point& rRef1, const Point& rRef2) override; virtual void Shear(const Point& rRef, tools::Long nAngle, double tn, bool bVShear) override; @@ -93,7 +95,8 @@ public: virtual void SetLogicRect(const tools::Rectangle& rRect) override; virtual void NbcMove(const Size& rSiz) override; - virtual void NbcResize(const Point& rRef, const Fraction& xFact, const Fraction& yFact) override; + virtual void NbcResize(const Point& rRef, const Fraction& xFact, + const Fraction& yFact) override; virtual void NbcRotate(const Point& rRef, tools::Long nAngle, double sn, double cs) override; virtual void NbcMirror(const Point& rRef1, const Point& rRef2) override; virtual void NbcShear(const Point& rRef, tools::Long nAngle, double tn, bool bVShear) override; diff --git a/include/svx/svdovirt.hxx b/include/svx/svdovirt.hxx index a9864189da3f..b47bc03ce3f3 100644 --- a/include/svx/svdovirt.hxx +++ b/include/svx/svdovirt.hxx @@ -29,15 +29,16 @@ */ class SVXCORE_DLLPUBLIC SdrVirtObj : public SdrObject { - SdrVirtObj( const SdrVirtObj& ) = delete; + SdrVirtObj(const SdrVirtObj&) = delete; + public: virtual sdr::properties::BaseProperties& GetProperties() const override; protected: virtual std::unique_ptr<sdr::contact::ViewContact> CreateObjectSpecificViewContact() override; - SdrObject& rRefObj; // Referenced drawing object - tools::Rectangle aSnapRect; + SdrObject& rRefObj; // Referenced drawing object + tools::Rectangle aSnapRect; protected: virtual void Notify(SfxBroadcaster& rBC, const SfxHint& rHint) override; @@ -50,9 +51,7 @@ protected: virtual ~SdrVirtObj() override; public: - SdrVirtObj( - SdrModel& rSdrModel, - SdrObject& rNewObj); + SdrVirtObj(SdrModel& rSdrModel, SdrObject& rNewObj); SdrObject& ReferencedObj(); const SdrObject& GetReferencedObj() const; @@ -99,13 +98,15 @@ public: virtual basegfx::B2DPolyPolygon TakeCreatePoly(const SdrDragStat& rDrag) const override; virtual void NbcMove(const Size& rSiz) override; - virtual void NbcResize(const Point& rRef, const Fraction& xFact, const Fraction& yFact) override; + virtual void NbcResize(const Point& rRef, const Fraction& xFact, + const Fraction& yFact) override; virtual void NbcRotate(const Point& rRef, tools::Long nAngle, double sn, double cs) override; virtual void NbcMirror(const Point& rRef1, const Point& rRef2) override; virtual void NbcShear(const Point& rRef, tools::Long nAngle, double tn, bool bVShear) override; virtual void Move(const Size& rSiz) override; - virtual void Resize(const Point& rRef, const Fraction& xFact, const Fraction& yFact, bool bUnsetRelative = true) override; + virtual void Resize(const Point& rRef, const Fraction& xFact, const Fraction& yFact, + bool bUnsetRelative = true) override; virtual void Rotate(const Point& rRef, tools::Long nAngle, double sn, double cs) override; virtual void Mirror(const Point& rRef1, const Point& rRef2) override; virtual void Shear(const Point& rRef, tools::Long nAngle, double tn, bool bVShear) override; @@ -136,10 +137,11 @@ public: virtual void NbcReformatText() override; virtual bool HasMacro() const override; - virtual SdrObject* CheckMacroHit (const SdrObjMacroHitRec& rRec) const override; - virtual PointerStyle GetMacroPointer (const SdrObjMacroHitRec& rRec) const override; - virtual void PaintMacro (OutputDevice& rOut, const tools::Rectangle& rDirtyRect, const SdrObjMacroHitRec& rRec) const override; - virtual bool DoMacro (const SdrObjMacroHitRec& rRec) override; + virtual SdrObject* CheckMacroHit(const SdrObjMacroHitRec& rRec) const override; + virtual PointerStyle GetMacroPointer(const SdrObjMacroHitRec& rRec) const override; + virtual void PaintMacro(OutputDevice& rOut, const tools::Rectangle& rDirtyRect, + const SdrObjMacroHitRec& rRec) const override; + virtual bool DoMacro(const SdrObjMacroHitRec& rRec) override; // #i73248# for default SdrVirtObj, offset is aAnchor, not (0,0) virtual Point GetOffset() const; diff --git a/include/svx/svdtext.hxx b/include/svx/svdtext.hxx index 7f06e3441454..2eb8ac691c0d 100644 --- a/include/svx/svdtext.hxx +++ b/include/svx/svdtext.hxx @@ -25,7 +25,6 @@ #include <tools/weakbase.hxx> #include <memory> - class OutlinerParaObject; class SdrOutliner; class SdrTextObj; @@ -33,8 +32,9 @@ class SdrModel; class SfxItemSet; enum class OutlinerMode; -namespace sdr::properties { - class TextProperties; +namespace sdr::properties +{ +class TextProperties; } /** This class stores information about one text inside a shape. @@ -44,15 +44,15 @@ class SfxStyleSheet; class SVXCORE_DLLPUBLIC SdrText : public tools::WeakBase { public: - explicit SdrText( SdrTextObj& rObject ); + explicit SdrText(SdrTextObj& rObject); virtual ~SdrText() override; - void ForceOutlinerParaObject( OutlinerMode nOutlMode ); + void ForceOutlinerParaObject(OutlinerMode nOutlMode); - virtual void SetOutlinerParaObject( std::unique_ptr<OutlinerParaObject> pTextObject ); + virtual void SetOutlinerParaObject(std::unique_ptr<OutlinerParaObject> pTextObject); OutlinerParaObject* GetOutlinerParaObject() const; - void CheckPortionInfo( SdrOutliner& rOutliner ); + void CheckPortionInfo(SdrOutliner& rOutliner); void ReformatText(); // default uses GetObjectItemSet, but may be overridden to diff --git a/include/svx/svdtypes.hxx b/include/svx/svdtypes.hxx index f6c6b36e6971..a2c065c4b342 100644 --- a/include/svx/svdtypes.hxx +++ b/include/svx/svdtypes.hxx @@ -26,9 +26,9 @@ // commands for EndCreate() enum class SdrCreateCmd { - NextPoint, // next traverse station, segment of a circle: next coordinate - NextObject, // next polygon in PolyPolygon - ForceEnd // forced end + NextPoint, // next traverse station, segment of a circle: next coordinate + NextObject, // next polygon in PolyPolygon + ForceEnd // forced end }; enum class SdrDragMode @@ -48,8 +48,6 @@ enum class SdrDragMode Crop }; - - /* * Layer */ @@ -65,12 +63,13 @@ constexpr SdrLayerID SDRLAYER_NOTFOUND(0xff); /* * Repeat */ -enum class SdrRepeatFunc { +enum class SdrRepeatFunc +{ NONE, // with parameter - Move, // distance - Resize, // factor, reference(%) related to MarkRect - Rotate, // rotation angle, reference(%) related to MarkRect + Move, // distance + Resize, // factor, reference(%) related to MarkRect + Rotate, // rotation angle, reference(%) related to MarkRect // Without parameter Delete, CombinePolyPoly, diff --git a/include/svx/svxdllapi.h b/include/svx/svxdllapi.h index 3e3de30c4ae1..c992f7e304d9 100644 --- a/include/svx/svxdllapi.h +++ b/include/svx/svxdllapi.h @@ -23,9 +23,9 @@ #include <sal/types.h> #if defined(SVX_DLLIMPLEMENTATION) -#define SVX_DLLPUBLIC SAL_DLLPUBLIC_EXPORT +#define SVX_DLLPUBLIC SAL_DLLPUBLIC_EXPORT #else -#define SVX_DLLPUBLIC SAL_DLLPUBLIC_IMPORT +#define SVX_DLLPUBLIC SAL_DLLPUBLIC_IMPORT #endif #define SVX_DLLPRIVATE SAL_DLLPRIVATE diff --git a/include/svx/swframetypes.hxx b/include/svx/swframetypes.hxx index cd33ae4779b4..abff5b0ee72b 100644 --- a/include/svx/swframetypes.hxx +++ b/include/svx/swframetypes.hxx @@ -26,21 +26,21 @@ // that are only of importance for interfaces (SwDoc). enum class RndStdIds { - UNKNOWN = -1, // return value used by SwFEShell::GetAnchorId + UNKNOWN = -1, // return value used by SwFEShell::GetAnchorId // the following 5 values are deliberately the same as the values in css::text::TextContentAnchorType - FLY_AT_PARA = int(css::text::TextContentAnchorType_AT_PARAGRAPH), // Anchored at paragraph. - FLY_AS_CHAR = int(css::text::TextContentAnchorType_AS_CHARACTER), // Anchored as character. - FLY_AT_PAGE = int(css::text::TextContentAnchorType_AT_PAGE), // Anchored at page. - FLY_AT_FLY = int(css::text::TextContentAnchorType_AT_FRAME), // Anchored at frame. - FLY_AT_CHAR = int(css::text::TextContentAnchorType_AT_CHARACTER), // Anchored at character. + FLY_AT_PARA = int(css::text::TextContentAnchorType_AT_PARAGRAPH), // Anchored at paragraph. + FLY_AS_CHAR = int(css::text::TextContentAnchorType_AS_CHARACTER), // Anchored as character. + FLY_AT_PAGE = int(css::text::TextContentAnchorType_AT_PAGE), // Anchored at page. + FLY_AT_FLY = int(css::text::TextContentAnchorType_AT_FRAME), // Anchored at frame. + FLY_AT_CHAR = int(css::text::TextContentAnchorType_AT_CHARACTER), // Anchored at character. HEADER, FOOTER, HEADERL, HEADERR, - DRAW_OBJECT // A draw-Object! For the SwDoc-interface only! + DRAW_OBJECT // A draw-Object! For the SwDoc-interface only! }; #endif diff --git a/include/svx/sxcgitm.hxx b/include/svx/sxcgitm.hxx index 64e7337b36ef..993d164dea10 100644 --- a/include/svx/sxcgitm.hxx +++ b/include/svx/sxcgitm.hxx @@ -26,9 +26,13 @@ * class SdrCaptionGapItem * Distance of the line start from the Rect */ -class SdrCaptionGapItem final : public SdrMetricItem { +class SdrCaptionGapItem final : public SdrMetricItem +{ public: - SdrCaptionGapItem(tools::Long nGap=0) : SdrMetricItem(SDRATTR_CAPTIONGAP,nGap) {} + SdrCaptionGapItem(tools::Long nGap = 0) + : SdrMetricItem(SDRATTR_CAPTIONGAP, nGap) + { + } virtual SdrCaptionGapItem* Clone(SfxItemPool*) const override { return new SdrCaptionGapItem(*this); diff --git a/include/svx/sxciaitm.hxx b/include/svx/sxciaitm.hxx index cde519accd36..f14ba75288e7 100644 --- a/include/svx/sxciaitm.hxx +++ b/include/svx/sxciaitm.hxx @@ -22,11 +22,13 @@ #include <svx/svddef.hxx> #include <svx/sdangitm.hxx> -inline SdrAngleItem makeSdrCircStartAngleItem(tools::Long nAngle) { +inline SdrAngleItem makeSdrCircStartAngleItem(tools::Long nAngle) +{ return SdrAngleItem(SDRATTR_CIRCSTARTANGLE, nAngle); } -inline SdrAngleItem makeSdrCircEndAngleItem(tools::Long nAngle) { +inline SdrAngleItem makeSdrCircEndAngleItem(tools::Long nAngle) +{ return SdrAngleItem(SDRATTR_CIRCENDANGLE, nAngle); } diff --git a/include/svx/sxelditm.hxx b/include/svx/sxelditm.hxx index 34557d42d850..81cae31f3f5a 100644 --- a/include/svx/sxelditm.hxx +++ b/include/svx/sxelditm.hxx @@ -22,24 +22,31 @@ #include <svx/svddef.hxx> #include <svx/sdmetitm.hxx> -class SdrEdgeLineDeltaCountItem: public SfxUInt16Item { +class SdrEdgeLineDeltaCountItem : public SfxUInt16Item +{ public: - SdrEdgeLineDeltaCountItem(sal_uInt16 nVal=0): SfxUInt16Item(SDRATTR_EDGELINEDELTACOUNT,nVal) {} + SdrEdgeLineDeltaCountItem(sal_uInt16 nVal = 0) + : SfxUInt16Item(SDRATTR_EDGELINEDELTACOUNT, nVal) + { + } virtual SdrEdgeLineDeltaCountItem* Clone(SfxItemPool*) const override { return new SdrEdgeLineDeltaCountItem(*this); } }; -inline SdrMetricItem makeSdrEdgeLine1DeltaItem(tools::Long nVal) { +inline SdrMetricItem makeSdrEdgeLine1DeltaItem(tools::Long nVal) +{ return SdrMetricItem(SDRATTR_EDGELINE1DELTA, nVal); } -inline SdrMetricItem makeSdrEdgeLine2DeltaItem(tools::Long nVal) { +inline SdrMetricItem makeSdrEdgeLine2DeltaItem(tools::Long nVal) +{ return SdrMetricItem(SDRATTR_EDGELINE2DELTA, nVal); } -inline SdrMetricItem makeSdrEdgeLine3DeltaItem(tools::Long nVal) { +inline SdrMetricItem makeSdrEdgeLine3DeltaItem(tools::Long nVal) +{ return SdrMetricItem(SDRATTR_EDGELINE3DELTA, nVal); } diff --git a/include/svx/sxmlhitm.hxx b/include/svx/sxmlhitm.hxx index fc18d53e4683..8fdb7c64ee25 100644 --- a/include/svx/sxmlhitm.hxx +++ b/include/svx/sxmlhitm.hxx @@ -36,27 +36,32 @@ // gab between dimension line and document reference edge (norm=8mm) // can be dragged on the handles of the arrowheads -inline SdrMetricItem makeSdrMeasureLineDistItem(tools::Long nVal) { +inline SdrMetricItem makeSdrMeasureLineDistItem(tools::Long nVal) +{ return SdrMetricItem(SDRATTR_MEASURELINEDIST, nVal); } // overhang of dimension help line to dimension line (norm=2mm) -inline SdrMetricItem makeSdrMeasureHelplineOverhangItem(tools::Long nVal) { +inline SdrMetricItem makeSdrMeasureHelplineOverhangItem(tools::Long nVal) +{ return SdrMetricItem(SDRATTR_MEASUREHELPLINEOVERHANG, nVal); } // gab between dimension line and document reference edge // dimension help lines shell not touch the object -inline SdrMetricItem makeSdrMeasureHelplineDistItem(tools::Long nVal) { +inline SdrMetricItem makeSdrMeasureHelplineDistItem(tools::Long nVal) +{ return SdrMetricItem(SDRATTR_MEASUREHELPLINEDIST, nVal); } // overlength of the help lines can be dragged at the round handles, // which are under the reference points by default -inline SdrMetricItem makeSdrMeasureHelpline1LenItem(tools::Long nVal) { +inline SdrMetricItem makeSdrMeasureHelpline1LenItem(tools::Long nVal) +{ return SdrMetricItem(SDRATTR_MEASUREHELPLINE1LEN, nVal); } -inline SdrMetricItem makeSdrMeasureHelpline2LenItem(tools::Long nVal) { +inline SdrMetricItem makeSdrMeasureHelpline2LenItem(tools::Long nVal) +{ return SdrMetricItem(SDRATTR_MEASUREHELPLINE2LEN, nVal); } diff --git a/include/svx/tabline.hxx b/include/svx/tabline.hxx index 398845146102..2b6e318da2a2 100644 --- a/include/svx/tabline.hxx +++ b/include/svx/tabline.hxx @@ -25,10 +25,10 @@ class SdrObject; //defines for the symbol selection on the page //Positive value (0,...n) declares the index in pSymbollist, else: -#define SVX_SYMBOLTYPE_NONE (-3) //symbol hidden -#define SVX_SYMBOLTYPE_AUTO (-2) //symbol automatically generated -#define SVX_SYMBOLTYPE_BRUSHITEM (-1) //symbol is contained as graphic in item: -#define SVX_SYMBOLTYPE_UNKNOWN (-100) //unknown/not initialized +#define SVX_SYMBOLTYPE_NONE (-3) //symbol hidden +#define SVX_SYMBOLTYPE_AUTO (-2) //symbol automatically generated +#define SVX_SYMBOLTYPE_BRUSHITEM (-1) //symbol is contained as graphic in item: +#define SVX_SYMBOLTYPE_UNKNOWN (-100) //unknown/not initialized #endif // INCLUDED_SVX_TABLINE_HXX diff --git a/include/svx/verttexttbxctrl.hxx b/include/svx/verttexttbxctrl.hxx index 324e650a64f7..262b7f9267f1 100644 --- a/include/svx/verttexttbxctrl.hxx +++ b/include/svx/verttexttbxctrl.hxx @@ -25,8 +25,8 @@ #include <svtools/toolboxcontroller.hxx> //HACK to avoid duplicate ImplInheritanceHelper symbols with MSVC: -class SAL_DLLPUBLIC_TEMPLATE SvxVertCTLTextTbxCtrl_Base: - public cppu::ImplInheritanceHelper<svt::ToolboxController, css::lang::XServiceInfo> +class SAL_DLLPUBLIC_TEMPLATE SvxVertCTLTextTbxCtrl_Base + : public cppu::ImplInheritanceHelper<svt::ToolboxController, css::lang::XServiceInfo> { using ImplInheritanceHelper::ImplInheritanceHelper; }; @@ -37,8 +37,10 @@ class SAL_DLLPUBLIC_TEMPLATE SvxVertCTLTextTbxCtrl_Base: class SvxVertCTLTextTbxCtrl : public SvxVertCTLTextTbxCtrl_Base { bool m_bVisible; + public: - explicit SvxVertCTLTextTbxCtrl(const css::uno::Reference<css::uno::XComponentContext>& rContext); + explicit SvxVertCTLTextTbxCtrl( + const css::uno::Reference<css::uno::XComponentContext>& rContext); virtual ~SvxVertCTLTextTbxCtrl() override; @@ -47,8 +49,8 @@ public: // XServiceInfo virtual OUString SAL_CALL getImplementationName() override = 0; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; + virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) override; + virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override; // XStatusListener virtual void SAL_CALL statusChanged(const css::frame::FeatureStateEvent& rEvent) override; diff --git a/include/svx/xftshcit.hxx b/include/svx/xftshcit.hxx index d0adcbf22fc0..cfaccbfadec7 100644 --- a/include/svx/xftshcit.hxx +++ b/include/svx/xftshcit.hxx @@ -32,9 +32,9 @@ class SVXCORE_DLLPUBLIC XFormTextShadowColorItem final : public XColorItem { public: - static SfxPoolItem* CreateDefault(); - XFormTextShadowColorItem() {} - XFormTextShadowColorItem(const OUString& rName, const Color& rTheColor); + static SfxPoolItem* CreateDefault(); + XFormTextShadowColorItem() {} + XFormTextShadowColorItem(const OUString& rName, const Color& rTheColor); virtual XFormTextShadowColorItem* Clone(SfxItemPool* pPool = nullptr) const override; }; diff --git a/include/svx/xpool.hxx b/include/svx/xpool.hxx index 0b31df19acb7..26b27e10f0cd 100644 --- a/include/svx/xpool.hxx +++ b/include/svx/xpool.hxx @@ -32,14 +32,15 @@ class XOutdevItemPool : public SfxItemPool { protected: - std::vector<SfxPoolItem*>* mpLocalPoolDefaults; + std::vector<SfxPoolItem*>* mpLocalPoolDefaults; std::unique_ptr<SfxItemInfo[]> mpLocalItemInfos; public: - XOutdevItemPool( SfxItemPool* pMaster); + XOutdevItemPool(SfxItemPool* pMaster); XOutdevItemPool(const XOutdevItemPool& rPool); virtual SfxItemPool* Clone() const override; + protected: virtual ~XOutdevItemPool() override; }; diff --git a/include/svx/zoom_def.hxx b/include/svx/zoom_def.hxx index e75dd9a27ac3..1a98d929df2e 100644 --- a/include/svx/zoom_def.hxx +++ b/include/svx/zoom_def.hxx @@ -21,10 +21,10 @@ enum class ZoomButtonId { - NONE = 0x0000, - OPTIMAL = 0x0001, - PAGEWIDTH = 0x0002, - WHOLEPAGE = 0x0004, + NONE = 0x0000, + OPTIMAL = 0x0001, + PAGEWIDTH = 0x0002, + WHOLEPAGE = 0x0004, }; /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svx/zoomctrl.hxx b/include/svx/zoomctrl.hxx index 4508fcf3dc7b..f7a565affeb7 100644 --- a/include/svx/zoomctrl.hxx +++ b/include/svx/zoomctrl.hxx @@ -27,18 +27,18 @@ class SVX_DLLPUBLIC SvxZoomStatusBarControl : public SfxStatusBarControl { private: - sal_uInt16 nZoom; + sal_uInt16 nZoom; SvxZoomEnableFlags nValueSet; public: - virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, - const SfxPoolItem* pState ) override; - virtual void Paint( const UserDrawEvent& rEvt ) override; - virtual void Command( const CommandEvent& rCEvt ) override; + virtual void StateChanged(sal_uInt16 nSID, SfxItemState eState, + const SfxPoolItem* pState) override; + virtual void Paint(const UserDrawEvent& rEvt) override; + virtual void Command(const CommandEvent& rCEvt) override; SFX_DECL_STATUSBAR_CONTROL(); - SvxZoomStatusBarControl( sal_uInt16 nSlotId, sal_uInt16 nId, StatusBar& rStb ); + SvxZoomStatusBarControl(sal_uInt16 nSlotId, sal_uInt16 nId, StatusBar& rStb); private: void ImplUpdateItemText(); @@ -48,9 +48,10 @@ class SVX_DLLPUBLIC SvxZoomPageStatusBarControl final : public SfxStatusBarContr { private: Image maImage; + public: - virtual void Paint( const UserDrawEvent& rEvt ) override; - virtual bool MouseButtonDown( const MouseEvent & rEvt ) override; + virtual void Paint(const UserDrawEvent& rEvt) override; + virtual bool MouseButtonDown(const MouseEvent& rEvt) override; SFX_DECL_STATUSBAR_CONTROL(); diff --git a/include/systools/win32/qswin32.h b/include/systools/win32/qswin32.h index d9c386e17bdd..8bc7cac5e821 100644 --- a/include/systools/win32/qswin32.h +++ b/include/systools/win32/qswin32.h @@ -20,9 +20,9 @@ #ifndef INCLUDED_SYSTOOLS_WIN32_QSWIN32_H #define INCLUDED_SYSTOOLS_WIN32_QSWIN32_H -#define QUICKSTART_CLASSNAME L"LO Listener Class" -#define QUICKSTART_WINDOWNAME L"LO Listener Window" -#define SHUTDOWN_QUICKSTART_MESSAGE L"LO KillTray" +#define QUICKSTART_CLASSNAME L"LO Listener Class" +#define QUICKSTART_WINDOWNAME L"LO Listener Window" +#define SHUTDOWN_QUICKSTART_MESSAGE L"LO KillTray" #endif // INCLUDED_SYSTOOLS_WIN32_QSWIN32_H diff --git a/include/systools/win32/uwinapi.h b/include/systools/win32/uwinapi.h index 3134609908f1..d48bb7a457ec 100644 --- a/include/systools/win32/uwinapi.h +++ b/include/systools/win32/uwinapi.h @@ -29,14 +29,14 @@ inline bool IsValidHandle(HANDLE handle) { - return handle != INVALID_HANDLE_VALUE && handle != NULL; + return handle != INVALID_HANDLE_VALUE && handle != NULL; } -#else /* __cplusplus */ +#else /* __cplusplus */ -#define IsValidHandle(Handle) ((DWORD_PTR)(Handle) + 1 > 1) +#define IsValidHandle(Handle) ((DWORD_PTR)(Handle) + 1 > 1) -#endif /* __cplusplus */ +#endif /* __cplusplus */ #endif // INCLUDED_SYSTOOLS_WIN32_UWINAPI_H diff --git a/include/test/bootstrapfixture.hxx b/include/test/bootstrapfixture.hxx index 84cf1ade2728..052e3a8e229d 100644 --- a/include/test/bootstrapfixture.hxx +++ b/include/test/bootstrapfixture.hxx @@ -24,8 +24,8 @@ #include <unotest/bootstrapfixturebase.hxx> #include <test/testdllapi.hxx> -namespace test { - +namespace test +{ enum ValidationFormat { OOXML, @@ -42,23 +42,22 @@ enum ValidationFormat // run of unit tests ... class OOO_DLLPUBLIC_TEST BootstrapFixture : public BootstrapFixtureBase { - bool m_bNeedUCB; - bool m_bAssertOnDialog; + bool m_bNeedUCB; + bool m_bAssertOnDialog; protected: - css::uno::Reference<css::uno::XComponentContext> mxComponentContext; + css::uno::Reference<css::uno::XComponentContext> mxComponentContext; public: - DECL_STATIC_LINK( BootstrapFixture, ImplInitFilterHdl, ConvertData&, bool ); + DECL_STATIC_LINK(BootstrapFixture, ImplInitFilterHdl, ConvertData&, bool); - BootstrapFixture( bool bAssertOnDialog = true, bool bNeedUCB = true ); - virtual ~BootstrapFixture() override; + BootstrapFixture(bool bAssertOnDialog = true, bool bNeedUCB = true); + virtual ~BootstrapFixture() override; - virtual void setUp() override; + virtual void setUp() override; - void validate(const OUString& rURL, ValidationFormat) const; + void validate(const OUString& rURL, ValidationFormat) const; }; - } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/test/container/xnamed.hxx b/include/test/container/xnamed.hxx index 2b323e6f95b9..ff4c4616df36 100644 --- a/include/test/container/xnamed.hxx +++ b/include/test/container/xnamed.hxx @@ -18,13 +18,13 @@ #include <test/testdllapi.hxx> -namespace apitest { - +namespace apitest +{ class OOO_DLLPUBLIC_TEST XNamed { public: XNamed(const OUString& rTestName) - : m_aTestName(rTestName) + : m_aTestName(rTestName) { } @@ -34,7 +34,7 @@ public: void testSetNameByScSheetLinkObj(); void testSetNameThrowsException(); - virtual css::uno::Reference< css::uno::XInterface > init() = 0; + virtual css::uno::Reference<css::uno::XInterface> init() = 0; protected: ~XNamed() {} @@ -42,7 +42,6 @@ protected: private: OUString m_aTestName; }; - } #endif // INCLUDED_TEST_CONTAINER_XNAMED_HXX diff --git a/include/test/htmltesttools.hxx b/include/test/htmltesttools.hxx index fa5722075f87..154bb902dfac 100644 --- a/include/test/htmltesttools.hxx +++ b/include/test/htmltesttools.hxx @@ -24,7 +24,7 @@ using htmlDocUniquePtr = xmlDocUniquePtr; class OOO_DLLPUBLIC_TEST HtmlTestTools { protected: - static htmlDocUniquePtr parseHtml(utl::TempFile const & aTempFile); + static htmlDocUniquePtr parseHtml(utl::TempFile const& aTempFile); static htmlDocUniquePtr parseHtmlStream(SvStream* pStream); }; diff --git a/include/test/screenshot_test.hxx b/include/test/screenshot_test.hxx index 3e1f3f84a06f..9acee7a5d656 100644 --- a/include/test/screenshot_test.hxx +++ b/include/test/screenshot_test.hxx @@ -20,16 +20,16 @@ #include <map> class VclAbstractDialog; -typedef std::map< OString, sal_uInt32 > mapType; +typedef std::map<OString, sal_uInt32> mapType; class OOO_DLLPUBLIC_TEST ScreenshotTest : public test::BootstrapFixture, public unotest::MacrosTest { private: /// The current UI language - OUString maCurrentLanguage; + OUString maCurrentLanguage; /// the set of known dialogs and their ID for usage in createDialogByID - mapType maKnownDialogs; + mapType maKnownDialogs; /// parent for non-dialog buildables weld::GenericDialogController maParent; @@ -38,7 +38,7 @@ private: private: /// helpers void implSaveScreenshot(const BitmapEx& rScreenshot, const OString& rScreenshotId); - void saveScreenshot(VclAbstractDialog const & rDialog); + void saveScreenshot(VclAbstractDialog const& rDialog); void saveScreenshot(weld::Window& rDialog); /// helper method to create and dump a dialog based on Builder contents. diff --git a/include/test/sheet/cellproperties.hxx b/include/test/sheet/cellproperties.hxx index 4ffd785e43c1..aa5fe0f2c162 100644 --- a/include/test/sheet/cellproperties.hxx +++ b/include/test/sheet/cellproperties.hxx @@ -14,12 +14,12 @@ #include <com/sun/star/uno/XInterface.hpp> #include <test/testdllapi.hxx> -namespace apitest { - +namespace apitest +{ class OOO_DLLPUBLIC_TEST CellProperties { public: - virtual css::uno::Reference < css::uno::XInterface > init() = 0; + virtual css::uno::Reference<css::uno::XInterface> init() = 0; void testVertJustify(); void testRotateReference(); @@ -27,7 +27,6 @@ public: protected: ~CellProperties() {} }; - } #endif // INCLUDED_TEST_SHEET_CELLPROPERTIES_HXX diff --git a/include/test/sheet/databaserange.hxx b/include/test/sheet/databaserange.hxx index 3932fb41b1b0..9aca2f5eb390 100644 --- a/include/test/sheet/databaserange.hxx +++ b/include/test/sheet/databaserange.hxx @@ -14,12 +14,12 @@ #include <com/sun/star/uno/Reference.hxx> #include <test/testdllapi.hxx> -namespace apitest { - +namespace apitest +{ class OOO_DLLPUBLIC_TEST DatabaseRange { public: - virtual css::uno::Reference< css::uno::XInterface > init(const OUString& rDBName) = 0; + virtual css::uno::Reference<css::uno::XInterface> init(const OUString& rDBName) = 0; void testMoveCells(); void testKeepFormats(); @@ -36,7 +36,6 @@ public: protected: ~DatabaseRange() {} }; - } #endif // INCLUDED_TEST_SHEET_DATABASERANGE_HXX diff --git a/include/test/sheet/datapilotfield.hxx b/include/test/sheet/datapilotfield.hxx index b1eda76c2450..28e73d7a2081 100644 --- a/include/test/sheet/datapilotfield.hxx +++ b/include/test/sheet/datapilotfield.hxx @@ -13,12 +13,12 @@ #include <com/sun/star/uno/Reference.hxx> #include <test/testdllapi.hxx> -namespace apitest { - +namespace apitest +{ class OOO_DLLPUBLIC_TEST DataPilotField { public: - virtual css::uno::Reference< css::uno::XInterface > init() = 0; + virtual css::uno::Reference<css::uno::XInterface> init() = 0; void testSortInfo(); void testLayoutInfo(); @@ -29,7 +29,6 @@ public: protected: ~DataPilotField() {} }; - } #endif // INCLUDED_TEST_SHEET_DATAPILOTFIELD_HXX diff --git a/include/test/sheet/datapilotitem.hxx b/include/test/sheet/datapilotitem.hxx index 1c05078352a6..bf711d3babfd 100644 --- a/include/test/sheet/datapilotitem.hxx +++ b/include/test/sheet/datapilotitem.hxx @@ -14,19 +14,18 @@ #include <com/sun/star/uno/Reference.hxx> #include <test/testdllapi.hxx> -namespace apitest { - +namespace apitest +{ class OOO_DLLPUBLIC_TEST DataPilotItem { public: - virtual css::uno::Reference< css::uno::XInterface > init() = 0; + virtual css::uno::Reference<css::uno::XInterface> init() = 0; void testProperties(); protected: ~DataPilotItem() {} }; - } #endif // INCLUDED_TEST_SHEET_DATAPILOTITEM_HXX diff --git a/include/test/sheet/xarealink.hxx b/include/test/sheet/xarealink.hxx index 1f1636207f6f..15a65f249a27 100644 --- a/include/test/sheet/xarealink.hxx +++ b/include/test/sheet/xarealink.hxx @@ -14,20 +14,19 @@ #include <com/sun/star/uno/Reference.hxx> #include <test/testdllapi.hxx> -namespace apitest { - +namespace apitest +{ class OOO_DLLPUBLIC_TEST XAreaLink { public: - virtual css::uno::Reference< css::uno::XInterface > init() = 0; - virtual ~XAreaLink(){} + virtual css::uno::Reference<css::uno::XInterface> init() = 0; + virtual ~XAreaLink() {} void testGetSourceArea(); void testSetSourceArea(); void testGetDestArea(); void testSetDestArea(); }; - } #endif // INCLUDED_TEST_SHEET_XAREALINK_HXX diff --git a/include/test/sheet/xcelladdressable.hxx b/include/test/sheet/xcelladdressable.hxx index 9fcae658b2a5..506415a11a40 100644 --- a/include/test/sheet/xcelladdressable.hxx +++ b/include/test/sheet/xcelladdressable.hxx @@ -14,17 +14,16 @@ #include <com/sun/star/uno/Reference.hxx> #include <test/testdllapi.hxx> -namespace apitest { - +namespace apitest +{ class OOO_DLLPUBLIC_TEST XCellAddressable { public: - virtual css::uno::Reference< css::uno::XInterface > init() = 0; - virtual ~XCellAddressable(){} + virtual css::uno::Reference<css::uno::XInterface> init() = 0; + virtual ~XCellAddressable() {} void testGetCellAddress(); }; - } #endif // INCLUDED_TEST_SHEET_XCELLADDRESSABLE_HXX diff --git a/include/test/sheet/xcellrangedata.hxx b/include/test/sheet/xcellrangedata.hxx index 00aef5e8152c..0b6efef2e07e 100644 --- a/include/test/sheet/xcellrangedata.hxx +++ b/include/test/sheet/xcellrangedata.hxx @@ -13,13 +13,13 @@ #include <com/sun/star/uno/Reference.hxx> #include <test/testdllapi.hxx> -namespace apitest { - +namespace apitest +{ class OOO_DLLPUBLIC_TEST XCellRangeData { public: - virtual css::uno::Reference< css::uno::XInterface > init() = 0; - virtual css::uno::Reference< css::uno::XInterface > getXCellRangeData() = 0; + virtual css::uno::Reference<css::uno::XInterface> init() = 0; + virtual css::uno::Reference<css::uno::XInterface> getXCellRangeData() = 0; void testGetDataArray(); void testSetDataArray(); @@ -29,7 +29,6 @@ public: protected: ~XCellRangeData() {} }; - } #endif // INCLUDED_TEST_SHEET_XCELLRANGEDATA_HXX diff --git a/include/test/sheet/xcellrangereferrer.hxx b/include/test/sheet/xcellrangereferrer.hxx index 949f6b12eb7e..a2a659d17d13 100644 --- a/include/test/sheet/xcellrangereferrer.hxx +++ b/include/test/sheet/xcellrangereferrer.hxx @@ -16,15 +16,15 @@ #include <test/testdllapi.hxx> -namespace apitest { - +namespace apitest +{ class OOO_DLLPUBLIC_TEST XCellRangeReferrer { public: - virtual css::uno::Reference< css::uno::XInterface > init() = 0; + virtual css::uno::Reference<css::uno::XInterface> init() = 0; void setCellRange(css::table::CellRangeAddress aCellRange) { m_aCellRange = aCellRange; } - const css::table::CellRangeAddress & getCellRange() const { return m_aCellRange; } + const css::table::CellRangeAddress& getCellRange() const { return m_aCellRange; } void testGetReferredCells(); protected: @@ -33,7 +33,6 @@ protected: private: css::table::CellRangeAddress m_aCellRange; }; - } #endif // INCLUDED_TEST_SHEET_XCELLRANGEREFERRER_HXX diff --git a/include/test/sheet/xcellrangesquery.hxx b/include/test/sheet/xcellrangesquery.hxx index 4d3cdcf1c6ec..ba275295a07a 100644 --- a/include/test/sheet/xcellrangesquery.hxx +++ b/include/test/sheet/xcellrangesquery.hxx @@ -13,12 +13,12 @@ #include <com/sun/star/uno/XInterface.hpp> #include <test/testdllapi.hxx> -namespace apitest { - +namespace apitest +{ class OOO_DLLPUBLIC_TEST XCellRangesQuery { public: - virtual css::uno::Reference< css::uno::XInterface > init() = 0; + virtual css::uno::Reference<css::uno::XInterface> init() = 0; //Testcases void testQueryColumnDifference(); @@ -32,7 +32,6 @@ public: protected: ~XCellRangesQuery() {} }; - } #endif // INCLUDED_TEST_SHEET_XCELLRANGESQUERY_HXX diff --git a/include/test/sheet/xdatabaserange.hxx b/include/test/sheet/xdatabaserange.hxx index 09f640935e4d..388b89d9abfd 100644 --- a/include/test/sheet/xdatabaserange.hxx +++ b/include/test/sheet/xdatabaserange.hxx @@ -14,12 +14,12 @@ #include <com/sun/star/uno/Reference.hxx> #include <test/testdllapi.hxx> -namespace apitest { - +namespace apitest +{ class OOO_DLLPUBLIC_TEST XDatabaseRange { public: - virtual css::uno::Reference< css::uno::XInterface > init(const OUString& rDBName) = 0; + virtual css::uno::Reference<css::uno::XInterface> init(const OUString& rDBName) = 0; void testDataArea(); void testGetSortDescriptor(); @@ -31,7 +31,6 @@ public: protected: ~XDatabaseRange() {} }; - } #endif // INCLUDED_TEST_SHEET_XDATABASERANGE_HXX diff --git a/include/test/sheet/xgoalseek.hxx b/include/test/sheet/xgoalseek.hxx index cb984f20fb66..08eeae92acd0 100644 --- a/include/test/sheet/xgoalseek.hxx +++ b/include/test/sheet/xgoalseek.hxx @@ -13,19 +13,18 @@ #include <com/sun/star/uno/Reference.hxx> #include <test/testdllapi.hxx> -namespace apitest { - +namespace apitest +{ class OOO_DLLPUBLIC_TEST XGoalSeek { public: - virtual css::uno::Reference< css::uno::XInterface > init() = 0; + virtual css::uno::Reference<css::uno::XInterface> init() = 0; void testSeekGoal(); protected: virtual ~XGoalSeek() {} }; - } #endif // INCLUDED_TEST_SHEET_XGOALSEEK_HXX diff --git a/include/test/sheet/xnamedrange.hxx b/include/test/sheet/xnamedrange.hxx index 180c82727b9f..f088bf2abf66 100644 --- a/include/test/sheet/xnamedrange.hxx +++ b/include/test/sheet/xnamedrange.hxx @@ -14,12 +14,12 @@ #include <com/sun/star/sheet/XNamedRange.hpp> #include <test/testdllapi.hxx> -namespace apitest { - +namespace apitest +{ class OOO_DLLPUBLIC_TEST XNamedRange { public: - virtual css::uno::Reference< css::uno::XInterface > init() = 0; + virtual css::uno::Reference<css::uno::XInterface> init() = 0; // XNamedRange void testGetContent(); @@ -32,9 +32,8 @@ public: protected: ~XNamedRange() {} - virtual css::uno::Reference< css::sheet::XNamedRange> getNamedRange(const OUString&) = 0; + virtual css::uno::Reference<css::sheet::XNamedRange> getNamedRange(const OUString&) = 0; }; - } #endif // INCLUDED_TEST_SHEET_XNAMEDRANGE_HXX diff --git a/include/test/sheet/xsheetannotation.hxx b/include/test/sheet/xsheetannotation.hxx index c12106209f8b..0003d8b119a3 100644 --- a/include/test/sheet/xsheetannotation.hxx +++ b/include/test/sheet/xsheetannotation.hxx @@ -15,12 +15,12 @@ #include <com/sun/star/table/CellAddress.hpp> -namespace apitest { - +namespace apitest +{ class OOO_DLLPUBLIC_TEST XSheetAnnotation { public: - virtual css::uno::Reference< css::uno::XInterface > init() = 0; + virtual css::uno::Reference<css::uno::XInterface> init() = 0; // XSheetAnnotation void testGetPosition(); @@ -32,9 +32,9 @@ public: protected: ~XSheetAnnotation() {} - virtual css::uno::Reference< css::sheet::XSheetAnnotation> getAnnotation(css::table::CellAddress&) = 0; + virtual css::uno::Reference<css::sheet::XSheetAnnotation> + getAnnotation(css::table::CellAddress&) = 0; }; - } #endif // INCLUDED_TEST_SHEET_XSHEETANNOTATION_HXX diff --git a/include/test/sheet/xsheetlinkable.hxx b/include/test/sheet/xsheetlinkable.hxx index 08cfd9642ba0..fc239fb7b75c 100644 --- a/include/test/sheet/xsheetlinkable.hxx +++ b/include/test/sheet/xsheetlinkable.hxx @@ -10,26 +10,24 @@ #ifndef INCLUDED_TEST_SHEET_XSHEETLINKABLE_HXX #define INCLUDED_TEST_SHEET_XSHEETLINKABLE_HXX - #include <com/sun/star/uno/XInterface.hpp> #include <com/sun/star/uno/Reference.hxx> #include <test/testdllapi.hxx> -namespace apitest { - +namespace apitest +{ class OOO_DLLPUBLIC_TEST XSheetLinkable { public: - virtual css::uno::Reference< css::uno::XInterface > init() =0; - virtual OUString getFileURL() =0; + virtual css::uno::Reference<css::uno::XInterface> init() = 0; + virtual OUString getFileURL() = 0; void testSheetLinkable(); protected: ~XSheetLinkable() {} }; - } #endif // INCLUDED_TEST_SHEET_XSHEETLINKABLE_HXX diff --git a/include/test/sheet/xsheetoperation.hxx b/include/test/sheet/xsheetoperation.hxx index ab03d2d451d0..ea436ce38b6e 100644 --- a/include/test/sheet/xsheetoperation.hxx +++ b/include/test/sheet/xsheetoperation.hxx @@ -10,18 +10,17 @@ #ifndef INCLUDED_TEST_SHEET_XSHEETOPERATION_HXX #define INCLUDED_TEST_SHEET_XSHEETOPERATION_HXX - #include <com/sun/star/uno/XInterface.hpp> #include <com/sun/star/uno/Reference.hxx> #include <test/testdllapi.hxx> -namespace apitest { - +namespace apitest +{ class OOO_DLLPUBLIC_TEST XSheetOperation { public: - virtual css::uno::Reference< css::uno::XInterface > init() = 0; + virtual css::uno::Reference<css::uno::XInterface> init() = 0; void testComputeFunction(); void testClearContents(); @@ -29,7 +28,6 @@ public: protected: ~XSheetOperation() {} }; - } #endif // INCLUDED_TEST_SHEET_XSHEETOPERATION_HXX diff --git a/include/test/sheet/xsheetoutline.hxx b/include/test/sheet/xsheetoutline.hxx index f477b188257d..0210e6214742 100644 --- a/include/test/sheet/xsheetoutline.hxx +++ b/include/test/sheet/xsheetoutline.hxx @@ -13,12 +13,12 @@ #include <com/sun/star/uno/Reference.hxx> #include <test/testdllapi.hxx> -namespace apitest { - +namespace apitest +{ class OOO_DLLPUBLIC_TEST XSheetOutline { public: - virtual css::uno::Reference< css::uno::XInterface > init() = 0; + virtual css::uno::Reference<css::uno::XInterface> init() = 0; // XSheetOutline void testHideDetail(); @@ -31,7 +31,6 @@ public: protected: ~XSheetOutline() {} }; - } #endif // INCLUDED_TEST_SHEET_XSHEETOUTLINE_HXX diff --git a/include/test/sheet/xsheetpagebreak.hxx b/include/test/sheet/xsheetpagebreak.hxx index be8b2ff0a072..e7a47628d0d6 100644 --- a/include/test/sheet/xsheetpagebreak.hxx +++ b/include/test/sheet/xsheetpagebreak.hxx @@ -13,12 +13,12 @@ #include <com/sun/star/uno/Reference.hxx> #include <test/testdllapi.hxx> -namespace apitest { - +namespace apitest +{ class OOO_DLLPUBLIC_TEST XSheetPageBreak { public: - virtual css::uno::Reference< css::uno::XInterface > init() = 0; + virtual css::uno::Reference<css::uno::XInterface> init() = 0; void testGetColumnPageBreaks(); void testGetRowPageBreaks(); @@ -27,7 +27,6 @@ public: protected: ~XSheetPageBreak() {} }; - } #endif // INCLUDED_TEST_SHEET_XSHEETPAGEBREAK_HXX diff --git a/include/test/sheet/xspreadsheet.hxx b/include/test/sheet/xspreadsheet.hxx index 13604921a5fb..8033b8e55292 100644 --- a/include/test/sheet/xspreadsheet.hxx +++ b/include/test/sheet/xspreadsheet.hxx @@ -14,20 +14,19 @@ #include <com/sun/star/uno/XInterface.hpp> #include <com/sun/star/uno/Reference.hxx> -namespace apitest { - +namespace apitest +{ class OOO_DLLPUBLIC_TEST XSpreadsheet { public: - virtual css::uno::Reference< css::uno::XInterface > init() = 0; + virtual css::uno::Reference<css::uno::XInterface> init() = 0; void testCreateCursor(); void testCreateCursorByRange(); protected: - ~XSpreadsheet(){} + ~XSpreadsheet() {} }; - } #endif // INCLUDED_TEST_SHEET_XSPREADSHEET_HXX diff --git a/include/test/sheet/xspreadsheets.hxx b/include/test/sheet/xspreadsheets.hxx index 40c4b2f5a03f..2ec471db6479 100644 --- a/include/test/sheet/xspreadsheets.hxx +++ b/include/test/sheet/xspreadsheets.hxx @@ -14,20 +14,19 @@ #include <com/sun/star/uno/XInterface.hpp> #include <com/sun/star/uno/Reference.hxx> -namespace apitest { - +namespace apitest +{ class OOO_DLLPUBLIC_TEST XSpreadsheets { public: - virtual css::uno::Reference< css::uno::XInterface > init() = 0; - virtual ~XSpreadsheets(){} + virtual css::uno::Reference<css::uno::XInterface> init() = 0; + virtual ~XSpreadsheets() {} void testInsertNewByName(); void testInsertNewByNameBadName(); void testMoveByName(); void testCopyByName(); }; - } #endif // INCLUDED_TEST_SHEET_XSPREADSHEETS_HXX diff --git a/include/test/sheet/xsubtotalcalculatable.hxx b/include/test/sheet/xsubtotalcalculatable.hxx index 11f822b6b15f..2160816d3ac8 100644 --- a/include/test/sheet/xsubtotalcalculatable.hxx +++ b/include/test/sheet/xsubtotalcalculatable.hxx @@ -14,13 +14,13 @@ #include <com/sun/star/uno/XInterface.hpp> #include <test/testdllapi.hxx> -namespace apitest { - +namespace apitest +{ class OOO_DLLPUBLIC_TEST XSubTotalCalculatable { public: - virtual css::uno::Reference< css::uno::XInterface > init() = 0; - virtual css::uno::Reference< css::uno::XInterface > getXSpreadsheet() = 0; + virtual css::uno::Reference<css::uno::XInterface> init() = 0; + virtual css::uno::Reference<css::uno::XInterface> getXSpreadsheet() = 0; void testCreateSubTotalDescriptor(); void testApplyRemoveSubTotals(); @@ -28,7 +28,6 @@ public: protected: ~XSubTotalCalculatable() {} }; - } #endif // INCLUDED_TEST_SHEET_XSUBTOTALCALCULATABLE_HXX diff --git a/include/test/sheet/xsubtotaldescriptor.hxx b/include/test/sheet/xsubtotaldescriptor.hxx index 9ca44718cf24..dc570c1819ba 100644 --- a/include/test/sheet/xsubtotaldescriptor.hxx +++ b/include/test/sheet/xsubtotaldescriptor.hxx @@ -14,12 +14,12 @@ #include <com/sun/star/uno/XInterface.hpp> #include <test/testdllapi.hxx> -namespace apitest { - +namespace apitest +{ class OOO_DLLPUBLIC_TEST XSubTotalDescriptor { public: - virtual css::uno::Reference< css::uno::XInterface > init() = 0; + virtual css::uno::Reference<css::uno::XInterface> init() = 0; void testAddNew(); void testClear(); @@ -27,7 +27,6 @@ public: protected: ~XSubTotalDescriptor() {} }; - } #endif // INCLUDED_TEST_SHEET_XSUBTOTALDESCRIPTOR_HXX diff --git a/include/test/sheet/xsubtotalfield.hxx b/include/test/sheet/xsubtotalfield.hxx index c32af101aae9..c5925ee6c70e 100644 --- a/include/test/sheet/xsubtotalfield.hxx +++ b/include/test/sheet/xsubtotalfield.hxx @@ -14,12 +14,12 @@ #include <com/sun/star/uno/XInterface.hpp> #include <test/testdllapi.hxx> -namespace apitest { - +namespace apitest +{ class OOO_DLLPUBLIC_TEST XSubTotalField { public: - virtual css::uno::Reference< css::uno::XInterface > init() = 0; + virtual css::uno::Reference<css::uno::XInterface> init() = 0; void testGetSetGroupColumn(); void testGetSetTotalColumns(); @@ -27,7 +27,6 @@ public: protected: ~XSubTotalField() {} }; - } #endif // INCLUDED_TEST_SHEET_XSUBTOTALFIELD_HXX diff --git a/include/test/sheet/xusedareacursor.hxx b/include/test/sheet/xusedareacursor.hxx index fddd2002a8dc..95b4fe402574 100644 --- a/include/test/sheet/xusedareacursor.hxx +++ b/include/test/sheet/xusedareacursor.hxx @@ -14,19 +14,18 @@ #include <com/sun/star/uno/Reference.hxx> #include <test/testdllapi.hxx> -namespace apitest { - +namespace apitest +{ class OOO_DLLPUBLIC_TEST XUsedAreaCursor { public: - virtual css::uno::Reference< css::uno::XInterface > init() = 0; - virtual css::uno::Reference< css::uno::XInterface > getXSpreadsheet() = 0; - virtual ~XUsedAreaCursor(){} + virtual css::uno::Reference<css::uno::XInterface> init() = 0; + virtual css::uno::Reference<css::uno::XInterface> getXSpreadsheet() = 0; + virtual ~XUsedAreaCursor() {} void testGotoStartOfUsedArea(); void testGotoEndOfUsedArea(); }; - } #endif // INCLUDED_TEST_SHEET_XUSEDAREACURSOR_HXX diff --git a/include/test/sheet/xviewfreezable.hxx b/include/test/sheet/xviewfreezable.hxx index 1da565f70dd4..642e2eaf03e1 100644 --- a/include/test/sheet/xviewfreezable.hxx +++ b/include/test/sheet/xviewfreezable.hxx @@ -14,17 +14,16 @@ #include <com/sun/star/uno/Reference.hxx> #include <test/testdllapi.hxx> -namespace apitest { - +namespace apitest +{ class OOO_DLLPUBLIC_TEST XViewFreezable { public: - virtual css::uno::Reference< css::uno::XInterface > init() = 0; - virtual ~XViewFreezable(){} + virtual css::uno::Reference<css::uno::XInterface> init() = 0; + virtual ~XViewFreezable() {} void testFreeze(); }; - } #endif // INCLUDED_TEST_SHEET_XVIEWFREEZABLE_HXX diff --git a/include/test/sheet/xviewpane.hxx b/include/test/sheet/xviewpane.hxx index 12ab794ecf07..ba0689bd24d9 100644 --- a/include/test/sheet/xviewpane.hxx +++ b/include/test/sheet/xviewpane.hxx @@ -14,12 +14,12 @@ #include <com/sun/star/uno/XInterface.hpp> #include <test/testdllapi.hxx> -namespace apitest { - +namespace apitest +{ class OOO_DLLPUBLIC_TEST XViewPane { public: - virtual css::uno::Reference< css::uno::XInterface > init() = 0; + virtual css::uno::Reference<css::uno::XInterface> init() = 0; void testFirstVisibleColumn(); void testFirstVisibleRow(); @@ -27,9 +27,7 @@ public: protected: virtual ~XViewPane() {} - }; - } #endif // INCLUDED_TEST_SHEET_XVIEWPANE_HXX diff --git a/include/test/text/xtext.hxx b/include/test/text/xtext.hxx index d5c0801f7c31..537cfa21dae7 100644 --- a/include/test/text/xtext.hxx +++ b/include/test/text/xtext.hxx @@ -14,8 +14,8 @@ #include <com/sun/star/text/XTextContent.hpp> -namespace apitest { - +namespace apitest +{ class OOO_DLLPUBLIC_TEST XText { public: @@ -26,7 +26,6 @@ public: void testInsertRemoveTextContent(); }; - } #endif diff --git a/include/test/unoapi_test.hxx b/include/test/unoapi_test.hxx index 32c20997808f..b4a09b4a28cd 100644 --- a/include/test/unoapi_test.hxx +++ b/include/test/unoapi_test.hxx @@ -28,8 +28,7 @@ public: virtual void setUp() override; protected: - void closeDocument( css::uno::Reference< css::lang::XComponent > const & xDocument ); - + void closeDocument(css::uno::Reference<css::lang::XComponent> const& xDocument); private: OUString m_aBaseString; diff --git a/include/toolkit/helper/emptyfontdescriptor.hxx b/include/toolkit/helper/emptyfontdescriptor.hxx index ffd6f65b681d..77ac9a1d18f5 100644 --- a/include/toolkit/helper/emptyfontdescriptor.hxx +++ b/include/toolkit/helper/emptyfontdescriptor.hxx @@ -24,8 +24,6 @@ #include <com/sun/star/awt/FontUnderline.hpp> #include <com/sun/star/awt/FontStrikeout.hpp> - - class EmptyFontDescriptor : public css::awt::FontDescriptor { public: diff --git a/include/toolkit/helper/mutexhelper.hxx b/include/toolkit/helper/mutexhelper.hxx index 7c11d9b798e5..80c6c7303e67 100644 --- a/include/toolkit/helper/mutexhelper.hxx +++ b/include/toolkit/helper/mutexhelper.hxx @@ -22,9 +22,6 @@ #include <osl/mutex.hxx> - - - class MutexHelper { private: @@ -32,10 +29,8 @@ private: public: ::osl::Mutex& GetMutex() { return maMutex; } - }; - #endif // INCLUDED_TOOLKIT_HELPER_MUTEXHELPER_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/tools/contnr.hxx b/include/tools/contnr.hxx index 716cbf242bd1..3ff08c9688a1 100644 --- a/include/tools/contnr.hxx +++ b/include/tools/contnr.hxx @@ -21,8 +21,8 @@ #include <limits.h> -#define TREELIST_APPEND (ULONG_MAX) -#define TREELIST_ENTRY_NOTFOUND (ULONG_MAX) +#define TREELIST_APPEND (ULONG_MAX) +#define TREELIST_ENTRY_NOTFOUND (ULONG_MAX) #endif diff --git a/include/tools/datetimeutils.hxx b/include/tools/datetimeutils.hxx index 28766ee8a968..3df6229cb574 100644 --- a/include/tools/datetimeutils.hxx +++ b/include/tools/datetimeutils.hxx @@ -13,13 +13,13 @@ #include <tools/datetime.hxx> // This function converts a 'DateTime' object to an 'OString' object -TOOLS_DLLPUBLIC OString DateTimeToOString( const DateTime& rDateTime ); +TOOLS_DLLPUBLIC OString DateTimeToOString(const DateTime& rDateTime); // This function converts a 'Date' object to an 'OString' object in ISO-8601 representation -TOOLS_DLLPUBLIC OString DateToOString( const Date& rDate ); +TOOLS_DLLPUBLIC OString DateToOString(const Date& rDate); // This function converts a 'Date' object to an 'OString' object in DD/MM/YYYY format -TOOLS_DLLPUBLIC OString DateToDDMMYYYYOString( const Date& rDate ); +TOOLS_DLLPUBLIC OString DateToDDMMYYYYOString(const Date& rDate); #endif diff --git a/include/tools/extendapplicationenvironment.hxx b/include/tools/extendapplicationenvironment.hxx index 9a610a0b811e..0ca8ceca42d1 100644 --- a/include/tools/extendapplicationenvironment.hxx +++ b/include/tools/extendapplicationenvironment.hxx @@ -22,12 +22,11 @@ #include <sal/config.h> #include <tools/toolsdllapi.h> -namespace tools { - +namespace tools +{ // Extend the environment of the process in a platform specific way as necessary // for OOo-related applications; must be called first thing in main: TOOLS_DLLPUBLIC void extendApplicationEnvironment(); - } #endif diff --git a/include/tools/pathutils.hxx b/include/tools/pathutils.hxx index 3fa5cc0d1e9d..045ec4b96bbe 100644 --- a/include/tools/pathutils.hxx +++ b/include/tools/pathutils.hxx @@ -29,15 +29,15 @@ // The compiled code is not part of the tl dynamic library, but is delivered as // pathutils-obj and pathutils-slo objects (it is linked into special // executables and dynamic libraries that do not link against OOo libraries): -namespace tools { - +namespace tools +{ /** Determine the filename part of a path. @param path A non-NULL pointer to a null-terminated path. @return A pointer to the trailing filename part of the given path. */ -WCHAR * filename(WCHAR * path); +WCHAR* filename(WCHAR* path); /** Concatenate two paths. @@ -62,10 +62,8 @@ WCHAR * filename(WCHAR * path); A pointer to the terminating null character of the concatenation, or NULL if a failure occurred. */ -WCHAR * buildPath( - WCHAR * path, WCHAR const * frontBegin, WCHAR const * frontEnd, - WCHAR const * backBegin, std::size_t backLength); - +WCHAR* buildPath(WCHAR* path, WCHAR const* frontBegin, WCHAR const* frontEnd, + WCHAR const* backBegin, std::size_t backLength); } #endif diff --git a/include/tools/svlibrary.h b/include/tools/svlibrary.h index 2a46d8c88412..df3f7203140c 100644 --- a/include/tools/svlibrary.h +++ b/include/tools/svlibrary.h @@ -8,7 +8,7 @@ */ #ifndef SVLIBRARY -#define SVLIBRARY( Base ) SAL_MODULENAME( Base "lo" ) +#define SVLIBRARY(Base) SAL_MODULENAME(Base "lo") #include <osl/module.h> #endif diff --git a/include/tools/tenccvt.hxx b/include/tools/tenccvt.hxx index 4d1cdcff3177..1893c735518e 100644 --- a/include/tools/tenccvt.hxx +++ b/include/tools/tenccvt.hxx @@ -27,20 +27,20 @@ /// return an encoding which has more defined Characters as the given /// encoding, but have the same definition for the defined characters /// e.g.: windows-1252 for iso-8859-1 or windows-1254 for iso-8859-9 -TOOLS_DLLPUBLIC rtl_TextEncoding GetExtendedCompatibilityTextEncoding( rtl_TextEncoding eEncoding ); +TOOLS_DLLPUBLIC rtl_TextEncoding GetExtendedCompatibilityTextEncoding(rtl_TextEncoding eEncoding); /// return an encoding which has more defined Characters as the given /// encoding. The encodings could be different. /// e.g.: windows-1251 for iso-8859-5 -TOOLS_DLLPUBLIC rtl_TextEncoding GetExtendedTextEncoding( rtl_TextEncoding eEncoding ); +TOOLS_DLLPUBLIC rtl_TextEncoding GetExtendedTextEncoding(rtl_TextEncoding eEncoding); /// if the given encoding is an multi-byte encoding (which allows more than /// one byte per char, e.g. UTF-8 or Shift-JIS), a one-byte encoding /// is returned (normally windows-1252). -rtl_TextEncoding GetOneByteTextEncoding( rtl_TextEncoding eEncoding ); +rtl_TextEncoding GetOneByteTextEncoding(rtl_TextEncoding eEncoding); -TOOLS_DLLPUBLIC rtl_TextEncoding GetSOLoadTextEncoding( rtl_TextEncoding eEncoding ); -TOOLS_DLLPUBLIC rtl_TextEncoding GetSOStoreTextEncoding( rtl_TextEncoding eEncoding ); +TOOLS_DLLPUBLIC rtl_TextEncoding GetSOLoadTextEncoding(rtl_TextEncoding eEncoding); +TOOLS_DLLPUBLIC rtl_TextEncoding GetSOStoreTextEncoding(rtl_TextEncoding eEncoding); /** * Given a Unicode character, return a legacy Microsoft Encoding which diff --git a/include/tools/toolsdllapi.h b/include/tools/toolsdllapi.h index 6c13b6f4024c..0ee778e6f086 100644 --- a/include/tools/toolsdllapi.h +++ b/include/tools/toolsdllapi.h @@ -23,9 +23,9 @@ #include <sal/types.h> #if defined(TOOLS_DLLIMPLEMENTATION) -#define TOOLS_DLLPUBLIC SAL_DLLPUBLIC_EXPORT +#define TOOLS_DLLPUBLIC SAL_DLLPUBLIC_EXPORT #else -#define TOOLS_DLLPUBLIC SAL_DLLPUBLIC_IMPORT +#define TOOLS_DLLPUBLIC SAL_DLLPUBLIC_IMPORT #endif #define TOOLS_DLLPRIVATE SAL_DLLPRIVATE diff --git a/include/typelib/typeclass.h b/include/typelib/typeclass.h index 2da05b143645..f2091c13ae9c 100644 --- a/include/typelib/typeclass.h +++ b/include/typelib/typeclass.h @@ -23,8 +23,7 @@ /** This type class enum is binary compatible with the IDL enum com.sun.star.uno.TypeClass. */ -typedef enum _typelib_TypeClass -{ +typedef enum _typelib_TypeClass { /** type class of void */ typelib_TypeClass_VOID = 0, /** type class of char */ diff --git a/include/typelib/uik.h b/include/typelib/uik.h index 4c077ffeba65..e1cde78f6219 100644 --- a/include/typelib/uik.h +++ b/include/typelib/uik.h @@ -21,7 +21,7 @@ #include "sal/types.h" -#if defined( _WIN32) +#if defined(_WIN32) #pragma pack(push, 8) #endif @@ -31,15 +31,15 @@ */ typedef struct _typelib_Uik { - sal_uInt32 m_Data1; - sal_uInt16 m_Data2; - sal_uInt16 m_Data3; - sal_uInt32 m_Data4; - sal_uInt32 m_Data5; + sal_uInt32 m_Data1; + sal_uInt16 m_Data2; + sal_uInt16 m_Data3; + sal_uInt32 m_Data4; + sal_uInt32 m_Data5; } typelib_Uik; -#if defined( _WIN32) -# pragma pack(pop) +#if defined(_WIN32) +#pragma pack(pop) #endif #endif diff --git a/include/ucbhelper/activedatasink.hxx b/include/ucbhelper/activedatasink.hxx index c71066421e2e..391be2c91d4a 100644 --- a/include/ucbhelper/activedatasink.hxx +++ b/include/ucbhelper/activedatasink.hxx @@ -27,9 +27,11 @@ namespace ucbhelper { - // workaround for incremental linking bugs in MSVC2015 -class SAL_DLLPUBLIC_TEMPLATE ActiveDataSink_Base : public cppu::WeakImplHelper< css::io::XActiveDataSink > {}; +class SAL_DLLPUBLIC_TEMPLATE ActiveDataSink_Base + : public cppu::WeakImplHelper<css::io::XActiveDataSink> +{ +}; /** * This class implements the interface css::io::XActiveDataSink. @@ -38,13 +40,14 @@ class SAL_DLLPUBLIC_TEMPLATE ActiveDataSink_Base : public cppu::WeakImplHelper< */ class UNLESS_MERGELIBS(UCBHELPER_DLLPUBLIC) ActiveDataSink final : public ActiveDataSink_Base { - css::uno::Reference< css::io::XInputStream > m_xStream; + css::uno::Reference<css::io::XInputStream> m_xStream; public: // XActiveDataSink methods. - virtual void SAL_CALL setInputStream( const css::uno::Reference< css::io::XInputStream >& aStream ) override; + virtual void SAL_CALL + setInputStream(const css::uno::Reference<css::io::XInputStream>& aStream) override; - virtual css::uno::Reference< css::io::XInputStream > SAL_CALL getInputStream() override; + virtual css::uno::Reference<css::io::XInputStream> SAL_CALL getInputStream() override; }; } /* namespace ucbhelper */ diff --git a/include/ucbhelper/commandenvironment.hxx b/include/ucbhelper/commandenvironment.hxx index a09d70e5a9e7..efdc9ea66908 100644 --- a/include/ucbhelper/commandenvironment.hxx +++ b/include/ucbhelper/commandenvironment.hxx @@ -30,7 +30,10 @@ namespace ucbhelper struct CommandEnvironment_Impl; // workaround for incremental linking bugs in MSVC2015 -class SAL_DLLPUBLIC_TEMPLATE CommandEnvironment_Base : public cppu::WeakImplHelper< css::ucb::XCommandEnvironment > {}; +class SAL_DLLPUBLIC_TEMPLATE CommandEnvironment_Base + : public cppu::WeakImplHelper<css::ucb::XCommandEnvironment> +{ +}; /** * This class implements the interface @@ -42,8 +45,8 @@ class UCBHELPER_DLLPUBLIC CommandEnvironment final : public CommandEnvironment_B std::unique_ptr<CommandEnvironment_Impl> m_pImpl; private: - CommandEnvironment( const CommandEnvironment& ) = delete; - CommandEnvironment& operator=( const CommandEnvironment& ) = delete; + CommandEnvironment(const CommandEnvironment&) = delete; + CommandEnvironment& operator=(const CommandEnvironment&) = delete; public: /** @@ -54,17 +57,19 @@ public: * @param rxProgressHandler is the implementation of a Progress * Handler or an empty reference. */ - CommandEnvironment( const css::uno::Reference< css::task::XInteractionHandler >& rxInteractionHandler, - const css::uno::Reference< css::ucb::XProgressHandler >& rxProgressHandler ); + CommandEnvironment( + const css::uno::Reference<css::task::XInteractionHandler>& rxInteractionHandler, + const css::uno::Reference<css::ucb::XProgressHandler>& rxProgressHandler); /** * Destructor. */ virtual ~CommandEnvironment() override; - // XCommandEnvironment - virtual css::uno::Reference< css::task::XInteractionHandler > SAL_CALL getInteractionHandler() override; + // XCommandEnvironment + virtual css::uno::Reference<css::task::XInteractionHandler> + SAL_CALL getInteractionHandler() override; - virtual css::uno::Reference< css::ucb::XProgressHandler > SAL_CALL getProgressHandler() override; + virtual css::uno::Reference<css::ucb::XProgressHandler> SAL_CALL getProgressHandler() override; }; } /* namespace ucbhelper */ diff --git a/include/ucbhelper/content.hxx b/include/ucbhelper/content.hxx index f382373f98b4..6f4a7b2d4316 100644 --- a/include/ucbhelper/content.hxx +++ b/include/ucbhelper/content.hxx @@ -24,42 +24,48 @@ #include <com/sun/star/uno/Sequence.h> #include <ucbhelper/ucbhelperdllapi.h> -namespace com::sun::star::beans { - class XPropertySetInfo; +namespace com::sun::star::beans +{ +class XPropertySetInfo; } -namespace com::sun::star::io { - class XActiveDataSink; - class XOutputStream; - class XInputStream; - class XStream; +namespace com::sun::star::io +{ +class XActiveDataSink; +class XOutputStream; +class XInputStream; +class XStream; } -namespace com::sun::star::sdbc { - class XResultSet; - class XRow; +namespace com::sun::star::sdbc +{ +class XResultSet; +class XRow; } -namespace com::sun::star::ucb { - class XCommandEnvironment; - class XCommandInfo; - class XContent; - class XDynamicResultSet; - class XAnyCompareFactory; - struct ContentInfo; - struct NumberedSortingInfo; +namespace com::sun::star::ucb +{ +class XCommandEnvironment; +class XCommandInfo; +class XContent; +class XDynamicResultSet; +class XAnyCompareFactory; +struct ContentInfo; +struct NumberedSortingInfo; } -namespace com::sun::star::uno { - class XComponentContext; +namespace com::sun::star::uno +{ +class XComponentContext; } -namespace com::sun::star::uno { class Any; } +namespace com::sun::star::uno +{ +class Any; +} namespace ucbhelper { - - /** * These are the possible values for the parameter eMode of method * ucbhelper::Content::createCursor. @@ -79,10 +85,9 @@ enum class InsertOperation { Copy, // copy source data Move, // move source data - Checkin // check-in source data + Checkin // check-in source data }; - class Content_Impl; /** @@ -92,13 +97,13 @@ class Content_Impl; */ class UCBHELPER_DLLPUBLIC Content final { - rtl::Reference< Content_Impl > m_xImpl; + rtl::Reference<Content_Impl> m_xImpl; /// @throws css::ucb::CommandAbortedException /// @throws css::uno::RuntimeException, /// @throws css::uno::Exception - css::uno::Any createCursorAny( const css::uno::Sequence< OUString >& rPropertyNames, - ResultSetInclude eMode ); + css::uno::Any createCursorAny(const css::uno::Sequence<OUString>& rPropertyNames, + ResultSetInclude eMode); public: /** @@ -117,9 +122,8 @@ public: * @throws css::ucb::ContentCreationException * @throws css::uno::RuntimeException */ - Content( const OUString& rURL, - const css::uno::Reference< css::ucb::XCommandEnvironment >& rEnv, - const css::uno::Reference< css::uno::XComponentContext >& rCtx ); + Content(const OUString& rURL, const css::uno::Reference<css::ucb::XCommandEnvironment>& rEnv, + const css::uno::Reference<css::uno::XComponentContext>& rCtx); /** * Constructor. * @@ -131,15 +135,15 @@ public: * @throws css::ucb::ContentCreationException * @throws css::uno::RuntimeException */ - Content( const css::uno::Reference< css::ucb::XContent >& rContent, - const css::uno::Reference< css::ucb::XCommandEnvironment >& rEnv, - const css::uno::Reference< css::uno::XComponentContext >& rCtx ); + Content(const css::uno::Reference<css::ucb::XContent>& rContent, + const css::uno::Reference<css::ucb::XCommandEnvironment>& rEnv, + const css::uno::Reference<css::uno::XComponentContext>& rCtx); /** * Copy Constructor. * * @param rContent is the content this content shall be a copy of. */ - Content( const Content& rOther ); + Content(const Content& rOther); /** * Move constructor. @@ -156,7 +160,7 @@ public: * * @param rContent is the content this content shall be a copy of. */ - Content& operator=( const Content& rOther ); + Content& operator=(const Content& rOther); /** * Move assignment operator. @@ -176,16 +180,13 @@ public: * @param rContent will be filled by this method with the content created. * @return true, if the operation was successful - false, otherwise. */ - static bool - create( const OUString& rURL, - const css::uno::Reference< css::ucb::XCommandEnvironment >& rEnv, - const css::uno::Reference< css::uno::XComponentContext >& rCtx, - Content& rContent ); - + static bool create(const OUString& rURL, + const css::uno::Reference<css::ucb::XCommandEnvironment>& rEnv, + const css::uno::Reference<css::uno::XComponentContext>& rCtx, + Content& rContent); // Direct access to UCB content. - /** * This method provides access to the "native" UCB content interface(s). * This is useful in case the convenience methods provided by this @@ -195,12 +196,10 @@ public: * * @return the XContent interface of the underlying UCB content. */ - css::uno::Reference< css::ucb::XContent > get() const; - + css::uno::Reference<css::ucb::XContent> get() const; // Object identity. - /** * This method returns the URL of the content. * @@ -208,30 +207,24 @@ public: */ const OUString& getURL() const; - // Command environment. - /** * This method returns the environment to use when executing commands. * * @return the command environment. */ - const css::uno::Reference< css::ucb::XCommandEnvironment >& - getCommandEnvironment() const; + const css::uno::Reference<css::ucb::XCommandEnvironment>& getCommandEnvironment() const; /** * This method sets a new command environment. * * @param xNewEnv is the new command environment. */ - void setCommandEnvironment( - const css::uno::Reference< css::ucb::XCommandEnvironment >& xNewEnv ); - + void setCommandEnvironment(const css::uno::Reference<css::ucb::XCommandEnvironment>& xNewEnv); // Access to supported commands/properties. - /** * This methods provides access to meta data of the commands supported * by this content. @@ -242,8 +235,7 @@ public: * @throws css::uno::RuntimeException * @throws css::uno::Exception */ - css::uno::Reference< css::ucb::XCommandInfo > - getCommands(); + css::uno::Reference<css::ucb::XCommandInfo> getCommands(); /** * This methods provides access to meta data of the properties supported * by this content. @@ -254,13 +246,10 @@ public: * @throws css::uno::RuntimeException * @throws css::uno::Exception */ - css::uno::Reference< css::beans::XPropertySetInfo > - getProperties(); - + css::uno::Reference<css::beans::XPropertySetInfo> getProperties(); // Access to property value(s). - /** * This method can be used to read a single property value. * @@ -271,8 +260,7 @@ public: * @throws css::uno::RuntimeException * @throws css::uno::Exception */ - css::uno::Any - getPropertyValue( const OUString& rPropertyName ); + css::uno::Any getPropertyValue(const OUString& rPropertyName); /** * This method can be used to set a single property value. * @@ -300,9 +288,7 @@ public: * @throws css::uno::RuntimeException * @throws css::uno::Exception */ - css::uno::Any - setPropertyValue( const OUString& rPropertyName, - const css::uno::Any& rValue ); + css::uno::Any setPropertyValue(const OUString& rPropertyName, const css::uno::Any& rValue); /** * This method can be used to read multiple property values. * @@ -313,8 +299,8 @@ public: * @throws css::uno::RuntimeException * @throws css::uno::Exception */ - css::uno::Sequence< css::uno::Any > - getPropertyValues( const css::uno::Sequence< OUString >& rPropertyNames ); + css::uno::Sequence<css::uno::Any> + getPropertyValues(const css::uno::Sequence<OUString>& rPropertyNames); /** * This method can be used to read multiple property values. * @@ -325,8 +311,8 @@ public: * @throws css::uno::RuntimeException * @throws css::uno::Exception */ - css::uno::Reference< css::sdbc::XRow > - getPropertyValuesInterface( const css::uno::Sequence< OUString >& rPropertyNames ); + css::uno::Reference<css::sdbc::XRow> + getPropertyValuesInterface(const css::uno::Sequence<OUString>& rPropertyNames); /** * This method can be used to set multiple property values. @@ -361,14 +347,12 @@ public: * @throws css::uno::RuntimeException * @throws css::uno::Exception */ - css::uno::Sequence< css::uno::Any > - setPropertyValues( const css::uno::Sequence< OUString >& rPropertyNames, - const css::uno::Sequence< css::uno::Any >& rValues ); - + css::uno::Sequence<css::uno::Any> + setPropertyValues(const css::uno::Sequence<OUString>& rPropertyNames, + const css::uno::Sequence<css::uno::Any>& rValues); // General command execution. - /** * This method can be used to execute any command supported by the * content. @@ -382,14 +366,11 @@ public: * @throws css::uno::RuntimeException * @throws css::uno::Exception */ - css::uno::Any - executeCommand( const OUString& rCommandName, - const css::uno::Any& rCommandArgument ); - + css::uno::Any executeCommand(const OUString& rCommandName, + const css::uno::Any& rCommandArgument); // Special commands. - /** * This methods gives access to the children of a folder content. * Additionally, the result set returned provides efficient access to @@ -408,9 +389,9 @@ public: * @throws css::uno::RuntimeException * @throws css::uno::Exception */ - css::uno::Reference< css::sdbc::XResultSet > - createCursor( const css::uno::Sequence< OUString >& rPropertyNames, - ResultSetInclude eMode = INCLUDE_FOLDERS_AND_DOCUMENTS ); + css::uno::Reference<css::sdbc::XResultSet> + createCursor(const css::uno::Sequence<OUString>& rPropertyNames, + ResultSetInclude eMode = INCLUDE_FOLDERS_AND_DOCUMENTS); /** * This methods gives access to the children of a folder content. * Additionally, the result set returned provides efficient access to @@ -429,18 +410,18 @@ public: * @throws css::uno::RuntimeException * @throws css::uno::Exception */ - css::uno::Reference< css::ucb::XDynamicResultSet > - createDynamicCursor( const css::uno::Sequence< OUString >& rPropertyNames, - ResultSetInclude eMode = INCLUDE_FOLDERS_AND_DOCUMENTS ); + css::uno::Reference<css::ucb::XDynamicResultSet> + createDynamicCursor(const css::uno::Sequence<OUString>& rPropertyNames, + ResultSetInclude eMode = INCLUDE_FOLDERS_AND_DOCUMENTS); /// @throws css::ucb::CommandAbortedException /// @throws css::uno::RuntimeException /// @throws css::uno::Exception - css::uno::Reference< css::sdbc::XResultSet > - createSortedCursor( const css::uno::Sequence< OUString >& rPropertyNames, - const css::uno::Sequence< css::ucb::NumberedSortingInfo >& rSortInfo, - const css::uno::Reference< css::ucb::XAnyCompareFactory >& rAnyCompareFactory, - ResultSetInclude eMode = INCLUDE_FOLDERS_AND_DOCUMENTS ); + css::uno::Reference<css::sdbc::XResultSet> + createSortedCursor(const css::uno::Sequence<OUString>& rPropertyNames, + const css::uno::Sequence<css::ucb::NumberedSortingInfo>& rSortInfo, + const css::uno::Reference<css::ucb::XAnyCompareFactory>& rAnyCompareFactory, + ResultSetInclude eMode = INCLUDE_FOLDERS_AND_DOCUMENTS); /** * This methods gives read access to the content stream of a content (i.e @@ -453,8 +434,7 @@ public: * @throws css::uno::RuntimeException * @throws css::uno::Exception */ - css::uno::Reference< css::io::XInputStream > - openStream(); + css::uno::Reference<css::io::XInputStream> openStream(); /** * This methods gives read access to the content stream of a content (i.e * the content of a file located at the local file system). @@ -467,8 +447,7 @@ public: * @throws css::uno::RuntimeException * @throws css::uno::Exception */ - css::uno::Reference< css::io::XInputStream > - openStreamNoLock(); + css::uno::Reference<css::io::XInputStream> openStreamNoLock(); /** * This methods gives read/write access to the content stream of a content (i.e @@ -481,8 +460,7 @@ public: * @throws css::uno::RuntimeException * @throws css::uno::Exception */ - css::uno::Reference< css::io::XStream > - openWriteableStream(); + css::uno::Reference<css::io::XStream> openWriteableStream(); /** * This methods gives read/write access to the content stream of a content (i.e * the content of a file located at the local file system). @@ -495,8 +473,7 @@ public: * @throws css::uno::RuntimeException * @throws css::uno::Exception */ - css::uno::Reference< css::io::XStream > - openWriteableStreamNoLock(); + css::uno::Reference<css::io::XStream> openWriteableStreamNoLock(); /** * This methods gives read access to the content stream of a content (i.e @@ -509,8 +486,7 @@ public: * @throws css::uno::RuntimeException * @throws css::uno::Exception */ - bool - openStream( const css::uno::Reference< css::io::XActiveDataSink >& rSink ); + bool openStream(const css::uno::Reference<css::io::XActiveDataSink>& rSink); /** * This methods gives read access to the content stream of a content (i.e * the content of a file located at the local file system). @@ -522,8 +498,7 @@ public: * @throws css::uno::RuntimeException * @throws css::uno::Exception */ - bool - openStream( const css::uno::Reference< css::io::XOutputStream >& rStream ); + bool openStream(const css::uno::Reference<css::io::XOutputStream>& rStream); /** * This methods gives write access to the content stream of a content (i.e * the content of a file located at the local file system). @@ -537,9 +512,8 @@ public: * @throws css::uno::RuntimeException * @throws css::uno::Exception */ - void - writeStream( const css::uno::Reference< css::io::XInputStream >& rStream, - bool bReplaceExisting ); + void writeStream(const css::uno::Reference<css::io::XInputStream>& rStream, + bool bReplaceExisting); /** * This method returns the different types of contents this content @@ -551,8 +525,7 @@ public: * @throws css::uno::RuntimeException * @throws css::uno::Exception */ - css::uno::Sequence< css::ucb::ContentInfo > - queryCreatableContentsInfo(); + css::uno::Sequence<css::ucb::ContentInfo> queryCreatableContentsInfo(); /** * This method creates, initializes and inserts ( commits ) a new content @@ -580,11 +553,10 @@ public: * @throws css::uno::RuntimeException * @throws css::uno::Exception */ - bool - insertNewContent( const OUString& rContentType, - const css::uno::Sequence< OUString >& rPropertyNames, - const css::uno::Sequence< css::uno::Any >& rPropertyValues, - Content& rNewContent ); + bool insertNewContent(const OUString& rContentType, + const css::uno::Sequence<OUString>& rPropertyNames, + const css::uno::Sequence<css::uno::Any>& rPropertyValues, + Content& rNewContent); /** * This method creates, initializes and inserts (commits) a new content * inside this (the target folder) content. For example, it can be used to @@ -614,12 +586,11 @@ public: * @throws css::uno::RuntimeException * @throws css::uno::Exception */ - bool - insertNewContent( const OUString& rContentType, - const css::uno::Sequence< OUString >& rPropertyNames, - const css::uno::Sequence< css::uno::Any >& rPropertyValues, - const css::uno::Reference< css::io::XInputStream >& rStream, - Content& rNewContent ); + bool insertNewContent(const OUString& rContentType, + const css::uno::Sequence<OUString>& rPropertyNames, + const css::uno::Sequence<css::uno::Any>& rPropertyValues, + const css::uno::Reference<css::io::XInputStream>& rStream, + Content& rNewContent); /** * This method transfers (copies/moves) a content. It creates a new @@ -653,16 +624,12 @@ public: * @throws css::uno::RuntimeException * @throws css::uno::Exception */ - void - transferContent( const Content& rSourceContent, - InsertOperation eOperation, - const OUString & rTitle, - const sal_Int32 nNameClashAction, - const OUString & rMimeType = OUString( ), - bool bMajorVersion = false, - const OUString & rCommentVersion = OUString( ), - OUString* pResultURL = nullptr, - const OUString & rDocumentId = OUString( ) ) const; + void transferContent(const Content& rSourceContent, InsertOperation eOperation, + const OUString& rTitle, const sal_Int32 nNameClashAction, + const OUString& rMimeType = OUString(), bool bMajorVersion = false, + const OUString& rCommentVersion = OUString(), + OUString* pResultURL = nullptr, + const OUString& rDocumentId = OUString()) const; /** * This method lock the resource. @@ -671,8 +638,7 @@ public: * @throws css::uno::RuntimeException * @throws css::uno::Exception */ - void - lock(); + void lock(); /** * This method unlock the resource. @@ -681,12 +647,10 @@ public: * @throws css::uno::RuntimeException * @throws css::uno::Exception */ - void - unlock(); + void unlock(); // Required properties. - /** * This method returns the value of the content's property "IsFolder". * @@ -696,8 +660,7 @@ public: * @throws css::uno::RuntimeException * @throws css::uno::Exception */ - bool - isFolder(); + bool isFolder(); /** * This method returns the value of the content's property "IsDocument". * @@ -707,9 +670,7 @@ public: * @throws css::uno::RuntimeException * @throws css::uno::Exception */ - bool - isDocument(); - + bool isDocument(); }; } /* namespace ucbhelper */ diff --git a/include/ucbhelper/contentidentifier.hxx b/include/ucbhelper/contentidentifier.hxx index 20f3b5e3db48..9b538829fb03 100644 --- a/include/ucbhelper/contentidentifier.hxx +++ b/include/ucbhelper/contentidentifier.hxx @@ -25,31 +25,26 @@ #include <ucbhelper/ucbhelperdllapi.h> #include <memory> - namespace ucbhelper { - struct ContentIdentifier_Impl; - /** * This class implements a simple identifier object for UCB contents. * It mainly stores and returns the URL as it was passed to the constructor - * The only difference is that the URL scheme will be lower cased. This can * be done, because URL schemes are never case sensitive. */ -class UCBHELPER_DLLPUBLIC ContentIdentifier final : - public cppu::WeakImplHelper<css::ucb::XContentIdentifier> +class UCBHELPER_DLLPUBLIC ContentIdentifier final + : public cppu::WeakImplHelper<css::ucb::XContentIdentifier> { public: - ContentIdentifier( const OUString& rURL ); + ContentIdentifier(const OUString& rURL); virtual ~ContentIdentifier() override; // XContentIdentifier - virtual OUString SAL_CALL - getContentIdentifier() override; - virtual OUString SAL_CALL - getContentProviderScheme() override; + virtual OUString SAL_CALL getContentIdentifier() override; + virtual OUString SAL_CALL getContentProviderScheme() override; private: std::unique_ptr<ContentIdentifier_Impl> m_pImpl; diff --git a/include/ucbhelper/simpleinteractionrequest.hxx b/include/ucbhelper/simpleinteractionrequest.hxx index eb09bcce8051..25656202288b 100644 --- a/include/ucbhelper/simpleinteractionrequest.hxx +++ b/include/ucbhelper/simpleinteractionrequest.hxx @@ -29,25 +29,28 @@ * SimpleInteractionRequest::getResponse(). */ -enum class ContinuationFlags { +enum class ContinuationFlags +{ /** The request was not (yet) handled by the interaction handler. */ - NONE = 0, + NONE = 0, /** The interaction handler selected XInteractionAbort. */ - Abort = 1, + Abort = 1, /** The interaction handler selected XInteractionRetry. */ - Retry = 2, + Retry = 2, /** The interaction handler selected XInteractionApprove. */ - Approve = 4, + Approve = 4, /** The interaction handler selected XInteractionDisapprove. */ Disapprove = 8, }; namespace o3tl { - template<> struct typed_flags<ContinuationFlags> : is_typed_flags<ContinuationFlags, 0x0f> {}; +template <> struct typed_flags<ContinuationFlags> : is_typed_flags<ContinuationFlags, 0x0f> +{ +}; } -namespace ucbhelper { - +namespace ucbhelper +{ /** * This class implements a simple interaction request. The user must not deal * with XInteractionContinuations directly, but can use constants that are @@ -73,8 +76,7 @@ public: * This can be any of the CONTINUATION_* constants combinations * listed above. */ - SimpleInteractionRequest( const css::uno::Any & rRequest, - const ContinuationFlags nContinuations ); + SimpleInteractionRequest(const css::uno::Any& rRequest, const ContinuationFlags nContinuations); /** * After passing this request to XInteractionHandler::handle, this method diff --git a/include/ucbhelper/simplenameclashresolverequest.hxx b/include/ucbhelper/simplenameclashresolverequest.hxx index 05b36dbd31ba..f6826b43d1b2 100644 --- a/include/ucbhelper/simplenameclashresolverequest.hxx +++ b/include/ucbhelper/simplenameclashresolverequest.hxx @@ -25,8 +25,8 @@ #include <ucbhelper/interactionrequest.hxx> #include <ucbhelper/ucbhelperdllapi.h> -namespace ucbhelper { - +namespace ucbhelper +{ class InteractionSupplyName; /** @@ -40,9 +40,10 @@ class InteractionSupplyName; * @see InteractionAbort * @see InteractioneplaceExistingData */ -class UNLESS_MERGELIBS(UCBHELPER_DLLPUBLIC) SimpleNameClashResolveRequest final : public ucbhelper::InteractionRequest +class UNLESS_MERGELIBS(UCBHELPER_DLLPUBLIC) SimpleNameClashResolveRequest final + : public ucbhelper::InteractionRequest { - rtl::Reference< InteractionSupplyName > m_xNameSupplier; + rtl::Reference<InteractionSupplyName> m_xNameSupplier; virtual ~SimpleNameClashResolveRequest() override; @@ -54,15 +55,14 @@ public: * the clashing resource. * @param rClashingName contains the clashing name. */ - SimpleNameClashResolveRequest( const OUString & rTargetFolderURL, - const OUString & rClashingName ); + SimpleNameClashResolveRequest(const OUString& rTargetFolderURL, const OUString& rClashingName); /** * This method returns the new name that was supplied by the interaction * handler. * * @return the new name, if supplied. */ - OUString const & getNewName() const; + OUString const& getNewName() const; }; } // namespace ucbhelper diff --git a/include/ucbhelper/ucbhelperdllapi.h b/include/ucbhelper/ucbhelperdllapi.h index bebc94781661..739d76d0e7eb 100644 --- a/include/ucbhelper/ucbhelperdllapi.h +++ b/include/ucbhelper/ucbhelperdllapi.h @@ -23,9 +23,9 @@ #include <sal/types.h> #if defined(UCBHELPER_DLLIMPLEMENTATION) -#define UCBHELPER_DLLPUBLIC SAL_DLLPUBLIC_EXPORT +#define UCBHELPER_DLLPUBLIC SAL_DLLPUBLIC_EXPORT #else -#define UCBHELPER_DLLPUBLIC SAL_DLLPUBLIC_IMPORT +#define UCBHELPER_DLLPUBLIC SAL_DLLPUBLIC_IMPORT #endif #define UCBHELPER_DLLPRIVATE SAL_DLLPRIVATE diff --git a/include/uno/lbnames.h b/include/uno/lbnames.h index b8f0ef758870..68418861e3ed 100644 --- a/include/uno/lbnames.h +++ b/include/uno/lbnames.h @@ -30,7 +30,7 @@ #ifdef CPPU_ENV /** Name for C++ compiler/ platform, e.g. "gcc3", "msci" */ -#define CPPU_CURRENT_LANGUAGE_BINDING_NAME SAL_STRINGIFY( CPPU_ENV ) +#define CPPU_CURRENT_LANGUAGE_BINDING_NAME SAL_STRINGIFY(CPPU_ENV) #else diff --git a/include/unoidl/detail/dllapi.hxx b/include/unoidl/detail/dllapi.hxx index c9132786879d..a0a0a45d4906 100644 --- a/include/unoidl/detail/dllapi.hxx +++ b/include/unoidl/detail/dllapi.hxx @@ -7,7 +7,6 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ - #ifndef INCLUDED_UNOIDL_DETAIL_DLLAPI_HXX #define INCLUDED_UNOIDL_DETAIL_DLLAPI_HXX diff --git a/include/unotest/directories.hxx b/include/unotest/directories.hxx index 5a901c8781bf..4fcf7fe3cbba 100644 --- a/include/unotest/directories.hxx +++ b/include/unotest/directories.hxx @@ -15,9 +15,10 @@ #include <rtl/ustring.hxx> #include <unotest/detail/unotestdllapi.hxx> -namespace test { - -class OOO_DLLPUBLIC_UNOTEST Directories { +namespace test +{ +class OOO_DLLPUBLIC_UNOTEST Directories +{ private: OUString m_aSrcRootURL; OUString m_aSrcRootPath; @@ -27,7 +28,7 @@ private: public: Directories(); - const OUString& getSrcRootURL() const { return m_aSrcRootURL; } + const OUString& getSrcRootURL() const { return m_aSrcRootURL; } const OUString& getSrcRootPath() const { return m_aSrcRootPath; } // return a URL to a given path from the source directory @@ -37,12 +38,11 @@ public: OUString getPathFromSrc(const OUString& rPath) const; // return a URL to a given path from the workdir directory - OUString getURLFromWorkdir(const OUString &rPath) const; + OUString getURLFromWorkdir(const OUString& rPath) const; // return a Path to a given path from the workdir directory - OUString getPathFromWorkdir(const OUString &rPath) const; + OUString getPathFromWorkdir(const OUString& rPath) const; }; - } #endif diff --git a/include/unotest/macros_test.hxx b/include/unotest/macros_test.hxx index 6f55e34e7c87..14917794d38d 100644 --- a/include/unotest/macros_test.hxx +++ b/include/unotest/macros_test.hxx @@ -34,18 +34,18 @@ namespace test class Directories; } -namespace unotest { - +namespace unotest +{ class OOO_DLLPUBLIC_UNOTEST MacrosTest { public: class Resetter { private: - std::function<void ()> m_Func; + std::function<void()> m_Func; public: - Resetter(std::function<void ()> const& rFunc) + Resetter(std::function<void()> const& rFunc) : m_Func(rFunc) { } @@ -66,8 +66,10 @@ public: MacrosTest(); ~MacrosTest(); - css::uno::Reference< css::lang::XComponent > loadFromDesktop(const OUString& rURL, const OUString& rDocService = OUString(), - const css::uno::Sequence<css::beans::PropertyValue>& rExtra_args = css::uno::Sequence<css::beans::PropertyValue>() ); + css::uno::Reference<css::lang::XComponent> + loadFromDesktop(const OUString& rURL, const OUString& rDocService = OUString(), + const css::uno::Sequence<css::beans::PropertyValue>& rExtra_args + = css::uno::Sequence<css::beans::PropertyValue>()); static void dispatchCommand(const css::uno::Reference<css::lang::XComponent>& xComponent, @@ -78,7 +80,7 @@ public: void tearDownNssGpg(); protected: - css::uno::Reference< css::frame::XDesktop2> mxDesktop; + css::uno::Reference<css::frame::XDesktop2> mxDesktop; private: std::unique_ptr<BasicDLL> mpDll; @@ -86,7 +88,6 @@ private: OString m_gpgconfCommandPrefix; #endif }; - } #endif 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 diff --git a/include/vbahelper/vbadllapi.h b/include/vbahelper/vbadllapi.h index ff4861de5b67..c706302669f1 100644 --- a/include/vbahelper/vbadllapi.h +++ b/include/vbahelper/vbadllapi.h @@ -23,9 +23,9 @@ #include <sal/types.h> #if defined(VBAHELPER_DLLIMPLEMENTATION) -#define VBAHELPER_DLLPUBLIC SAL_DLLPUBLIC_EXPORT +#define VBAHELPER_DLLPUBLIC SAL_DLLPUBLIC_EXPORT #else -#define VBAHELPER_DLLPUBLIC SAL_DLLPUBLIC_IMPORT +#define VBAHELPER_DLLPUBLIC SAL_DLLPUBLIC_IMPORT #endif #define VBAHELPER_DLLPRIVATE SAL_DLLPRIVATE diff --git a/include/vcl/IContext.hxx b/include/vcl/IContext.hxx index 6af9b20c4453..05823d190ed7 100644 --- a/include/vcl/IContext.hxx +++ b/include/vcl/IContext.hxx @@ -16,14 +16,10 @@ namespace vcl { - class VCL_DLLPUBLIC IContext { protected: - IContext() - { - maContext.push_back( vcl::EnumContext::Context::Any ); - } + IContext() { maContext.push_back(vcl::EnumContext::Context::Any); } public: void SetContext(const std::vector<vcl::EnumContext::Context>& aContext) @@ -31,7 +27,7 @@ public: maContext = aContext; } - bool HasContext( const vcl::EnumContext::Context eContext ) const + bool HasContext(const vcl::EnumContext::Context eContext) const { auto aFind = std::find(maContext.begin(), maContext.end(), eContext); if (aFind == maContext.end()) diff --git a/include/vcl/IconThemeInfo.hxx b/include/vcl/IconThemeInfo.hxx index 92892283c8fc..c398754c88a1 100644 --- a/include/vcl/IconThemeInfo.hxx +++ b/include/vcl/IconThemeInfo.hxx @@ -21,14 +21,13 @@ class IconThemeInfoTest; class IconThemeSelectorTest; class IconThemeScannerTest; -namespace vcl { - +namespace vcl +{ /** This class provides information about an icon theme. */ -class VCL_DLLPUBLIC IconThemeInfo { - +class VCL_DLLPUBLIC IconThemeInfo +{ public: - /** The name of the icon theme to use for high contrast mode */ static constexpr OUStringLiteral HIGH_CONTRAST_ID = u"sifr"; @@ -38,7 +37,7 @@ public: */ IconThemeInfo(const OUString& urlToFile); - const OUString& GetDisplayName() const {return mDisplayName;} + const OUString& GetDisplayName() const { return mDisplayName; } const OUString& GetThemeId() const { return mThemeId; } @@ -61,8 +60,8 @@ public: FindIconThemeById(const std::vector<vcl::IconThemeInfo>& themes, const OUString& themeId); /** Check whether a theme with a specified id is in a vector of IconThemeInfo */ - static bool - IconThemeIsInVector(const std::vector<vcl::IconThemeInfo>& themes, const OUString& themeId); + static bool IconThemeIsInVector(const std::vector<vcl::IconThemeInfo>& themes, + const OUString& themeId); private: /** private constructor for testing purposes only */ @@ -95,5 +94,4 @@ private: } // namespace vcl - #endif // INCLUDED_VCL_ICONTHEMEINFO_HXX diff --git a/include/vcl/NotebookbarContextControl.hxx b/include/vcl/NotebookbarContextControl.hxx index ce557c54904f..adb6178e510d 100644 --- a/include/vcl/NotebookbarContextControl.hxx +++ b/include/vcl/NotebookbarContextControl.hxx @@ -16,7 +16,7 @@ class NotebookbarContextControl { public: virtual ~NotebookbarContextControl() {} - virtual void SetContext( vcl::EnumContext::Context eContext ) = 0; + virtual void SetContext(vcl::EnumContext::Context eContext) = 0; }; #endif diff --git a/include/vcl/dllapi.h b/include/vcl/dllapi.h index 805d1cb00908..ccfd5e3b80c5 100644 --- a/include/vcl/dllapi.h +++ b/include/vcl/dllapi.h @@ -36,7 +36,7 @@ #define UITEST_DLLPUBLIC SAL_DLLPUBLIC_IMPORT #endif -#if (defined UNX && ! defined MACOS) || defined _WIN32 +#if (defined UNX && !defined MACOS) || defined _WIN32 #define VCL_PLUGIN_PUBLIC VCL_DLLPUBLIC #else #define VCL_PLUGIN_PUBLIC SAL_DLLPRIVATE diff --git a/include/vcl/exceptiontypes.hxx b/include/vcl/exceptiontypes.hxx index 83654d3705bb..b0e63a982f88 100644 --- a/include/vcl/exceptiontypes.hxx +++ b/include/vcl/exceptiontypes.hxx @@ -20,8 +20,11 @@ #ifndef INCLUDED_VCL_EXCEPTIONTYPES_HXX #define INCLUDED_VCL_EXCEPTIONTYPES_HXX -enum class ExceptionCategory { - NONE, System, UserInterface +enum class ExceptionCategory +{ + NONE, + System, + UserInterface }; #endif // INCLUDED_VCL_EXCEPTIONTYPES_HXX diff --git a/include/vcl/extoutdevdata.hxx b/include/vcl/extoutdevdata.hxx index 5db49cddb08d..537414435215 100644 --- a/include/vcl/extoutdevdata.hxx +++ b/include/vcl/extoutdevdata.hxx @@ -24,14 +24,11 @@ namespace vcl { - class VCL_DLLPUBLIC ExtOutDevData { public: - virtual ~ExtOutDevData(); }; - } #endif // INCLUDED_VCL_EXTOUTDEVDATA_HXX diff --git a/include/vcl/gdimetafiletools.hxx b/include/vcl/gdimetafiletools.hxx index d956658676a0..665683dd279f 100644 --- a/include/vcl/gdimetafiletools.hxx +++ b/include/vcl/gdimetafiletools.hxx @@ -24,7 +24,6 @@ class GDIMetaFile; - // #i121267# Added tooling to be able to support old exporters which are based on // metafiles as graphic content, but do not implement using the contained clip // regions. @@ -37,7 +36,6 @@ class GDIMetaFile; void clipMetafileContentAgainstOwnRegions(GDIMetaFile& rSource); - // Allow to check if a Metafile contains clipping or not bool usesClipActions(const GDIMetaFile& rSource); @@ -52,7 +50,6 @@ public: virtual ~MetafileAccessor(); }; - #endif // INCLUDED_VCL_GDIMETAFILETOOLS_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/vcl/introwin.hxx b/include/vcl/introwin.hxx index fbe35c710a06..8d7d709e457b 100644 --- a/include/vcl/introwin.hxx +++ b/include/vcl/introwin.hxx @@ -30,10 +30,9 @@ private: SAL_DLLPRIVATE void ImplInitIntroWindowData(); public: - IntroWindow(); - virtual ~IntroWindow() override; + IntroWindow(); + virtual ~IntroWindow() override; virtual void dispose() override; - }; #endif // INCLUDED_VCL_INTROWIN_HXX diff --git a/include/vcl/keycodes.hxx b/include/vcl/keycodes.hxx index c262610fd35b..e68f176ffe32 100644 --- a/include/vcl/keycodes.hxx +++ b/include/vcl/keycodes.hxx @@ -160,32 +160,39 @@ constexpr sal_uInt16 KEY_NUMLOCK = css::awt::Key::NUMLOCK; constexpr sal_uInt16 KEY_SCROLLLOCK = css::awt::Key::SCROLLLOCK; // extended Modifier-Keys (only used for modkey events) -enum class ModKeyFlags { - NONE = 0x0000, - LeftShift = 0x0001, - RightShift = 0x0002, - LeftMod1 = 0x0004, - RightMod1 = 0x0008, - LeftMod2 = 0x0010, - RightMod2 = 0x0020, - LeftMod3 = 0x0040, - RightMod3 = 0x0080, - Mod1Msk = LeftMod1 | RightMod1, // should be Mod1Mask, but that conflicts with a X.h macro grrrr - Mod2Msk = LeftMod2 | RightMod2, +enum class ModKeyFlags +{ + NONE = 0x0000, + LeftShift = 0x0001, + RightShift = 0x0002, + LeftMod1 = 0x0004, + RightMod1 = 0x0008, + LeftMod2 = 0x0010, + RightMod2 = 0x0020, + LeftMod3 = 0x0040, + RightMod3 = 0x0080, + Mod1Msk = LeftMod1 | RightMod1, // should be Mod1Mask, but that conflicts with a X.h macro grrrr + Mod2Msk = LeftMod2 | RightMod2, +}; +namespace o3tl +{ +template <> struct typed_flags<ModKeyFlags> : is_typed_flags<ModKeyFlags, 0x00ff> +{ }; -namespace o3tl { - template<> struct typed_flags<ModKeyFlags> : is_typed_flags<ModKeyFlags, 0x00ff> {}; } -enum class KeyIndicatorState { - NONE = 0x0000, - CAPSLOCK = 0x0001, - NUMLOCK = 0x0002, - SCROLLLOCK = 0x0004 +enum class KeyIndicatorState +{ + NONE = 0x0000, + CAPSLOCK = 0x0001, + NUMLOCK = 0x0002, + SCROLLLOCK = 0x0004 }; namespace o3tl { - template<> struct typed_flags<KeyIndicatorState> : is_typed_flags<KeyIndicatorState, 0x0007> {}; +template <> struct typed_flags<KeyIndicatorState> : is_typed_flags<KeyIndicatorState, 0x0007> +{ +}; } #endif // INCLUDED_VCL_KEYCODES_HXX diff --git a/include/vcl/mtfxmldump.hxx b/include/vcl/mtfxmldump.hxx index 3bdf4d663eb9..edfcaff55e4d 100644 --- a/include/vcl/mtfxmldump.hxx +++ b/include/vcl/mtfxmldump.hxx @@ -15,7 +15,10 @@ #include <vcl/metaactiontypes.hxx> #include <o3tl/enumarray.hxx> -namespace tools { class XmlWriter; } +namespace tools +{ +class XmlWriter; +} class GDIMetaFile; class SvStream; diff --git a/include/vcl/opengl/OpenGLWrapper.hxx b/include/vcl/opengl/OpenGLWrapper.hxx index c84286ea5244..23237804e79b 100644 --- a/include/vcl/opengl/OpenGLWrapper.hxx +++ b/include/vcl/opengl/OpenGLWrapper.hxx @@ -31,10 +31,7 @@ struct VCL_DLLPUBLIC OpenGLWrapper */ static sal_Int64 getBufferSwapCounter(); #else - static bool isVCLOpenGLEnabled() - { - return false; - } + static bool isVCLOpenGLEnabled() { return false; } #endif }; diff --git a/include/vcl/pngread.hxx b/include/vcl/pngread.hxx index fe59bfa1b4a6..d3fa1942ee57 100644 --- a/include/vcl/pngread.hxx +++ b/include/vcl/pngread.hxx @@ -27,7 +27,6 @@ namespace vcl { - class PNGReaderImpl; class VCL_DLLPUBLIC PNGReader @@ -35,7 +34,6 @@ class VCL_DLLPUBLIC PNGReader std::unique_ptr<PNGReaderImpl> mpImpl; public: - /* the PNG chunks are read within the c'tor, so the stream will be positioned at the end of the PNG */ explicit PNGReader(SvStream& rStream); diff --git a/include/vcl/sound.hxx b/include/vcl/sound.hxx index 2df3c800442e..77398a3efe9f 100644 --- a/include/vcl/sound.hxx +++ b/include/vcl/sound.hxx @@ -21,11 +21,10 @@ #include <vcl/dllapi.h> - class VCL_DLLPUBLIC Sound { public: - static void Beep(); + static void Beep(); }; /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/vcl/uitest/factory.hxx b/include/vcl/uitest/factory.hxx index 3319c5e18583..e51427876668 100644 --- a/include/vcl/uitest/factory.hxx +++ b/include/vcl/uitest/factory.hxx @@ -13,10 +13,9 @@ #include <memory> #include <functional> -namespace vcl { - +namespace vcl +{ class Window; - } class UIObject; diff --git a/include/vcl/vclmain.hxx b/include/vcl/vclmain.hxx index 54a630c43223..6572d6d30e8b 100644 --- a/include/vcl/vclmain.hxx +++ b/include/vcl/vclmain.hxx @@ -16,8 +16,8 @@ #include <vcl/dllapi.h> #endif -namespace vclmain { - +namespace vclmain +{ // Function called from vclmain's implementation of main, needs to be // implemented by the application and needs to instantiate a (static, derived) // instance of Application (where the Application constructor takes care to link diff --git a/include/vcl/wmfexternal.hxx b/include/vcl/wmfexternal.hxx index d20fdf84d034..fcff240a5ff4 100644 --- a/include/vcl/wmfexternal.hxx +++ b/include/vcl/wmfexternal.hxx @@ -23,7 +23,10 @@ #include <vcl/dllapi.h> #include <com/sun/star/uno/Sequence.hxx> -namespace com::sun::star::beans { struct PropertyValue; } +namespace com::sun::star::beans +{ +struct PropertyValue; +} struct VCL_DLLPUBLIC WmfExternal { @@ -47,8 +50,8 @@ struct VCL_DLLPUBLIC WmfExternal sal_uInt16 mapMode; WmfExternal(); - css::uno::Sequence< css::beans::PropertyValue > getSequence() const; - bool setSequence(const css::uno::Sequence< css::beans::PropertyValue >& rSequence); + css::uno::Sequence<css::beans::PropertyValue> getSequence() const; + bool setSequence(const css::uno::Sequence<css::beans::PropertyValue>& rSequence); }; #endif diff --git a/include/xmloff/SchXMLExportHelper.hxx b/include/xmloff/SchXMLExportHelper.hxx index 6e14b764db90..6043a03eaa82 100644 --- a/include/xmloff/SchXMLExportHelper.hxx +++ b/include/xmloff/SchXMLExportHelper.hxx @@ -38,20 +38,19 @@ class SchXMLExportHelper_Impl; class XMLOFF_DLLPUBLIC SchXMLExportHelper final : public salhelper::SimpleReferenceObject { public: - SchXMLExportHelper( SvXMLExport& rExport, - SvXMLAutoStylePoolP& rASPool ); + SchXMLExportHelper(SvXMLExport& rExport, SvXMLAutoStylePoolP& rASPool); virtual ~SchXMLExportHelper() override; /// returns the string corresponding to the current FileFormat CLSID for Chart const OUString& getChartCLSID() const; - void SetSourceShellID( const OUString& rShellID ); - void SetDestinationShellID( const OUString& rShellID ); + void SetSourceShellID(const OUString& rShellID); + void SetDestinationShellID(const OUString& rShellID); private: - SchXMLExportHelper(SchXMLExportHelper const &) = delete; - SchXMLExportHelper& operator =(SchXMLExportHelper const &) = delete; + SchXMLExportHelper(SchXMLExportHelper const&) = delete; + SchXMLExportHelper& operator=(SchXMLExportHelper const&) = delete; private: std::unique_ptr<SchXMLExportHelper_Impl> m_pImpl; diff --git a/include/xmloff/XMLGraphicsDefaultStyle.hxx b/include/xmloff/XMLGraphicsDefaultStyle.hxx index 229b480d1fd5..58f2f0f1a8d5 100644 --- a/include/xmloff/XMLGraphicsDefaultStyle.hxx +++ b/include/xmloff/XMLGraphicsDefaultStyle.hxx @@ -27,14 +27,13 @@ class XMLOFF_DLLPUBLIC XMLGraphicsDefaultStyle final : public XMLPropStyleContext { public: - - XMLGraphicsDefaultStyle( SvXMLImport& rImport, - SvXMLStylesContext& rStyles); + XMLGraphicsDefaultStyle(SvXMLImport& rImport, SvXMLStylesContext& rStyles); virtual ~XMLGraphicsDefaultStyle() override; - virtual css::uno::Reference< css::xml::sax::XFastContextHandler > SAL_CALL createFastChildContext( - sal_Int32 nElement, const css::uno::Reference< css::xml::sax::XFastAttributeList >& AttrList ) override; + virtual css::uno::Reference<css::xml::sax::XFastContextHandler> SAL_CALL createFastChildContext( + sal_Int32 nElement, + const css::uno::Reference<css::xml::sax::XFastAttributeList>& AttrList) override; // This method is called for every default style virtual void SetDefaults() override; diff --git a/include/xmloff/XMLTextMasterStylesContext.hxx b/include/xmloff/XMLTextMasterStylesContext.hxx index 1671ac01a2bc..ab1942b314f9 100644 --- a/include/xmloff/XMLTextMasterStylesContext.hxx +++ b/include/xmloff/XMLTextMasterStylesContext.hxx @@ -27,18 +27,18 @@ class XMLOFF_DLLPUBLIC XMLTextMasterStylesContext : public SvXMLStylesContext { protected: - virtual SvXMLStyleContext *CreateStyleChildContext( sal_Int32 nElement, - const css::uno::Reference< css::xml::sax::XFastAttributeList > & xAttrList ) override; + virtual SvXMLStyleContext* CreateStyleChildContext( + sal_Int32 nElement, + const css::uno::Reference<css::xml::sax::XFastAttributeList>& xAttrList) override; - virtual bool InsertStyleFamily( XmlStyleFamily nFamily ) const override; + virtual bool InsertStyleFamily(XmlStyleFamily nFamily) const override; public: - - XMLTextMasterStylesContext( SvXMLImport& rImport ); + XMLTextMasterStylesContext(SvXMLImport& rImport); virtual ~XMLTextMasterStylesContext() override; }; -#endif // _XMLOFF_XMLTEXTMASTERSTYLECONTEXT_HXX +#endif // _XMLOFF_XMLTEXTMASTERSTYLECONTEXT_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/xmloff/animexp.hxx b/include/xmloff/animexp.hxx index 8f20dce4f86c..286cb21d35d0 100644 --- a/include/xmloff/animexp.hxx +++ b/include/xmloff/animexp.hxx @@ -23,8 +23,14 @@ #include <salhelper/simplereferenceobject.hxx> #include <memory> -namespace com::sun::star::drawing { class XShape; } -namespace com::sun::star::uno { template <typename > class Reference; } +namespace com::sun::star::drawing +{ +class XShape; +} +namespace com::sun::star::uno +{ +template <typename> class Reference; +} class AnimExpImpl; class SvXMLExport; @@ -38,9 +44,9 @@ public: XMLAnimationsExporter(); virtual ~XMLAnimationsExporter() override; - static void prepare( const css::uno::Reference< css::drawing::XShape >& xShape ); - void collect( const css::uno::Reference< css::drawing::XShape >& xShape, SvXMLExport& rExport ); - void exportAnimations( SvXMLExport& rExport ); + static void prepare(const css::uno::Reference<css::drawing::XShape>& xShape); + void collect(const css::uno::Reference<css::drawing::XShape>& xShape, SvXMLExport& rExport); + void exportAnimations(SvXMLExport& rExport); }; #endif // INCLUDED_XMLOFF_ANIMEXP_HXX diff --git a/include/xmloff/odffields.hxx b/include/xmloff/odffields.hxx index c37631f07d46..e1014e8310e3 100644 --- a/include/xmloff/odffields.hxx +++ b/include/xmloff/odffields.hxx @@ -20,7 +20,6 @@ #ifndef INCLUDED_XMLOFF_ODFFIELDS_HXX #define INCLUDED_XMLOFF_ODFFIELDS_HXX - #define ODF_FORMTEXT "vnd.oasis.opendocument.field.FORMTEXT" #define ODF_FORMFIELD_DEFAULT_LENGTH 5 diff --git a/include/xmloff/prhdlfac.hxx b/include/xmloff/prhdlfac.hxx index 2ad3f3d7a920..e9eb038da121 100644 --- a/include/xmloff/prhdlfac.hxx +++ b/include/xmloff/prhdlfac.hxx @@ -42,8 +42,8 @@ class XMLOFF_DLLPUBLIC XMLPropertyHandlerFactory : public salhelper::SimpleRefer struct Impl; std::unique_ptr<Impl> mpImpl; - XMLPropertyHandlerFactory( const XMLPropertyHandlerFactory& ) = delete; - XMLPropertyHandlerFactory& operator= ( const XMLPropertyHandlerFactory& ) = delete; + XMLPropertyHandlerFactory(const XMLPropertyHandlerFactory&) = delete; + XMLPropertyHandlerFactory& operator=(const XMLPropertyHandlerFactory&) = delete; public: XMLPropertyHandlerFactory(); @@ -81,24 +81,24 @@ public: return pHdl; } */ - virtual const XMLPropertyHandler* GetPropertyHandler( sal_Int32 nType ) const; + virtual const XMLPropertyHandler* GetPropertyHandler(sal_Int32 nType) const; /** helper method to statically create a property handler; this will not * use the handler cache. This method should only be called in special * circumstances; calling GetPropertyHandler is almost always * preferable. */ - static std::unique_ptr<XMLPropertyHandler> CreatePropertyHandler( sal_Int32 nType ); + static std::unique_ptr<XMLPropertyHandler> CreatePropertyHandler(sal_Int32 nType); protected: /** Retrieves a PropertyHandler from the internal cache */ - const XMLPropertyHandler* GetHdlCache( sal_Int32 nType ) const; + const XMLPropertyHandler* GetHdlCache(sal_Int32 nType) const; /** Puts a PropertyHandler into the internal cache */ - void PutHdlCache( sal_Int32 nType, const XMLPropertyHandler* pHdl ) const; + void PutHdlCache(sal_Int32 nType, const XMLPropertyHandler* pHdl) const; private: /** Retrieves ( creates if necessary ) PropertyHandler for basic XML-types */ - SAL_DLLPRIVATE const XMLPropertyHandler* GetBasicHandler( sal_Int32 nType ) const; + SAL_DLLPRIVATE const XMLPropertyHandler* GetBasicHandler(sal_Int32 nType) const; }; #endif // INCLUDED_XMLOFF_PRHDLFAC_HXX diff --git a/include/xmlreader/pad.hxx b/include/xmlreader/pad.hxx index d450f7a54c96..b142cebcdd41 100644 --- a/include/xmlreader/pad.hxx +++ b/include/xmlreader/pad.hxx @@ -29,17 +29,16 @@ #include <xmlreader/detail/xmlreaderdllapi.hxx> #include <xmlreader/span.hxx> -namespace xmlreader { - -class SAL_WARN_UNUSED OOO_DLLPUBLIC_XMLREADER Pad { +namespace xmlreader +{ +class SAL_WARN_UNUSED OOO_DLLPUBLIC_XMLREADER Pad +{ public: - void add(char const * begin, sal_Int32 length); + void add(char const* begin, sal_Int32 length); - template< std::size_t N > void add(char const (& literal)[N]) { - add(literal, N - 1); - } + template <std::size_t N> void add(char const (&literal)[N]) { add(literal, N - 1); } - void addEphemeral(char const * begin, sal_Int32 length); + void addEphemeral(char const* begin, sal_Int32 length); void clear(); @@ -49,9 +48,8 @@ private: SAL_DLLPRIVATE void flushSpan(); Span span_; - OStringBuffer buffer_ {256}; + OStringBuffer buffer_{ 256 }; }; - } #endif diff --git a/include/xmlscript/xmlscriptdllapi.h b/include/xmlscript/xmlscriptdllapi.h index 22616ab90998..6d3875885d78 100644 --- a/include/xmlscript/xmlscriptdllapi.h +++ b/include/xmlscript/xmlscriptdllapi.h @@ -23,9 +23,9 @@ #include <sal/types.h> #if defined(XMLSCRIPT_DLLIMPLEMENTATION) -#define XMLSCRIPT_DLLPUBLIC SAL_DLLPUBLIC_EXPORT +#define XMLSCRIPT_DLLPUBLIC SAL_DLLPUBLIC_EXPORT #else -#define XMLSCRIPT_DLLPUBLIC SAL_DLLPUBLIC_IMPORT +#define XMLSCRIPT_DLLPUBLIC SAL_DLLPUBLIC_IMPORT #endif #define XMLSCRIPT_DLLPRIVATE SAL_DLLPRIVATE diff --git a/solenv/clang-format/excludelist b/solenv/clang-format/excludelist index 1ce036a02254..fb5d403349f9 100644 --- a/solenv/clang-format/excludelist +++ b/solenv/clang-format/excludelist @@ -5014,20 +5014,15 @@ include/LibreOfficeKit/LibreOfficeKit.hxx include/LibreOfficeKit/LibreOfficeKitEnums.h include/LibreOfficeKit/LibreOfficeKitGtk.h include/LibreOfficeKit/LibreOfficeKitInit.h -include/LibreOfficeKit/LibreOfficeKitTypes.h include/animations/animationnodehelper.hxx include/apple_remote/RemoteControl.h -include/apple_remote/RemoteMainController.h include/avmedia/MediaControlBase.hxx -include/avmedia/avmediadllapi.h include/avmedia/mediaitem.hxx include/avmedia/mediaplayer.hxx include/avmedia/mediatoolbox.hxx include/avmedia/mediawindow.hxx -include/basegfx/basegfxdllapi.h include/basegfx/color/bcolor.hxx include/basegfx/color/bcolormodifier.hxx -include/basegfx/color/bcolortools.hxx include/basegfx/curve/b2dbeziertools.hxx include/basegfx/curve/b2dcubicbezier.hxx include/basegfx/matrix/b2dhommatrix.hxx @@ -5057,10 +5052,8 @@ include/basegfx/range/b2dconnectedranges.hxx include/basegfx/range/b2dpolyrange.hxx include/basegfx/range/b2drange.hxx include/basegfx/range/b2drangeclipper.hxx -include/basegfx/range/b2drectangle.hxx include/basegfx/range/b2ibox.hxx include/basegfx/range/b2irange.hxx -include/basegfx/range/b2irectangle.hxx include/basegfx/range/b3drange.hxx include/basegfx/range/basicbox.hxx include/basegfx/range/basicrange.hxx @@ -5080,17 +5073,12 @@ include/basegfx/utils/rectcliptools.hxx include/basegfx/utils/systemdependentdata.hxx include/basegfx/utils/tools.hxx include/basegfx/utils/unopolypolygon.hxx -include/basegfx/utils/zoomtools.hxx -include/basegfx/vector/b2dsize.hxx include/basegfx/vector/b2dvector.hxx include/basegfx/vector/b2enums.hxx -include/basegfx/vector/b2isize.hxx include/basegfx/vector/b2ivector.hxx include/basegfx/vector/b3dvector.hxx -include/basic/basicdllapi.h include/basic/basicmanagerrepository.hxx include/basic/basmgr.hxx -include/basic/basrdll.hxx include/basic/codecompletecache.hxx include/basic/modsizeexceeded.hxx include/basic/sbdef.hxx @@ -5107,13 +5095,10 @@ include/basic/sbxobj.hxx include/basic/sbxvar.hxx include/basic/vbahelper.hxx include/canvas/canvastools.hxx -include/canvas/canvastoolsdllapi.h include/canvas/elapsedtime.hxx -include/codemaker/codemaker.hxx include/codemaker/commoncpp.hxx include/codemaker/commonjava.hxx include/codemaker/exceptiontree.hxx -include/codemaker/generatedtypeset.hxx include/codemaker/global.hxx include/codemaker/options.hxx include/codemaker/typemanager.hxx @@ -5126,7 +5111,6 @@ include/com/sun/star/uno/Sequence.h include/com/sun/star/uno/Sequence.hxx include/com/sun/star/uno/Type.h include/com/sun/star/uno/Type.hxx -include/com/sun/star/uno/genfunc.h include/com/sun/star/uno/genfunc.hxx include/comphelper/ChainablePropertySet.hxx include/comphelper/ChainablePropertySetInfo.hxx @@ -5144,15 +5128,12 @@ include/comphelper/accessibletexthelper.hxx include/comphelper/accessiblewrapper.hxx include/comphelper/accimplaccess.hxx include/comphelper/anycompare.hxx -include/comphelper/anytostring.hxx include/comphelper/asyncnotification.hxx include/comphelper/attributelist.hxx include/comphelper/backupfilehelper.hxx -include/comphelper/base64.hxx include/comphelper/basicio.hxx include/comphelper/broadcasthelper.hxx include/comphelper/classids.hxx -include/comphelper/comphelperdllapi.h include/comphelper/componentbase.hxx include/comphelper/componentguard.hxx include/comphelper/configuration.hxx @@ -5169,23 +5150,14 @@ include/comphelper/embeddedobjectcontainer.hxx include/comphelper/enumhelper.hxx include/comphelper/eventattachermgr.hxx include/comphelper/evtlistenerhlp.hxx -include/comphelper/evtmethodhelper.hxx -include/comphelper/extract.hxx -include/comphelper/fileformat.h -include/comphelper/fileurl.hxx include/comphelper/flagguard.hxx -include/comphelper/genericpropertyset.hxx -include/comphelper/getexpandeduri.hxx include/comphelper/guarding.hxx include/comphelper/hash.hxx include/comphelper/interaction.hxx include/comphelper/interfacecontainer2.hxx include/comphelper/listenernotification.hxx include/comphelper/logging.hxx -include/comphelper/lok.hxx -include/comphelper/make_shared_from_uno.hxx include/comphelper/mimeconfighelper.hxx -include/comphelper/namecontainer.hxx include/comphelper/namedvaluecollection.hxx include/comphelper/newarray.hxx include/comphelper/numberedcollection.hxx @@ -5193,7 +5165,6 @@ include/comphelper/numbers.hxx include/comphelper/ofopxmlhelper.hxx include/comphelper/oslfile2streamwrap.hxx include/comphelper/processfactory.hxx -include/comphelper/profilezone.hxx include/comphelper/propagg.hxx include/comphelper/proparrhlp.hxx include/comphelper/property.hxx @@ -5207,8 +5178,6 @@ include/comphelper/propertystatecontainer.hxx include/comphelper/propmultiplex.hxx include/comphelper/propstate.hxx include/comphelper/proxyaggregation.hxx -include/comphelper/random.hxx -include/comphelper/refcountedmutex.hxx include/comphelper/scopeguard.hxx include/comphelper/seekableinput.hxx include/comphelper/seqstream.hxx @@ -5222,7 +5191,6 @@ include/comphelper/solarmutex.hxx include/comphelper/stillreadwriteinteraction.hxx include/comphelper/stl_types.hxx include/comphelper/storagehelper.hxx -include/comphelper/streamsection.hxx include/comphelper/string.hxx include/comphelper/synchronousdispatch.hxx include/comphelper/syntaxhighlight.hxx @@ -5289,10 +5257,8 @@ include/cppcanvas/sprite.hxx include/cppcanvas/spritecanvas.hxx include/cppcanvas/vclfactory.hxx include/cppu/Enterable.hxx -include/cppu/EnvDcp.hxx include/cppu/EnvGuards.hxx include/cppu/Map.hxx -include/cppu/cppudllapi.h include/cppu/helper/purpenv/Environment.hxx include/cppu/helper/purpenv/Mapping.hxx include/cppu/macros.hxx @@ -5316,8 +5282,6 @@ include/cppuhelper/compbase9.hxx include/cppuhelper/compbase_ex.hxx include/cppuhelper/component.hxx include/cppuhelper/component_context.hxx -include/cppuhelper/cppuhelperdllapi.h -include/cppuhelper/exc_hlp.hxx include/cppuhelper/factory.hxx include/cppuhelper/implbase.hxx include/cppuhelper/implbase1.hxx @@ -5347,7 +5311,6 @@ include/cppuhelper/queryinterface.hxx include/cppuhelper/shlib.hxx include/cppuhelper/supportsservice.hxx include/cppuhelper/typeprovider.hxx -include/cppuhelper/unourl.hxx include/cppuhelper/weak.hxx include/cppuhelper/weakagg.hxx include/cppuhelper/weakref.hxx @@ -5356,14 +5319,10 @@ include/dbaccess/AsynchronousLink.hxx include/dbaccess/IController.hxx include/dbaccess/controllerframe.hxx include/dbaccess/dataview.hxx -include/dbaccess/dbaccessdllapi.h include/dbaccess/dbaundomanager.hxx include/dbaccess/dbsubcomponentcontroller.hxx include/dbaccess/genericcontroller.hxx include/desktop/crashreport.hxx -include/desktop/dllapi.h -include/desktop/exithelper.h -include/desktop/minidump.hxx include/drawinglayer/XShapeDumper.hxx include/drawinglayer/animation/animationtiming.hxx include/drawinglayer/attribute/fillgradientattribute.hxx @@ -5445,7 +5404,6 @@ include/drawinglayer/processor2d/textaspolygonextractor2d.hxx include/drawinglayer/processor3d/baseprocessor3d.hxx include/drawinglayer/processor3d/cutfindprocessor3d.hxx include/drawinglayer/tools/primitive2dxmldump.hxx -include/editeng/AccessibleComponentBase.hxx include/editeng/AccessibleContextBase.hxx include/editeng/AccessibleEditableTextPara.hxx include/editeng/AccessibleParaManager.hxx @@ -5453,7 +5411,6 @@ include/editeng/AccessibleSelectionBase.hxx include/editeng/AccessibleStaticTextBase.hxx include/editeng/CustomPropertyField.hxx include/editeng/SpellPortions.hxx -include/editeng/Trie.hxx include/editeng/UnoForbiddenCharsTable.hxx include/editeng/acorrcfg.hxx include/editeng/adjustitem.hxx @@ -5473,27 +5430,21 @@ include/editeng/contouritem.hxx include/editeng/crossedoutitem.hxx include/editeng/editdata.hxx include/editeng/editeng.hxx -include/editeng/editengdllapi.h -include/editeng/editerr.hxx include/editeng/editobj.hxx include/editeng/editstat.hxx -include/editeng/editund2.hxx include/editeng/editview.hxx include/editeng/edtdlg.hxx include/editeng/eedata.hxx include/editeng/eeitem.hxx -include/editeng/eerdll.hxx include/editeng/emphasismarkitem.hxx include/editeng/escapementitem.hxx include/editeng/fhgtitem.hxx -include/editeng/fieldupdater.hxx include/editeng/flditem.hxx include/editeng/flstitem.hxx include/editeng/fontitem.hxx include/editeng/forbiddencharacterstable.hxx include/editeng/forbiddenruleitem.hxx include/editeng/formatbreakitem.hxx -include/editeng/frmdir.hxx include/editeng/frmdiritem.hxx include/editeng/hangulhanja.hxx include/editeng/hngpnctitem.hxx @@ -5509,10 +5460,7 @@ include/editeng/lrspitem.hxx include/editeng/lspcitem.hxx include/editeng/measfld.hxx include/editeng/memberids.h -include/editeng/misspellrange.hxx -include/editeng/mutxhelp.hxx include/editeng/nhypitem.hxx -include/editeng/numdef.hxx include/editeng/numitem.hxx include/editeng/opaqitem.hxx include/editeng/optitems.hxx @@ -5532,7 +5480,6 @@ include/editeng/protitem.hxx include/editeng/rsiditem.hxx include/editeng/scriptspaceitem.hxx include/editeng/scripttypeitem.hxx -include/editeng/section.hxx include/editeng/shaditem.hxx include/editeng/shdditem.hxx include/editeng/sizeitem.hxx @@ -5551,7 +5498,6 @@ include/editeng/ulspitem.hxx include/editeng/unoedhlp.hxx include/editeng/unoedprx.hxx include/editeng/unoedsrc.hxx -include/editeng/unofdesc.hxx include/editeng/unofield.hxx include/editeng/unofored.hxx include/editeng/unoforou.hxx @@ -5579,7 +5525,6 @@ include/filter/msfilter/msoleexp.hxx include/filter/msfilter/mstoolbar.hxx include/filter/msfilter/msvbahelper.hxx include/filter/msfilter/svdfppt.hxx -include/filter/msfilter/svxmsbas.hxx include/filter/msfilter/util.hxx include/formula/ExternalReferenceHelper.hxx include/formula/FormulaCompiler.hxx @@ -5590,16 +5535,13 @@ include/formula/compiler.hxx include/formula/errorcodes.hxx include/formula/formdata.hxx include/formula/formula.hxx -include/formula/formuladllapi.h include/formula/formulahelper.hxx include/formula/funcutl.hxx -include/formula/funcvarargs.h include/formula/grammar.hxx include/formula/opcode.hxx include/formula/paramclass.hxx include/formula/token.hxx include/formula/tokenarray.hxx -include/formula/types.hxx include/formula/vectortoken.hxx include/framework/ContextChangeEventMultiplexerTunnel.hxx include/framework/actiontriggerhelper.hxx @@ -5612,7 +5554,6 @@ include/framework/framelistanalyzer.hxx include/framework/gate.hxx include/framework/generictoolbarcontroller.hxx include/framework/imutex.hxx -include/framework/interaction.hxx include/framework/sfxhelperfunctions.hxx include/framework/titlehelper.hxx include/framework/transactionmanager.hxx @@ -5621,44 +5562,28 @@ include/helpcompiler/HelpIndexer.hxx include/helpcompiler/HelpSearch.hxx include/helpcompiler/compilehelp.hxx include/i18nlangtag/applelangid.hxx -include/i18nlangtag/i18nlangtagdllapi.h include/i18nlangtag/lang.h include/i18nlangtag/languagetag.hxx include/i18nlangtag/languagetagicu.hxx include/i18nlangtag/mslangid.hxx include/i18nutil/casefolding.hxx -include/i18nutil/i18nutildllapi.h include/i18nutil/oneToOneMapping.hxx -include/i18nutil/paper.hxx include/i18nutil/scripttypedetector.hxx include/i18nutil/searchopt.hxx include/i18nutil/transliteration.hxx -include/i18nutil/unicode.hxx include/i18nutil/widthfolding.hxx -include/jvmaccess/classpath.hxx -include/jvmaccess/jvmaccessdllapi.h -include/jvmaccess/unovirtualmachine.hxx -include/jvmaccess/virtualmachine.hxx -include/jvmfwk/framework.hxx -include/jvmfwk/jvmfwkdllapi.hxx include/linguistic/hyphdta.hxx -include/linguistic/lngdllapi.h include/linguistic/lngprophelp.hxx -include/linguistic/lngprops.hxx include/linguistic/misc.hxx include/linguistic/spelldta.hxx include/o3tl/any.hxx include/o3tl/char16_t2wchar_t.hxx include/o3tl/cow_wrapper.hxx -include/o3tl/deleter.hxx include/o3tl/enumarray.hxx include/o3tl/enumrange.hxx include/o3tl/functional.hxx include/o3tl/lazy_update.hxx -include/o3tl/lru_map.hxx -include/o3tl/make_shared.hxx include/o3tl/numeric.hxx -include/o3tl/runtimetooustring.hxx include/o3tl/safeint.hxx include/o3tl/sorted_vector.hxx include/o3tl/span.hxx @@ -5671,7 +5596,6 @@ include/onlineupdate/mar_private.h include/onlineupdate/mozilla/Assertions.h include/onlineupdate/mozilla/Attributes.h include/onlineupdate/mozilla/Compiler.h -include/onlineupdate/mozilla/Likely.h include/onlineupdate/mozilla/MacroArgs.h include/onlineupdate/mozilla/TypeTraits.h include/onlineupdate/mozilla/Types.h @@ -5740,7 +5664,6 @@ include/oox/helper/textinputstream.hxx include/oox/helper/zipstorage.hxx include/oox/mathml/export.hxx include/oox/mathml/import.hxx -include/oox/mathml/importutils.hxx include/oox/ole/axbinaryreader.hxx include/oox/ole/axbinarywriter.hxx include/oox/ole/axcontrol.hxx @@ -5779,9 +5702,6 @@ include/oox/ppt/soundactioncontext.hxx include/oox/ppt/timenode.hxx include/oox/ppt/timenodelistcontext.hxx include/oox/shape/ShapeFilterBase.hxx -include/oox/token/namespacemap.hxx -include/oox/token/propertynames.hxx -include/oox/token/relationship.hxx include/oox/token/tokenmap.hxx include/oox/vml/vmldrawing.hxx include/oox/vml/vmldrawingfragment.hxx @@ -5792,9 +5712,7 @@ include/oox/vml/vmlshapecontainer.hxx include/oox/vml/vmlshapecontext.hxx include/oox/vml/vmltextbox.hxx include/oox/vml/vmltextboxcontext.hxx -include/opencl/OpenCLZone.hxx include/opencl/openclconfig.hxx -include/opencl/opencldllapi.h include/opencl/openclwrapper.hxx include/opencl/platforminfo.hxx include/osl/conditn.h @@ -5802,13 +5720,11 @@ include/osl/conditn.hxx include/osl/detail/android-bootstrap.h include/osl/detail/component-defines.h include/osl/detail/component-mapping.h -include/osl/detail/file.h include/osl/diagnose.h include/osl/diagnose.hxx include/osl/endian.h include/osl/file.h include/osl/file.hxx -include/osl/getglobalmutex.hxx include/osl/interlck.h include/osl/module.h include/osl/module.hxx @@ -5817,7 +5733,6 @@ include/osl/mutex.hxx include/osl/nlsupport.h include/osl/pipe.h include/osl/pipe.hxx -include/osl/pipe_decl.hxx include/osl/process.h include/osl/profile.h include/osl/profile.hxx @@ -5834,15 +5749,9 @@ include/osl/thread.hxx include/osl/time.h include/package/Deflater.hxx include/package/Inflater.hxx -include/package/packagedllapi.hxx -include/prewin.h include/registry/reader.hxx -include/registry/refltype.hxx -include/registry/regdllapi.h include/registry/registry.hxx -include/registry/regtype.h include/registry/typereg_reader.hxx -include/registry/types.hxx include/registry/version.h include/registry/writer.h include/registry/writer.hxx @@ -5851,7 +5760,6 @@ include/rtl/bootstrap.h include/rtl/bootstrap.hxx include/rtl/byteseq.h include/rtl/byteseq.hxx -include/rtl/character.hxx include/rtl/cipher.h include/rtl/crc.h include/rtl/digest.h @@ -5880,24 +5788,18 @@ include/rtl/ustrbuf.hxx include/rtl/ustring.h include/rtl/ustring.hxx include/rtl/uuid.h -include/sal/alloca.h -include/sal/backtrace.hxx -include/sal/config.h include/sal/detail/log.h include/sal/log.hxx include/sal/macros.h include/sal/main.h include/sal/mathconf.h -include/sal/saldllapi.h include/sal/types.h include/salhelper/condition.hxx include/salhelper/dynload.hxx include/salhelper/linkhelper.hxx include/salhelper/refobj.hxx -include/salhelper/salhelperdllapi.h include/salhelper/simplereferenceobject.hxx include/salhelper/singletonref.hxx -include/salhelper/thread.hxx include/salhelper/timer.hxx include/sax/fastattribs.hxx include/sax/fastparser.hxx @@ -5906,21 +5808,16 @@ include/sax/tools/converter.hxx include/sax/tools/documenthandleradapter.hxx include/sfx2/DocumentMetadataAccess.hxx include/sfx2/Metadatable.hxx -include/sfx2/QuerySaveDocument.hxx include/sfx2/StyleManager.hxx include/sfx2/StylePreviewRenderer.hxx include/sfx2/XmlIdRegistry.hxx include/sfx2/app.hxx include/sfx2/basedlgs.hxx include/sfx2/bindings.hxx -include/sfx2/brokenpackageint.hxx include/sfx2/chalign.hxx -include/sfx2/charmappopup.hxx include/sfx2/charwin.hxx include/sfx2/childwin.hxx -include/sfx2/classificationhelper.hxx include/sfx2/ctrlitem.hxx -include/sfx2/dialoghelper.hxx include/sfx2/dinfdlg.hxx include/sfx2/dispatch.hxx include/sfx2/docfac.hxx @@ -5932,19 +5829,13 @@ include/sfx2/dockwin.hxx include/sfx2/docmacromode.hxx include/sfx2/docstoragemodifylistener.hxx include/sfx2/doctempl.hxx -include/sfx2/emojipopup.hxx include/sfx2/event.hxx include/sfx2/evntconf.hxx include/sfx2/fcontnr.hxx include/sfx2/filedlghelper.hxx -include/sfx2/flatpak.hxx include/sfx2/frame.hxx include/sfx2/frmdescr.hxx -include/sfx2/frmhtml.hxx include/sfx2/frmhtmlw.hxx -include/sfx2/groupid.hxx -include/sfx2/htmlmode.hxx -include/sfx2/inputdlg.hxx include/sfx2/ipclient.hxx include/sfx2/linkmgr.hxx include/sfx2/linksrc.hxx @@ -5952,15 +5843,12 @@ include/sfx2/lnkbase.hxx include/sfx2/lokcharthelper.hxx include/sfx2/lokhelper.hxx include/sfx2/mailmodelapi.hxx -include/sfx2/mieclip.hxx include/sfx2/minfitem.hxx include/sfx2/module.hxx include/sfx2/msg.hxx include/sfx2/msgpool.hxx include/sfx2/navigat.hxx include/sfx2/new.hxx -include/sfx2/newstyle.hxx -include/sfx2/notebookbar/SfxNotebookBar.hxx include/sfx2/objface.hxx include/sfx2/objitem.hxx include/sfx2/objsh.hxx @@ -5971,7 +5859,6 @@ include/sfx2/printer.hxx include/sfx2/printopt.hxx include/sfx2/progress.hxx include/sfx2/request.hxx -include/sfx2/safemode.hxx include/sfx2/sfxbasecontroller.hxx include/sfx2/sfxbasemodel.hxx include/sfx2/sfxdlg.hxx @@ -5981,33 +5868,23 @@ include/sfx2/sfxmodelfactory.hxx include/sfx2/sfxstatuslistener.hxx include/sfx2/sfxuno.hxx include/sfx2/shell.hxx -include/sfx2/sidebar/AsynchronousCall.hxx -include/sfx2/sidebar/Context.hxx include/sfx2/sidebar/ControllerItem.hxx -include/sfx2/sidebar/Deck.hxx include/sfx2/sidebar/FocusManager.hxx -include/sfx2/sidebar/IContextChangeReceiver.hxx -include/sfx2/sidebar/ILayoutableWindow.hxx -include/sfx2/sidebar/Panel.hxx include/sfx2/sidebar/PanelLayout.hxx include/sfx2/sidebar/ResourceManager.hxx include/sfx2/sidebar/Sidebar.hxx include/sfx2/sidebar/SidebarChildWindow.hxx include/sfx2/sidebar/SidebarController.hxx include/sfx2/sidebar/SidebarDockingWindow.hxx -include/sfx2/sidebar/SidebarModelUpdate.hxx include/sfx2/sidebar/SidebarPanelBase.hxx include/sfx2/sidebar/TabBar.hxx include/sfx2/sidebar/Theme.hxx -include/sfx2/signaturestate.hxx include/sfx2/stbitem.hxx include/sfx2/styfitem.hxx include/sfx2/styledlg.hxx include/sfx2/tabdlg.hxx include/sfx2/tbxctrl.hxx -include/sfx2/templatedlg.hxx include/sfx2/templatelocalview.hxx -include/sfx2/templateproperties.hxx include/sfx2/thumbnailview.hxx include/sfx2/thumbnailviewitem.hxx include/sfx2/titledockwin.hxx @@ -6019,18 +5896,12 @@ include/sfx2/viewsh.hxx include/sfx2/watermarkitem.hxx include/sfx2/zoomitem.hxx include/sot/exchange.hxx -include/sot/filelist.hxx include/sot/formats.hxx -include/sot/object.hxx -include/sot/sotdllapi.h include/sot/stg.hxx include/sot/storage.hxx -include/sot/storinfo.hxx include/store/store.h include/store/store.hxx -include/store/storedllapi.h include/store/types.h -include/svl/IndexedStyleSheets.hxx include/svl/PasswordHelper.hxx include/svl/SfxBroadcaster.hxx include/svl/adrparse.hxx @@ -6039,11 +5910,8 @@ include/svl/asiancfg.hxx include/svl/broadcast.hxx include/svl/cenumitm.hxx include/svl/cintitem.hxx -include/svl/cjkoptions.hxx -include/svl/converter.hxx include/svl/cryptosign.hxx include/svl/ctloptions.hxx -include/svl/currencytable.hxx include/svl/custritm.hxx include/svl/documentlockfile.hxx include/svl/eitem.hxx @@ -6051,17 +5919,14 @@ include/svl/filenotation.hxx include/svl/flagitem.hxx include/svl/fstathelper.hxx include/svl/globalnameitem.hxx -include/svl/gridprinter.hxx include/svl/hint.hxx include/svl/ilstitem.hxx include/svl/imageitm.hxx include/svl/inethist.hxx -include/svl/inettype.hxx include/svl/instrm.hxx include/svl/int64item.hxx include/svl/intitem.hxx include/svl/isethint.hxx -include/svl/itemiter.hxx include/svl/itempool.hxx include/svl/itemprop.hxx include/svl/itemset.hxx @@ -6079,7 +5944,6 @@ include/svl/nfkeytab.hxx include/svl/nfsymbol.hxx include/svl/numuno.hxx include/svl/ondemand.hxx -include/svl/outstrm.hxx include/svl/ownlist.hxx include/svl/pickerhistoryaccess.hxx include/svl/poolcach.hxx @@ -6089,7 +5953,6 @@ include/svl/rectitem.hxx include/svl/rngitem.hxx include/svl/sharecontrolfile.hxx include/svl/sharedstring.hxx -include/svl/sharedstringpool.hxx include/svl/sigstruct.hxx include/svl/slstitm.hxx include/svl/srchdefs.hxx @@ -6097,18 +5960,14 @@ include/svl/srchitem.hxx include/svl/stritem.hxx include/svl/style.hxx include/svl/stylepool.hxx -include/svl/stylesheetuser.hxx include/svl/svdde.hxx -include/svl/svldllapi.h include/svl/undo.hxx include/svl/urihelper.hxx include/svl/urlbmk.hxx include/svl/visitem.hxx -include/svl/whiter.hxx include/svl/zforlist.hxx include/svl/zformat.hxx include/svtools/DocumentToGraphicRenderer.hxx -include/svtools/PlaceEditDialog.hxx include/svtools/acceleratorexecute.hxx include/svtools/accessibilityoptions.hxx include/svtools/addresstemplate.hxx @@ -6120,7 +5979,6 @@ include/svtools/borderline.hxx include/svtools/brwbox.hxx include/svtools/brwhead.hxx include/svtools/cliplistener.hxx -include/svtools/collatorres.hxx include/svtools/colorcfg.hxx include/svtools/colrdlg.hxx include/svtools/ctrlbox.hxx @@ -6138,20 +5996,16 @@ include/svtools/genericunodialog.hxx include/svtools/helpids.h include/svtools/helpopt.hxx include/svtools/htmlcfg.hxx -include/svtools/htmlkywd.hxx include/svtools/htmlout.hxx include/svtools/htmltokn.h include/svtools/imagemgr.hxx include/svtools/imageresourceaccess.hxx -include/svtools/imgdef.hxx -include/svtools/indexentryres.hxx include/svtools/inettbc.hxx include/svtools/insdlg.hxx include/svtools/javacontext.hxx include/svtools/javainteractionhandler.hxx include/svtools/langhelp.hxx include/svtools/langtab.hxx -include/svtools/menuoptions.hxx include/svtools/miscopt.hxx include/svtools/openfiledroptargetlistener.hxx include/svtools/optionsdrawinglayer.hxx @@ -6159,14 +6013,12 @@ include/svtools/parhtml.hxx include/svtools/parrtf.hxx include/svtools/place.hxx include/svtools/popupmenucontrollerbase.hxx -include/svtools/popupwindowcontroller.hxx include/svtools/printoptions.hxx include/svtools/prnsetup.hxx include/svtools/restartdialog.hxx include/svtools/rtfout.hxx include/svtools/rtftoken.h include/svtools/ruler.hxx -include/svtools/sampletext.hxx include/svtools/scriptedtext.hxx include/svtools/sfxecode.hxx include/svtools/slidesorterbaropt.hxx @@ -6174,7 +6026,6 @@ include/svtools/soerr.hxx include/svtools/statusbarcontroller.hxx include/svtools/stringtransfer.hxx include/svtools/svparser.hxx -include/svtools/svtdllapi.h include/svtools/tabbar.hxx include/svtools/templatefoldercache.hxx include/svtools/toolbarmenu.hxx @@ -6190,47 +6041,30 @@ include/svx/AccessibleOLEShape.hxx include/svx/AccessibleShape.hxx include/svx/AccessibleShapeInfo.hxx include/svx/AccessibleShapeTreeInfo.hxx -include/svx/AccessibleTextHelper.hxx include/svx/ActionDescriptionProvider.hxx -include/svx/ChildrenManager.hxx -include/svx/ClassificationDialog.hxx include/svx/ClassificationField.hxx include/svx/ColorSets.hxx include/svx/CommonStyleManager.hxx include/svx/EnhancedCustomShape2d.hxx include/svx/EnhancedCustomShapeFunctionParser.hxx include/svx/EnhancedCustomShapeGeometry.hxx -include/svx/EnhancedCustomShapeTypeNames.hxx include/svx/IAccessibleParent.hxx -include/svx/IAccessibleViewForwarder.hxx -include/svx/IAccessibleViewForwarderListener.hxx include/svx/Palette.hxx include/svx/PaletteManager.hxx -include/svx/ParaLineSpacingPopup.hxx -include/svx/ParaSpacingControl.hxx include/svx/ParseContext.hxx include/svx/ShapeTypeHandler.hxx include/svx/SmartTagItem.hxx include/svx/SmartTagMgr.hxx -include/svx/SpellDialogChildWindow.hxx include/svx/SvxColorChildWindow.hxx include/svx/SvxPresetListBox.hxx -include/svx/SvxShapeTypes.hxx -include/svx/TextCharacterSpacingPopup.hxx -include/svx/TextUnderlinePopup.hxx -include/svx/UnoNamespaceMap.hxx -include/svx/XPropertyEntry.hxx include/svx/algitem.hxx include/svx/anchorid.hxx include/svx/autoformathelper.hxx include/svx/bmpmask.hxx -include/svx/camera3d.hxx include/svx/charmap.hxx include/svx/charthelper.hxx include/svx/chrtitem.hxx include/svx/clipboardctl.hxx -include/svx/clipfmtitem.hxx -include/svx/colorbox.hxx include/svx/colorwindow.hxx include/svx/compressgraphicdialog.hxx include/svx/connctrl.hxx @@ -6242,28 +6076,21 @@ include/svx/databaselocationinput.hxx include/svx/databaseregistrationui.hxx include/svx/dbaexchange.hxx include/svx/dbaobjectex.hxx -include/svx/def3d.hxx include/svx/deflt3d.hxx include/svx/dialcontrol.hxx include/svx/dlgctl3d.hxx include/svx/dlgctrl.hxx -include/svx/dlgutil.hxx include/svx/drawitem.hxx include/svx/e3ditem.hxx -include/svx/e3dsceneupdater.hxx include/svx/e3dundo.hxx include/svx/extedit.hxx -include/svx/extrusionbar.hxx -include/svx/f3dchild.hxx include/svx/fillctrl.hxx include/svx/flagsdef.hxx include/svx/float3d.hxx -include/svx/fmdmod.hxx include/svx/fmdpage.hxx include/svx/fmgridcl.hxx include/svx/fmgridif.hxx include/svx/fmmodel.hxx -include/svx/fmobjfac.hxx include/svx/fmpage.hxx include/svx/fmsearch.hxx include/svx/fmshell.hxx @@ -6273,13 +6100,11 @@ include/svx/fmtools.hxx include/svx/fmview.hxx include/svx/fntctrl.hxx include/svx/fontwork.hxx -include/svx/fontworkbar.hxx include/svx/fontworkgallery.hxx include/svx/formatpaintbrushctrl.hxx include/svx/framebordertype.hxx include/svx/framelink.hxx include/svx/framelinkarray.hxx -include/svx/frmdirlbox.hxx include/svx/frmsel.hxx include/svx/galctrl.hxx include/svx/gallery.hxx @@ -6300,49 +6125,36 @@ include/svx/hlnkitem.hxx include/svx/hyperdlg.hxx include/svx/ifaceids.hxx include/svx/imapdlg.hxx -include/svx/insctrl.hxx -include/svx/ipolypolygoneditorcontroller.hxx -include/svx/itemwin.hxx include/svx/itextprovider.hxx include/svx/langbox.hxx include/svx/lathe3d.hxx -include/svx/layctrl.hxx -include/svx/lboxctrl.hxx include/svx/legacyitem.hxx include/svx/linectrl.hxx -include/svx/measctrl.hxx -include/svx/modctrl.hxx include/svx/msdffdef.hxx include/svx/nbdtmg.hxx -include/svx/nbdtmgfact.hxx include/svx/numfmtsh.hxx include/svx/numinf.hxx include/svx/numvset.hxx include/svx/obj3d.hxx -include/svx/objfac3d.hxx include/svx/ofaitem.hxx include/svx/optgenrl.hxx include/svx/optgrid.hxx include/svx/pagectrl.hxx include/svx/pageitem.hxx include/svx/pagenumberlistbox.hxx -include/svx/papersizelistbox.hxx include/svx/paraprev.hxx include/svx/passwd.hxx include/svx/polypolygoneditor.hxx include/svx/postattr.hxx include/svx/pszctrl.hxx -include/svx/rectenum.hxx include/svx/relfld.hxx include/svx/rotmodit.hxx include/svx/rubydialog.hxx include/svx/ruler.hxx include/svx/rulritem.hxx -include/svx/samecontentlistbox.hxx include/svx/scene3d.hxx include/svx/sdangitm.hxx include/svx/sdasitm.hxx -include/svx/sderitm.hxx include/svx/sdgcpitm.hxx include/svx/sdggaitm.hxx include/svx/sdgluitm.hxx @@ -6357,13 +6169,9 @@ include/svx/sdr/attribute/sdrallfillattributeshelper.hxx include/svx/sdr/contact/displayinfo.hxx include/svx/sdr/contact/objectcontact.hxx include/svx/sdr/contact/objectcontactofpageview.hxx -include/svx/sdr/contact/viewcontact.hxx include/svx/sdr/contact/viewcontactofe3dscene.hxx -include/svx/sdr/contact/viewcontactofsdrmediaobj.hxx include/svx/sdr/contact/viewcontactofsdrobj.hxx -include/svx/sdr/contact/viewcontactofvirtobj.hxx include/svx/sdr/contact/viewobjectcontact.hxx -include/svx/sdr/contact/viewobjectcontactofsdrobj.hxx include/svx/sdr/contact/viewobjectcontactredirector.hxx include/svx/sdr/overlay/overlayanimatedbitmapex.hxx include/svx/sdr/overlay/overlaybitmapex.hxx @@ -6378,7 +6186,6 @@ include/svx/sdr/primitive2d/svx_primitivetypes2d.hxx include/svx/sdr/properties/defaultproperties.hxx include/svx/sdr/properties/properties.hxx include/svx/sdr/table/tablecontroller.hxx -include/svx/sdr/table/tabledesign.hxx include/svx/sdrhittesthelper.hxx include/svx/sdrmasterpagedescriptor.hxx include/svx/sdrobjectfilter.hxx @@ -6386,39 +6193,24 @@ include/svx/sdrobjectuser.hxx include/svx/sdrpageuser.hxx include/svx/sdrpagewindow.hxx include/svx/sdrpaintwindow.hxx -include/svx/sdrundomanager.hxx -include/svx/sdshcitm.hxx -include/svx/sdshitm.hxx -include/svx/sdshtitm.hxx -include/svx/sdsxyitm.hxx include/svx/sdtaaitm.hxx include/svx/sdtacitm.hxx include/svx/sdtaditm.hxx -include/svx/sdtagitm.hxx include/svx/sdtaiitm.hxx include/svx/sdtaitm.hxx include/svx/sdtakitm.hxx include/svx/sdtayitm.hxx -include/svx/sdtcfitm.hxx -include/svx/sdtditm.hxx include/svx/sdtfchim.hxx include/svx/sdtfsitm.hxx -include/svx/sdtmfitm.hxx include/svx/sdynitm.hxx include/svx/searchcharmap.hxx -include/svx/selctrl.hxx include/svx/selectioncontroller.hxx include/svx/shapeproperty.hxx include/svx/shapepropertynotifier.hxx include/svx/sidebar/AreaPropertyPanelBase.hxx -include/svx/sidebar/AreaTransparencyGradientPopup.hxx include/svx/sidebar/ContextChangeEventMultiplexer.hxx -include/svx/sidebar/LinePropertyPanelBase.hxx -include/svx/sidebar/LineWidthPopup.hxx include/svx/sidebar/SelectionAnalyzer.hxx include/svx/sidebar/SelectionChangeHandler.hxx -include/svx/sidebar/ValueSetWithTextControl.hxx -include/svx/spacinglistbox.hxx include/svx/sphere3d.hxx include/svx/srchdlg.hxx include/svx/svdcrtv.hxx @@ -6445,7 +6237,6 @@ include/svx/svdocapt.hxx include/svx/svdocirc.hxx include/svx/svdoedge.hxx include/svx/svdograf.hxx -include/svx/svdogrp.hxx include/svx/svdomeas.hxx include/svx/svdomedia.hxx include/svx/svdoole2.hxx @@ -6456,7 +6247,6 @@ include/svx/svdotable.hxx include/svx/svdotext.hxx include/svx/svdouno.hxx include/svx/svdoutl.hxx -include/svx/svdovirt.hxx include/svx/svdpage.hxx include/svx/svdpagv.hxx include/svx/svdpntv.hxx @@ -6464,38 +6254,29 @@ include/svx/svdpoev.hxx include/svx/svdpool.hxx include/svx/svdsnpv.hxx include/svx/svdsob.hxx -include/svx/svdtext.hxx include/svx/svdtrans.hxx -include/svx/svdtypes.hxx include/svx/svdundo.hxx include/svx/svdview.hxx include/svx/svdviter.hxx include/svx/svdxcgv.hxx include/svx/svx3ditems.hxx include/svx/svxdlg.hxx -include/svx/svxdllapi.h include/svx/svxerr.hxx include/svx/svxgraphicitem.hxx include/svx/swframeexample.hxx include/svx/swframeposstrings.hxx -include/svx/swframetypes.hxx include/svx/swframevalidation.hxx include/svx/sxcecitm.hxx -include/svx/sxcgitm.hxx -include/svx/sxciaitm.hxx include/svx/sxcllitm.hxx include/svx/sxctitm.hxx include/svx/sxekitm.hxx -include/svx/sxelditm.hxx include/svx/sxenditm.hxx include/svx/sxmbritm.hxx -include/svx/sxmlhitm.hxx include/svx/sxmtfitm.hxx include/svx/sxmtpitm.hxx include/svx/sxmtritm.hxx include/svx/sxmuitm.hxx include/svx/tabarea.hxx -include/svx/tabline.hxx include/svx/tbcontrl.hxx include/svx/tbxcolor.hxx include/svx/tbxctl.hxx @@ -6516,7 +6297,6 @@ include/svx/unoprov.hxx include/svx/unoshape.hxx include/svx/unoshprp.hxx include/svx/unoshtxt.hxx -include/svx/verttexttbxctrl.hxx include/svx/view3d.hxx include/svx/viewlayoutitem.hxx include/svx/viewpt3d.hxx @@ -6545,7 +6325,6 @@ include/svx/xftadit.hxx include/svx/xftdiit.hxx include/svx/xftmrit.hxx include/svx/xftouit.hxx -include/svx/xftshcit.hxx include/svx/xftshit.hxx include/svx/xftshxy.hxx include/svx/xftstit.hxx @@ -6573,64 +6352,28 @@ include/svx/xmlgrhlp.hxx include/svx/xmlsecctrl.hxx include/svx/xoutbmp.hxx include/svx/xpoly.hxx -include/svx/xpool.hxx include/svx/xsflclit.hxx include/svx/xtable.hxx include/svx/xtextit0.hxx -include/svx/zoom_def.hxx -include/svx/zoomctrl.hxx include/svx/zoomsliderctrl.hxx include/svx/zoomslideritem.hxx include/systools/win32/comtools.hxx -include/systools/win32/qswin32.h -include/systools/win32/uwinapi.h -include/test/bootstrapfixture.hxx -include/test/container/xnamed.hxx -include/test/htmltesttools.hxx -include/test/screenshot_test.hxx -include/test/sheet/cellproperties.hxx -include/test/sheet/databaserange.hxx -include/test/sheet/datapilotfield.hxx -include/test/sheet/datapilotitem.hxx -include/test/sheet/xarealink.hxx include/test/sheet/xarealinks.hxx -include/test/sheet/xcelladdressable.hxx -include/test/sheet/xcellrangedata.hxx -include/test/sheet/xcellrangereferrer.hxx -include/test/sheet/xcellrangesquery.hxx include/test/sheet/xcellseries.hxx -include/test/sheet/xdatabaserange.hxx include/test/sheet/xdatapilotdescriptor.hxx include/test/sheet/xdatapilotfieldgrouping.hxx include/test/sheet/xdatapilottable.hxx include/test/sheet/xdatapilottable2.hxx -include/test/sheet/xgoalseek.hxx -include/test/sheet/xnamedrange.hxx include/test/sheet/xprintareas.hxx -include/test/sheet/xsheetannotation.hxx include/test/sheet/xsheetannotations.hxx include/test/sheet/xsheetannotationshapesupplier.hxx include/test/sheet/xsheetfilterable.hxx -include/test/sheet/xsheetlinkable.hxx -include/test/sheet/xsheetoperation.hxx -include/test/sheet/xsheetoutline.hxx -include/test/sheet/xsheetpagebreak.hxx -include/test/sheet/xspreadsheet.hxx include/test/sheet/xspreadsheetdocument.hxx -include/test/sheet/xspreadsheets.hxx include/test/sheet/xspreadsheets2.hxx -include/test/sheet/xsubtotalcalculatable.hxx -include/test/sheet/xsubtotaldescriptor.hxx -include/test/sheet/xsubtotalfield.hxx include/test/sheet/xuniquecellformatrangessupplier.hxx -include/test/sheet/xusedareacursor.hxx -include/test/sheet/xviewfreezable.hxx -include/test/sheet/xviewpane.hxx include/test/sheet/xviewsplitable.hxx include/test/testinteractionhandler.hxx -include/test/text/xtext.hxx include/test/text/xtextcontent.hxx -include/test/unoapi_test.hxx include/test/util/xreplaceable.hxx include/test/util/xsearchable.hxx include/test/xmldiff.hxx @@ -6649,26 +6392,21 @@ include/toolkit/controls/unocontrolmodel.hxx include/toolkit/controls/unocontrols.hxx include/toolkit/helper/accessiblefactory.hxx include/toolkit/helper/convert.hxx -include/toolkit/helper/emptyfontdescriptor.hxx include/toolkit/helper/formpdfexport.hxx include/toolkit/helper/listenermultiplexer.hxx include/toolkit/helper/macros.hxx include/toolkit/helper/mutexandbroadcasthelper.hxx -include/toolkit/helper/mutexhelper.hxx include/toolkit/helper/property.hxx include/toolkit/helper/vclunohelper.hxx include/tools/b3dtrans.hxx include/tools/bigint.hxx include/tools/color.hxx include/tools/config.hxx -include/tools/contnr.hxx include/tools/cpuid.hxx include/tools/date.hxx include/tools/datetime.hxx -include/tools/datetimeutils.hxx include/tools/debug.hxx include/tools/diagnose_ex.h -include/tools/extendapplicationenvironment.hxx include/tools/fontenum.hxx include/tools/fract.hxx include/tools/gen.hxx @@ -6682,16 +6420,12 @@ include/tools/lineend.hxx include/tools/link.hxx include/tools/mapunit.hxx include/tools/multisel.hxx -include/tools/pathutils.hxx include/tools/poly.hxx include/tools/ref.hxx include/tools/solar.h include/tools/stream.hxx include/tools/svborder.hxx -include/tools/svlibrary.h -include/tools/tenccvt.hxx include/tools/time.hxx -include/tools/toolsdllapi.h include/tools/urlobj.hxx include/tools/vcompat.hxx include/tools/weakbase.h @@ -6699,17 +6433,11 @@ include/tools/weakbase.hxx include/tools/wintypes.hxx include/tools/wldcrd.hxx include/tools/zcodec.hxx -include/typelib/typeclass.h include/typelib/typedescription.h include/typelib/typedescription.hxx -include/typelib/uik.h -include/ucbhelper/activedatasink.hxx include/ucbhelper/authenticationfallback.hxx include/ucbhelper/cancelcommandexecution.hxx -include/ucbhelper/commandenvironment.hxx -include/ucbhelper/content.hxx include/ucbhelper/contenthelper.hxx -include/ucbhelper/contentidentifier.hxx include/ucbhelper/fd_inputstream.hxx include/ucbhelper/interactionrequest.hxx include/ucbhelper/interceptedinteraction.hxx @@ -6723,9 +6451,6 @@ include/ucbhelper/resultsethelper.hxx include/ucbhelper/resultsetmetadata.hxx include/ucbhelper/simpleauthenticationrequest.hxx include/ucbhelper/simplecertificatevalidationrequest.hxx -include/ucbhelper/simpleinteractionrequest.hxx -include/ucbhelper/simplenameclashresolverequest.hxx -include/ucbhelper/ucbhelperdllapi.h include/uno/Enterable.h include/uno/EnvDcp.h include/uno/any2.h @@ -6736,29 +6461,21 @@ include/uno/dispatcher.h include/uno/dispatcher.hxx include/uno/environment.h include/uno/environment.hxx -include/uno/lbnames.h include/uno/mapping.h include/uno/mapping.hxx include/uno/sequence2.h include/uno/threadpool.h -include/unoidl/detail/dllapi.hxx include/unoidl/unoidl.hxx include/unotest/bootstrapfixturebase.hxx -include/unotest/directories.hxx include/unotest/filters-test.hxx include/unotest/gettestargument.hxx -include/unotest/macros_test.hxx include/unotest/officeconnection.hxx include/unotest/toabsolutefileurl.hxx include/unotools/ZipPackageHelper.hxx -include/unotools/accessiblerelationsethelper.hxx -include/unotools/accessiblestatesethelper.hxx include/unotools/bootstrap.hxx include/unotools/calendarwrapper.hxx -include/unotools/caserotate.hxx include/unotools/charclass.hxx include/unotools/closeveto.hxx -include/unotools/cmdoptions.hxx include/unotools/collatorwrapper.hxx include/unotools/compatibility.hxx include/unotools/configitem.hxx @@ -6767,10 +6484,8 @@ include/unotools/confignode.hxx include/unotools/configpaths.hxx include/unotools/configvaluecontainer.hxx include/unotools/datetime.hxx -include/unotools/defaultoptions.hxx include/unotools/desktopterminationobserver.hxx include/unotools/digitgroupingiterator.hxx -include/unotools/docinfohelper.hxx include/unotools/dynamicmenuoptions.hxx include/unotools/eventcfg.hxx include/unotools/eventlisteneradapter.hxx @@ -6792,7 +6507,6 @@ include/unotools/nativenumberwrapper.hxx include/unotools/options.hxx include/unotools/optionsdlg.hxx include/unotools/pathoptions.hxx -include/unotools/progresshandlerwrap.hxx include/unotools/readwritemutexguard.hxx include/unotools/resmgr.hxx include/unotools/saveopt.hxx @@ -6808,7 +6522,6 @@ include/unotools/textsearch.hxx include/unotools/transliterationwrapper.hxx include/unotools/ucbhelper.hxx include/unotools/ucbstreamhelper.hxx -include/unotools/unotoolsdllapi.h include/unotools/useroptions.hxx include/unotools/viewoptions.hxx include/unotools/wincodepage.hxx @@ -6817,7 +6530,6 @@ include/vbahelper/vbaapplicationbase.hxx include/vbahelper/vbacollectionimpl.hxx include/vbahelper/vbadialogbase.hxx include/vbahelper/vbadialogsbase.hxx -include/vbahelper/vbadllapi.h include/vbahelper/vbadocumentbase.hxx include/vbahelper/vbadocumentsbase.hxx include/vbahelper/vbaeventshelperbase.hxx @@ -6842,13 +6554,10 @@ include/vcl/ColorMask.hxx include/vcl/EnumContext.hxx include/vcl/FilterConfigItem.hxx include/vcl/GraphicObject.hxx -include/vcl/IContext.hxx include/vcl/IDialogRenderable.hxx include/vcl/IPrioritable.hxx include/vcl/ITiledRenderable.hxx -include/vcl/IconThemeInfo.hxx include/vcl/ImageTree.hxx -include/vcl/NotebookbarContextControl.hxx include/vcl/Scanline.hxx include/vcl/abstdlg.hxx include/vcl/accel.hxx @@ -6872,7 +6581,6 @@ include/vcl/cursor.hxx include/vcl/cvtgrf.hxx include/vcl/decoview.hxx include/vcl/dibtools.hxx -include/vcl/dllapi.h include/vcl/dndhelp.hxx include/vcl/dockingarea.hxx include/vcl/dockwin.hxx @@ -6881,8 +6589,6 @@ include/vcl/errcode.hxx include/vcl/errinf.hxx include/vcl/event.hxx include/vcl/evntpost.hxx -include/vcl/exceptiontypes.hxx -include/vcl/extoutdevdata.hxx include/vcl/fixed.hxx include/vcl/floatwin.hxx include/vcl/formatter.hxx @@ -6890,7 +6596,6 @@ include/vcl/fntstyle.hxx include/vcl/font.hxx include/vcl/fontcapabilities.hxx include/vcl/fontcharmap.hxx -include/vcl/gdimetafiletools.hxx include/vcl/gdimtf.hxx include/vcl/gfxlink.hxx include/vcl/gradient.hxx @@ -6911,10 +6616,8 @@ include/vcl/imaprect.hxx include/vcl/inetimg.hxx include/vcl/inputctx.hxx include/vcl/inputtypes.hxx -include/vcl/introwin.hxx include/vcl/jobset.hxx include/vcl/keycod.hxx -include/vcl/keycodes.hxx include/vcl/layout.hxx include/vcl/lazydelete.hxx include/vcl/lineinfo.hxx @@ -6925,18 +6628,15 @@ include/vcl/metaact.hxx include/vcl/metaactiontypes.hxx include/vcl/metric.hxx include/vcl/mnemonic.hxx -include/vcl/mtfxmldump.hxx include/vcl/notebookbar.hxx include/vcl/oldprintadaptor.hxx include/vcl/opengl/OpenGLContext.hxx include/vcl/opengl/OpenGLHelper.hxx -include/vcl/opengl/OpenGLWrapper.hxx include/vcl/outdev.hxx include/vcl/outdevmap.hxx include/vcl/outdevstate.hxx include/vcl/pdfextoutdevdata.hxx include/vcl/pdfwriter.hxx -include/vcl/pngread.hxx include/vcl/pngwrite.hxx include/vcl/print.hxx include/vcl/prntypes.hxx @@ -6952,7 +6652,6 @@ include/vcl/scopedbitmapaccess.hxx include/vcl/scrbar.hxx include/vcl/seleng.hxx include/vcl/settings.hxx -include/vcl/sound.hxx include/vcl/split.hxx include/vcl/splitwin.hxx include/vcl/status.hxx @@ -7005,7 +6704,6 @@ include/vcl/toolkit/vclmedit.hxx include/vcl/toolkit/viewdataentry.hxx include/vcl/transfer.hxx include/vcl/txtattr.hxx -include/vcl/uitest/factory.hxx include/vcl/uitest/uiobject.hxx include/vcl/uitest/uitest.hxx include/vcl/unohelp.hxx @@ -7013,7 +6711,6 @@ include/vcl/unohelp2.hxx include/vcl/vclenum.hxx include/vcl/vclevent.hxx include/vcl/vcllayout.hxx -include/vcl/vclmain.hxx include/vcl/vclptr.hxx include/vcl/vclreferencebase.hxx include/vcl/vectorgraphicdata.hxx @@ -7023,7 +6720,6 @@ include/vcl/wall.hxx include/vcl/window.hxx include/vcl/wizardmachine.hxx include/vcl/wmf.hxx -include/vcl/wmfexternal.hxx include/vcl/wrkwin.hxx include/vcl/xtextedt.hxx include/xmloff/DashStyle.hxx @@ -7035,7 +6731,6 @@ include/xmloff/ImageStyle.hxx include/xmloff/MarkerStyle.hxx include/xmloff/NamedBoolPropertyHdl.hxx include/xmloff/ProgressBarHelper.hxx -include/xmloff/SchXMLExportHelper.hxx include/xmloff/SchXMLImportHelper.hxx include/xmloff/SchXMLSeriesHelper.hxx include/xmloff/SettingsExportHelper.hxx @@ -7048,19 +6743,16 @@ include/xmloff/XMLEventsImportContext.hxx include/xmloff/XMLFilterServiceNames.h include/xmloff/XMLFontAutoStylePool.hxx include/xmloff/XMLFontStylesContext.hxx -include/xmloff/XMLGraphicsDefaultStyle.hxx include/xmloff/XMLPageExport.hxx include/xmloff/XMLSettingsExportContext.hxx include/xmloff/XMLShapeStyleContext.hxx include/xmloff/XMLTextListAutoStylePool.hxx include/xmloff/XMLTextMasterPageContext.hxx include/xmloff/XMLTextMasterPageExport.hxx -include/xmloff/XMLTextMasterStylesContext.hxx include/xmloff/XMLTextShapeImportHelper.hxx include/xmloff/XMLTextShapeStyleContext.hxx include/xmloff/XMLTextTableContext.hxx include/xmloff/animationexport.hxx -include/xmloff/animexp.hxx include/xmloff/attrlist.hxx include/xmloff/autolayout.hxx include/xmloff/contextid.hxx @@ -7073,8 +6765,6 @@ include/xmloff/languagetagodf.hxx include/xmloff/maptype.hxx include/xmloff/namespacemap.hxx include/xmloff/numehelp.hxx -include/xmloff/odffields.hxx -include/xmloff/prhdlfac.hxx include/xmloff/prstylei.hxx include/xmloff/settingsstore.hxx include/xmloff/shapeexport.hxx @@ -7117,14 +6807,12 @@ include/xmloff/xmltkmap.hxx include/xmloff/xmltoken.hxx include/xmloff/xmltypes.hxx include/xmloff/xmluconv.hxx -include/xmlreader/pad.hxx include/xmlreader/span.hxx include/xmlreader/xmlreader.hxx include/xmlscript/xml_helper.hxx include/xmlscript/xmldlg_imexp.hxx include/xmlscript/xmllib_imexp.hxx include/xmlscript/xmlmod_imexp.hxx -include/xmlscript/xmlscriptdllapi.h io/qa/textinputstream.cxx io/source/TextInputStream/TextInputStream.cxx io/source/TextOutputStream/TextOutputStream.cxx |