summaryrefslogtreecommitdiff
path: root/sc/inc/pivot.hxx
diff options
context:
space:
mode:
authorMichael Meeks <michael.meeks@novell.com>2011-03-14 17:34:17 +0000
committerMichael Meeks <michael.meeks@novell.com>2011-03-14 17:34:17 +0000
commit697a77f6ec0a837e6b9b8bf26369c6af8ca8ffd0 (patch)
treed62c2f7c000aaac8ff28e13fb2a1c9bc2c7deeef /sc/inc/pivot.hxx
parentbd2ea8f871ca6dc02f09af5f55c5c5c6fd511a91 (diff)
fix misc merge issues breaking the build
Diffstat (limited to 'sc/inc/pivot.hxx')
-rw-r--r--sc/inc/pivot.hxx2
1 files changed, 1 insertions, 1 deletions
diff --git a/sc/inc/pivot.hxx b/sc/inc/pivot.hxx
index 21da6840be6e..ed69859df546 100644
--- a/sc/inc/pivot.hxx
+++ b/sc/inc/pivot.hxx
@@ -109,7 +109,7 @@ struct ScPivotParam
~ScPivotParam();
ScPivotParam& operator= ( const ScPivotParam& r );
- sal_Bool operator== ( const ScPivotParam& r ) const;
+ bool operator== ( const ScPivotParam& r ) const;
void ClearPivotArrays();
void SetLabelData (const ::std::vector<ScDPLabelDataRef>& r);
};