diff options
Diffstat (limited to 'svx/inc')
23 files changed, 165 insertions, 169 deletions
diff --git a/svx/inc/AffineMatrixItem.hxx b/svx/inc/AffineMatrixItem.hxx index 7d1c48a538f6..c7eb5cb71e8e 100644 --- a/svx/inc/AffineMatrixItem.hxx +++ b/svx/inc/AffineMatrixItem.hxx @@ -27,7 +27,7 @@ class SfxItemPool; class AffineMatrixItem final : public SfxPoolItem { private: - css::geometry::AffineMatrix2D maMatrix; + css::geometry::AffineMatrix2D maMatrix; public: AffineMatrixItem(const css::geometry::AffineMatrix2D* pMatrix); @@ -35,10 +35,10 @@ public: virtual ~AffineMatrixItem() override; virtual bool operator==(const SfxPoolItem&) const override; - virtual AffineMatrixItem* Clone( SfxItemPool* pPool = nullptr ) const override; + virtual AffineMatrixItem* Clone(SfxItemPool* pPool = nullptr) const 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; }; /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/DescriptionGenerator.hxx b/svx/inc/DescriptionGenerator.hxx index c1407a769188..5895b310b3fe 100644 --- a/svx/inc/DescriptionGenerator.hxx +++ b/svx/inc/DescriptionGenerator.hxx @@ -17,18 +17,22 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #pragma once #include <com/sun/star/uno/Reference.hxx> #include <rtl/ustrbuf.hxx> -namespace com::sun::star::beans { class XPropertySet; } -namespace com::sun::star::drawing { class XShape; } - - -namespace accessibility { +namespace com::sun::star::beans +{ +class XPropertySet; +} +namespace com::sun::star::drawing +{ +class XShape; +} +namespace accessibility +{ /** This class creates description strings for shapes. <p>Initialized with a given shape additional calls to the <member>addProperty</member> method will build a descriptive string that @@ -39,7 +43,8 @@ namespace accessibility { class DescriptionGenerator { public: - enum class PropertyType { + enum class PropertyType + { Color, Integer }; @@ -51,8 +56,7 @@ public: The shape from which properties will be extracted by later calls to <member>addProperty</member>. */ - DescriptionGenerator (const css::uno::Reference< - css::drawing::XShape>& xShape); + DescriptionGenerator(const css::uno::Reference<css::drawing::XShape>& xShape); ~DescriptionGenerator(); @@ -62,7 +66,7 @@ public: An introductory description of the shape that is made more specific by later calls to <member>addProperty</member>. */ - void Initialize (const OUString& sPrefix); + void Initialize(const OUString& sPrefix); /** Initialize the description with the specified string from the resource followed by the shape style in parentheses and a colon. @@ -78,7 +82,7 @@ public: @return The description string in its current form. */ - OUString operator() (void); + OUString operator()(void); /** Add the given property name and its associated value to the description string. If the property value does not differ from the @@ -93,22 +97,21 @@ public: Localized name of the property. An empty string tells the method to use the property name instead. */ - void AddProperty (const OUString& sPropertyName, - PropertyType aType); + void AddProperty(const OUString& sPropertyName, PropertyType aType); /** Append the given string as is to the current description. @param sString String to append to the current description. It is not modified in any way. */ - void AppendString (const OUString& sString); + void AppendString(const OUString& sString); private: /// Reference to the shape from which the properties are extracted. - css::uno::Reference< css::drawing::XShape> mxShape; + css::uno::Reference<css::drawing::XShape> mxShape; /// Reference to the shape's property set. - css::uno::Reference< css::beans::XPropertySet> mxSet; + css::uno::Reference<css::beans::XPropertySet> mxSet; /// The description string that is build. OUStringBuffer msDescription; @@ -120,15 +123,13 @@ private: /** Add a property value formatted as color to the description string. */ - void AddColor (const OUString& sPropertyName); + void AddColor(const OUString& sPropertyName); /** Add a property value formatted as integer to the description string. */ - void AddInteger (const OUString& sPropertyName); + void AddInteger(const OUString& sPropertyName); }; - } // end of namespace accessibility - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/GalleryControl.hxx b/svx/inc/GalleryControl.hxx index 5b40f4bc83be..8f8e6339df85 100644 --- a/svx/inc/GalleryControl.hxx +++ b/svx/inc/GalleryControl.hxx @@ -31,13 +31,12 @@ class GalleryBrowser2; class FmFormModel; class Splitter; -namespace svx::sidebar { - - +namespace svx::sidebar +{ class UNLESS_MERGELIBS(SVXCORE_DLLPUBLIC) GalleryControl final : public PanelLayout { public: - GalleryControl( vcl::Window* pParentWindow ); + GalleryControl(vcl::Window* pParentWindow); private: Gallery* mpGallery; diff --git a/svx/inc/dbcharsethelper.hxx b/svx/inc/dbcharsethelper.hxx index 207d89fb25d6..8dfaf27ca693 100644 --- a/svx/inc/dbcharsethelper.hxx +++ b/svx/inc/dbcharsethelper.hxx @@ -25,12 +25,10 @@ namespace svxform::charset_helper { - - /** enumerates all supported charsets +/** enumerates all supported charsets @return the number of charsets supported */ - sal_Int32 getSupportedTextEncodings( ::std::vector< rtl_TextEncoding >& _rEncs ); - +sal_Int32 getSupportedTextEncodings(::std::vector<rtl_TextEncoding>& _rEncs); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/extrusiondepthdialog.hxx b/svx/inc/extrusiondepthdialog.hxx index e7f2e07a514b..11d69c17033f 100644 --- a/svx/inc/extrusiondepthdialog.hxx +++ b/svx/inc/extrusiondepthdialog.hxx @@ -22,8 +22,8 @@ #include <vcl/weld.hxx> -namespace svx { - +namespace svx +{ class ExtrusionDepthDialog final : public weld::GenericDialogController { std::unique_ptr<weld::MetricSpinButton> m_xMtrDepth; @@ -34,7 +34,6 @@ public: double getDepth() const; }; - } #endif // INCLUDED_SVX_INC_EXTRUSIONDEPTHDIALOG_HXX diff --git a/svx/inc/polygn3d.hxx b/svx/inc/polygn3d.hxx index 05b15c83fd1d..2665efdffcb8 100644 --- a/svx/inc/polygn3d.hxx +++ b/svx/inc/polygn3d.hxx @@ -29,7 +29,7 @@ class UNLESS_MERGELIBS(SVXCORE_DLLPUBLIC) E3dPolygonObj final : public E3dCompou basegfx::B3DPolyPolygon aPolyPoly3D; basegfx::B3DPolyPolygon aPolyNormals3D; basegfx::B2DPolyPolygon aPolyTexture2D; - bool bLineOnly; + bool bLineOnly; SVX_DLLPRIVATE void CreateDefaultNormals(); SVX_DLLPRIVATE void CreateDefaultTexture(); @@ -44,9 +44,7 @@ public: void SetPolyNormals3D(const basegfx::B3DPolyPolygon& rNewPolyPoly3D); void SetPolyTexture2D(const basegfx::B2DPolyPolygon& rNewPolyPoly2D); - E3dPolygonObj( - SdrModel& rSdrModel, - const basegfx::B3DPolyPolygon& rPolyPoly3D); + E3dPolygonObj(SdrModel& rSdrModel, const basegfx::B3DPolyPolygon& rPolyPoly3D); E3dPolygonObj(SdrModel& rSdrModel); const basegfx::B3DPolyPolygon& GetPolyPolygon3D() const { return aPolyPoly3D; } diff --git a/svx/inc/sdr/contact/viewcontactofe3d.hxx b/svx/inc/sdr/contact/viewcontactofe3d.hxx index 982d28752984..2f24460cd106 100644 --- a/svx/inc/sdr/contact/viewcontactofe3d.hxx +++ b/svx/inc/sdr/contact/viewcontactofe3d.hxx @@ -23,14 +23,18 @@ #include <svx/sdr/contact/viewcontactofsdrobj.hxx> #include <drawinglayer/primitive3d/baseprimitive3d.hxx> -namespace drawinglayer::attribute { class SdrLineAttribute; } -namespace basegfx { - class BColor; - class B3DHomMatrix; +namespace drawinglayer::attribute +{ +class SdrLineAttribute; +} +namespace basegfx +{ +class BColor; +class B3DHomMatrix; } -namespace sdr::contact { - +namespace sdr::contact +{ class ViewContactOfE3dScene; class ViewContactOfE3d : public ViewContactOfSdrObj @@ -38,7 +42,8 @@ class ViewContactOfE3d : public ViewContactOfSdrObj 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; public: // basic constructor, used from E3dObject. @@ -46,38 +51,36 @@ public: virtual ~ViewContactOfE3d() override; // access to E3dObject - const E3dObject& GetE3dObject() const - { - return static_cast<const E3dObject&>(GetSdrObject()); - } + const E3dObject& GetE3dObject() const { return static_cast<const E3dObject&>(GetSdrObject()); } // public helpers drawinglayer::primitive2d::Primitive2DContainer impCreateWithGivenPrimitive3DContainer( const drawinglayer::primitive3d::Primitive3DContainer& rxContent3D) const; - // primitive stuff // Primitive3DContainer of the ViewContact. This contains all necessary information // for the graphical visualisation and needs to be supported by all 3D VCs which // can be visualized. It does NOT contain the object transformation to be able to // buffer for all possible usages - drawinglayer::primitive3d::Primitive3DContainer mxViewIndependentPrimitive3DContainer; + drawinglayer::primitive3d::Primitive3DContainer mxViewIndependentPrimitive3DContainer; protected: // This method is responsible for creating the graphical visualisation data which is // stored in mxViewIndependentPrimitive3DContainer, but without object transformation - virtual drawinglayer::primitive3d::Primitive3DContainer createViewIndependentPrimitive3DContainer() const = 0; + virtual drawinglayer::primitive3d::Primitive3DContainer + createViewIndependentPrimitive3DContainer() const = 0; // This method is responsible for creating the graphical visualisation data derived ONLY from // the model data. The default implementation will try to create a 3D to 2D embedding (will work // when scene is known) which can then be used for 2D processing concerning ranges - virtual drawinglayer::primitive2d::Primitive2DContainer createViewIndependentPrimitive2DSequence() const override; + virtual drawinglayer::primitive2d::Primitive2DContainer + createViewIndependentPrimitive2DSequence() const override; public: // access to the local primitive without the object's local 3D transform. This is e.g. needed // to get the not-yet transformed BoundVolume for e.g. interactions - drawinglayer::primitive3d::Primitive3DContainer const & getVIP3DSWithoutObjectTransform() const; + drawinglayer::primitive3d::Primitive3DContainer const& getVIP3DSWithoutObjectTransform() const; // access to the local primitive. This will ensure that the list is // current in comparing the local list content with a fresh created incarnation. It will @@ -85,8 +88,6 @@ public: // local 3d transform is used drawinglayer::primitive3d::Primitive3DContainer getViewIndependentPrimitive3DContainer() const; }; - } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/sdr/contact/viewcontactofpageobj.hxx b/svx/inc/sdr/contact/viewcontactofpageobj.hxx index e1cb66a8b42a..f7ca5a7efd63 100644 --- a/svx/inc/sdr/contact/viewcontactofpageobj.hxx +++ b/svx/inc/sdr/contact/viewcontactofpageobj.hxx @@ -25,16 +25,19 @@ class SdrPage; -namespace sdr::contact { - +namespace sdr::contact +{ class ViewContactOfPageObj final : public ViewContactOfSdrObj { // 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; // create graphical visualisation data - virtual drawinglayer::primitive2d::Primitive2DContainer createViewIndependentPrimitive2DSequence() const override; + virtual drawinglayer::primitive2d::Primitive2DContainer + createViewIndependentPrimitive2DSequence() const override; + public: // basic constructor, used from SdrObject. explicit ViewContactOfPageObj(SdrPageObj& rPageObj); @@ -44,13 +47,8 @@ public: virtual void ActionChanged() override; // access to SdrObject - const SdrPageObj& GetPageObj() const - { - return static_cast<const SdrPageObj&>(GetSdrObject()); - } + const SdrPageObj& GetPageObj() const { return static_cast<const SdrPageObj&>(GetSdrObject()); } }; - } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/sdr/contact/viewcontactofsdrole2obj.hxx b/svx/inc/sdr/contact/viewcontactofsdrole2obj.hxx index 7a79e3ee4f12..ac7a861e924f 100644 --- a/svx/inc/sdr/contact/viewcontactofsdrole2obj.hxx +++ b/svx/inc/sdr/contact/viewcontactofsdrole2obj.hxx @@ -26,8 +26,8 @@ class Graphic; -namespace sdr::contact { - +namespace sdr::contact +{ class ViewContactOfSdrOle2Obj final : public ViewContactOfSdrRectObj { private: @@ -36,14 +36,12 @@ private: // 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; public: // access to SdrOle2Obj - const SdrOle2Obj& GetOle2Obj() const - { - return static_cast<const SdrOle2Obj&>(GetSdrObject()); - } + const SdrOle2Obj& GetOle2Obj() const { return static_cast<const SdrOle2Obj&>(GetSdrObject()); } /// helper to create transformation from SdrObject basegfx::B2DHomMatrix createObjectTransform() const; @@ -61,17 +59,17 @@ public: // #i123539# get rid of buffered chart content (if there) on change virtual void ActionChanged() override; - virtual basegfx::B2DRange getRange( const drawinglayer::geometry::ViewInformation2D& rViewInfo2D ) const override; + virtual basegfx::B2DRange + getRange(const drawinglayer::geometry::ViewInformation2D& rViewInfo2D) const override; private: // This method is responsible for creating the graphical visualisation data // ONLY based on model data, just wraps to call createPrimitive2DSequenceWithParameters(false) - virtual drawinglayer::primitive2d::Primitive2DContainer createViewIndependentPrimitive2DSequence() const override; + virtual drawinglayer::primitive2d::Primitive2DContainer + createViewIndependentPrimitive2DSequence() const override; }; - } - #endif // INCLUDED_SVX_INC_SDR_CONTACT_VIEWCONTACTOFSDROLE2OBJ_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/sdr/contact/viewcontactofsdrrectobj.hxx b/svx/inc/sdr/contact/viewcontactofsdrrectobj.hxx index b1de079e3177..3477ce4f8f87 100644 --- a/svx/inc/sdr/contact/viewcontactofsdrrectobj.hxx +++ b/svx/inc/sdr/contact/viewcontactofsdrrectobj.hxx @@ -22,16 +22,13 @@ #include <sdr/contact/viewcontactoftextobj.hxx> #include <svx/svdorect.hxx> -namespace sdr::contact { - +namespace sdr::contact +{ class ViewContactOfSdrRectObj : public ViewContactOfTextObj { protected: // internal access to SdrRectObj - const SdrRectObj& GetRectObj() const - { - return static_cast<const SdrRectObj&>(GetSdrObject()); - } + const SdrRectObj& GetRectObj() const { return static_cast<const SdrRectObj&>(GetSdrObject()); } public: // basic constructor, used from SdrObject. @@ -41,9 +38,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; }; - } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/sdr/contact/viewcontactoftextobj.hxx b/svx/inc/sdr/contact/viewcontactoftextobj.hxx index 132744d0019e..cdf88e10c7bd 100644 --- a/svx/inc/sdr/contact/viewcontactoftextobj.hxx +++ b/svx/inc/sdr/contact/viewcontactoftextobj.hxx @@ -23,8 +23,8 @@ class SdrTextObj; -namespace sdr::contact { - +namespace sdr::contact +{ class ViewContactOfTextObj : public ViewContactOfSdrObj { public: @@ -32,7 +32,6 @@ public: explicit ViewContactOfTextObj(SdrTextObj& rTextObj); virtual ~ViewContactOfTextObj() override; }; - } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/sdr/contact/viewobjectcontactofpageobj.hxx b/svx/inc/sdr/contact/viewobjectcontactofpageobj.hxx index c0f67e83ed53..16e168c41235 100644 --- a/svx/inc/sdr/contact/viewobjectcontactofpageobj.hxx +++ b/svx/inc/sdr/contact/viewobjectcontactofpageobj.hxx @@ -24,8 +24,8 @@ class SdrPage; -namespace sdr::contact { - +namespace sdr::contact +{ class PagePrimitiveExtractor; class ViewObjectContactOfPageObj final : public ViewObjectContactOfSdrObj @@ -37,15 +37,13 @@ private: // This method is responsible for creating the graphical visualisation data which is // stored/cached in the local primitive. // This method will not handle included hierarchies and not check geometric visibility. - virtual drawinglayer::primitive2d::Primitive2DContainer createPrimitive2DSequence(const DisplayInfo& rDisplayInfo) const override; + virtual drawinglayer::primitive2d::Primitive2DContainer + createPrimitive2DSequence(const DisplayInfo& rDisplayInfo) const override; public: ViewObjectContactOfPageObj(ObjectContact& rObjectContact, ViewContact& rViewContact); virtual ~ViewObjectContactOfPageObj() override; }; - } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/sdr/contact/viewobjectcontactofsdrole2obj.hxx b/svx/inc/sdr/contact/viewobjectcontactofsdrole2obj.hxx index 4d227a9c20e5..8afd0c2cc76d 100644 --- a/svx/inc/sdr/contact/viewobjectcontactofsdrole2obj.hxx +++ b/svx/inc/sdr/contact/viewobjectcontactofsdrole2obj.hxx @@ -24,18 +24,18 @@ class SdrOle2Obj; -namespace sdr::contact { - +namespace sdr::contact +{ class ViewObjectContactOfSdrOle2Obj final : public ViewObjectContactOfSdrObj { // This method is responsible for creating the graphical visualisation data - virtual drawinglayer::primitive2d::Primitive2DContainer createPrimitive2DSequence(const DisplayInfo& rDisplayInfo) const override; + virtual drawinglayer::primitive2d::Primitive2DContainer + createPrimitive2DSequence(const DisplayInfo& rDisplayInfo) const override; public: ViewObjectContactOfSdrOle2Obj(ObjectContact& rObjectContact, ViewContact& rViewContact); virtual ~ViewObjectContactOfSdrOle2Obj() override; }; - } #endif // INCLUDED_SVX_INC_SDR_CONTACT_VIEWOBJECTCONTACTOFSDROLE2OBJ_HXX diff --git a/svx/inc/sdr/primitive2d/sdrprimitivetools.hxx b/svx/inc/sdr/primitive2d/sdrprimitivetools.hxx index 5b2bd6d30535..71e50cdf7fd8 100644 --- a/svx/inc/sdr/primitive2d/sdrprimitivetools.hxx +++ b/svx/inc/sdr/primitive2d/sdrprimitivetools.hxx @@ -22,23 +22,21 @@ #include <vcl/bitmapex.hxx> - // predefines -namespace basegfx { - class BColor; +namespace basegfx +{ +class BColor; } - // helper methods namespace drawinglayer::primitive2d - { - // create a 3x3 cross in given color as BitmapEx - BitmapEx createDefaultCross_3x3(const basegfx::BColor& rBColor); +{ +// create a 3x3 cross in given color as BitmapEx +BitmapEx createDefaultCross_3x3(const basegfx::BColor& rBColor); } // end of namespace drawinglayer::primitive2d - #endif // INCLUDED_SVX_INC_SDR_PRIMITIVE2D_SDRPRIMITIVETOOLS_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/sxcaitm.hxx b/svx/inc/sxcaitm.hxx index 8ffaec240f30..d6e216bf5493 100644 --- a/svx/inc/sxcaitm.hxx +++ b/svx/inc/sxcaitm.hxx @@ -32,9 +32,13 @@ // only if Type2, Type3 and Type4 // and only if SdrCaptionIsFixedAngleItem=TRUE -class SdrCaptionAngleItem final : public SdrAngleItem { +class SdrCaptionAngleItem final : public SdrAngleItem +{ public: - SdrCaptionAngleItem(tools::Long nAngle=0): SdrAngleItem(SDRATTR_CAPTIONANGLE,nAngle) {} + SdrCaptionAngleItem(tools::Long nAngle = 0) + : SdrAngleItem(SDRATTR_CAPTIONANGLE, nAngle) + { + } virtual SdrCaptionAngleItem* Clone(SfxItemPool*) const override { return new SdrCaptionAngleItem(*this); diff --git a/svx/inc/sxmoitm.hxx b/svx/inc/sxmoitm.hxx index db4989134990..24ee1fc32b6b 100644 --- a/svx/inc/sxmoitm.hxx +++ b/svx/inc/sxmoitm.hxx @@ -24,9 +24,13 @@ // Overlap of the measure line over the measure helper lines // Only of the measure arrows are on the outside -class SdrMeasureOverhangItem: public SdrMetricItem { +class SdrMeasureOverhangItem : public SdrMetricItem +{ public: - SdrMeasureOverhangItem(tools::Long nVal): SdrMetricItem(SDRATTR_MEASUREOVERHANG,nVal) {} + SdrMeasureOverhangItem(tools::Long nVal) + : SdrMetricItem(SDRATTR_MEASUREOVERHANG, nVal) + { + } virtual SdrMeasureOverhangItem* Clone(SfxItemPool*) const override { return new SdrMeasureOverhangItem(*this); diff --git a/svx/inc/sxmsitm.hxx b/svx/inc/sxmsitm.hxx index 78dea13bf74e..f821c73fe047 100644 --- a/svx/inc/sxmsitm.hxx +++ b/svx/inc/sxmsitm.hxx @@ -25,9 +25,13 @@ // Measure scale setting // We do not overwrite a measure scale (UIScale), If the model already has one set. // Instead, we multiply them with each other. -class SdrMeasureScaleItem final : public SdrScaleItem { +class SdrMeasureScaleItem final : public SdrScaleItem +{ public: - SdrMeasureScaleItem() : SdrScaleItem(SDRATTR_MEASURESCALE,Fraction(1,1)) {} + SdrMeasureScaleItem() + : SdrScaleItem(SDRATTR_MEASURESCALE, Fraction(1, 1)) + { + } virtual SdrMeasureScaleItem* Clone(SfxItemPool*) const override { return new SdrMeasureScaleItem(*this); diff --git a/svx/inc/sxroaitm.hxx b/svx/inc/sxroaitm.hxx index dde8f989cde1..66785c68af7e 100644 --- a/svx/inc/sxroaitm.hxx +++ b/svx/inc/sxroaitm.hxx @@ -22,9 +22,13 @@ #include <svx/svddef.hxx> #include <svx/sdangitm.hxx> -class SdrRotateAllItem final : public SdrAngleItem { +class SdrRotateAllItem final : public SdrAngleItem +{ public: - SdrRotateAllItem(): SdrAngleItem(SDRATTR_ROTATEALL,0) {} + SdrRotateAllItem() + : SdrAngleItem(SDRATTR_ROTATEALL, 0) + { + } virtual SdrRotateAllItem* Clone(SfxItemPool*) const override { return new SdrRotateAllItem(*this); diff --git a/svx/inc/sxsaitm.hxx b/svx/inc/sxsaitm.hxx index 8d9fbd6a5c7f..1591dfa4938f 100644 --- a/svx/inc/sxsaitm.hxx +++ b/svx/inc/sxsaitm.hxx @@ -22,9 +22,13 @@ #include <svx/svddef.hxx> #include <svx/sdangitm.hxx> -class SdrShearAngleItem: public SdrAngleItem { +class SdrShearAngleItem : public SdrAngleItem +{ public: - SdrShearAngleItem(tools::Long nAngle=0): SdrAngleItem(SDRATTR_SHEARANGLE,nAngle) {} + SdrShearAngleItem(tools::Long nAngle = 0) + : SdrAngleItem(SDRATTR_SHEARANGLE, nAngle) + { + } virtual SdrShearAngleItem* Clone(SfxItemPool*) const override { return new SdrShearAngleItem(*this); diff --git a/svx/inc/textchain.hxx b/svx/inc/textchain.hxx index d5cae0be281c..a74b6c9f6768 100644 --- a/svx/inc/textchain.hxx +++ b/svx/inc/textchain.hxx @@ -26,8 +26,9 @@ class ImpChainLinkProperties; class SdrTextObj; class SdrModel; -namespace rtl { - class OUString; +namespace rtl +{ +class OUString; } typedef OUString ChainLinkId; @@ -45,11 +46,12 @@ class ImpChainLinkProperties protected: friend class TextChain; - ImpChainLinkProperties() { + ImpChainLinkProperties() + { aNilChainingEvent = false; aCursorEvent = CursorChainingEvent::NULL_EVENT; - aPreChainingSel = ESelection(0,0,0,0); - aPostChainingSel = ESelection(0,0,0,0); + aPreChainingSel = ESelection(0, 0, 0, 0); + aPostChainingSel = ESelection(0, 0, 0, 0); aIsPartOfLastParaInNextLink = false; // XXX: Should come from file aSwitchingToNextBox = false; } @@ -64,40 +66,39 @@ private: bool aSwitchingToNextBox; }; - class TextChain { public: ~TextChain(); - ImpChainLinkProperties *GetLinkProperties(const SdrTextObj *); + ImpChainLinkProperties* GetLinkProperties(const SdrTextObj*); // Specific Link Properties - CursorChainingEvent const & GetCursorEvent(const SdrTextObj *); - void SetCursorEvent(const SdrTextObj *, CursorChainingEvent const &); + CursorChainingEvent const& GetCursorEvent(const SdrTextObj*); + void SetCursorEvent(const SdrTextObj*, CursorChainingEvent const&); - bool GetNilChainingEvent(const SdrTextObj *); - void SetNilChainingEvent(const SdrTextObj *, bool); + bool GetNilChainingEvent(const SdrTextObj*); + void SetNilChainingEvent(const SdrTextObj*, bool); - ESelection const & GetPreChainingSel(const SdrTextObj *); - void SetPreChainingSel(const SdrTextObj *, ESelection const &); + ESelection const& GetPreChainingSel(const SdrTextObj*); + void SetPreChainingSel(const SdrTextObj*, ESelection const&); - ESelection const & GetPostChainingSel(const SdrTextObj *); - void SetPostChainingSel(const SdrTextObj *, ESelection const &); + ESelection const& GetPostChainingSel(const SdrTextObj*); + void SetPostChainingSel(const SdrTextObj*, ESelection const&); // return whether a paragraph is split between this box and the next - bool GetIsPartOfLastParaInNextLink(const SdrTextObj *); - void SetIsPartOfLastParaInNextLink(const SdrTextObj *, bool ); + bool GetIsPartOfLastParaInNextLink(const SdrTextObj*); + void SetIsPartOfLastParaInNextLink(const SdrTextObj*, bool); // return whether we are currently moving the cursor to the next box (useful to know whether we should prevent SetOutlinerParaObject invocations in SdrTextObj::EndTextEdit) - bool GetSwitchingToNextBox(const SdrTextObj *); - void SetSwitchingToNextBox(const SdrTextObj *, bool); + bool GetSwitchingToNextBox(const SdrTextObj*); + void SetSwitchingToNextBox(const SdrTextObj*, bool); protected: TextChain(); private: - std::map< ChainLinkId, ImpChainLinkProperties *> maLinkPropertiesMap; + std::map<ChainLinkId, ImpChainLinkProperties*> maLinkPropertiesMap; friend class SdrModel; }; diff --git a/svx/inc/textchainflow.hxx b/svx/inc/textchainflow.hxx index c823663d631b..e8ffd654b5b6 100644 --- a/svx/inc/textchainflow.hxx +++ b/svx/inc/textchainflow.hxx @@ -34,21 +34,21 @@ class UFlowChainedText; class TextChainFlow { public: - TextChainFlow(SdrTextObj *pChainTarget); + TextChainFlow(SdrTextObj* pChainTarget); virtual ~TextChainFlow(); // Check for flow events in Outliner - virtual void CheckForFlowEvents(SdrOutliner *); + virtual void CheckForFlowEvents(SdrOutliner*); - void ExecuteUnderflow(SdrOutliner *); + void ExecuteUnderflow(SdrOutliner*); // Uses two outliners: one for the non-overflow text and one for overflowing (might be the same) - void ExecuteOverflow(SdrOutliner *, SdrOutliner *); + void ExecuteOverflow(SdrOutliner*, SdrOutliner*); bool IsOverflow() const; bool IsUnderflow() const; - SdrTextObj *GetLinkTarget() const; + SdrTextObj* GetLinkTarget() const; protected: // Cursor related @@ -59,43 +59,42 @@ protected: std::unique_ptr<OFlowChainedText> mpOverflChText; std::unique_ptr<UFlowChainedText> mpUnderflChText; - void impCheckForFlowEvents(SdrOutliner *, SdrOutliner *); + void impCheckForFlowEvents(SdrOutliner*, SdrOutliner*); - TextChain *GetTextChain() const; + TextChain* GetTextChain() const; - virtual void impLeaveOnlyNonOverflowingText(SdrOutliner *); - void impMoveChainedTextToNextLink(SdrOutliner *); + virtual void impLeaveOnlyNonOverflowingText(SdrOutliner*); + void impMoveChainedTextToNextLink(SdrOutliner*); - virtual void impSetFlowOutlinerParams(SdrOutliner *, SdrOutliner *); + virtual void impSetFlowOutlinerParams(SdrOutliner*, SdrOutliner*); private: bool mbOFisUFinduced; void impUpdateCursorInfo(); - SdrTextObj *mpTargetLink; - SdrTextObj *mpNextLink; + SdrTextObj* mpTargetLink; + SdrTextObj* mpNextLink; - TextChain *mpTextChain; + TextChain* mpTextChain; bool bUnderflow; bool bOverflow; }; - // NOTE: EditingTextChainFlow might be strongly coupled with behavior in SdrTextObj::onChainingEvent class EditingTextChainFlow : public TextChainFlow { public: - EditingTextChainFlow(SdrTextObj *); - virtual void CheckForFlowEvents(SdrOutliner *) override; + EditingTextChainFlow(SdrTextObj*); + virtual void CheckForFlowEvents(SdrOutliner*) override; //virtual void ExecuteOverflow(SdrOutliner *, SdrOutliner *) override; protected: - virtual void impLeaveOnlyNonOverflowingText(SdrOutliner *) override; + virtual void impLeaveOnlyNonOverflowingText(SdrOutliner*) override; - virtual void impSetFlowOutlinerParams(SdrOutliner *, SdrOutliner *) override; + virtual void impSetFlowOutlinerParams(SdrOutliner*, SdrOutliner*) override; private: void impBroadcastCursorInfo() const; diff --git a/svx/inc/uiobject.hxx b/svx/inc/uiobject.hxx index 34659619cf83..bddf321a130e 100644 --- a/svx/inc/uiobject.hxx +++ b/svx/inc/uiobject.hxx @@ -24,36 +24,29 @@ class SvxShowCharSetUIObject final : public DrawingAreaUIObject public: SvxShowCharSetUIObject(const VclPtr<vcl::Window>& rCharSetWin); - virtual void execute(const OUString& rAction, - const StringMap& rParameters) override; + virtual void execute(const OUString& rAction, const StringMap& rParameters) override; static std::unique_ptr<UIObject> create(vcl::Window* pWindow); private: - OUString get_name() const override; }; - class SvxNumValueSetUIObject final : public DrawingAreaUIObject { SvxNumValueSet* mpNumValueSet; public: - SvxNumValueSetUIObject(vcl::Window* pNumValueSetWin); - virtual void execute(const OUString& rAction, - const StringMap& rParameters) override; + virtual void execute(const OUString& rAction, const StringMap& rParameters) override; static std::unique_ptr<UIObject> create(vcl::Window* pWindow); virtual StringMap get_state() override; private: - OUString get_name() const override; - }; #endif // INCLUDED_SVX_INC_UIOBJECT_HXX diff --git a/svx/inc/unomlstr.hxx b/svx/inc/unomlstr.hxx index af2559fa09b4..55cae9c0dfdc 100644 --- a/svx/inc/unomlstr.hxx +++ b/svx/inc/unomlstr.hxx @@ -25,12 +25,13 @@ class SdrObject; -class SvxUnoShapeModifyListener final : public ::cppu::WeakAggImplHelper1< css::util::XModifyListener > +class SvxUnoShapeModifyListener final + : public ::cppu::WeakAggImplHelper1<css::util::XModifyListener> { - SdrObject* mpObj; + SdrObject* mpObj; public: - SvxUnoShapeModifyListener( SdrObject* pObj ) throw(); + SvxUnoShapeModifyListener(SdrObject* pObj) throw(); virtual ~SvxUnoShapeModifyListener() throw() override; // css::util::XModifyListener @@ -43,8 +44,6 @@ public: void invalidate() throw(); }; - #endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |