summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--forms/source/component/DatabaseForm.cxx4
-rw-r--r--reportdesign/source/ui/report/ReportController.cxx2
-rw-r--r--sc/source/ui/view/tabvwshb.cxx8
-rw-r--r--sd/source/ui/view/viewshel.cxx3
-rw-r--r--starmath/source/document.cxx2
-rw-r--r--svl/inc/svl/undo.hxx8
-rw-r--r--svl/source/undo/undo.cxx8
-rw-r--r--sw/source/ui/shells/annotsh.cxx2
-rw-r--r--sw/source/ui/shells/drwtxtsh.cxx2
9 files changed, 19 insertions, 20 deletions
diff --git a/forms/source/component/DatabaseForm.cxx b/forms/source/component/DatabaseForm.cxx
index 7a6e75881fee..a41fd7cd5d39 100644
--- a/forms/source/component/DatabaseForm.cxx
+++ b/forms/source/component/DatabaseForm.cxx
@@ -1030,7 +1030,7 @@ void ODatabaseForm::InsertTextPart( INetMIMEMessage& rParent, const ::rtl::OUStr
aContentDisp += rName;
aContentDisp += UniString('\"');
pChild->SetContentDisposition( aContentDisp );
- pChild->SetContentType( UniString::CreateFromAscii("text/plain") );
+ pChild->SetContentType(::rtl::OUString("text/plain"));
rtl_TextEncoding eSystemEncoding = osl_getThreadTextEncoding();
const sal_Char* pBestMatchingEncoding = rtl_getBestMimeCharsetFromTextEncoding( eSystemEncoding );
@@ -1098,7 +1098,7 @@ sal_Bool ODatabaseForm::InsertFilePart( INetMIMEMessage& rParent, const ::rtl::O
aContentDisp += UniString('\"');
pChild->SetContentDisposition( aContentDisp );
pChild->SetContentType( aContentType );
- pChild->SetContentTransferEncoding( UniString(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("8bit") ) ) );
+ pChild->SetContentTransferEncoding(::rtl::OUString("8bit"));
// Body
diff --git a/reportdesign/source/ui/report/ReportController.cxx b/reportdesign/source/ui/report/ReportController.cxx
index 13de5327e4b2..54c64887fa1b 100644
--- a/reportdesign/source/ui/report/ReportController.cxx
+++ b/reportdesign/source/ui/report/ReportController.cxx
@@ -475,7 +475,7 @@ FeatureState OReportController::GetState(sal_uInt16 _nId) const
if ( aReturn.bEnabled )
{
// TODO: add "Undo/Redo: prefix"
- String ( SfxUndoManager::*retrieveComment )( size_t, bool const ) const =
+ rtl::OUString ( SfxUndoManager::*retrieveComment )( size_t, bool const ) const =
( _nId == SID_UNDO ) ? &SfxUndoManager::GetUndoActionComment : &SfxUndoManager::GetRedoActionComment;
aReturn.sTitle = (rUndoManager.*retrieveComment)( 0, ::svl::IUndoManager::TopLevel );
}
diff --git a/sc/source/ui/view/tabvwshb.cxx b/sc/source/ui/view/tabvwshb.cxx
index 843f4cf9d62c..3a0e5ed36be0 100644
--- a/sc/source/ui/view/tabvwshb.cxx
+++ b/sc/source/ui/view/tabvwshb.cxx
@@ -553,9 +553,11 @@ void ScTabViewShell::GetUndoState(SfxItemSet &rSet)
std::vector<String> &aList = aStrLst.GetList();
sal_Bool bIsUndo = ( nWhich == SID_GETUNDOSTRINGS );
size_t nCount = bIsUndo ? pUndoManager->GetUndoActionCount() : pUndoManager->GetRedoActionCount();
- for (size_t i=0; i<nCount; i++)
- aList.push_back( bIsUndo ? pUndoManager->GetUndoActionComment(i) :
- pUndoManager->GetRedoActionComment(i) );
+ for (size_t i=0; i<nCount; ++i)
+ {
+ aList.push_back( rtl::OUString( bIsUndo ? pUndoManager->GetUndoActionComment(i) :
+ pUndoManager->GetRedoActionComment(i) ) );
+ }
}
rSet.Put( aStrLst );
}
diff --git a/sd/source/ui/view/viewshel.cxx b/sd/source/ui/view/viewshel.cxx
index fdbead996f26..bcc2f2adbee4 100644
--- a/sd/source/ui/view/viewshel.cxx
+++ b/sd/source/ui/view/viewshel.cxx
@@ -1062,9 +1062,8 @@ void ViewShell::ImpGetUndoStrings(SfxItemSet &rSet) const
{
// prepare list
::std::vector< String > aStringList;
- sal_uInt16 a;
- for( a = 0; a < nCount; a++)
+ for (sal_uInt16 a = 0; a < nCount; ++a)
{
// generate one String in list per undo step
aStringList.push_back( String(pUndoManager->GetUndoActionComment(a)) );
diff --git a/starmath/source/document.cxx b/starmath/source/document.cxx
index 9d168b886abe..be84b1456a64 100644
--- a/starmath/source/document.cxx
+++ b/starmath/source/document.cxx
@@ -1290,7 +1290,7 @@ void SmDocShell::GetState(SfxItemSet &rSet)
::svl::IUndoManager* pTmpUndoMgr = GetUndoManager();
if( pTmpUndoMgr )
{
- UniString(::svl::IUndoManager:: *fnGetComment)( size_t, bool const ) const;
+ rtl::OUString(::svl::IUndoManager:: *fnGetComment)( size_t, bool const ) const;
sal_uInt16 nCount;
if( SID_GETUNDOSTRINGS == nWh )
diff --git a/svl/inc/svl/undo.hxx b/svl/inc/svl/undo.hxx
index a6b3fd646168..58c620c013a6 100644
--- a/svl/inc/svl/undo.hxx
+++ b/svl/inc/svl/undo.hxx
@@ -242,11 +242,11 @@ namespace svl
virtual size_t GetUndoActionCount( bool const i_currentLevel = CurrentLevel ) const = 0;
virtual sal_uInt16 GetUndoActionId() const = 0;
- virtual UniString GetUndoActionComment( size_t nNo=0, bool const i_currentLevel = CurrentLevel ) const = 0;
+ virtual rtl::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 UniString GetRedoActionComment( size_t nNo=0, bool const i_currentLevel = CurrentLevel ) const = 0;
+ virtual rtl::OUString GetRedoActionComment( size_t nNo=0, bool const i_currentLevel = CurrentLevel ) const = 0;
virtual sal_Bool Undo() = 0;
virtual sal_Bool Redo() = 0;
@@ -356,10 +356,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 UniString GetUndoActionComment( size_t nNo=0, bool const i_currentLevel = CurrentLevel ) const;
+ virtual rtl::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 UniString GetRedoActionComment( size_t nNo=0, bool const i_currentLevel = CurrentLevel ) const;
+ virtual rtl::OUString GetRedoActionComment( size_t nNo=0, bool const i_currentLevel = CurrentLevel ) const;
virtual sal_Bool Undo();
virtual sal_Bool Redo();
virtual void Clear();
diff --git a/svl/source/undo/undo.cxx b/svl/source/undo/undo.cxx
index 91836647d1a2..e27bf00e5ba4 100644
--- a/svl/source/undo/undo.cxx
+++ b/svl/source/undo/undo.cxx
@@ -691,17 +691,15 @@ size_t SfxUndoManager::GetUndoActionCount( bool const i_currentLevel ) const
//------------------------------------------------------------------------
-XubString SfxUndoManager::GetUndoActionComment( size_t nNo, bool const i_currentLevel ) const
+rtl::OUString SfxUndoManager::GetUndoActionComment( size_t nNo, bool const i_currentLevel ) const
{
UndoManagerGuard aGuard( *m_pData );
- String sComment;
+ rtl::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 )
- {
sComment = pUndoArray->aUndoActions[ pUndoArray->nCurUndoAction - 1 - nNo ].pAction->GetComment();
- }
return sComment;
}
@@ -852,7 +850,7 @@ size_t SfxUndoManager::ImplGetRedoActionCount_Lock( bool const i_currentLevel )
//------------------------------------------------------------------------
-XubString SfxUndoManager::GetRedoActionComment( size_t nNo, bool const i_currentLevel ) const
+rtl::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;
diff --git a/sw/source/ui/shells/annotsh.cxx b/sw/source/ui/shells/annotsh.cxx
index 4ce1e0a6a4a0..431de8bda43e 100644
--- a/sw/source/ui/shells/annotsh.cxx
+++ b/sw/source/ui/shells/annotsh.cxx
@@ -1471,7 +1471,7 @@ void SwAnnotationShell::StateUndo(SfxItemSet &rSet)
{
if( pUndoManager )
{
- UniString (::svl::IUndoManager:: *fnGetComment)( size_t, bool const ) const;
+ rtl::OUString (::svl::IUndoManager:: *fnGetComment)( size_t, bool const ) const;
sal_uInt16 nCount;
if( SID_GETUNDOSTRINGS == nWhich )
diff --git a/sw/source/ui/shells/drwtxtsh.cxx b/sw/source/ui/shells/drwtxtsh.cxx
index 299294cd35f7..2bb6c5ae27cc 100644
--- a/sw/source/ui/shells/drwtxtsh.cxx
+++ b/sw/source/ui/shells/drwtxtsh.cxx
@@ -585,7 +585,7 @@ void SwDrawTextShell::StateUndo(SfxItemSet &rSet)
::svl::IUndoManager* pUndoManager = GetUndoManager();
if( pUndoManager )
{
- UniString (::svl::IUndoManager:: *fnGetComment)( size_t, bool const ) const;
+ rtl::OUString (::svl::IUndoManager:: *fnGetComment)( size_t, bool const ) const;
sal_uInt16 nCount;
if( SID_GETUNDOSTRINGS == nWhich )
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-30 21:46:30 +0000