summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarkus Mohrhard <markus.mohrhard@googlemail.com>2014-05-03 16:37:11 +0200
committerMarkus Mohrhard <markus.mohrhard@googlemail.com>2014-05-03 16:37:11 +0200
commit01b1e56107dc112666e513f732f0d99a0887ec8a (patch)
treed2cf39fb9dccf29e0d10c666f270d9c211b94c14
parent3fbe82594c6535b75859aa8b99e2cb6bac63d660 (diff)
more build fixes for windows
-rw-r--r--sc/source/ui/inc/undoblk.hxx4
-rw-r--r--sc/source/ui/undo/undoblk.cxx2
2 files changed, 3 insertions, 3 deletions
diff --git a/sc/source/ui/inc/undoblk.hxx b/sc/source/ui/inc/undoblk.hxx
index b146cefba8e5..6877f0b268e1 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 c2e011cb0726..796d2678e56e 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;
}