mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Clean up some whitespace and comment craziness

Browse Source 
Change-Id: Id8d5173729a3e290e3d43ea67a6a9d06f244c409
This commit is contained in:
Tor Lillqvist
2017-02-14 15:59:45 +02:00
parent 1a50702c69
commit 183a7fc3ca
1 changed files with 12 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
include/svx/svdoashp.hxx
View File

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