summaryrefslogtreecommitdiff
path: root/sc/source/ui/undo
diff options
context:
space:
mode:
Diffstat (limited to 'sc/source/ui/undo')
-rw-r--r--sc/source/ui/undo/undobase.cxx4
-rw-r--r--sc/source/ui/undo/undoblk.cxx34
-rw-r--r--sc/source/ui/undo/undoblk2.cxx2
-rw-r--r--sc/source/ui/undo/undoblk3.cxx34
-rw-r--r--sc/source/ui/undo/undocell.cxx24
-rw-r--r--sc/source/ui/undo/undodat.cxx36
-rw-r--r--sc/source/ui/undo/undodraw.cxx4
-rw-r--r--sc/source/ui/undo/undorangename.cxx14
-rw-r--r--sc/source/ui/undo/undostyl.cxx4
-rw-r--r--sc/source/ui/undo/undotab.cxx59
-rw-r--r--sc/source/ui/undo/undoutil.cxx4
11 files changed, 109 insertions, 110 deletions
diff --git a/sc/source/ui/undo/undobase.cxx b/sc/source/ui/undo/undobase.cxx
index 2960ecfb558b..299d1a7c9ddc 100644
--- a/sc/source/ui/undo/undobase.cxx
+++ b/sc/source/ui/undo/undobase.cxx
@@ -539,11 +539,11 @@ void ScUndoWrapper::ForgetWrappedUndo()
pWrappedUndo = NULL; // don't delete in dtor - pointer must be stored outside
}
-rtl::OUString ScUndoWrapper::GetComment() const
+OUString ScUndoWrapper::GetComment() const
{
if (pWrappedUndo)
return pWrappedUndo->GetComment();
- return rtl::OUString();
+ return OUString();
}
OUString ScUndoWrapper::GetRepeatComment(SfxRepeatTarget& rTarget) const
diff --git a/sc/source/ui/undo/undoblk.cxx b/sc/source/ui/undo/undoblk.cxx
index ebc0e0e98cdf..afe6f72286fe 100644
--- a/sc/source/ui/undo/undoblk.cxx
+++ b/sc/source/ui/undo/undoblk.cxx
@@ -110,7 +110,7 @@ ScUndoInsertCells::~ScUndoInsertCells()
delete []pScenarios;
}
-rtl::OUString ScUndoInsertCells::GetComment() const
+OUString ScUndoInsertCells::GetComment() const
{
return ScGlobal::GetRscString( pPasteUndo ? STR_UNDO_PASTE : STR_UNDO_INSERTCELLS );
}
@@ -349,7 +349,7 @@ ScUndoDeleteCells::~ScUndoDeleteCells()
delete []pScenarios;
}
-rtl::OUString ScUndoDeleteCells::GetComment() const
+OUString ScUndoDeleteCells::GetComment() const
{
return ScGlobal::GetRscString( STR_UNDO_DELETECELLS ); // "Delete"
}
@@ -573,7 +573,7 @@ ScUndoDeleteMulti::~ScUndoDeleteMulti()
delete [] pRanges;
}
-rtl::OUString ScUndoDeleteMulti::GetComment() const
+OUString ScUndoDeleteMulti::GetComment() const
{
return ScGlobal::GetRscString( STR_UNDO_DELETECELLS ); // like DeleteCells
}
@@ -752,7 +752,7 @@ ScUndoCut::~ScUndoCut()
delete pUndoDoc;
}
-rtl::OUString ScUndoCut::GetComment() const
+OUString ScUndoCut::GetComment() const
{
return ScGlobal::GetRscString( STR_UNDO_CUT ); // "cut"
}
@@ -867,7 +867,7 @@ ScUndoPaste::~ScUndoPaste()
delete pRefRedoData;
}
-rtl::OUString ScUndoPaste::GetComment() const
+OUString ScUndoPaste::GetComment() const
{
return ScGlobal::GetRscString( STR_UNDO_PASTE ); // "paste"
}
@@ -1138,7 +1138,7 @@ ScUndoDragDrop::~ScUndoDragDrop()
{
}
-rtl::OUString ScUndoDragDrop::GetComment() const
+OUString ScUndoDragDrop::GetComment() const
{ // "Move" : "Copy"
return bCut ?
ScGlobal::GetRscString( STR_UNDO_MOVE ) :
@@ -1361,7 +1361,7 @@ ScUndoListNames::~ScUndoListNames()
delete pRedoDoc;
}
-rtl::OUString ScUndoListNames::GetComment() const
+OUString ScUndoListNames::GetComment() const
{
return ScGlobal::GetRscString( STR_UNDO_LISTNAMES );
}
@@ -1427,7 +1427,7 @@ ScUndoUseScenario::~ScUndoUseScenario()
delete pUndoDoc;
}
-rtl::OUString ScUndoUseScenario::GetComment() const
+OUString ScUndoUseScenario::GetComment() const
{
return ScGlobal::GetRscString( STR_UNDO_USESCENARIO );
}
@@ -1456,7 +1456,7 @@ void ScUndoUseScenario::Undo()
for (SCTAB i = nTab+1; i<=nEndTab; i++)
{
// Flags always
- rtl::OUString aComment;
+ OUString aComment;
Color aColor;
sal_uInt16 nScenFlags;
pUndoDoc->GetScenarioData( i, aComment, aColor, nScenFlags );
@@ -1543,7 +1543,7 @@ ScUndoSelectionStyle::~ScUndoSelectionStyle()
delete pUndoDoc;
}
-rtl::OUString ScUndoSelectionStyle::GetComment() const
+OUString ScUndoSelectionStyle::GetComment() const
{
return ScGlobal::GetRscString( STR_UNDO_APPLYCELLSTYLE );
}
@@ -1648,7 +1648,7 @@ ScUndoEnterMatrix::~ScUndoEnterMatrix()
delete pUndoDoc;
}
-rtl::OUString ScUndoEnterMatrix::GetComment() const
+OUString ScUndoEnterMatrix::GetComment() const
{
return ScGlobal::GetRscString( STR_UNDO_ENTERMATRIX );
}
@@ -1742,7 +1742,7 @@ ScUndoIndent::~ScUndoIndent()
delete pUndoDoc;
}
-rtl::OUString ScUndoIndent::GetComment() const
+OUString ScUndoIndent::GetComment() const
{
sal_uInt16 nId = bIsIncrement ? STR_UNDO_INC_INDENT : STR_UNDO_DEC_INDENT;
return ScGlobal::GetRscString( nId );
@@ -1799,7 +1799,7 @@ ScUndoTransliterate::~ScUndoTransliterate()
delete pUndoDoc;
}
-rtl::OUString ScUndoTransliterate::GetComment() const
+OUString ScUndoTransliterate::GetComment() const
{
return ScGlobal::GetRscString( STR_UNDO_TRANSLITERATE );
}
@@ -1864,7 +1864,7 @@ ScUndoClearItems::~ScUndoClearItems()
delete pWhich;
}
-rtl::OUString ScUndoClearItems::GetComment() const
+OUString ScUndoClearItems::GetComment() const
{
return ScGlobal::GetRscString( STR_UNDO_DELETECONTENTS );
}
@@ -1919,7 +1919,7 @@ ScUndoRemoveBreaks::~ScUndoRemoveBreaks()
delete pUndoDoc;
}
-rtl::OUString ScUndoRemoveBreaks::GetComment() const
+OUString ScUndoRemoveBreaks::GetComment() const
{
return ScGlobal::GetRscString( STR_UNDO_REMOVEBREAKS );
}
@@ -1982,7 +1982,7 @@ ScUndoRemoveMerge::~ScUndoRemoveMerge()
delete pUndoDoc;
}
-rtl::OUString ScUndoRemoveMerge::GetComment() const
+OUString ScUndoRemoveMerge::GetComment() const
{
return ScGlobal::GetRscString( STR_UNDO_REMERGE ); // "remove merge"
}
@@ -2124,7 +2124,7 @@ ScUndoBorder::~ScUndoBorder()
delete pInner;
}
-rtl::OUString ScUndoBorder::GetComment() const
+OUString ScUndoBorder::GetComment() const
{
return ScGlobal::GetRscString( STR_UNDO_SELATTRLINES ); //! eigener String?
}
diff --git a/sc/source/ui/undo/undoblk2.cxx b/sc/source/ui/undo/undoblk2.cxx
index 9eb40e7c79c3..384c8bce7a53 100644
--- a/sc/source/ui/undo/undoblk2.cxx
+++ b/sc/source/ui/undo/undoblk2.cxx
@@ -65,7 +65,7 @@ ScUndoWidthOrHeight::~ScUndoWidthOrHeight()
DeleteSdrUndoAction( pDrawUndo );
}
-rtl::OUString ScUndoWidthOrHeight::GetComment() const
+OUString ScUndoWidthOrHeight::GetComment() const
{
// [ "optimal " ] "Column width" | "row height"
return ( bWidth ?
diff --git a/sc/source/ui/undo/undoblk3.cxx b/sc/source/ui/undo/undoblk3.cxx
index 317cab43df32..3c9b86a0eebb 100644
--- a/sc/source/ui/undo/undoblk3.cxx
+++ b/sc/source/ui/undo/undoblk3.cxx
@@ -99,7 +99,7 @@ ScUndoDeleteContents::~ScUndoDeleteContents()
DeleteSdrUndoAction( pDrawUndo );
}
-rtl::OUString ScUndoDeleteContents::GetComment() const
+OUString ScUndoDeleteContents::GetComment() const
{
return ScGlobal::GetRscString( STR_UNDO_DELETECONTENTS ); // "Delete"
}
@@ -187,7 +187,7 @@ void ScUndoDeleteContents::Undo()
{
ScRangeList aChangeRanges;
aChangeRanges.Append( aRange );
- pModelObj->NotifyChanges( ::rtl::OUString( "cell-change" ), aChangeRanges );
+ pModelObj->NotifyChanges( OUString( "cell-change" ), aChangeRanges );
}
}
@@ -203,7 +203,7 @@ void ScUndoDeleteContents::Redo()
{
ScRangeList aChangeRanges;
aChangeRanges.Append( aRange );
- pModelObj->NotifyChanges( ::rtl::OUString( "cell-change" ), aChangeRanges );
+ pModelObj->NotifyChanges( OUString( "cell-change" ), aChangeRanges );
}
}
@@ -243,7 +243,7 @@ ScUndoFillTable::~ScUndoFillTable()
delete pUndoDoc;
}
-rtl::OUString ScUndoFillTable::GetComment() const
+OUString ScUndoFillTable::GetComment() const
{
return ScGlobal::GetRscString( STR_FILL_TAB );
}
@@ -383,7 +383,7 @@ ScUndoSelectionAttr::~ScUndoSelectionAttr()
delete pUndoDoc;
}
-rtl::OUString ScUndoSelectionAttr::GetComment() const
+OUString ScUndoSelectionAttr::GetComment() const
{
//"Attribute" "/Lines"
return ScGlobal::GetRscString( pLineOuter ? STR_UNDO_SELATTRLINES : STR_UNDO_SELATTR );
@@ -515,7 +515,7 @@ ScUndoAutoFill::~ScUndoAutoFill()
delete pUndoDoc;
}
-rtl::OUString ScUndoAutoFill::GetComment() const
+OUString ScUndoAutoFill::GetComment() const
{
return ScGlobal::GetRscString( STR_UNDO_AUTOFILL ); //"Fill"
}
@@ -655,7 +655,7 @@ ScUndoMerge::~ScUndoMerge()
DeleteSdrUndoAction( mpDrawUndo );
}
-rtl::OUString ScUndoMerge::GetComment() const
+OUString ScUndoMerge::GetComment() const
{
return ScGlobal::GetRscString( STR_UNDO_MERGE );
}
@@ -780,7 +780,7 @@ ScUndoAutoFormat::~ScUndoAutoFormat()
delete pUndoDoc;
}
-rtl::OUString ScUndoAutoFormat::GetComment() const
+OUString ScUndoAutoFormat::GetComment() const
{
return ScGlobal::GetRscString( STR_UNDO_AUTOFORMAT ); //"Auto-Format"
}
@@ -961,7 +961,7 @@ void ScUndoReplace::SetChangeTrack()
nStartChangeAction = nEndChangeAction = 0;
}
-rtl::OUString ScUndoReplace::GetComment() const
+OUString ScUndoReplace::GetComment() const
{
return ScGlobal::GetRscString( STR_UNDO_REPLACE ); // "Replace"
}
@@ -1116,7 +1116,7 @@ ScUndoTabOp::~ScUndoTabOp()
delete pUndoDoc;
}
-rtl::OUString ScUndoTabOp::GetComment() const
+OUString ScUndoTabOp::GetComment() const
{
return ScGlobal::GetRscString( STR_UNDO_TABOP ); // "Multiple operation"
}
@@ -1209,9 +1209,9 @@ void ScUndoConversion::SetChangeTrack()
nStartChangeAction = nEndChangeAction = 0;
}
-rtl::OUString ScUndoConversion::GetComment() const
+OUString ScUndoConversion::GetComment() const
{
- rtl::OUString aText;
+ OUString aText;
switch( maConvParam.GetType() )
{
case SC_CONVERSION_SPELLCHECK: aText = ScGlobal::GetRscString( STR_UNDO_SPELLING ); break;
@@ -1295,7 +1295,7 @@ ScUndoRefConversion::~ScUndoRefConversion()
delete pRedoDoc;
}
-rtl::OUString ScUndoRefConversion::GetComment() const
+OUString ScUndoRefConversion::GetComment() const
{
return ScGlobal::GetRscString( STR_UNDO_ENTERDATA ); // "Input"
}
@@ -1375,7 +1375,7 @@ ScUndoRefreshLink::~ScUndoRefreshLink()
delete pRedoDoc;
}
-rtl::OUString ScUndoRefreshLink::GetComment() const
+OUString ScUndoRefreshLink::GetComment() const
{
return ScGlobal::GetRscString( STR_UNDO_UPDATELINK );
}
@@ -1506,7 +1506,7 @@ ScUndoInsertAreaLink::~ScUndoInsertAreaLink()
{
}
-rtl::OUString ScUndoInsertAreaLink::GetComment() const
+OUString ScUndoInsertAreaLink::GetComment() const
{
return ScGlobal::GetRscString( STR_UNDO_INSERTAREALINK );
}
@@ -1568,7 +1568,7 @@ ScUndoRemoveAreaLink::~ScUndoRemoveAreaLink()
{
}
-rtl::OUString ScUndoRemoveAreaLink::GetComment() const
+OUString ScUndoRemoveAreaLink::GetComment() const
{
return ScGlobal::GetRscString( STR_UNDO_REMOVELINK ); //! eigener Text ??
}
@@ -1644,7 +1644,7 @@ ScUndoUpdateAreaLink::~ScUndoUpdateAreaLink()
delete pRedoDoc;
}
-rtl::OUString ScUndoUpdateAreaLink::GetComment() const
+OUString ScUndoUpdateAreaLink::GetComment() const
{
return ScGlobal::GetRscString( STR_UNDO_UPDATELINK ); //! own text ??
}
diff --git a/sc/source/ui/undo/undocell.cxx b/sc/source/ui/undo/undocell.cxx
index 40ca1da9c02b..01873318e58a 100644
--- a/sc/source/ui/undo/undocell.cxx
+++ b/sc/source/ui/undo/undocell.cxx
@@ -83,7 +83,7 @@ ScUndoCursorAttr::~ScUndoCursorAttr()
pPool->Remove(*pApplyPattern);
}
-rtl::OUString ScUndoCursorAttr::GetComment() const
+OUString ScUndoCursorAttr::GetComment() const
{
//! own text for automatic attribution
@@ -181,7 +181,7 @@ ScUndoEnterData::ScUndoEnterData(
ScUndoEnterData::~ScUndoEnterData() {}
-rtl::OUString ScUndoEnterData::GetComment() const
+OUString ScUndoEnterData::GetComment() const
{
return ScGlobal::GetRscString( STR_UNDO_ENTERDATA ); // "Input"
}
@@ -267,7 +267,7 @@ void ScUndoEnterData::Undo()
{
aChangeRanges.Append( ScRange(maPos.Col(), maPos.Row(), maOldValues[i].mnTab));
}
- pModelObj->NotifyChanges( ::rtl::OUString( "cell-change" ), aChangeRanges );
+ pModelObj->NotifyChanges( OUString( "cell-change" ), aChangeRanges );
}
}
@@ -306,7 +306,7 @@ void ScUndoEnterData::Redo()
{
aChangeRanges.Append(ScRange(maPos.Col(), maPos.Row(), maOldValues[i].mnTab));
}
- pModelObj->NotifyChanges( ::rtl::OUString( "cell-change" ), aChangeRanges );
+ pModelObj->NotifyChanges( OUString( "cell-change" ), aChangeRanges );
}
}
@@ -340,7 +340,7 @@ ScUndoEnterValue::~ScUndoEnterValue()
{
}
-rtl::OUString ScUndoEnterValue::GetComment() const
+OUString ScUndoEnterValue::GetComment() const
{
return ScGlobal::GetRscString( STR_UNDO_ENTERDATA ); // "Input"
}
@@ -517,7 +517,7 @@ ScUndoPageBreak::~ScUndoPageBreak()
{
}
-rtl::OUString ScUndoPageBreak::GetComment() const
+OUString ScUndoPageBreak::GetComment() const
{
//"Column break" | "Row break" "insert" | "delete"
return String ( bColumn ?
@@ -596,7 +596,7 @@ ScUndoPrintZoom::~ScUndoPrintZoom()
{
}
-rtl::OUString ScUndoPrintZoom::GetComment() const
+OUString ScUndoPrintZoom::GetComment() const
{
return ScGlobal::GetRscString( STR_UNDO_PRINTSCALE );
}
@@ -685,7 +685,7 @@ ScUndoThesaurus::~ScUndoThesaurus()
delete pRedoTObject;
}
-rtl::OUString ScUndoThesaurus::GetComment() const
+OUString ScUndoThesaurus::GetComment() const
{
return ScGlobal::GetRscString( STR_UNDO_THESAURUS ); // "Thesaurus"
}
@@ -844,7 +844,7 @@ sal_Bool ScUndoReplaceNote::CanRepeat( SfxRepeatTarget& /*rTarget*/ ) const
return false;
}
-rtl::OUString ScUndoReplaceNote::GetComment() const
+OUString ScUndoReplaceNote::GetComment() const
{
return ScGlobal::GetRscString( maNewData.mpCaption ?
(maOldData.mpCaption ? STR_UNDO_EDITNOTE : STR_UNDO_INSERTNOTE) : STR_UNDO_DELETENOTE );
@@ -914,7 +914,7 @@ sal_Bool ScUndoShowHideNote::CanRepeat( SfxRepeatTarget& /*rTarget*/ ) const
return false;
}
-rtl::OUString ScUndoShowHideNote::GetComment() const
+OUString ScUndoShowHideNote::GetComment() const
{
return ScGlobal::GetRscString( mbShown ? STR_UNDO_SHOWNOTE : STR_UNDO_HIDENOTE );
}
@@ -941,7 +941,7 @@ ScUndoDetective::~ScUndoDetective()
delete pOldList;
}
-rtl::OUString ScUndoDetective::GetComment() const
+OUString ScUndoDetective::GetComment() const
{
sal_uInt16 nId = STR_UNDO_DETDELALL;
if ( !bIsDelete )
@@ -1039,7 +1039,7 @@ ScUndoRangeNames::~ScUndoRangeNames()
delete pNewRanges;
}
-rtl::OUString ScUndoRangeNames::GetComment() const
+OUString ScUndoRangeNames::GetComment() const
{
return ScGlobal::GetRscString( STR_UNDO_RANGENAMES );
}
diff --git a/sc/source/ui/undo/undodat.cxx b/sc/source/ui/undo/undodat.cxx
index 81106e5c0550..2a631d5a8c44 100644
--- a/sc/source/ui/undo/undodat.cxx
+++ b/sc/source/ui/undo/undodat.cxx
@@ -87,7 +87,7 @@ ScUndoDoOutline::~ScUndoDoOutline()
delete pUndoDoc;
}
-rtl::OUString ScUndoDoOutline::GetComment() const
+OUString ScUndoDoOutline::GetComment() const
{ // Show outline" "Hide outline"
return bShow ?
ScGlobal::GetRscString( STR_UNDO_DOOUTLINE ) :
@@ -176,7 +176,7 @@ ScUndoMakeOutline::~ScUndoMakeOutline()
delete pUndoTable;
}
-rtl::OUString ScUndoMakeOutline::GetComment() const
+OUString ScUndoMakeOutline::GetComment() const
{ // "Grouping" "Undo grouping"
return bMake ?
ScGlobal::GetRscString( STR_UNDO_MAKEOUTLINE ) :
@@ -261,7 +261,7 @@ ScUndoOutlineLevel::~ScUndoOutlineLevel()
delete pUndoTable;
}
-rtl::OUString ScUndoOutlineLevel::GetComment() const
+OUString ScUndoOutlineLevel::GetComment() const
{ // "Select outline level"
return ScGlobal::GetRscString( STR_UNDO_OUTLINELEVEL );
}
@@ -346,7 +346,7 @@ ScUndoOutlineBlock::~ScUndoOutlineBlock()
delete pUndoTable;
}
-rtl::OUString ScUndoOutlineBlock::GetComment() const
+OUString ScUndoOutlineBlock::GetComment() const
{ // "Show outline" "Hide outline"
return bShow ?
ScGlobal::GetRscString( STR_UNDO_DOOUTLINEBLK ) :
@@ -447,7 +447,7 @@ ScUndoRemoveAllOutlines::~ScUndoRemoveAllOutlines()
delete pUndoTable;
}
-rtl::OUString ScUndoRemoveAllOutlines::GetComment() const
+OUString ScUndoRemoveAllOutlines::GetComment() const
{ // "Remove outlines"
return ScGlobal::GetRscString( STR_UNDO_REMOVEALLOTLNS );
}
@@ -532,7 +532,7 @@ ScUndoAutoOutline::~ScUndoAutoOutline()
delete pUndoTable;
}
-rtl::OUString ScUndoAutoOutline::GetComment() const
+OUString ScUndoAutoOutline::GetComment() const
{
return ScGlobal::GetRscString( STR_UNDO_AUTOOUTLINE );
}
@@ -641,7 +641,7 @@ ScUndoSubTotals::~ScUndoSubTotals()
delete pUndoDB;
}
-rtl::OUString ScUndoSubTotals::GetComment() const
+OUString ScUndoSubTotals::GetComment() const
{ // "Subtotals"
return ScGlobal::GetRscString( STR_UNDO_SUBTOTALS );
}
@@ -765,7 +765,7 @@ ScUndoSort::~ScUndoSort()
delete pUndoDB;
}
-rtl::OUString ScUndoSort::GetComment() const
+OUString ScUndoSort::GetComment() const
{
return ScGlobal::GetRscString( STR_UNDO_SORT );
}
@@ -891,7 +891,7 @@ ScUndoQuery::~ScUndoQuery()
DeleteSdrUndoAction( pDrawUndo );
}
-rtl::OUString ScUndoQuery::GetComment() const
+OUString ScUndoQuery::GetComment() const
{ // "Filter";
return ScGlobal::GetRscString( STR_UNDO_QUERY );
}
@@ -1029,7 +1029,7 @@ sal_Bool ScUndoQuery::CanRepeat(SfxRepeatTarget& /* rTarget */) const
// Show or hide AutoFilter buttons (doesn't include filter settings)
ScUndoAutoFilter::ScUndoAutoFilter( ScDocShell* pNewDocShell, const ScRange& rRange,
- const ::rtl::OUString& rName, bool bSet ) :
+ const OUString& rName, bool bSet ) :
ScDBFuncUndo( pNewDocShell, rRange ),
aDBName( rName ),
bFilterSet( bSet )
@@ -1040,7 +1040,7 @@ ScUndoAutoFilter::~ScUndoAutoFilter()
{
}
-rtl::OUString ScUndoAutoFilter::GetComment() const
+OUString ScUndoAutoFilter::GetComment() const
{
return ScGlobal::GetRscString( STR_UNDO_QUERY ); // same as ScUndoQuery
}
@@ -1120,7 +1120,7 @@ ScUndoDBData::~ScUndoDBData()
delete pRedoColl;
}
-rtl::OUString ScUndoDBData::GetComment() const
+OUString ScUndoDBData::GetComment() const
{ // "Change database range";
return ScGlobal::GetRscString( STR_UNDO_DBDATA );
}
@@ -1198,7 +1198,7 @@ ScUndoImportData::~ScUndoImportData()
delete pRedoDBData;
}
-rtl::OUString ScUndoImportData::GetComment() const
+OUString ScUndoImportData::GetComment() const
{
return ScGlobal::GetRscString( STR_UNDO_IMPORTDATA );
}
@@ -1417,7 +1417,7 @@ ScUndoRepeatDB::~ScUndoRepeatDB()
delete pUndoDB;
}
-rtl::OUString ScUndoRepeatDB::GetComment() const
+OUString ScUndoRepeatDB::GetComment() const
{
return ScGlobal::GetRscString( STR_UNDO_REPEATDB );
}
@@ -1571,7 +1571,7 @@ ScUndoDataPilot::~ScUndoDataPilot()
delete pNewUndoDoc;
}
-rtl::OUString ScUndoDataPilot::GetComment() const
+OUString ScUndoDataPilot::GetComment() const
{
sal_uInt16 nIndex;
if ( pOldUndoDoc && pNewUndoDoc )
@@ -1728,7 +1728,7 @@ ScUndoConsolidate::~ScUndoConsolidate()
delete pUndoData;
}
-rtl::OUString ScUndoConsolidate::GetComment() const
+OUString ScUndoConsolidate::GetComment() const
{
return ScGlobal::GetRscString( STR_UNDO_CONSOLIDATE );
}
@@ -1885,7 +1885,7 @@ ScUndoChartData::~ScUndoChartData()
{
}
-rtl::OUString ScUndoChartData::GetComment() const
+OUString ScUndoChartData::GetComment() const
{
return ScGlobal::GetRscString( STR_UNDO_CHARTDATA );
}
@@ -1958,7 +1958,7 @@ ScUndoDataForm::~ScUndoDataForm()
delete pRefRedoData;
}
-rtl::OUString ScUndoDataForm::GetComment() const
+OUString ScUndoDataForm::GetComment() const
{
return ScGlobal::GetRscString( STR_UNDO_PASTE );
}
diff --git a/sc/source/ui/undo/undodraw.cxx b/sc/source/ui/undo/undodraw.cxx
index c91f4f7dd000..fc047c117afe 100644
--- a/sc/source/ui/undo/undodraw.cxx
+++ b/sc/source/ui/undo/undodraw.cxx
@@ -41,11 +41,11 @@ void ScUndoDraw::ForgetDrawUndo()
pDrawUndo = NULL; // do not delete (DrawUndo has to be remembered from outside)
}
-rtl::OUString ScUndoDraw::GetComment() const
+OUString ScUndoDraw::GetComment() const
{
if (pDrawUndo)
return pDrawUndo->GetComment();
- return rtl::OUString();
+ return OUString();
}
OUString ScUndoDraw::GetRepeatComment(SfxRepeatTarget& rTarget) const
diff --git a/sc/source/ui/undo/undorangename.cxx b/sc/source/ui/undo/undorangename.cxx
index 9330c3680fcb..fbc447246815 100644
--- a/sc/source/ui/undo/undorangename.cxx
+++ b/sc/source/ui/undo/undorangename.cxx
@@ -41,11 +41,11 @@ using ::std::auto_ptr;
ScUndoAllRangeNames::ScUndoAllRangeNames(
ScDocShell* pDocSh,
- const std::map<rtl::OUString, ScRangeName*>& rOldNames,
- const boost::ptr_map<rtl::OUString, ScRangeName>& rNewNames) :
+ const std::map<OUString, ScRangeName*>& rOldNames,
+ const boost::ptr_map<OUString, ScRangeName>& rNewNames) :
ScSimpleUndo(pDocSh)
{
- std::map<rtl::OUString, ScRangeName*>::const_iterator itr, itrEnd;
+ std::map<OUString, ScRangeName*>::const_iterator itr, itrEnd;
for (itr = rOldNames.begin(), itrEnd = rOldNames.end(); itr != itrEnd; ++itr)
{
SAL_WNODEPRECATED_DECLARATIONS_PUSH
@@ -54,7 +54,7 @@ ScUndoAllRangeNames::ScUndoAllRangeNames(
maOldNames.insert(itr->first, p);
}
- boost::ptr_map<rtl::OUString, ScRangeName>::const_iterator it, itEnd;
+ boost::ptr_map<OUString, ScRangeName>::const_iterator it, itEnd;
for (it = rNewNames.begin(), itEnd = rNewNames.end(); it != itEnd; ++it)
{
SAL_WNODEPRECATED_DECLARATIONS_PUSH
@@ -87,12 +87,12 @@ sal_Bool ScUndoAllRangeNames::CanRepeat(SfxRepeatTarget& /*rTarget*/) const
return sal_False;
}
-rtl::OUString ScUndoAllRangeNames::GetComment() const
+OUString ScUndoAllRangeNames::GetComment() const
{
return ScGlobal::GetRscString(STR_UNDO_RANGENAMES);
}
-void ScUndoAllRangeNames::DoChange(const boost::ptr_map<rtl::OUString, ScRangeName>& rNames)
+void ScUndoAllRangeNames::DoChange(const boost::ptr_map<OUString, ScRangeName>& rNames)
{
ScDocument& rDoc = *pDocShell->GetDocument();
@@ -160,7 +160,7 @@ sal_Bool ScUndoAddRangeData::CanRepeat(SfxRepeatTarget& /*rTarget*/) const
return sal_False;
}
-rtl::OUString ScUndoAddRangeData::GetComment() const
+OUString ScUndoAddRangeData::GetComment() const
{
return ScGlobal::GetRscString(STR_UNDO_RANGENAMES);
}
diff --git a/sc/source/ui/undo/undostyl.cxx b/sc/source/ui/undo/undostyl.cxx
index 0f8aa68f5cdd..5125bbaf4a83 100644
--- a/sc/source/ui/undo/undostyl.cxx
+++ b/sc/source/ui/undo/undostyl.cxx
@@ -101,7 +101,7 @@ ScUndoModifyStyle::~ScUndoModifyStyle()
{
}
-rtl::OUString ScUndoModifyStyle::GetComment() const
+OUString ScUndoModifyStyle::GetComment() const
{
sal_uInt16 nId = (eFamily == SFX_STYLE_FAMILY_PARA) ?
STR_UNDO_EDITCELLSTYLE :
@@ -255,7 +255,7 @@ void ScUndoApplyPageStyle::AddSheetAction( SCTAB nTab, const String& rOldStyle )
maEntries.push_back( ApplyStyleEntry( nTab, rOldStyle ) );
}
-rtl::OUString ScUndoApplyPageStyle::GetComment() const
+OUString ScUndoApplyPageStyle::GetComment() const
{
return ScGlobal::GetRscString( STR_UNDO_APPLYPAGESTYLE );
}
diff --git a/sc/source/ui/undo/undotab.cxx b/sc/source/ui/undo/undotab.cxx
index a45b6488007b..3c1ef777c401 100644
--- a/sc/source/ui/undo/undotab.cxx
+++ b/sc/source/ui/undo/undotab.cxx
@@ -53,7 +53,6 @@ extern sal_Bool bDrawIsInUndo; // somewhere as member!
using namespace com::sun::star;
using ::com::sun::star::uno::Sequence;
-using ::rtl::OUString;
using ::std::auto_ptr;
using ::std::vector;
using ::boost::shared_ptr;
@@ -93,7 +92,7 @@ ScUndoInsertTab::~ScUndoInsertTab()
DeleteSdrUndoAction( pDrawUndo );
}
-rtl::OUString ScUndoInsertTab::GetComment() const
+OUString ScUndoInsertTab::GetComment() const
{
if (bAppend)
return ScGlobal::GetRscString( STR_UNDO_APPEND_TAB );
@@ -170,7 +169,7 @@ sal_Bool ScUndoInsertTab::CanRepeat(SfxRepeatTarget& rTarget) const
ScUndoInsertTables::ScUndoInsertTables( ScDocShell* pNewDocShell,
SCTAB nTabNum,
- std::vector<rtl::OUString>& newNameList) :
+ std::vector<OUString>& newNameList) :
ScSimpleUndo( pNewDocShell ),
pDrawUndo( NULL ),
aNameList( newNameList ),
@@ -186,7 +185,7 @@ ScUndoInsertTables::~ScUndoInsertTables()
DeleteSdrUndoAction( pDrawUndo );
}
-rtl::OUString ScUndoInsertTables::GetComment() const
+OUString ScUndoInsertTables::GetComment() const
{
return ScGlobal::GetRscString( STR_UNDO_INSERT_TAB );
}
@@ -276,7 +275,7 @@ ScUndoDeleteTab::~ScUndoDeleteTab()
theTabs.clear();
}
-rtl::OUString ScUndoDeleteTab::GetComment() const
+OUString ScUndoDeleteTab::GetComment() const
{
return ScGlobal::GetRscString( STR_UNDO_DELETE_TAB );
}
@@ -317,7 +316,7 @@ void ScUndoDeleteTab::Undo()
ScDocument* pDoc = pDocShell->GetDocument();
sal_Bool bLink = false;
- rtl::OUString aName;
+ OUString aName;
for(i=0; i<theTabs.size(); ++i)
{
@@ -331,7 +330,7 @@ void ScUndoDeleteTab::Undo()
{
pRefUndoDoc->CopyToDocument(0,0,nTab, MAXCOL,MAXROW,nTab, IDF_ALL,false, pDoc );
- rtl::OUString aOldName;
+ OUString aOldName;
pRefUndoDoc->GetName( nTab, aOldName );
pDoc->RenameTab( nTab, aOldName, false );
if (pRefUndoDoc->IsLinked(nTab))
@@ -345,7 +344,7 @@ void ScUndoDeleteTab::Undo()
if ( pRefUndoDoc->IsScenario(nTab) )
{
pDoc->SetScenario( nTab, sal_True );
- rtl::OUString aComment;
+ OUString aComment;
Color aColor;
sal_uInt16 nScenFlags;
pRefUndoDoc->GetScenarioData( nTab, aComment, aColor, nScenFlags );
@@ -437,7 +436,7 @@ ScUndoRenameTab::~ScUndoRenameTab()
{
}
-rtl::OUString ScUndoRenameTab::GetComment() const
+OUString ScUndoRenameTab::GetComment() const
{
return ScGlobal::GetRscString( STR_UNDO_RENAME_TAB );
}
@@ -499,7 +498,7 @@ ScUndoMoveTab::~ScUndoMoveTab()
{
}
-rtl::OUString ScUndoMoveTab::GetComment() const
+OUString ScUndoMoveTab::GetComment() const
{
return ScGlobal::GetRscString( STR_UNDO_MOVE_TAB );
}
@@ -606,7 +605,7 @@ ScUndoCopyTab::~ScUndoCopyTab()
DeleteSdrUndoAction( pDrawUndo );
}
-rtl::OUString ScUndoCopyTab::GetComment() const
+OUString ScUndoCopyTab::GetComment() const
{
return ScGlobal::GetRscString( STR_UNDO_COPY_TAB );
}
@@ -685,7 +684,7 @@ void ScUndoCopyTab::Redo()
if ( pDoc->IsScenario(nAdjSource) )
{
pDoc->SetScenario(nNewTab, sal_True );
- rtl::OUString aComment;
+ OUString aComment;
Color aColor;
sal_uInt16 nScenFlags;
pDoc->GetScenarioData(nAdjSource, aComment, aColor, nScenFlags );
@@ -747,7 +746,7 @@ ScUndoTabColor::~ScUndoTabColor()
{
}
-rtl::OUString ScUndoTabColor::GetComment() const
+OUString ScUndoTabColor::GetComment() const
{
if (aTabColorList.size() > 1)
return ScGlobal::GetRscString(STR_UNDO_SET_MULTI_TAB_BG_COLOR);
@@ -816,7 +815,7 @@ ScUndoMakeScenario::~ScUndoMakeScenario()
DeleteSdrUndoAction( pDrawUndo );
}
-rtl::OUString ScUndoMakeScenario::GetComment() const
+OUString ScUndoMakeScenario::GetComment() const
{
return ScGlobal::GetRscString( STR_UNDO_MAKESCENARIO );
}
@@ -897,7 +896,7 @@ ScUndoImportTab::~ScUndoImportTab()
DeleteSdrUndoAction( pDrawUndo );
}
-rtl::OUString ScUndoImportTab::GetComment() const
+OUString ScUndoImportTab::GetComment() const
{
return ScGlobal::GetRscString( STR_UNDO_INSERT_TAB );
}
@@ -936,7 +935,7 @@ void ScUndoImportTab::Undo()
pRedoDoc = new ScDocument( SCDOCMODE_UNDO );
pRedoDoc->InitUndo( pDoc, nTab,nTab+nCount-1, sal_True,sal_True );
- rtl::OUString aOldName;
+ OUString aOldName;
for (i=0; i<nCount; i++)
{
SCTAB nTabPos=nTab+i;
@@ -949,7 +948,7 @@ void ScUndoImportTab::Undo()
if ( pDoc->IsScenario(nTabPos) )
{
pRedoDoc->SetScenario(nTabPos, sal_True );
- rtl::OUString aComment;
+ OUString aComment;
Color aColor;
sal_uInt16 nScenFlags;
pDoc->GetScenarioData(nTabPos, aComment, aColor, nScenFlags );
@@ -985,7 +984,7 @@ void ScUndoImportTab::Redo()
}
ScDocument* pDoc = pDocShell->GetDocument();
- rtl::OUString aName;
+ OUString aName;
SCTAB i;
for (i=0; i<nCount; i++) // first insert all sheets (#63304#)
{
@@ -1004,7 +1003,7 @@ void ScUndoImportTab::Redo()
if ( pRedoDoc->IsScenario(nTabPos) )
{
pDoc->SetScenario(nTabPos, sal_True );
- rtl::OUString aComment;
+ OUString aComment;
Color aColor;
sal_uInt16 nScenFlags;
pRedoDoc->GetScenarioData(nTabPos, aComment, aColor, nScenFlags );
@@ -1051,7 +1050,7 @@ ScUndoRemoveLink::ScUndoRemoveLink( ScDocShell* pShell, const String& rDoc ) :
{
sal_uInt8 nMode = pDoc->GetLinkMode(i);
if (nMode)
- if (pDoc->GetLinkDoc(i) == rtl::OUString(aDocName))
+ if (pDoc->GetLinkDoc(i) == OUString(aDocName))
{
if (!nCount)
{
@@ -1061,8 +1060,8 @@ ScUndoRemoveLink::ScUndoRemoveLink( ScDocShell* pShell, const String& rDoc ) :
}
else
{
- OSL_ENSURE(rtl::OUString(aFltName) == pDoc->GetLinkFlt(i) &&
- rtl::OUString(aOptions) == pDoc->GetLinkOpt(i),
+ OSL_ENSURE(OUString(aFltName) == pDoc->GetLinkFlt(i) &&
+ OUString(aOptions) == pDoc->GetLinkOpt(i),
"different Filter for a Document?");
}
pTabs[nCount] = i;
@@ -1080,7 +1079,7 @@ ScUndoRemoveLink::~ScUndoRemoveLink()
delete[] pTabNames;
}
-rtl::OUString ScUndoRemoveLink::GetComment() const
+OUString ScUndoRemoveLink::GetComment() const
{
return ScGlobal::GetRscString( STR_UNDO_REMOVELINK );
}
@@ -1170,7 +1169,7 @@ sal_Bool ScUndoShowHideTab::CanRepeat(SfxRepeatTarget& rTarget) const
return (rTarget.ISA(ScTabViewTarget));
}
-rtl::OUString ScUndoShowHideTab::GetComment() const
+OUString ScUndoShowHideTab::GetComment() const
{
sal_uInt16 nId;
if (undoTabs.size() > 1)
@@ -1250,7 +1249,7 @@ sal_Bool ScUndoDocProtect::CanRepeat(SfxRepeatTarget& /* rTarget */) const
return false; // makes no sense
}
-rtl::OUString ScUndoDocProtect::GetComment() const
+OUString ScUndoDocProtect::GetComment() const
{
sal_uInt16 nId = mpProtectSettings->isProtected() ? STR_UNDO_PROTECT_DOC : STR_UNDO_UNPROTECT_DOC;
return ScGlobal::GetRscString( nId );
@@ -1322,7 +1321,7 @@ sal_Bool ScUndoTabProtect::CanRepeat(SfxRepeatTarget& /* rTarget */) const
return false; // makes no sense
}
-rtl::OUString ScUndoTabProtect::GetComment() const
+OUString ScUndoTabProtect::GetComment() const
{
sal_uInt16 nId = mpProtectSettings->isProtected() ? STR_UNDO_PROTECT_TAB : STR_UNDO_UNPROTECT_TAB;
return ScGlobal::GetRscString( nId );
@@ -1384,7 +1383,7 @@ sal_Bool ScUndoPrintRange::CanRepeat(SfxRepeatTarget& /* rTarget */) const
return false; // makes no sense
}
-rtl::OUString ScUndoPrintRange::GetComment() const
+OUString ScUndoPrintRange::GetComment() const
{
return ScGlobal::GetRscString( STR_UNDO_PRINTRANGES );
}
@@ -1409,7 +1408,7 @@ ScUndoScenarioFlags::~ScUndoScenarioFlags()
{
}
-rtl::OUString ScUndoScenarioFlags::GetComment() const
+OUString ScUndoScenarioFlags::GetComment() const
{
return ScGlobal::GetRscString( STR_UNDO_EDITSCENARIO );
}
@@ -1472,7 +1471,7 @@ ScUndoRenameObject::~ScUndoRenameObject()
{
}
-rtl::OUString ScUndoRenameObject::GetComment() const
+OUString ScUndoRenameObject::GetComment() const
{
// string resource shared with title for dialog
return String( ScResId(SCSTR_RENAMEOBJECT) );
@@ -1584,7 +1583,7 @@ sal_Bool ScUndoLayoutRTL::CanRepeat(SfxRepeatTarget& rTarget) const
return (rTarget.ISA(ScTabViewTarget));
}
-rtl::OUString ScUndoLayoutRTL::GetComment() const
+OUString ScUndoLayoutRTL::GetComment() const
{
return ScGlobal::GetRscString( STR_UNDO_TAB_RTL );
}
diff --git a/sc/source/ui/undo/undoutil.cxx b/sc/source/ui/undo/undoutil.cxx
index 06a1f1937775..e36813751ada 100644
--- a/sc/source/ui/undo/undoutil.cxx
+++ b/sc/source/ui/undo/undoutil.cxx
@@ -80,7 +80,7 @@ ScDBData* ScUndoUtil::GetOldDBData( ScDBData* pUndoData, ScDocument* pDoc, SCTAB
bool bWasTemp = false;
if ( pUndoData )
{
- const ::rtl::OUString& aName = pUndoData->GetName();
+ const OUString& aName = pUndoData->GetName();
if ( aName == STR_DB_LOCAL_NONAME )
bWasTemp = true;
}
@@ -89,7 +89,7 @@ ScDBData* ScUndoUtil::GetOldDBData( ScDBData* pUndoData, ScDocument* pDoc, SCTAB
pRet = pDoc->GetAnonymousDBData(nTab);
if (!pRet)
{
- pRet = new ScDBData( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(STR_DB_LOCAL_NONAME)), nTab,
+ pRet = new ScDBData( OUString(RTL_CONSTASCII_USTRINGPARAM(STR_DB_LOCAL_NONAME)), nTab,
nCol1,nRow1, nCol2,nRow2, sal_True,
pDoc->HasColHeader( nCol1,nRow1,nCol2,nRow2,nTab ) );
pDoc->SetAnonymousDBData(nTab,pRet);
generated by cgit (git 2.34.1) at 2024-08-07 21:55:21 +0000