[Libreoffice-commits] core.git: 2 commits - include/svx

[Tor Lillqvist]

 include/svx/svdoashp.hxx |   38 ++++++++++++--------------------------
 1 file changed, 12 insertions(+), 26 deletions(-)

New commits:
commit 183a7fc3ca46876a3ac10832bcd068d559132b4d
Author: Tor Lillqvist <tml at collabora.com>
Date:   Tue Feb 14 15:59:45 2017 +0200

    Clean up some whitespace and comment craziness
    
    Change-Id: Id8d5173729a3e290e3d43ea67a6a9d06f244c409

diff --git a/include/svx/svdoashp.hxx b/include/svx/svdoashp.hxx
index ac35822..e978be4 100644
--- a/include/svx/svdoashp.hxx
+++ b/include/svx/svdoashp.hxx
@@ -35,19 +35,17 @@ namespace sdr
     namespace properties
     {
         class CustomShapeProperties;
-    } // end of namespace properties
-} // end of namespace sdr
+    }
+}
 
 class SdrAShapeObjGeoData : public SdrTextObjGeoData
 {
-    public:
-
+public:
     bool        bMirroredX;
     bool        bMirroredY;
     double      fObjectRotation;
 
-    css::uno::Sequence< css::drawing::EnhancedCustomShapeAdjustmentValue >
-                aAdjustmentSeq;
+    css::uno::Sequence< css::drawing::EnhancedCustomShapeAdjustmentValue > aAdjustmentSeq;
 };
 
 enum class CustomShapeHandleModes
@@ -60,6 +58,7 @@ enum class CustomShapeHandleModes
     MOVE_SHAPE           = 16,
     ORTHO4               = 32,
 };
+
 namespace o3tl
 {
     template<> struct typed_flags<CustomShapeHandleModes> : is_typed_flags<CustomShapeHandleModes, 63> {};
@@ -67,15 +66,11 @@ namespace o3tl
 
 struct SdrCustomShapeInteraction
 {
-    css::uno::Reference< css::drawing::XCustomShapeHandle >   xInteraction;
-    css::awt::Point                                                      aPosition;
-    CustomShapeHandleModes                                                          nMode;
+    css::uno::Reference< css::drawing::XCustomShapeHandle > xInteraction;
+    css::awt::Point                                         aPosition;
+    CustomShapeHandleModes                                  nMode;
 };
 
-
-//   SdrObjCustomShape
-
-
 class SVX_DLLPUBLIC SdrObjCustomShape : public SdrTextObj
 {
 private:
@@ -97,7 +92,7 @@ public:
     mutable css::uno::Reference< css::drawing::XCustomShapeEngine > mxCustomShapeEngine;
 
     // #i37011# render geometry shadow
-    SdrObject*                                          mpLastShadowGeometry;
+    SdrObject* mpLastShadowGeometry;
 
     css::uno::Reference< css::drawing::XCustomShapeEngine > const & GetCustomShapeEngine() const;
 
@@ -137,10 +132,9 @@ protected:
     // and object sizes
     virtual void AdaptTextMinSize() override;
 
-    Size          m_aSuggestedTextFrameSize;
+    Size m_aSuggestedTextFrameSize;
 
 public:
-
     bool UseNoFillStyle() const;
 
     bool IsMirroredX() const;
@@ -239,8 +233,8 @@ public:
     virtual void SetPage( SdrPage* pNewPage ) override;
 
     virtual SdrObjGeoData *NewGeoData() const override;
-    virtual void          SaveGeoData(SdrObjGeoData &rGeo) const override;
-    virtual void          RestGeoData(const SdrObjGeoData &rGeo) override;
+    virtual void SaveGeoData(SdrObjGeoData &rGeo) const override;
+    virtual void RestGeoData(const SdrObjGeoData &rGeo) override;
 
     // need to take fObjectRotation instead of aGeo.nAngle, replace it temporary
     virtual bool TRGetBaseGeometry(basegfx::B2DHomMatrix& rMatrix, basegfx::B2DPolyPolygon& rPolyPolygon) const override;
commit 1a50702c696b3ac046bd5353af402efcb80c4537
Author: Tor Lillqvist <tml at collabora.com>
Date:   Tue Feb 14 15:57:23 2017 +0200

    Bin unused forward declarations
    
    Change-Id: I5c55c79157d7e14067fc3a3823412b1af5b15d92

diff --git a/include/svx/svdoashp.hxx b/include/svx/svdoashp.hxx
index c0670b6..ac35822 100644
--- a/include/svx/svdoashp.hxx
+++ b/include/svx/svdoashp.hxx
@@ -30,14 +30,6 @@
 #include <svx/svxdllapi.h>
 #include <o3tl/typed_flags_set.hxx>
 
-
-//   Initial Declarations
-
-
-class SdrObjList;
-class SdrObjListIter;
-class SfxItemSet;
-
 namespace sdr
 {
     namespace properties