summaryrefslogtreecommitdiff
path: root/sc
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2012-09-28 00:17:55 +0100
committerCaolán McNamara <caolanm@redhat.com>2012-09-28 08:48:55 +0100
commit62384d5898c3775c141409a7399a612ef6dd9ecb (patch)
treefd3f1231b3ca307279034a4ad00912c66c2ea7a7 /sc
parentfac4bed44bb22d4ccdab1dd08fac597b39ea2ba4 (diff)
convert GetRepeatComment to OUString
Change-Id: Ibf75533d04b3c68b875f44ad22639934578867e3
Diffstat (limited to 'sc')
-rw-r--r--sc/source/ui/inc/undobase.hxx4
-rw-r--r--sc/source/ui/inc/undodraw.hxx4
-rw-r--r--sc/source/ui/undo/undobase.cxx5
-rw-r--r--sc/source/ui/undo/undodraw.cxx5
4 files changed, 8 insertions, 10 deletions
diff --git a/sc/source/ui/inc/undobase.hxx b/sc/source/ui/inc/undobase.hxx
index d625464e20ca..f9ab46c63dfc 100644
--- a/sc/source/ui/inc/undobase.hxx
+++ b/sc/source/ui/inc/undobase.hxx
@@ -189,8 +189,8 @@ public:
virtual void Repeat(SfxRepeatTarget& rTarget);
virtual sal_Bool CanRepeat(SfxRepeatTarget& rTarget) const;
virtual sal_Bool Merge( SfxUndoAction *pNextAction );
- virtual rtl::OUString GetComment() const;
- virtual String GetRepeatComment(SfxRepeatTarget&) const;
+ virtual OUString GetComment() const;
+ virtual OUString GetRepeatComment(SfxRepeatTarget&) const;
virtual sal_uInt16 GetId() const;
};
diff --git a/sc/source/ui/inc/undodraw.hxx b/sc/source/ui/inc/undodraw.hxx
index 7155215cf569..62e3666405fd 100644
--- a/sc/source/ui/inc/undodraw.hxx
+++ b/sc/source/ui/inc/undodraw.hxx
@@ -55,8 +55,8 @@ public:
virtual void Repeat(SfxRepeatTarget& rTarget);
virtual sal_Bool CanRepeat(SfxRepeatTarget& rTarget) const;
virtual sal_Bool Merge( SfxUndoAction *pNextAction );
- virtual rtl::OUString GetComment() const;
- virtual String GetRepeatComment(SfxRepeatTarget&) const;
+ virtual OUString GetComment() const;
+ virtual OUString GetRepeatComment(SfxRepeatTarget&) const;
virtual sal_uInt16 GetId() const;
};
diff --git a/sc/source/ui/undo/undobase.cxx b/sc/source/ui/undo/undobase.cxx
index ef473c3f7242..853340ba3b31 100644
--- a/sc/source/ui/undo/undobase.cxx
+++ b/sc/source/ui/undo/undobase.cxx
@@ -555,12 +555,11 @@ rtl::OUString ScUndoWrapper::GetComment() const
return rtl::OUString();
}
-String ScUndoWrapper::GetRepeatComment(SfxRepeatTarget& rTarget) const
+OUString ScUndoWrapper::GetRepeatComment(SfxRepeatTarget& rTarget) const
{
if (pWrappedUndo)
return pWrappedUndo->GetRepeatComment(rTarget);
- else
- return String();
+ return OUString();
}
sal_uInt16 ScUndoWrapper::GetId() const
diff --git a/sc/source/ui/undo/undodraw.cxx b/sc/source/ui/undo/undodraw.cxx
index 42bd30b5852d..0dbd87ba8e81 100644
--- a/sc/source/ui/undo/undodraw.cxx
+++ b/sc/source/ui/undo/undodraw.cxx
@@ -57,12 +57,11 @@ rtl::OUString ScUndoDraw::GetComment() const
return rtl::OUString();
}
-String ScUndoDraw::GetRepeatComment(SfxRepeatTarget& rTarget) const
+OUString ScUndoDraw::GetRepeatComment(SfxRepeatTarget& rTarget) const
{
if (pDrawUndo)
return pDrawUndo->GetRepeatComment(rTarget);
- else
- return String();
+ return OUString();
}
sal_uInt16 ScUndoDraw::GetId() const