summaryrefslogtreecommitdiff
path: root/vcl/source/helper
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2016-02-10 08:43:01 +0200
committerNoel Grandin <noelgrandin@gmail.com>2016-02-11 06:22:28 +0000
commit0f8ec3036f44b02aa03795ede3052a790134a90d (patch)
treea7cbba9eb70fcee3f793c07f8d8db6c092d0e594 /vcl/source/helper
parenta6f876d45bd4e41a7143594a6cb11b6893a0f620 (diff)
[API CHANGE] add operator==/!= to UNO structs
this is useful now that we are storing UNO structs in std::vector Change-Id: Ic558bcd669bd2b3cdf9eb8393269eb906ac52369 Reviewed-on: https://gerrit.libreoffice.org/22257 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'vcl/source/helper')
-rw-r--r--vcl/source/helper/canvastools.cxx5
1 files changed, 2 insertions, 3 deletions
diff --git a/vcl/source/helper/canvastools.cxx b/vcl/source/helper/canvastools.cxx
index ec023935a860..de6fcaa44b7d 100644
--- a/vcl/source/helper/canvastools.cxx
+++ b/vcl/source/helper/canvastools.cxx
@@ -74,7 +74,7 @@ namespace vcl
namespace
{
- inline bool operator==( const rendering::IntegerBitmapLayout& rLHS,
+ inline bool equalsLayout( const rendering::IntegerBitmapLayout& rLHS,
const rendering::IntegerBitmapLayout& rRHS )
{
return
@@ -85,7 +85,6 @@ namespace vcl
rLHS.Palette == rRHS.Palette &&
rLHS.IsMsbFirst == rRHS.IsMsbFirst;
}
-
bool readBmp( sal_Int32 nWidth,
sal_Int32 nHeight,
const rendering::IntegerBitmapLayout& rLayout,
@@ -111,7 +110,7 @@ namespace vcl
// re-read bmp from the start
return false;
}
- if( !(aCurrLayout == rLayout) )
+ if( !equalsLayout(aCurrLayout, rLayout) )
return false; // re-read bmp from the start
if( rAlphaAcc.get() )