summaryrefslogtreecommitdiff
path: root/vcl/qa/cppunit/canvasbitmaptest.cxx
diff options
context:
space:
mode:
Diffstat (limited to 'vcl/qa/cppunit/canvasbitmaptest.cxx')
-rw-r--r--vcl/qa/cppunit/canvasbitmaptest.cxx64
1 files changed, 32 insertions, 32 deletions
diff --git a/vcl/qa/cppunit/canvasbitmaptest.cxx b/vcl/qa/cppunit/canvasbitmaptest.cxx
index 2c4978bc65d8..b093275d921c 100644
--- a/vcl/qa/cppunit/canvasbitmaptest.cxx
+++ b/vcl/qa/cppunit/canvasbitmaptest.cxx
@@ -244,10 +244,10 @@ private:
const sal_Int32 mnBitsPerPixel;
// XBitmap
- virtual geometry::IntegerSize2D SAL_CALL getSize() throw (uno::RuntimeException, std::exception) SAL_OVERRIDE { return maSize; }
- virtual sal_Bool SAL_CALL hasAlpha( ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE { return mnBitsPerPixel != 8; }
+ virtual geometry::IntegerSize2D SAL_CALL getSize() throw (uno::RuntimeException, std::exception) override { return maSize; }
+ virtual sal_Bool SAL_CALL hasAlpha( ) throw (uno::RuntimeException, std::exception) override { return mnBitsPerPixel != 8; }
virtual uno::Reference< rendering::XBitmap > SAL_CALL getScaledBitmap( const geometry::RealSize2D&,
- sal_Bool ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE { return this; }
+ sal_Bool ) throw (uno::RuntimeException, std::exception) override { return this; }
// XIntegerReadOnlyBitmap
virtual uno::Sequence< ::sal_Int8 > SAL_CALL getData( rendering::IntegerBitmapLayout& bitmapLayout,
@@ -255,7 +255,7 @@ private:
throw (lang::IndexOutOfBoundsException,
rendering::VolatileContentDestroyedException,
uno::RuntimeException,
- std::exception) SAL_OVERRIDE
+ std::exception) override
{
CPPUNIT_ASSERT_MESSAGE( "X1 out of bounds", rect.X1 >= 0 );
CPPUNIT_ASSERT_MESSAGE( "Y1 out of bounds", rect.Y1 >= 0 );
@@ -304,7 +304,7 @@ private:
throw (lang::IndexOutOfBoundsException,
rendering::VolatileContentDestroyedException,
uno::RuntimeException,
- std::exception) SAL_OVERRIDE
+ std::exception) override
{
CPPUNIT_ASSERT_MESSAGE("getPixel: method not implemented", false);
return uno::Sequence< sal_Int8 >();
@@ -318,7 +318,7 @@ private:
return aRet;
}
- virtual rendering::IntegerBitmapLayout SAL_CALL getMemoryLayout( ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE
+ virtual rendering::IntegerBitmapLayout SAL_CALL getMemoryLayout( ) throw (uno::RuntimeException, std::exception) override
{
rendering::IntegerBitmapLayout aLayout( maLayout );
@@ -334,7 +334,7 @@ private:
}
// XBitmapPalette
- virtual sal_Int32 SAL_CALL getNumberOfEntries() throw (uno::RuntimeException, std::exception) SAL_OVERRIDE
+ virtual sal_Int32 SAL_CALL getNumberOfEntries() throw (uno::RuntimeException, std::exception) override
{
CPPUNIT_ASSERT_MESSAGE( "Got palette getNumberOfEntries interface call without handing out palette",
getPalette().is() );
@@ -346,7 +346,7 @@ private:
::sal_Int32 nIndex )
throw (lang::IndexOutOfBoundsException,
uno::RuntimeException,
- std::exception) SAL_OVERRIDE
+ std::exception) override
{
CPPUNIT_ASSERT_MESSAGE( "Got palette getIndex interface call without handing out palette",
getPalette().is() );
@@ -365,7 +365,7 @@ private:
::sal_Int32 nIndex ) throw (lang::IndexOutOfBoundsException,
lang::IllegalArgumentException,
uno::RuntimeException,
- std::exception) SAL_OVERRIDE
+ std::exception) override
{
CPPUNIT_ASSERT_MESSAGE( "Got palette setIndex interface call without handing out palette",
getPalette().is());
@@ -383,7 +383,7 @@ private:
}
};
- virtual uno::Reference< rendering::XColorSpace > SAL_CALL getColorSpace( ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE
+ virtual uno::Reference< rendering::XColorSpace > SAL_CALL getColorSpace( ) throw (uno::RuntimeException, std::exception) override
{
// this is the method from XBitmapPalette. Return palette color
// space here
@@ -391,24 +391,24 @@ private:
}
// XIntegerBitmapColorSpace
- virtual ::sal_Int8 SAL_CALL getType( ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE
+ virtual ::sal_Int8 SAL_CALL getType( ) throw (uno::RuntimeException, std::exception) override
{
return rendering::ColorSpaceType::RGB;
}
- virtual uno::Sequence< sal_Int8 > SAL_CALL getComponentTags( ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE
+ virtual uno::Sequence< sal_Int8 > SAL_CALL getComponentTags( ) throw (uno::RuntimeException, std::exception) override
{
return maComponentTags;
}
- virtual ::sal_Int8 SAL_CALL getRenderingIntent( ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE
+ virtual ::sal_Int8 SAL_CALL getRenderingIntent( ) throw (uno::RuntimeException, std::exception) override
{
return rendering::RenderingIntent::PERCEPTUAL;
}
virtual uno::Sequence< beans::PropertyValue > SAL_CALL getProperties()
throw (uno::RuntimeException,
- std::exception) SAL_OVERRIDE
+ std::exception) override
{
CPPUNIT_ASSERT_MESSAGE("getProperties: method not implemented", false );
return uno::Sequence< ::beans::PropertyValue >();
@@ -417,7 +417,7 @@ private:
virtual uno::Sequence< double > SAL_CALL convertColorSpace( const uno::Sequence< double >&,
const uno::Reference< rendering::XColorSpace >& )
throw (uno::RuntimeException,
- std::exception) SAL_OVERRIDE
+ std::exception) override
{
CPPUNIT_ASSERT_MESSAGE("convertColorSpace: method not implemented", false);
return uno::Sequence< double >();
@@ -426,7 +426,7 @@ private:
virtual uno::Sequence< rendering::RGBColor > SAL_CALL convertToRGB( const uno::Sequence< double >& )
throw (lang::IllegalArgumentException,
uno::RuntimeException,
- std::exception) SAL_OVERRIDE
+ std::exception) override
{
CPPUNIT_ASSERT_MESSAGE("convertToRGB: method not implemented", false);
return uno::Sequence< rendering::RGBColor >();
@@ -435,7 +435,7 @@ private:
virtual uno::Sequence< rendering::ARGBColor > SAL_CALL convertToARGB( const uno::Sequence< double >& )
throw (lang::IllegalArgumentException,
uno::RuntimeException,
- std::exception) SAL_OVERRIDE
+ std::exception) override
{
CPPUNIT_ASSERT_MESSAGE("convertToARGB: method not implemented", false);
return uno::Sequence< rendering::ARGBColor >();
@@ -444,7 +444,7 @@ private:
virtual uno::Sequence< rendering::ARGBColor > SAL_CALL convertToPARGB( const uno::Sequence< double >& )
throw (lang::IllegalArgumentException,
uno::RuntimeException,
- std::exception) SAL_OVERRIDE
+ std::exception) override
{
CPPUNIT_ASSERT_MESSAGE("convertToPARGB: method not implemented", false);
return uno::Sequence< rendering::ARGBColor >();
@@ -453,7 +453,7 @@ private:
virtual uno::Sequence< double > SAL_CALL convertFromRGB( const uno::Sequence< rendering::RGBColor >& )
throw (lang::IllegalArgumentException,
uno::RuntimeException,
- std::exception) SAL_OVERRIDE
+ std::exception) override
{
CPPUNIT_ASSERT_MESSAGE("convertFromRGB: method not implemented", false);
return uno::Sequence< double >();
@@ -462,7 +462,7 @@ private:
virtual uno::Sequence< double > SAL_CALL convertFromARGB( const uno::Sequence< rendering::ARGBColor >& )
throw (lang::IllegalArgumentException,
uno::RuntimeException,
- std::exception) SAL_OVERRIDE
+ std::exception) override
{
CPPUNIT_ASSERT_MESSAGE("convertFromARGB: this method is not expected to be called!", false);
return uno::Sequence< double >();
@@ -471,23 +471,23 @@ private:
virtual uno::Sequence< double > SAL_CALL convertFromPARGB( const uno::Sequence< rendering::ARGBColor >& )
throw (lang::IllegalArgumentException,
uno::RuntimeException,
- std::exception) SAL_OVERRIDE
+ std::exception) override
{
CPPUNIT_ASSERT_MESSAGE("convertFromPARGB: this method is not expected to be called!", false);
return uno::Sequence< double >();
}
- virtual ::sal_Int32 SAL_CALL getBitsPerPixel( ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE
+ virtual ::sal_Int32 SAL_CALL getBitsPerPixel( ) throw (uno::RuntimeException, std::exception) override
{
return mnBitsPerPixel;
}
- virtual uno::Sequence< ::sal_Int32 > SAL_CALL getComponentBitCounts( ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE
+ virtual uno::Sequence< ::sal_Int32 > SAL_CALL getComponentBitCounts( ) throw (uno::RuntimeException, std::exception) override
{
return maComponentBitCounts;
}
- virtual ::sal_Int8 SAL_CALL getEndianness( ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE
+ virtual ::sal_Int8 SAL_CALL getEndianness( ) throw (uno::RuntimeException, std::exception) override
{
return util::Endianness::LITTLE;
}
@@ -496,7 +496,7 @@ private:
const uno::Reference< rendering::XColorSpace >& )
throw (lang::IllegalArgumentException,
uno::RuntimeException,
- std::exception) SAL_OVERRIDE
+ std::exception) override
{
CPPUNIT_ASSERT_MESSAGE("convertFromIntegerColorSpace: method not implemented", false);
return uno::Sequence< double >();
@@ -506,14 +506,14 @@ private:
const uno::Reference< rendering::XIntegerBitmapColorSpace >& )
throw (lang::IllegalArgumentException,
uno::RuntimeException,
- std::exception) SAL_OVERRIDE
+ std::exception) override
{
CPPUNIT_ASSERT_MESSAGE("convertToIntegerColorSpace: method not implemented", false);
return uno::Sequence< sal_Int8 >();
}
virtual uno::Sequence< rendering::RGBColor > SAL_CALL convertIntegerToRGB( const uno::Sequence< ::sal_Int8 >& deviceColor ) throw (lang::IllegalArgumentException,
- uno::RuntimeException, std::exception) SAL_OVERRIDE
+ uno::RuntimeException, std::exception) override
{
const uno::Sequence< rendering::ARGBColor > aTemp( convertIntegerToARGB(deviceColor) );
const sal_Size nLen(aTemp.getLength());
@@ -530,7 +530,7 @@ private:
}
virtual uno::Sequence< rendering::ARGBColor > SAL_CALL convertIntegerToARGB( const uno::Sequence< ::sal_Int8 >& deviceColor ) throw (lang::IllegalArgumentException,
- uno::RuntimeException, std::exception) SAL_OVERRIDE
+ uno::RuntimeException, std::exception) override
{
const sal_Size nLen( deviceColor.getLength() );
const sal_Int32 nBytesPerPixel(mnBitsPerPixel == 8 ? 1 : 4);
@@ -570,7 +570,7 @@ private:
const uno::Sequence< ::sal_Int8 >& deviceColor)
throw (lang::IllegalArgumentException,
uno::RuntimeException,
- std::exception) SAL_OVERRIDE
+ std::exception) override
{
const sal_Size nLen( deviceColor.getLength() );
const sal_Int32 nBytesPerPixel(mnBitsPerPixel == 8 ? 1 : 4);
@@ -611,7 +611,7 @@ private:
const uno::Sequence< rendering::RGBColor >&)
throw (lang::IllegalArgumentException,
uno::RuntimeException,
- std::exception) SAL_OVERRIDE
+ std::exception) override
{
CPPUNIT_ASSERT_MESSAGE("convertIntegerFromRGB: method not implemented", false);
return uno::Sequence< sal_Int8 >();
@@ -619,7 +619,7 @@ private:
virtual uno::Sequence< ::sal_Int8 > SAL_CALL convertIntegerFromARGB( const uno::Sequence< rendering::ARGBColor >& ) throw (lang::IllegalArgumentException,
uno::RuntimeException,
- std::exception) SAL_OVERRIDE
+ std::exception) override
{
CPPUNIT_ASSERT_MESSAGE("convertIntegerFromARGB: method not implemented", false);
return uno::Sequence< sal_Int8 >();
@@ -628,7 +628,7 @@ private:
virtual uno::Sequence< ::sal_Int8 > SAL_CALL convertIntegerFromPARGB( const uno::Sequence< rendering::ARGBColor >& )
throw (lang::IllegalArgumentException,
uno::RuntimeException,
- std::exception) SAL_OVERRIDE
+ std::exception) override
{
CPPUNIT_ASSERT_MESSAGE("convertIntegerFromPARGB: method not implemented", false);
return uno::Sequence< sal_Int8 >();