summaryrefslogtreecommitdiff
path: root/sw/source/core/undo
diff options
context:
space:
mode:
Diffstat (limited to 'sw/source/core/undo')
-rw-r--r--sw/source/core/undo/docundo.cxx14
-rw-r--r--sw/source/core/undo/rolbck.cxx2
-rw-r--r--sw/source/core/undo/undel.cxx10
-rw-r--r--sw/source/core/undo/undobj.cxx2
-rw-r--r--sw/source/core/undo/undobj1.cxx2
-rw-r--r--sw/source/core/undo/undraw.cxx2
-rw-r--r--sw/source/core/undo/unins.cxx20
-rw-r--r--sw/source/core/undo/unovwr.cxx12
8 files changed, 32 insertions, 32 deletions
diff --git a/sw/source/core/undo/docundo.cxx b/sw/source/core/undo/docundo.cxx
index cc506f62f87b..f38cd4c47528 100644
--- a/sw/source/core/undo/docundo.cxx
+++ b/sw/source/core/undo/docundo.cxx
@@ -279,7 +279,7 @@ UndoManager::EndUndo(SwUndoId const i_eUndoId, SwRewriter const*const pRewriter)
bool
UndoManager::GetLastUndoInfo(
- ::rtl::OUString *const o_pStr, SwUndoId *const o_pId) const
+ OUString *const o_pStr, SwUndoId *const o_pId) const
{
// this is actually expected to work on the current level,
// but that was really not obvious from the previous implementation...
@@ -311,7 +311,7 @@ SwUndoComments_t UndoManager::GetUndoComments() const
sal_uInt16 const nUndoCount(SfxUndoManager::GetUndoActionCount(TopLevel));
for (sal_uInt16 n = 0; n < nUndoCount; ++n)
{
- ::rtl::OUString const comment(
+ OUString const comment(
SfxUndoManager::GetUndoActionComment(n, TopLevel));
ret.push_back(comment);
}
@@ -321,7 +321,7 @@ SwUndoComments_t UndoManager::GetUndoComments() const
/**************** REDO ******************/
-bool UndoManager::GetFirstRedoInfo(::rtl::OUString *const o_pStr) const
+bool UndoManager::GetFirstRedoInfo(OUString *const o_pStr) const
{
if (!SfxUndoManager::GetRedoActionCount(CurrentLevel))
{
@@ -346,7 +346,7 @@ SwUndoComments_t UndoManager::GetRedoComments() const
sal_uInt16 const nRedoCount(SfxUndoManager::GetRedoActionCount(TopLevel));
for (sal_uInt16 n = 0; n < nRedoCount; ++n)
{
- ::rtl::OUString const comment(
+ OUString const comment(
SfxUndoManager::GetRedoActionComment(n, TopLevel));
ret.push_back(comment);
}
@@ -356,7 +356,7 @@ SwUndoComments_t UndoManager::GetRedoComments() const
/**************** REPEAT ******************/
-SwUndoId UndoManager::GetRepeatInfo(::rtl::OUString *const o_pStr) const
+SwUndoId UndoManager::GetRepeatInfo(OUString *const o_pStr) const
{
SwUndoId nRepeatId(UNDO_EMPTY);
GetLastUndoInfo(o_pStr, & nRepeatId);
@@ -535,8 +535,8 @@ UndoManager::Repeat(::sw::RepeatContext & rContext,
return false;
}
- ::rtl::OUString const comment(pRepeatAction->GetComment());
- ::rtl::OUString const rcomment(pRepeatAction->GetRepeatComment(rContext));
+ OUString const comment(pRepeatAction->GetComment());
+ OUString const rcomment(pRepeatAction->GetRepeatComment(rContext));
sal_uInt16 const nId(pRepeatAction->GetId());
if (DoesUndo())
{
diff --git a/sw/source/core/undo/rolbck.cxx b/sw/source/core/undo/rolbck.cxx
index b90c9a127d2c..ced76e507c80 100644
--- a/sw/source/core/undo/rolbck.cxx
+++ b/sw/source/core/undo/rolbck.cxx
@@ -663,7 +663,7 @@ bool SwHistoryBookmark::IsEqualBookmark(const ::sw::mark::IMark& rBkmk)
&& m_aName == rBkmk.GetName();
}
-const ::rtl::OUString& SwHistoryBookmark::GetName() const
+const OUString& SwHistoryBookmark::GetName() const
{
return m_aName;
}
diff --git a/sw/source/core/undo/undel.cxx b/sw/source/core/undo/undel.cxx
index 8cf6e1886cf6..2fbe933c3cb0 100644
--- a/sw/source/core/undo/undel.cxx
+++ b/sw/source/core/undo/undel.cxx
@@ -460,7 +460,7 @@ sal_Bool SwUndoDelete::CanGrouping( SwDoc* pDoc, const SwPaM& rDelPam )
sal_Unicode cDelChar = pDelTxtNd->GetTxt()[ pStt->nContent.GetIndex() ];
CharClass& rCC = GetAppCharClass();
if( ( CH_TXTATR_BREAKWORD == cDelChar || CH_TXTATR_INWORD == cDelChar ) ||
- rCC.isLetterNumeric( rtl::OUString( cDelChar ), 0 ) !=
+ rCC.isLetterNumeric( OUString( cDelChar ), 0 ) !=
rCC.isLetterNumeric( *pSttStr, nUChrPos ) )
return sal_False;
@@ -579,7 +579,7 @@ static String lcl_DenotedPortion(String rStr, xub_StrLen nStart,
case CH_TXTATR_INWORD:
case CH_TXTATR_BREAKWORD:
- aResult = rtl::OUString(UNDO_ARG2);
+ aResult = OUString(UNDO_ARG2);
break;
@@ -638,7 +638,7 @@ String DenoteSpecialCharacters(const String & rStr)
aResult += lcl_DenotedPortion(rStr, nStart, rStr.Len());
}
else
- aResult = rtl::OUString(UNDO_ARG2);
+ aResult = OUString(UNDO_ARG2);
return aResult;
}
@@ -686,7 +686,7 @@ SwRewriter SwUndoDelete::GetRewriter() const
}
else
{
- aStr = rtl::OUString(UNDO_ARG2);
+ aStr = OUString(UNDO_ARG2);
}
}
@@ -1084,7 +1084,7 @@ void SwUndoDelete::SetTableName(const String & rName)
String SwRewriter::Apply(const String & rStr) const
{
- rtl::OUString aResult = rStr;
+ OUString aResult = rStr;
std::vector<SwRewriteRule>::const_iterator aIt;
for (aIt = mRules.begin(); aIt != mRules.end(); ++aIt)
diff --git a/sw/source/core/undo/undobj.cxx b/sw/source/core/undo/undobj.cxx
index d6fb9fd6091e..30a86778525f 100644
--- a/sw/source/core/undo/undobj.cxx
+++ b/sw/source/core/undo/undobj.cxx
@@ -267,7 +267,7 @@ bool SwUndo::CanRepeatImpl( ::sw::RepeatContext & ) const
return ((REPEAT_START <= GetId()) && (GetId() < REPEAT_END));
}
-rtl::OUString SwUndo::GetComment() const
+OUString SwUndo::GetComment() const
{
String aResult;
diff --git a/sw/source/core/undo/undobj1.cxx b/sw/source/core/undo/undobj1.cxx
index b2791fae0930..c99c19e97aab 100644
--- a/sw/source/core/undo/undobj1.cxx
+++ b/sw/source/core/undo/undobj1.cxx
@@ -332,7 +332,7 @@ void SwUndoInsLayFmt::RepeatImpl(::sw::RepeatContext & rContext)
}
// #111827#
-rtl::OUString SwUndoInsLayFmt::GetComment() const
+OUString SwUndoInsLayFmt::GetComment() const
{
String aResult;
diff --git a/sw/source/core/undo/undraw.cxx b/sw/source/core/undo/undraw.cxx
index f725c29fe212..e9ba3a388cbc 100644
--- a/sw/source/core/undo/undraw.cxx
+++ b/sw/source/core/undo/undraw.cxx
@@ -107,7 +107,7 @@ void SwSdrUndo::RedoImpl(::sw::UndoRedoContext & rContext)
rContext.SetSelections(0, pMarkList);
}
-rtl::OUString SwSdrUndo::GetComment() const
+OUString SwSdrUndo::GetComment() const
{
return pSdrUndo->GetComment();
}
diff --git a/sw/source/core/undo/unins.cxx b/sw/source/core/undo/unins.cxx
index 18951111bc3e..4ac9ecb76ba1 100644
--- a/sw/source/core/undo/unins.cxx
+++ b/sw/source/core/undo/unins.cxx
@@ -128,7 +128,7 @@ SwUndoInsert::SwUndoInsert( const SwNodeIndex& rNd )
sal_Bool SwUndoInsert::CanGrouping( sal_Unicode cIns )
{
if( !bIsAppend && bIsWordDelim ==
- !GetAppCharClass().isLetterNumeric( rtl::OUString( cIns )) )
+ !GetAppCharClass().isLetterNumeric( OUString( cIns )) )
{
nLen++;
nCntnt++;
@@ -433,7 +433,7 @@ void SwUndoInsert::RepeatImpl(::sw::RepeatContext & rContext)
// TODO/MBA: seems that here a physical copy is done - not as in drawing layer! Testing!
// TODO/LATER: Copying through the container would copy the replacement image as well
comphelper::EmbeddedObjectContainer aCnt;
- ::rtl::OUString aName = aCnt.CreateUniqueObjectName();
+ OUString aName = aCnt.CreateUniqueObjectName();
if ( aCnt.StoreEmbeddedObject( rSwOLE.GetOleRef(), aName, sal_True ) )
{
uno::Reference < embed::XEmbeddedObject > aNew = aCnt.GetEmbeddedObject( aName );
@@ -486,8 +486,8 @@ SwRewriter SwUndoInsert::GetRewriter() const
class SwUndoReplace::Impl
: private SwUndoSaveCntnt
{
- ::rtl::OUString m_sOld;
- ::rtl::OUString m_sIns;
+ OUString m_sOld;
+ OUString m_sIns;
sal_uLong m_nSttNd, m_nEndNd, m_nOffset;
xub_StrLen m_nSttCnt, m_nEndCnt, m_nSetPos, m_nSelEnd;
bool m_bSplitNext : 1;
@@ -497,7 +497,7 @@ class SwUndoReplace::Impl
::boost::shared_ptr< ::sfx2::MetadatableUndo > m_pMetadataUndoEnd;
public:
- Impl(SwPaM const& rPam, ::rtl::OUString const& rIns, bool const bRegExp);
+ Impl(SwPaM const& rPam, OUString const& rIns, bool const bRegExp);
virtual ~Impl()
{
}
@@ -507,13 +507,13 @@ public:
void SetEnd(SwPaM const& rPam);
- ::rtl::OUString const& GetOld() const { return m_sOld; }
- ::rtl::OUString const& GetIns() const { return m_sIns; }
+ OUString const& GetOld() const { return m_sOld; }
+ OUString const& GetIns() const { return m_sIns; }
};
SwUndoReplace::SwUndoReplace(SwPaM const& rPam,
- ::rtl::OUString const& rIns, bool const bRegExp)
+ OUString const& rIns, bool const bRegExp)
: SwUndo( UNDO_REPLACE )
, m_pImpl(new Impl(rPam, rIns, bRegExp))
{
@@ -535,7 +535,7 @@ void SwUndoReplace::RedoImpl(::sw::UndoRedoContext & rContext)
SwRewriter
MakeUndoReplaceRewriter(sal_uLong const occurrences,
- ::rtl::OUString const& sOld, ::rtl::OUString const& sNew)
+ OUString const& sOld, OUString const& sNew)
{
SwRewriter aResult;
@@ -593,7 +593,7 @@ void SwUndoReplace::SetEnd(SwPaM const& rPam)
}
SwUndoReplace::Impl::Impl(
- SwPaM const& rPam, ::rtl::OUString const& rIns, bool const bRegExp)
+ SwPaM const& rPam, OUString const& rIns, bool const bRegExp)
: m_sIns( rIns )
, m_nOffset( 0 )
, m_bRegExp(bRegExp)
diff --git a/sw/source/core/undo/unovwr.cxx b/sw/source/core/undo/unovwr.cxx
index c317354a5148..b223846b6eaf 100644
--- a/sw/source/core/undo/unovwr.cxx
+++ b/sw/source/core/undo/unovwr.cxx
@@ -76,7 +76,7 @@ SwUndoOverwrite::SwUndoOverwrite( SwDoc* pDoc, SwPosition& rPos,
bool bOldExpFlg = pTxtNd->IsIgnoreDontExpand();
pTxtNd->SetIgnoreDontExpand( true );
- pTxtNd->InsertText( rtl::OUString(cIns), rPos.nContent,
+ pTxtNd->InsertText( OUString(cIns), rPos.nContent,
IDocumentContentOperations::INS_EMPTYEXPAND );
aInsStr.Insert( cIns );
@@ -116,7 +116,7 @@ sal_Bool SwUndoOverwrite::CanGrouping( SwDoc* pDoc, SwPosition& rPos,
// ask the char that should be inserted
if (( CH_TXTATR_BREAKWORD == cIns || CH_TXTATR_INWORD == cIns ) ||
- rCC.isLetterNumeric( rtl::OUString( cIns ), 0 ) !=
+ rCC.isLetterNumeric( OUString( cIns ), 0 ) !=
rCC.isLetterNumeric( aInsStr, aInsStr.Len()-1 ) )
return sal_False;
@@ -200,7 +200,7 @@ void SwUndoOverwrite::UndoImpl(::sw::UndoRedoContext & rContext)
if( aDelStr.Len() )
{
- String aTmpStr = rtl::OUString('1');
+ String aTmpStr = OUString('1');
sal_Unicode* pTmpStr = aTmpStr.GetBufferAccess();
bool bOldExpFlg = pTxtNd->IsIgnoreDontExpand();
@@ -248,10 +248,10 @@ void SwUndoOverwrite::RepeatImpl(::sw::RepeatContext & rContext)
{
::sw::GroupUndoGuard const undoGuard(rDoc.GetIDocumentUndoRedo());
- rDoc.Overwrite(*pAktPam, rtl::OUString(aInsStr.GetChar(0)));
+ rDoc.Overwrite(*pAktPam, OUString(aInsStr.GetChar(0)));
}
for( xub_StrLen n = 1; n < aInsStr.Len(); ++n )
- rDoc.Overwrite( *pAktPam, rtl::OUString(aInsStr.GetChar(n)) );
+ rDoc.Overwrite( *pAktPam, OUString(aInsStr.GetChar(n)) );
}
void SwUndoOverwrite::RedoImpl(::sw::UndoRedoContext & rContext)
@@ -282,7 +282,7 @@ void SwUndoOverwrite::RedoImpl(::sw::UndoRedoContext & rContext)
{
// do it individually, to keep the attributes!
OUString const ins(
- pTxtNd->InsertText( rtl::OUString(aInsStr.GetChar(n)), rIdx,
+ pTxtNd->InsertText( OUString(aInsStr.GetChar(n)), rIdx,
IDocumentContentOperations::INS_EMPTYEXPAND) );
assert(ins.getLength() == 1); // cannot fail
if( n < aDelStr.Len() )
generated by cgit v1.2.3 (git 2.39.1) at 2024-04-27 18:15:21 +0000