From 697a77f6ec0a837e6b9b8bf26369c6af8ca8ffd0 Mon Sep 17 00:00:00 2001
From: Michael Meeks <michael.meeks@novell.com>
Date: Mon, 14 Mar 2011 17:34:17 +0000
Subject: fix misc merge issues breaking the build

---
 sc/inc/pivot.hxx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'sc/inc/pivot.hxx')

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);
 };
-- 
cgit v1.2.3