[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.1' - sc/source

[Markus Mohrhard]

 sc/source/ui/inc/undoblk.hxx  |    4 ++--
 sc/source/ui/undo/undoblk.cxx |    2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 01b1e56107dc112666e513f732f0d99a0887ec8a
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date:   Sat May 3 16:37:11 2014 +0200

    more build fixes for windows

diff --git a/sc/source/ui/inc/undoblk.hxx b/sc/source/ui/inc/undoblk.hxx
index b146cef..6877f0b 100644
--- a/sc/source/ui/inc/undoblk.hxx
+++ b/sc/source/ui/inc/undoblk.hxx
@@ -637,7 +637,7 @@ private:
 class ScUndoConditionalFormat : public ScSimpleUndo
 {
 public:
-    TYPEINFO_OVERRIDE();
+    TYPEINFO();
     ScUndoConditionalFormat( ScDocShell* pNewDocShell,
             ScDocument* pUndoDoc, ScDocument* pRedoDoc, const ScRange& rRange);
     virtual         ~ScUndoConditionalFormat();
@@ -645,7 +645,7 @@ public:
     virtual void    Undo() SAL_OVERRIDE;
     virtual void    Redo() SAL_OVERRIDE;
     virtual void    Repeat(SfxRepeatTarget& rTarget) SAL_OVERRIDE;
-    virtual bool    CanRepeat(SfxRepeatTarget& rTarget) const SAL_OVERRIDE;
+    virtual sal_Bool CanRepeat(SfxRepeatTarget& rTarget) const SAL_OVERRIDE;
 
     virtual OUString GetComment() const SAL_OVERRIDE;
 
diff --git a/sc/source/ui/undo/undoblk.cxx b/sc/source/ui/undo/undoblk.cxx
index c2e011c..796d267 100644
--- a/sc/source/ui/undo/undoblk.cxx
+++ b/sc/source/ui/undo/undoblk.cxx
@@ -1450,7 +1450,7 @@ void ScUndoConditionalFormat::Repeat(SfxRepeatTarget& )
 {
 }
 
-bool ScUndoConditionalFormat::CanRepeat(SfxRepeatTarget& ) const
+sal_Bool ScUndoConditionalFormat::CanRepeat(SfxRepeatTarget& ) const
 {
     return false;
 }