summaryrefslogtreecommitdiff
path: root/svl
diff options
context:
space:
mode:
Diffstat (limited to 'svl')
-rw-r--r--svl/inc/svl/undo.hxx38
-rw-r--r--svl/source/undo/undo.cxx35
2 files changed, 36 insertions, 37 deletions
diff --git a/svl/inc/svl/undo.hxx b/svl/inc/svl/undo.hxx
index 096b05e74f04..7059ab88588a 100644
--- a/svl/inc/svl/undo.hxx
+++ b/svl/inc/svl/undo.hxx
@@ -66,8 +66,8 @@ public:
virtual sal_Bool Merge( SfxUndoAction *pNextAction );
- virtual rtl::OUString GetComment() const;
- virtual UniString GetRepeatComment(SfxRepeatTarget&) const;
+ virtual OUString GetComment() const;
+ virtual OUString GetRepeatComment(SfxRepeatTarget&) const;
virtual sal_uInt16 GetId() const;
private:
@@ -162,8 +162,8 @@ class SVL_DLLPUBLIC SfxListUndoAction : public SfxUndoAction, public SfxUndoArra
public:
TYPEINFO();
- SfxListUndoAction( const UniString &rComment,
- const UniString rRepeatComment, sal_uInt16 Id, SfxUndoArray *pFather);
+ SfxListUndoAction( const OUString &rComment,
+ const OUString rRepeatComment, sal_uInt16 Id, SfxUndoArray *pFather);
virtual void Undo();
virtual void UndoWithContext( SfxUndoContext& i_context );
virtual void Redo();
@@ -173,17 +173,17 @@ class SVL_DLLPUBLIC SfxListUndoAction : public SfxUndoAction, public SfxUndoArra
virtual sal_Bool Merge( SfxUndoAction *pNextAction );
- virtual rtl::OUString GetComment() const;
- virtual UniString GetRepeatComment(SfxRepeatTarget&) const;
+ virtual OUString GetComment() const;
+ virtual OUString GetRepeatComment(SfxRepeatTarget&) const;
virtual sal_uInt16 GetId() const;
- void SetComment( const UniString& rComment );
+ void SetComment(const OUString& rComment);
private:
sal_uInt16 nId;
- UniString aComment;
- UniString aRepeatComment;
+ OUString aComment;
+ OUString aRepeatComment;
};
@@ -232,11 +232,11 @@ namespace svl
virtual size_t GetUndoActionCount( bool const i_currentLevel = CurrentLevel ) const = 0;
virtual sal_uInt16 GetUndoActionId() const = 0;
- virtual rtl::OUString GetUndoActionComment( size_t nNo=0, bool const i_currentLevel = CurrentLevel ) const = 0;
+ virtual OUString GetUndoActionComment( size_t nNo=0, bool const i_currentLevel = CurrentLevel ) const = 0;
virtual SfxUndoAction* GetUndoAction( size_t nNo=0 ) const = 0;
virtual size_t GetRedoActionCount( bool const i_currentLevel = CurrentLevel ) const = 0;
- virtual rtl::OUString GetRedoActionComment( size_t nNo=0, bool const i_currentLevel = CurrentLevel ) const = 0;
+ virtual OUString GetRedoActionComment( size_t nNo=0, bool const i_currentLevel = CurrentLevel ) const = 0;
virtual sal_Bool Undo() = 0;
virtual sal_Bool Redo() = 0;
@@ -267,11 +267,11 @@ namespace svl
virtual bool IsDoing() const = 0;
virtual size_t GetRepeatActionCount() const = 0;
- virtual UniString GetRepeatActionComment( SfxRepeatTarget &rTarget) const = 0;
+ virtual OUString GetRepeatActionComment( SfxRepeatTarget &rTarget) const = 0;
virtual sal_Bool Repeat( SfxRepeatTarget &rTarget ) = 0;
virtual sal_Bool CanRepeat( SfxRepeatTarget &rTarget ) const = 0;
- virtual void EnterListAction(const UniString &rComment, const UniString& rRepeatComment, sal_uInt16 nId=0) = 0;
+ virtual void EnterListAction(const OUString &rComment, const OUString& rRepeatComment, sal_uInt16 nId=0) = 0;
/** leaves the list action entered with EnterListAction
@return the number of the sub actions in the list which has just been left. Note that in case no such
@@ -351,10 +351,10 @@ public:
virtual void AddUndoAction( SfxUndoAction *pAction, sal_Bool bTryMerg=sal_False );
virtual size_t GetUndoActionCount( bool const i_currentLevel = CurrentLevel ) const;
virtual sal_uInt16 GetUndoActionId() const;
- virtual rtl::OUString GetUndoActionComment( size_t nNo=0, bool const i_currentLevel = CurrentLevel ) const;
+ virtual OUString GetUndoActionComment( size_t nNo=0, bool const i_currentLevel = CurrentLevel ) const;
virtual SfxUndoAction* GetUndoAction( size_t nNo=0 ) const;
virtual size_t GetRedoActionCount( bool const i_currentLevel = CurrentLevel ) const;
- virtual rtl::OUString GetRedoActionComment( size_t nNo=0, bool const i_currentLevel = CurrentLevel ) const;
+ virtual OUString GetRedoActionComment( size_t nNo=0, bool const i_currentLevel = CurrentLevel ) const;
virtual sal_Bool Undo();
virtual sal_Bool Redo();
virtual void Clear();
@@ -362,10 +362,10 @@ public:
virtual void Reset();
virtual bool IsDoing() const;
virtual size_t GetRepeatActionCount() const;
- virtual UniString GetRepeatActionComment( SfxRepeatTarget &rTarget) const;
+ virtual OUString GetRepeatActionComment( SfxRepeatTarget &rTarget) const;
virtual sal_Bool Repeat( SfxRepeatTarget &rTarget );
virtual sal_Bool CanRepeat( SfxRepeatTarget &rTarget ) const;
- virtual void EnterListAction(const UniString &rComment, const UniString& rRepeatComment, sal_uInt16 nId=0);
+ virtual void EnterListAction(const OUString &rComment, const OUString& rRepeatComment, sal_uInt16 nId=0);
virtual size_t LeaveListAction();
virtual size_t LeaveAndMergeListAction();
virtual bool IsInListAction() const;
@@ -457,8 +457,8 @@ public:
virtual void Repeat(SfxRepeatTarget&r);
- virtual rtl::OUString GetComment() const;
- virtual UniString GetRepeatComment(SfxRepeatTarget&r) const;
+ virtual OUString GetComment() const;
+ virtual OUString GetRepeatComment(SfxRepeatTarget&r) const;
virtual sal_uInt16 GetId() const;
SfxUndoAction* GetAction() const { return pAction; }
diff --git a/svl/source/undo/undo.cxx b/svl/source/undo/undo.cxx
index c1f32cc5bbf9..379a327e5d80 100644
--- a/svl/source/undo/undo.cxx
+++ b/svl/source/undo/undo.cxx
@@ -94,10 +94,10 @@ sal_Bool SfxUndoAction::Merge( SfxUndoAction * )
//------------------------------------------------------------------------
-rtl::OUString SfxUndoAction::GetComment() const
+OUString SfxUndoAction::GetComment() const
{
DBG_CHKTHIS(SfxUndoAction, 0);
- return rtl::OUString();
+ return OUString();
}
//------------------------------------------------------------------------
@@ -111,7 +111,7 @@ sal_uInt16 SfxUndoAction::GetId() const
//------------------------------------------------------------------------
-XubString SfxUndoAction::GetRepeatComment(SfxRepeatTarget&) const
+OUString SfxUndoAction::GetRepeatComment(SfxRepeatTarget&) const
{
DBG_CHKTHIS(SfxUndoAction, 0);
return GetComment();
@@ -681,11 +681,11 @@ size_t SfxUndoManager::GetUndoActionCount( bool const i_currentLevel ) const
//------------------------------------------------------------------------
-rtl::OUString SfxUndoManager::GetUndoActionComment( size_t nNo, bool const i_currentLevel ) const
+OUString SfxUndoManager::GetUndoActionComment( size_t nNo, bool const i_currentLevel ) const
{
UndoManagerGuard aGuard( *m_pData );
- rtl::OUString sComment;
+ OUString sComment;
const SfxUndoArray* pUndoArray = i_currentLevel ? m_pData->pActUndoArray : m_pData->pUndoArray;
DBG_ASSERT( nNo < pUndoArray->nCurUndoAction, "svl::SfxUndoManager::GetUndoActionComment: illegal index!" );
if( nNo < pUndoArray->nCurUndoAction )
@@ -840,7 +840,7 @@ size_t SfxUndoManager::ImplGetRedoActionCount_Lock( bool const i_currentLevel )
//------------------------------------------------------------------------
-rtl::OUString SfxUndoManager::GetRedoActionComment( size_t nNo, bool const i_currentLevel ) const
+OUString SfxUndoManager::GetRedoActionComment( size_t nNo, bool const i_currentLevel ) const
{
UndoManagerGuard aGuard( *m_pData );
const SfxUndoArray* pUndoArray = i_currentLevel ? m_pData->pActUndoArray : m_pData->pUndoArray;
@@ -933,7 +933,7 @@ size_t SfxUndoManager::GetRepeatActionCount() const
//------------------------------------------------------------------------
-XubString SfxUndoManager::GetRepeatActionComment( SfxRepeatTarget &rTarget) const
+OUString SfxUndoManager::GetRepeatActionComment(SfxRepeatTarget &rTarget) const
{
UndoManagerGuard aGuard( *m_pData );
return m_pData->pActUndoArray->aUndoActions[ m_pData->pActUndoArray->aUndoActions.size() - 1 ].pAction
@@ -999,7 +999,7 @@ void SfxUndoManager::RemoveUndoListener( SfxUndoListener& i_listener )
//------------------------------------------------------------------------
void SfxUndoManager::EnterListAction(
- const XubString& rComment, const XubString &rRepeatComment, sal_uInt16 nId )
+ const OUString& rComment, const OUString &rRepeatComment, sal_uInt16 nId )
/* [Beschreibung]
@@ -1282,21 +1282,21 @@ sal_uInt16 SfxListUndoAction::GetId() const
//------------------------------------------------------------------------
-rtl::OUString SfxListUndoAction::GetComment() const
+OUString SfxListUndoAction::GetComment() const
{
return aComment;
}
//------------------------------------------------------------------------
-void SfxListUndoAction::SetComment( const UniString& rComment )
+void SfxListUndoAction::SetComment(const OUString& rComment)
{
aComment = rComment;
}
//------------------------------------------------------------------------
-XubString SfxListUndoAction::GetRepeatComment(SfxRepeatTarget &) const
+OUString SfxListUndoAction::GetRepeatComment(SfxRepeatTarget &) const
{
return aRepeatComment;
}
@@ -1306,8 +1306,8 @@ XubString SfxListUndoAction::GetRepeatComment(SfxRepeatTarget &) const
SfxListUndoAction::SfxListUndoAction
(
- const XubString &rComment,
- const XubString rRepeatComment,
+ const OUString &rComment,
+ const OUString rRepeatComment,
sal_uInt16 Id,
SfxUndoArray *pFather
)
@@ -1442,22 +1442,21 @@ void SfxLinkUndoAction::Repeat(SfxRepeatTarget&r)
//------------------------------------------------------------------------
-rtl::OUString SfxLinkUndoAction::GetComment() const
+OUString SfxLinkUndoAction::GetComment() const
{
if ( pAction )
return pAction->GetComment();
- return rtl::OUString();
+ return OUString();
}
//------------------------------------------------------------------------
-XubString SfxLinkUndoAction::GetRepeatComment(SfxRepeatTarget&r) const
+OUString SfxLinkUndoAction::GetRepeatComment(SfxRepeatTarget&r) const
{
if ( pAction )
return pAction->GetRepeatComment(r);
- else
- return XubString();
+ return OUString();
}
//------------------------------------------------------------------------
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-27 15:17:10 +0000