summaryrefslogtreecommitdiff
path: root/sw/source/filter/ww8/escher.hxx
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2015-10-12 16:04:04 +0200
committerStephan Bergmann <sbergman@redhat.com>2015-10-12 17:52:29 +0200
commitb36963c0a6a09f70ca6d8d607dd3249a3496497d (patch)
tree33e06dc8d227957cb31355277fb5cf20b9918628 /sw/source/filter/ww8/escher.hxx
parentb08247a12b43fcd9f86ecd912fce7d69a3e66061 (diff)
Replace "SAL_OVERRIDE" with "override" in LIBO_INTERNAL_ONLY code
Change-Id: I2ea407acd763ef2d7dae2d3b8f32525523ac8274
Diffstat (limited to 'sw/source/filter/ww8/escher.hxx')
-rw-r--r--sw/source/filter/ww8/escher.hxx16
1 files changed, 8 insertions, 8 deletions
diff --git a/sw/source/filter/ww8/escher.hxx b/sw/source/filter/ww8/escher.hxx
index e723b81e7f54..88c08beb789a 100644
--- a/sw/source/filter/ww8/escher.hxx
+++ b/sw/source/filter/ww8/escher.hxx
@@ -31,7 +31,7 @@ class SwFormatVertOrient;
class WinwordAnchoring : public EscherExClientRecord_Base
{
public:
- void WriteData(EscherEx& rEx) const SAL_OVERRIDE;
+ void WriteData(EscherEx& rEx) const override;
void SetAnchoring(const SwFrameFormat& rFormat);
/** method to perform conversion of positioning attributes with the help
@@ -81,7 +81,7 @@ public:
private:
/** Override to create a new memory stream for picture data. */
- virtual SvStream* ImplQueryPictureStream() SAL_OVERRIDE;
+ virtual SvStream* ImplQueryPictureStream() override;
private:
std::shared_ptr< SvStream > mxPicStrm;
@@ -154,23 +154,23 @@ private:
sal_uInt32 nTextBox, DrawObjPointerVector &rPVec);
void WriteOCXControl(const SwFrameFormat& rFormat,sal_uInt32 nShapeId);
virtual sal_Int32 WriteFlyFrameAttr(const SwFrameFormat& rFormat, MSO_SPT eShapeType,
- EscherPropertyContainer& rPropOpt) SAL_OVERRIDE;
+ EscherPropertyContainer& rPropOpt) override;
virtual sal_uInt32 QueryTextID(
const com::sun::star::uno::Reference<
- com::sun::star::drawing::XShape > &,sal_uInt32) SAL_OVERRIDE;
+ com::sun::star::drawing::XShape > &,sal_uInt32) override;
virtual void SetPicId(const SdrObject &rSdrObj, sal_uInt32 nShapeId,
- EscherPropertyContainer &rPropOpt) SAL_OVERRIDE;
+ EscherPropertyContainer &rPropOpt) override;
public:
SwEscherEx( SvStream* pStrm, WW8Export& rWW8Wrt );
virtual ~SwEscherEx();
void FinishEscher();
- virtual void WritePictures() SAL_OVERRIDE;
+ virtual void WritePictures() override;
- virtual void WriteFrmExtraData(const SwFrameFormat& rFormat) SAL_OVERRIDE;
+ virtual void WriteFrmExtraData(const SwFrameFormat& rFormat) override;
EscherExHostAppData* StartShape(const com::sun::star::uno::Reference<
- com::sun::star::drawing::XShape > &, const Rectangle*) SAL_OVERRIDE {return &aHostData;}
+ com::sun::star::drawing::XShape > &, const Rectangle*) override {return &aHostData;}
private:
SwEscherEx(const SwEscherEx&) = delete;
SwEscherEx &operator=(const SwEscherEx&) = delete;