summaryrefslogtreecommitdiff
path: root/basegfx
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 /basegfx
parentb08247a12b43fcd9f86ecd912fce7d69a3e66061 (diff)
Replace "SAL_OVERRIDE" with "override" in LIBO_INTERNAL_ONLY code
Change-Id: I2ea407acd763ef2d7dae2d3b8f32525523ac8274
Diffstat (limited to 'basegfx')
-rw-r--r--basegfx/test/basegfx2d.cxx8
-rw-r--r--basegfx/test/basegfx3d.cxx20
-rw-r--r--basegfx/test/basegfxtools.cxx4
-rw-r--r--basegfx/test/boxclipper.cxx4
-rw-r--r--basegfx/test/clipstate.cxx4
-rw-r--r--basegfx/test/genericclipper.cxx4
6 files changed, 22 insertions, 22 deletions
diff --git a/basegfx/test/basegfx2d.cxx b/basegfx/test/basegfx2d.cxx
index 5ed74f324735..ec95f8efd2ec 100644
--- a/basegfx/test/basegfx2d.cxx
+++ b/basegfx/test/basegfx2d.cxx
@@ -62,7 +62,7 @@ private:
public:
// initialise your test code values here.
- void setUp() SAL_OVERRIDE
+ void setUp() override
{
// simple rectangle
aPath0 = "M 10 10-10 10-10-10 10-10Z";
@@ -132,7 +132,7 @@ public:
"31-24 33-22 34-20 35-18 36-16 37-15 39-12 40-11z";
}
- void tearDown() SAL_OVERRIDE
+ void tearDown() override
{
}
@@ -326,7 +326,7 @@ private:
public:
// initialise your test code values here.
- void setUp() SAL_OVERRIDE
+ void setUp() override
{
// setup some test matrices
maIdentity.identity(); // force compact layout
@@ -369,7 +369,7 @@ public:
maPerspective.set(2,2, 9.0);
}
- void tearDown() SAL_OVERRIDE
+ void tearDown() override
{
}
diff --git a/basegfx/test/basegfx3d.cxx b/basegfx/test/basegfx3d.cxx
index 73040bd39502..61f781539f7f 100644
--- a/basegfx/test/basegfx3d.cxx
+++ b/basegfx/test/basegfx3d.cxx
@@ -29,11 +29,11 @@ class b3dhommatrix : public CppUnit::TestFixture
{
public:
// initialise your test code values here.
- void setUp() SAL_OVERRIDE
+ void setUp() override
{
}
- void tearDown() SAL_OVERRIDE
+ void tearDown() override
{
}
@@ -57,11 +57,11 @@ class b3dpoint : public CppUnit::TestFixture
{
public:
// initialise your test code values here.
- void setUp() SAL_OVERRIDE
+ void setUp() override
{
}
- void tearDown() SAL_OVERRIDE
+ void tearDown() override
{
}
@@ -85,11 +85,11 @@ class b3drange : public CppUnit::TestFixture
{
public:
// initialise your test code values here.
- void setUp() SAL_OVERRIDE
+ void setUp() override
{
}
- void tearDown() SAL_OVERRIDE
+ void tearDown() override
{
}
@@ -111,11 +111,11 @@ class b3dtuple : public CppUnit::TestFixture
{
public:
// initialise your test code values here.
- void setUp() SAL_OVERRIDE
+ void setUp() override
{
}
- void tearDown() SAL_OVERRIDE
+ void tearDown() override
{
}
@@ -139,11 +139,11 @@ class b3dvector : public CppUnit::TestFixture
{
public:
// initialise your test code values here.
- void setUp() SAL_OVERRIDE
+ void setUp() override
{
}
- void tearDown() SAL_OVERRIDE
+ void tearDown() override
{
}
diff --git a/basegfx/test/basegfxtools.cxx b/basegfx/test/basegfxtools.cxx
index 6dbc62654914..f0a6b7f97136 100644
--- a/basegfx/test/basegfxtools.cxx
+++ b/basegfx/test/basegfxtools.cxx
@@ -51,10 +51,10 @@ public:
maKeyStops(getTestVector())
{}
- void setUp() SAL_OVERRIDE
+ void setUp() override
{}
- void tearDown() SAL_OVERRIDE
+ void tearDown() override
{}
void test()
diff --git a/basegfx/test/boxclipper.cxx b/basegfx/test/boxclipper.cxx
index ca2f63482864..c6770d3e12ac 100644
--- a/basegfx/test/boxclipper.cxx
+++ b/basegfx/test/boxclipper.cxx
@@ -78,7 +78,7 @@ private:
public:
// initialise your test code values here.
- void setUp() SAL_OVERRIDE
+ void setUp() override
{
B2DRange aCenter(100, 100, -100, -100);
B2DRange aOffside(800, 800, 1000, 1000);
@@ -179,7 +179,7 @@ public:
#endif
}
- void tearDown() SAL_OVERRIDE
+ void tearDown() override
{
}
diff --git a/basegfx/test/clipstate.cxx b/basegfx/test/clipstate.cxx
index b8213af61246..3a9fcc696782 100644
--- a/basegfx/test/clipstate.cxx
+++ b/basegfx/test/clipstate.cxx
@@ -45,7 +45,7 @@ private:
tools::B2DClipState aSubtract;
public:
- void setUp() SAL_OVERRIDE
+ void setUp() override
{
B2DRange aCenter(100, 100, -100, -100);
B2DRange aNorth(-10, -110, 10, -90);
@@ -86,7 +86,7 @@ public:
aSubtract.subtractRange(aEast);
}
- void tearDown() SAL_OVERRIDE
+ void tearDown() override
{}
void verifyPoly(const char* sName, const char* sSvg, const tools::B2DClipState& toTest)
diff --git a/basegfx/test/genericclipper.cxx b/basegfx/test/genericclipper.cxx
index 6764a90b23eb..f91ec98dd7f9 100644
--- a/basegfx/test/genericclipper.cxx
+++ b/basegfx/test/genericclipper.cxx
@@ -47,7 +47,7 @@ private:
public:
// initialise your test code values here.
- void setUp() SAL_OVERRIDE
+ void setUp() override
{
aSelfIntersecting.append(B2DPoint(0, 0));
aSelfIntersecting.append(B2DPoint(0, 100));
@@ -63,7 +63,7 @@ public:
B2DRange(0,90,20,150));
}
- void tearDown() SAL_OVERRIDE
+ void tearDown() override
{}
void validate(const char* pName,