summaryrefslogtreecommitdiff
path: root/include/svx/sdr/overlay
diff options
context:
space:
mode:
Diffstat (limited to 'include/svx/sdr/overlay')
-rw-r--r--include/svx/sdr/overlay/overlayanimatedbitmapex.hxx4
-rw-r--r--include/svx/sdr/overlay/overlaybitmapex.hxx2
-rw-r--r--include/svx/sdr/overlay/overlaycrosshair.hxx4
-rw-r--r--include/svx/sdr/overlay/overlayhelpline.hxx4
-rw-r--r--include/svx/sdr/overlay/overlayline.hxx4
-rw-r--r--include/svx/sdr/overlay/overlaymanager.hxx4
-rw-r--r--include/svx/sdr/overlay/overlaymanagerbuffered.hxx10
-rw-r--r--include/svx/sdr/overlay/overlayobject.hxx2
-rw-r--r--include/svx/sdr/overlay/overlayobjectcell.hxx2
-rw-r--r--include/svx/sdr/overlay/overlaypolypolygon.hxx4
-rw-r--r--include/svx/sdr/overlay/overlayprimitive2dsequenceobject.hxx2
-rw-r--r--include/svx/sdr/overlay/overlayrectangle.hxx4
-rw-r--r--include/svx/sdr/overlay/overlayrollingrectangle.hxx4
-rw-r--r--include/svx/sdr/overlay/overlayselection.hxx4
-rw-r--r--include/svx/sdr/overlay/overlaytools.hxx20
-rw-r--r--include/svx/sdr/overlay/overlaytriangle.hxx2
16 files changed, 38 insertions, 38 deletions
diff --git a/include/svx/sdr/overlay/overlayanimatedbitmapex.hxx b/include/svx/sdr/overlay/overlayanimatedbitmapex.hxx
index 57605a4e165e..539f074c6b64 100644
--- a/include/svx/sdr/overlay/overlayanimatedbitmapex.hxx
+++ b/include/svx/sdr/overlay/overlayanimatedbitmapex.hxx
@@ -54,7 +54,7 @@ namespace sdr
bool mbOverlayState : 1;
// geometry creation for OverlayObject
- virtual drawinglayer::primitive2d::Primitive2DSequence createOverlayObjectPrimitive2DSequence();
+ virtual drawinglayer::primitive2d::Primitive2DSequence createOverlayObjectPrimitive2DSequence() SAL_OVERRIDE;
public:
OverlayAnimatedBitmapEx(
@@ -83,7 +83,7 @@ namespace sdr
// execute event from base class ::sdr::animation::Event. Default
// implementation does nothing and does not create a new event.
- virtual void Trigger(sal_uInt32 nTime);
+ virtual void Trigger(sal_uInt32 nTime) SAL_OVERRIDE;
// get shearX and rotation
double getShearX() const { return mfShearX; }
diff --git a/include/svx/sdr/overlay/overlaybitmapex.hxx b/include/svx/sdr/overlay/overlaybitmapex.hxx
index 13feeec1eb1b..bd8a779183da 100644
--- a/include/svx/sdr/overlay/overlaybitmapex.hxx
+++ b/include/svx/sdr/overlay/overlaybitmapex.hxx
@@ -44,7 +44,7 @@ namespace sdr
double mfShearX;
double mfRotation;
- virtual drawinglayer::primitive2d::Primitive2DSequence createOverlayObjectPrimitive2DSequence();
+ virtual drawinglayer::primitive2d::Primitive2DSequence createOverlayObjectPrimitive2DSequence() SAL_OVERRIDE;
public:
OverlayBitmapEx(
diff --git a/include/svx/sdr/overlay/overlaycrosshair.hxx b/include/svx/sdr/overlay/overlaycrosshair.hxx
index 10625aa8c198..e9a70a7e234d 100644
--- a/include/svx/sdr/overlay/overlaycrosshair.hxx
+++ b/include/svx/sdr/overlay/overlaycrosshair.hxx
@@ -32,14 +32,14 @@ namespace sdr
{
protected:
// geometry creation for OverlayObject
- virtual drawinglayer::primitive2d::Primitive2DSequence createOverlayObjectPrimitive2DSequence();
+ virtual drawinglayer::primitive2d::Primitive2DSequence createOverlayObjectPrimitive2DSequence() SAL_OVERRIDE;
public:
explicit OverlayCrosshairStriped(const basegfx::B2DPoint& rBasePos);
virtual ~OverlayCrosshairStriped();
// react on stripe definition change
- virtual void stripeDefinitionHasChanged();
+ virtual void stripeDefinitionHasChanged() SAL_OVERRIDE;
};
} // end of namespace overlay
} // end of namespace sdr
diff --git a/include/svx/sdr/overlay/overlayhelpline.hxx b/include/svx/sdr/overlay/overlayhelpline.hxx
index 3eff8fee6aa9..2e3bc1640ae7 100644
--- a/include/svx/sdr/overlay/overlayhelpline.hxx
+++ b/include/svx/sdr/overlay/overlayhelpline.hxx
@@ -36,7 +36,7 @@ namespace sdr
SdrHelpLineKind meKind;
// geometry creation for OverlayObject
- virtual drawinglayer::primitive2d::Primitive2DSequence createOverlayObjectPrimitive2DSequence();
+ virtual drawinglayer::primitive2d::Primitive2DSequence createOverlayObjectPrimitive2DSequence() SAL_OVERRIDE;
public:
explicit OverlayHelplineStriped(
@@ -48,7 +48,7 @@ namespace sdr
SdrHelpLineKind getKind() const { return meKind; }
// react on stripe definition change
- virtual void stripeDefinitionHasChanged();
+ virtual void stripeDefinitionHasChanged() SAL_OVERRIDE;
};
} // end of namespace overlay
} // end of namespace sdr
diff --git a/include/svx/sdr/overlay/overlayline.hxx b/include/svx/sdr/overlay/overlayline.hxx
index 4561a2bafe75..65b7bb58fc54 100644
--- a/include/svx/sdr/overlay/overlayline.hxx
+++ b/include/svx/sdr/overlay/overlayline.hxx
@@ -35,7 +35,7 @@ namespace sdr
basegfx::B2DPoint maSecondPosition;
// geometry creation for OverlayObject
- virtual drawinglayer::primitive2d::Primitive2DSequence createOverlayObjectPrimitive2DSequence();
+ virtual drawinglayer::primitive2d::Primitive2DSequence createOverlayObjectPrimitive2DSequence() SAL_OVERRIDE;
public:
OverlayLineStriped(
@@ -47,7 +47,7 @@ namespace sdr
const basegfx::B2DPoint& getSecondPosition() const { return maSecondPosition; }
// react on stripe definition change
- virtual void stripeDefinitionHasChanged();
+ virtual void stripeDefinitionHasChanged() SAL_OVERRIDE;
};
} // end of namespace overlay
} // end of namespace sdr
diff --git a/include/svx/sdr/overlay/overlaymanager.hxx b/include/svx/sdr/overlay/overlaymanager.hxx
index a2ab50d79122..b5c7c7bbe585 100644
--- a/include/svx/sdr/overlay/overlaymanager.hxx
+++ b/include/svx/sdr/overlay/overlaymanager.hxx
@@ -138,8 +138,8 @@ namespace sdr
void InsertEvent(sdr::animation::Event* pNew) { Scheduler::InsertEvent(pNew); }
- virtual oslInterlockedCount SAL_CALL acquire();
- virtual oslInterlockedCount SAL_CALL release();
+ virtual oslInterlockedCount SAL_CALL acquire() SAL_OVERRIDE;
+ virtual oslInterlockedCount SAL_CALL release() SAL_OVERRIDE;
};
} // end of namespace overlay
} // end of namespace sdr
diff --git a/include/svx/sdr/overlay/overlaymanagerbuffered.hxx b/include/svx/sdr/overlay/overlaymanagerbuffered.hxx
index 6e219193f62c..2db2cf1da96f 100644
--- a/include/svx/sdr/overlay/overlaymanagerbuffered.hxx
+++ b/include/svx/sdr/overlay/overlaymanagerbuffered.hxx
@@ -71,19 +71,19 @@ namespace sdr
bool bRefreshWithPreRendering = false);
// complete redraw
- virtual void completeRedraw(const Region& rRegion, OutputDevice* pPreRenderDevice = 0L) const;
+ virtual void completeRedraw(const Region& rRegion, OutputDevice* pPreRenderDevice = 0L) const SAL_OVERRIDE;
// flush. Do buffered updates.
- virtual void flush();
+ virtual void flush() SAL_OVERRIDE;
// #i68597# part of content gets copied, react on it
- virtual void copyArea(const Point& rDestPt, const Point& rSrcPt, const Size& rSrcSize);
+ virtual void copyArea(const Point& rDestPt, const Point& rSrcPt, const Size& rSrcSize) SAL_OVERRIDE;
// restore part of background. Implemented form buffered versions only.
- virtual void restoreBackground(const Region& rRegion) const;
+ virtual void restoreBackground(const Region& rRegion) const SAL_OVERRIDE;
// invalidate the given range at local OutputDevice
- virtual void invalidateRange(const basegfx::B2DRange& rRange);
+ virtual void invalidateRange(const basegfx::B2DRange& rRange) SAL_OVERRIDE;
// access to RefreshWithPreRendering Flag
bool DoRefreshWithPreRendering() const { return mbRefreshWithPreRendering; }
diff --git a/include/svx/sdr/overlay/overlayobject.hxx b/include/svx/sdr/overlay/overlayobject.hxx
index e4effa946efa..130c3406d50d 100644
--- a/include/svx/sdr/overlay/overlayobject.hxx
+++ b/include/svx/sdr/overlay/overlayobject.hxx
@@ -151,7 +151,7 @@ namespace sdr
// execute event from base class ::sdr::animation::Event. Default
// implementation does nothing and does not create a new event.
- virtual void Trigger(sal_uInt32 nTime);
+ virtual void Trigger(sal_uInt32 nTime) SAL_OVERRIDE;
// acces to AllowsAnimation flag
bool allowsAnimation() const { return mbAllowsAnimation; }
diff --git a/include/svx/sdr/overlay/overlayobjectcell.hxx b/include/svx/sdr/overlay/overlayobjectcell.hxx
index 75c334b974c5..baf5ced3b878 100644
--- a/include/svx/sdr/overlay/overlayobjectcell.hxx
+++ b/include/svx/sdr/overlay/overlayobjectcell.hxx
@@ -45,7 +45,7 @@ namespace sdr
RangeVector maRectangles;
// geometry creation for OverlayObject
- virtual drawinglayer::primitive2d::Primitive2DSequence createOverlayObjectPrimitive2DSequence();
+ virtual drawinglayer::primitive2d::Primitive2DSequence createOverlayObjectPrimitive2DSequence() SAL_OVERRIDE;
public:
OverlayObjectCell( CellOverlayType eType, const Color& rColor, const RangeVector& rRects);
diff --git a/include/svx/sdr/overlay/overlaypolypolygon.hxx b/include/svx/sdr/overlay/overlaypolypolygon.hxx
index c5f3d08376de..b51477b2969c 100644
--- a/include/svx/sdr/overlay/overlaypolypolygon.hxx
+++ b/include/svx/sdr/overlay/overlaypolypolygon.hxx
@@ -37,7 +37,7 @@ namespace sdr
basegfx::B2DPolyPolygon maLinePolyPolygon;
// geometry creation for OverlayObject
- virtual drawinglayer::primitive2d::Primitive2DSequence createOverlayObjectPrimitive2DSequence();
+ virtual drawinglayer::primitive2d::Primitive2DSequence createOverlayObjectPrimitive2DSequence() SAL_OVERRIDE;
public:
explicit OverlayPolyPolygonStripedAndFilled(
@@ -49,7 +49,7 @@ namespace sdr
void setLinePolyPolygon(const basegfx::B2DPolyPolygon& rNew);
// react on stripe definition change
- virtual void stripeDefinitionHasChanged();
+ virtual void stripeDefinitionHasChanged() SAL_OVERRIDE;
};
} // end of namespace overlay
} // end of namespace sdr
diff --git a/include/svx/sdr/overlay/overlayprimitive2dsequenceobject.hxx b/include/svx/sdr/overlay/overlayprimitive2dsequenceobject.hxx
index f888e480a0cf..e500bf89ca8e 100644
--- a/include/svx/sdr/overlay/overlayprimitive2dsequenceobject.hxx
+++ b/include/svx/sdr/overlay/overlayprimitive2dsequenceobject.hxx
@@ -37,7 +37,7 @@ namespace sdr
const drawinglayer::primitive2d::Primitive2DSequence maSequence;
// geometry creation for OverlayObject
- virtual drawinglayer::primitive2d::Primitive2DSequence createOverlayObjectPrimitive2DSequence();
+ virtual drawinglayer::primitive2d::Primitive2DSequence createOverlayObjectPrimitive2DSequence() SAL_OVERRIDE;
private:
// internal helper to create a drawinglayer::geometry::ViewInformation2D
diff --git a/include/svx/sdr/overlay/overlayrectangle.hxx b/include/svx/sdr/overlay/overlayrectangle.hxx
index cdb49c174274..7279a11bea0e 100644
--- a/include/svx/sdr/overlay/overlayrectangle.hxx
+++ b/include/svx/sdr/overlay/overlayrectangle.hxx
@@ -47,7 +47,7 @@ namespace sdr
bool mbOverlayState : 1;
// geometry creation for OverlayObject
- virtual drawinglayer::primitive2d::Primitive2DSequence createOverlayObjectPrimitive2DSequence();
+ virtual drawinglayer::primitive2d::Primitive2DSequence createOverlayObjectPrimitive2DSequence() SAL_OVERRIDE;
public:
OverlayRectangle(
@@ -72,7 +72,7 @@ namespace sdr
// execute event from base class ::sdr::animation::Event. Default
// implementation does nothing and does not create a new event.
- virtual void Trigger(sal_uInt32 nTime);
+ virtual void Trigger(sal_uInt32 nTime) SAL_OVERRIDE;
};
} // end of namespace overlay
} // end of namespace sdr
diff --git a/include/svx/sdr/overlay/overlayrollingrectangle.hxx b/include/svx/sdr/overlay/overlayrollingrectangle.hxx
index 0f7399a84762..2d7748e8d013 100644
--- a/include/svx/sdr/overlay/overlayrollingrectangle.hxx
+++ b/include/svx/sdr/overlay/overlayrollingrectangle.hxx
@@ -42,7 +42,7 @@ namespace sdr
bool mbShowBounds : 1;
// geometry creation for OverlayObject
- virtual drawinglayer::primitive2d::Primitive2DSequence createOverlayObjectPrimitive2DSequence();
+ virtual drawinglayer::primitive2d::Primitive2DSequence createOverlayObjectPrimitive2DSequence() SAL_OVERRIDE;
public:
OverlayRollingRectangleStriped(
@@ -63,7 +63,7 @@ namespace sdr
bool getShowBounds() const { return mbShowBounds; }
// react on stripe definition change
- virtual void stripeDefinitionHasChanged();
+ virtual void stripeDefinitionHasChanged() SAL_OVERRIDE;
};
} // end of namespace overlay
} // end of namespace sdr
diff --git a/include/svx/sdr/overlay/overlayselection.hxx b/include/svx/sdr/overlay/overlayselection.hxx
index c4ab9a345ff5..1e4c136d7c00 100644
--- a/include/svx/sdr/overlay/overlayselection.hxx
+++ b/include/svx/sdr/overlay/overlayselection.hxx
@@ -56,7 +56,7 @@ namespace sdr
bool mbBorder : 1;
// geometry creation for OverlayObject, can use local *Last* values
- virtual drawinglayer::primitive2d::Primitive2DSequence createOverlayObjectPrimitive2DSequence();
+ virtual drawinglayer::primitive2d::Primitive2DSequence createOverlayObjectPrimitive2DSequence() SAL_OVERRIDE;
public:
OverlaySelection(
@@ -72,7 +72,7 @@ namespace sdr
bool getBorder() const { return mbBorder; }
// overloaded to check conditions for last createOverlayObjectPrimitive2DSequence
- virtual drawinglayer::primitive2d::Primitive2DSequence getOverlayObjectPrimitive2DSequence() const;
+ virtual drawinglayer::primitive2d::Primitive2DSequence getOverlayObjectPrimitive2DSequence() const SAL_OVERRIDE;
// data write access
void setRanges(const std::vector< basegfx::B2DRange >& rNew);
diff --git a/include/svx/sdr/overlay/overlaytools.hxx b/include/svx/sdr/overlay/overlaytools.hxx
index 85b0c0b1732e..3dab6a607f75 100644
--- a/include/svx/sdr/overlay/overlaytools.hxx
+++ b/include/svx/sdr/overlay/overlaytools.hxx
@@ -51,7 +51,7 @@ namespace drawinglayer
double mfRotation;
protected:
- virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const;
+ virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const SAL_OVERRIDE;
public:
OverlayBitmapExPrimitive(
@@ -71,7 +71,7 @@ namespace drawinglayer
double getRotation() const { return mfRotation; }
// compare operator
- virtual bool operator==( const BasePrimitive2D& rPrimitive ) const;
+ virtual bool operator==( const BasePrimitive2D& rPrimitive ) const SAL_OVERRIDE;
DeclPrimitive2DIDBlock()
};
@@ -96,7 +96,7 @@ namespace drawinglayer
double mfDiscreteDashLength;
protected:
- virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const;
+ virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const SAL_OVERRIDE;
public:
OverlayCrosshairPrimitive(
@@ -112,7 +112,7 @@ namespace drawinglayer
double getDiscreteDashLength() const { return mfDiscreteDashLength; }
// compare operator
- virtual bool operator==( const BasePrimitive2D& rPrimitive ) const;
+ virtual bool operator==( const BasePrimitive2D& rPrimitive ) const SAL_OVERRIDE;
DeclPrimitive2DIDBlock()
};
@@ -144,7 +144,7 @@ namespace drawinglayer
double mfRotation;
protected:
- virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const;
+ virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const SAL_OVERRIDE;
public:
OverlayRectanglePrimitive(
@@ -164,7 +164,7 @@ namespace drawinglayer
double getRotation() const { return mfRotation; }
// compare operator
- virtual bool operator==( const BasePrimitive2D& rPrimitive ) const;
+ virtual bool operator==( const BasePrimitive2D& rPrimitive ) const SAL_OVERRIDE;
DeclPrimitive2DIDBlock()
};
@@ -200,7 +200,7 @@ namespace drawinglayer
double mfDiscreteDashLength;
protected:
- virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const;
+ virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const SAL_OVERRIDE;
public:
OverlayHelplineStripedPrimitive(
@@ -218,7 +218,7 @@ namespace drawinglayer
double getDiscreteDashLength() const { return mfDiscreteDashLength; }
// compare operator
- virtual bool operator==( const BasePrimitive2D& rPrimitive ) const;
+ virtual bool operator==( const BasePrimitive2D& rPrimitive ) const SAL_OVERRIDE;
DeclPrimitive2DIDBlock()
};
@@ -245,7 +245,7 @@ namespace drawinglayer
double mfDiscreteDashLength;
protected:
- virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const;
+ virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const SAL_OVERRIDE;
public:
OverlayRollingRectanglePrimitive(
@@ -261,7 +261,7 @@ namespace drawinglayer
double getDiscreteDashLength() const { return mfDiscreteDashLength; }
// compare operator
- virtual bool operator==( const BasePrimitive2D& rPrimitive ) const;
+ virtual bool operator==( const BasePrimitive2D& rPrimitive ) const SAL_OVERRIDE;
DeclPrimitive2DIDBlock()
};
diff --git a/include/svx/sdr/overlay/overlaytriangle.hxx b/include/svx/sdr/overlay/overlaytriangle.hxx
index 4f7b29b95c31..30b7dd02b4e7 100644
--- a/include/svx/sdr/overlay/overlaytriangle.hxx
+++ b/include/svx/sdr/overlay/overlaytriangle.hxx
@@ -36,7 +36,7 @@ namespace sdr
basegfx::B2DPoint maThirdPosition;
// geometry creation for OverlayObject
- virtual drawinglayer::primitive2d::Primitive2DSequence createOverlayObjectPrimitive2DSequence();
+ virtual drawinglayer::primitive2d::Primitive2DSequence createOverlayObjectPrimitive2DSequence() SAL_OVERRIDE;
public:
OverlayTriangle(