summaryrefslogtreecommitdiff
path: root/vcl
diff options
context:
space:
mode:
authorNorbert Thiebaud <nthiebaud@gmail.com>2013-07-05 16:25:03 -0500
committerNorbert Thiebaud <nthiebaud@gmail.com>2013-07-07 20:00:16 +0000
commit009851223b5ced4ed2662af2e2ae81c0f9200e45 (patch)
treea8ab339589ea23b98513d394eabc4f135e69ccae /vcl
parent35b42a9d1282a92dbc9a7fbc51d279812070688c (diff)
module svl: all String and some bool and related clean-up
Change-Id: I36eb559fa58dbe75384b7119c788af0048813aed Reviewed-on: https://gerrit.libreoffice.org/4733 Reviewed-by: Norbert Thiebaud <nthiebaud@gmail.com> Tested-by: Norbert Thiebaud <nthiebaud@gmail.com>
Diffstat (limited to 'vcl')
-rw-r--r--vcl/source/edit/textund2.hxx2
-rw-r--r--vcl/source/edit/textundo.cxx22
-rw-r--r--vcl/source/edit/textundo.hxx4
3 files changed, 14 insertions, 14 deletions
diff --git a/vcl/source/edit/textund2.hxx b/vcl/source/edit/textund2.hxx
index 0ff91792ed09..e8138056ab5c 100644
--- a/vcl/source/edit/textund2.hxx
+++ b/vcl/source/edit/textund2.hxx
@@ -91,7 +91,7 @@ public:
virtual void Undo();
virtual void Redo();
- virtual sal_Bool Merge( SfxUndoAction *pNextAction );
+ virtual bool Merge( SfxUndoAction *pNextAction );
virtual OUString GetComment () const;
};
diff --git a/vcl/source/edit/textundo.cxx b/vcl/source/edit/textundo.cxx
index fb6c00f1be17..324306c5b480 100644
--- a/vcl/source/edit/textundo.cxx
+++ b/vcl/source/edit/textundo.cxx
@@ -75,15 +75,15 @@ TextUndoManager::~TextUndoManager()
{
}
-sal_Bool TextUndoManager::Undo()
+bool TextUndoManager::Undo()
{
if ( GetUndoActionCount() == 0 )
- return sal_False;
+ return false;
UndoRedoStart();
mpTextEngine->SetIsInUndo( sal_True );
- sal_Bool bDone = SfxUndoManager::Undo();
+ bool bDone = SfxUndoManager::Undo();
mpTextEngine->SetIsInUndo( sal_False );
UndoRedoEnd();
@@ -91,16 +91,16 @@ sal_Bool TextUndoManager::Undo()
return bDone;
}
-sal_Bool TextUndoManager::Redo()
+bool TextUndoManager::Redo()
{
if ( GetRedoActionCount() == 0 )
- return sal_False;
+ return false;
UndoRedoStart();
mpTextEngine->SetIsInUndo( sal_True );
- sal_Bool bDone = SfxUndoManager::Redo();
+ bool bDone = SfxUndoManager::Redo();
mpTextEngine->SetIsInUndo( sal_False );
UndoRedoEnd();
@@ -278,22 +278,22 @@ void TextUndoInsertChars::Redo()
SetSelection( TextSelection( aSel.GetStart(), aNewPaM ) );
}
-sal_Bool TextUndoInsertChars::Merge( SfxUndoAction* pNextAction )
+bool TextUndoInsertChars::Merge( SfxUndoAction* pNextAction )
{
if ( !pNextAction->ISA( TextUndoInsertChars ) )
- return sal_False;
+ return false;
TextUndoInsertChars* pNext = (TextUndoInsertChars*)pNextAction;
if ( maTextPaM.GetPara() != pNext->maTextPaM.GetPara() )
- return sal_False;
+ return false;
if ( ( maTextPaM.GetIndex() + maText.Len() ) == pNext->maTextPaM.GetIndex() )
{
maText += pNext->maText;
- return sal_True;
+ return true;
}
- return sal_False;
+ return false;
}
OUString TextUndoInsertChars::GetComment () const
diff --git a/vcl/source/edit/textundo.hxx b/vcl/source/edit/textundo.hxx
index a461bd78e7b0..4d062d2f4893 100644
--- a/vcl/source/edit/textundo.hxx
+++ b/vcl/source/edit/textundo.hxx
@@ -44,9 +44,9 @@ public:
~TextUndoManager();
using SfxUndoManager::Undo;
- virtual sal_Bool Undo();
+ virtual bool Undo();
using SfxUndoManager::Redo;
- virtual sal_Bool Redo();
+ virtual bool Redo();
};