summaryrefslogtreecommitdiff
path: root/vcl/source/edit
diff options
context:
space:
mode:
authorLuboš Luňák <l.lunak@suse.cz>2013-04-07 12:06:47 +0200
committerLuboš Luňák <l.lunak@suse.cz>2013-04-07 14:23:11 +0200
commit1946794ae09ba732022fe6a74ea45e304ab70b84 (patch)
treee32bd7ba61fa021ecc7f8c85959df8ca837d6e81 /vcl/source/edit
parent5b08c6e7a21dda94d5b755eea0b1ed1e9c199bec (diff)
mass removal of rtl:: prefixes for O(U)String*
Modules sal, salhelper, cppu, cppuhelper, codemaker (selectively) and odk have kept them, in order not to break external API (the automatic using declaration is LO-internal). Change-Id: I588fc9e0c45b914f824f91c0376980621d730f09
Diffstat (limited to 'vcl/source/edit')
-rw-r--r--vcl/source/edit/texteng.cxx20
-rw-r--r--vcl/source/edit/textund2.hxx12
-rw-r--r--vcl/source/edit/textundo.cxx24
-rw-r--r--vcl/source/edit/textundo.hxx2
-rw-r--r--vcl/source/edit/textview.cxx16
-rw-r--r--vcl/source/edit/vclmedit.cxx14
-rw-r--r--vcl/source/edit/xtextedt.cxx2
7 files changed, 45 insertions, 45 deletions
diff --git a/vcl/source/edit/texteng.cxx b/vcl/source/edit/texteng.cxx
index 7213ad1cbc3b..b03924c88d67 100644
--- a/vcl/source/edit/texteng.cxx
+++ b/vcl/source/edit/texteng.cxx
@@ -200,10 +200,10 @@ void TextEngine::SetFont( const Font& rFont )
maFont.SetAlign( ALIGN_TOP );
mpRefDev->SetFont( maFont);
Size aTextSize;
- aTextSize.Width() = mpRefDev->GetTextWidth(rtl::OUString(" "));
+ aTextSize.Width() = mpRefDev->GetTextWidth(OUString(" "));
aTextSize.Height() = mpRefDev->GetTextHeight();
if ( !aTextSize.Width() )
- aTextSize.Width() = mpRefDev->GetTextWidth(rtl::OUString("XXXX"));
+ aTextSize.Width() = mpRefDev->GetTextWidth(OUString("XXXX"));
mnDefTab = (sal_uInt16)aTextSize.Width();
if ( !mnDefTab )
@@ -658,7 +658,7 @@ sal_Bool TextEngine::IsInputSequenceCheckingRequired( sal_Unicode c, const TextS
aCTLOptions.IsCTLFontEnabled() &&
aCTLOptions.IsCTLSequenceChecking() &&
nFirstPos != 0 && /* first char needs not to be checked */
- xBI.is() && i18n::ScriptType::COMPLEX == xBI->getScriptType( rtl::OUString( c ), 0 );
+ xBI.is() && i18n::ScriptType::COMPLEX == xBI->getScriptType( OUString( c ), 0 );
return bIsSequenceChecking;
}
@@ -711,8 +711,8 @@ TextPaM TextEngine::ImpInsertText( sal_Unicode c, const TextSelection& rCurSel,
// the text that needs to be checked is only the one
// before the current cursor position
- rtl::OUString aOldText( mpDoc->GetText( aPaM.GetPara() ).Copy(0, nTmpPos) );
- rtl::OUString aNewText( aOldText );
+ OUString aOldText( mpDoc->GetText( aPaM.GetPara() ).Copy(0, nTmpPos) );
+ OUString aNewText( aOldText );
if (aCTLOptions.IsCTLSequenceCheckingTypeAndReplace())
{
xISC->correctInputSequence( aNewText, nTmpPos - 1, c, nCheckMode );
@@ -752,7 +752,7 @@ TextPaM TextEngine::ImpInsertText( sal_Unicode c, const TextSelection& rCurSel,
if ( IsUndoEnabled() && !IsInUndo() )
{
- TextUndoInsertChars* pNewUndo = new TextUndoInsertChars( this, aPaM, rtl::OUString(c) );
+ TextUndoInsertChars* pNewUndo = new TextUndoInsertChars( this, aPaM, OUString(c) );
sal_Bool bTryMerge = ( !bDoOverwrite && ( c != ' ' ) ) ? sal_True : sal_False;
InsertUndo( pNewUndo, bTryMerge );
}
@@ -2556,14 +2556,14 @@ sal_Bool TextEngine::Read( SvStream& rInput, const TextSelection* pSel )
if ( aSel.HasRange() )
aSel = ImpDeleteText( aSel );
- rtl::OString aLine;
+ OString aLine;
sal_Bool bDone = rInput.ReadLine( aLine );
- rtl::OUString aTmpStr(rtl::OStringToOUString(aLine, rInput.GetStreamCharSet()));
+ OUString aTmpStr(OStringToOUString(aLine, rInput.GetStreamCharSet()));
while ( bDone )
{
aSel = ImpInsertText( aSel, aTmpStr );
bDone = rInput.ReadLine( aLine );
- aTmpStr = rtl::OStringToOUString(aLine, rInput.GetStreamCharSet());
+ aTmpStr = OStringToOUString(aLine, rInput.GetStreamCharSet());
if ( bDone )
aSel = ImpInsertParaBreak( aSel.GetEnd() );
}
@@ -2657,7 +2657,7 @@ sal_Bool TextEngine::Write( SvStream& rOutput, const TextSelection* pSel, sal_Bo
aText.AppendAscii( "</P>" );
}
- rOutput.WriteLine(rtl::OUStringToOString(aText,
+ rOutput.WriteLine(OUStringToOString(aText,
rOutput.GetStreamCharSet()));
}
diff --git a/vcl/source/edit/textund2.hxx b/vcl/source/edit/textund2.hxx
index 153e3db8c323..17a29181134f 100644
--- a/vcl/source/edit/textund2.hxx
+++ b/vcl/source/edit/textund2.hxx
@@ -38,7 +38,7 @@ public:
virtual void Undo();
virtual void Redo();
- virtual rtl::OUString GetComment () const;
+ virtual OUString GetComment () const;
};
@@ -56,7 +56,7 @@ public:
virtual void Undo();
virtual void Redo();
- virtual rtl::OUString GetComment () const;
+ virtual OUString GetComment () const;
};
@@ -74,7 +74,7 @@ public:
virtual void Undo();
virtual void Redo();
- virtual rtl::OUString GetComment () const;
+ virtual OUString GetComment () const;
};
@@ -93,7 +93,7 @@ public:
virtual sal_Bool Merge( SfxUndoAction *pNextAction );
- virtual rtl::OUString GetComment () const;
+ virtual OUString GetComment () const;
};
@@ -110,7 +110,7 @@ public:
virtual void Undo();
virtual void Redo();
- virtual rtl::OUString GetComment () const;
+ virtual OUString GetComment () const;
};
@@ -127,7 +127,7 @@ public:
virtual void Undo();
virtual void Redo();
- virtual rtl::OUString GetComment () const;
+ virtual OUString GetComment () const;
};
#endif // _TEXTUND2_HXX
diff --git a/vcl/source/edit/textundo.cxx b/vcl/source/edit/textundo.cxx
index 2b38fc220090..3cbb85d6999c 100644
--- a/vcl/source/edit/textundo.cxx
+++ b/vcl/source/edit/textundo.cxx
@@ -41,7 +41,7 @@ namespace
{
// Shorten() -- inserts ellipsis (...) in the middle of a long text
-void Shorten (rtl::OUString& rString)
+void Shorten (OUString& rString)
{
unsigned nLen = rString.getLength();
if (nLen > 48)
@@ -149,9 +149,9 @@ TextUndo::~TextUndo()
{
}
-rtl::OUString TextUndo::GetComment() const
+OUString TextUndo::GetComment() const
{
- return rtl::OUString();
+ return OUString();
}
void TextUndo::SetSelection( const TextSelection& rSel )
@@ -214,7 +214,7 @@ void TextUndoDelPara::Redo()
SetSelection( aPaM );
}
-rtl::OUString TextUndoDelPara::GetComment () const
+OUString TextUndoDelPara::GetComment () const
{
return ResId(STR_TEXTUNDO_DELPARA, *ImplGetResMgr());
}
@@ -248,7 +248,7 @@ void TextUndoConnectParas::Redo()
SetSelection( aPaM );
}
-rtl::OUString TextUndoConnectParas::GetComment () const
+OUString TextUndoConnectParas::GetComment () const
{
return ResId(STR_TEXTUNDO_CONNECTPARAS, *ImplGetResMgr());
}
@@ -282,7 +282,7 @@ void TextUndoSplitPara::Redo()
SetSelection( aPaM );
}
-rtl::OUString TextUndoSplitPara::GetComment () const
+OUString TextUndoSplitPara::GetComment () const
{
return ResId(STR_TEXTUNDO_SPLITPARA, *ImplGetResMgr());
}
@@ -334,12 +334,12 @@ sal_Bool TextUndoInsertChars::Merge( SfxUndoAction* pNextAction )
return sal_False;
}
-rtl::OUString TextUndoInsertChars::GetComment () const
+OUString TextUndoInsertChars::GetComment () const
{
// multiple lines?
- rtl::OUString sText(maText);
+ OUString sText(maText);
Shorten(sText);
- return rtl::OUString(ResId(STR_TEXTUNDO_INSERTCHARS, *ImplGetResMgr())).replaceAll("$1", sText);
+ return OUString(ResId(STR_TEXTUNDO_INSERTCHARS, *ImplGetResMgr())).replaceAll("$1", sText);
}
@@ -371,12 +371,12 @@ void TextUndoRemoveChars::Redo()
SetSelection( aPaM );
}
-rtl::OUString TextUndoRemoveChars::GetComment () const
+OUString TextUndoRemoveChars::GetComment () const
{
// multiple lines?
- rtl::OUString sText(maText);
+ OUString sText(maText);
Shorten(sText);
- return rtl::OUString(ResId(STR_TEXTUNDO_REMOVECHARS, *ImplGetResMgr())).replaceAll("$1", sText);
+ return OUString(ResId(STR_TEXTUNDO_REMOVECHARS, *ImplGetResMgr())).replaceAll("$1", sText);
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/source/edit/textundo.hxx b/vcl/source/edit/textundo.hxx
index 1474376f4464..a461bd78e7b0 100644
--- a/vcl/source/edit/textundo.hxx
+++ b/vcl/source/edit/textundo.hxx
@@ -73,7 +73,7 @@ public:
virtual void Undo() = 0;
virtual void Redo() = 0;
- virtual rtl::OUString GetComment() const;
+ virtual OUString GetComment() const;
};
#endif // _TEXTUNDO_HXX
diff --git a/vcl/source/edit/textview.cxx b/vcl/source/edit/textview.cxx
index ff061bbd9b69..05ea5f2e16dc 100644
--- a/vcl/source/edit/textview.cxx
+++ b/vcl/source/edit/textview.cxx
@@ -107,7 +107,7 @@ uno::Any TETextDataObject::getTransferData( const datatransfer::DataFlavor& rFla
sal_uLong nT = SotExchange::GetFormat( rFlavor );
if ( nT == SOT_FORMAT_STRING )
{
- aAny <<= (::rtl::OUString)GetText();
+ aAny <<= (OUString)GetText();
}
else if ( nT == SOT_FORMATSTR_ID_HTML )
{
@@ -706,7 +706,7 @@ sal_Bool TextView::KeyInput( const KeyEvent& rKeyEvent )
{
if ( !mpImpl->mbReadOnly && !rKeyEvent.GetKeyCode().IsShift() &&
!rKeyEvent.GetKeyCode().IsMod1() && !rKeyEvent.GetKeyCode().IsMod2() &&
- ImplCheckTextLen( rtl::OUString('x') ) )
+ ImplCheckTextLen( OUString('x') ) )
{
aCurSel = mpImpl->mpTextEngine->ImpInsertText( aCurSel, '\t', !IsInsertMode() );
bModified = sal_True;
@@ -720,7 +720,7 @@ sal_Bool TextView::KeyInput( const KeyEvent& rKeyEvent )
// Shift-RETURN darf nicht geschluckt werden, weil dann keine
// mehrzeilige Eingabe in Dialogen/Property-Editor moeglich.
if ( !mpImpl->mbReadOnly && !rKeyEvent.GetKeyCode().IsMod1() &&
- !rKeyEvent.GetKeyCode().IsMod2() && ImplCheckTextLen( rtl::OUString('x') ) )
+ !rKeyEvent.GetKeyCode().IsMod2() && ImplCheckTextLen( OUString('x') ) )
{
mpImpl->mpTextEngine->UndoActionStart();
aCurSel = mpImpl->mpTextEngine->ImpInsertParaBreak( aCurSel );
@@ -755,7 +755,7 @@ sal_Bool TextView::KeyInput( const KeyEvent& rKeyEvent )
if ( TextEngine::IsSimpleCharInput( rKeyEvent ) )
{
sal_Unicode nCharCode = rKeyEvent.GetCharCode();
- if ( !mpImpl->mbReadOnly && ImplCheckTextLen( rtl::OUString(nCharCode) ) ) // sonst trotzdem das Zeichen schlucken...
+ if ( !mpImpl->mbReadOnly && ImplCheckTextLen( OUString(nCharCode) ) ) // sonst trotzdem das Zeichen schlucken...
{
aCurSel = mpImpl->mpTextEngine->ImpInsertText( nCharCode, aCurSel, !IsInsertMode(), sal_True );
bModified = sal_True;
@@ -1176,7 +1176,7 @@ void TextView::Paste( uno::Reference< datatransfer::clipboard::XClipboard >& rxC
try
{
uno::Any aData = xDataObj->getTransferData( aFlavor );
- ::rtl::OUString aText;
+ OUString aText;
aData >>= aText;
bool bWasTruncated = false;
if( mpImpl->mpTextEngine->GetMaxTextLen() != 0 )
@@ -1342,7 +1342,7 @@ void TextView::InsertText( const XubString& rStr, sal_Bool bSelect )
InsertNewText( rStr, bSelect );
}
-void TextView::InsertNewText( const rtl::OUString& rStr, sal_Bool bSelect )
+void TextView::InsertNewText( const OUString& rStr, sal_Bool bSelect )
{
// HideSelection();
mpImpl->mpTextEngine->UndoActionStart();
@@ -1957,7 +1957,7 @@ sal_Bool TextView::Read( SvStream& rInput )
return bDone;
}
-bool TextView::ImplTruncateNewText( rtl::OUString& rNewText ) const
+bool TextView::ImplTruncateNewText( OUString& rNewText ) const
{
bool bTruncated = false;
@@ -2095,7 +2095,7 @@ void TextView::drop( const ::com::sun::star::datatransfer::dnd::DropTargetDropEv
if ( xDataObj->isDataFlavorSupported( aFlavor ) )
{
uno::Any aData = xDataObj->getTransferData( aFlavor );
- ::rtl::OUString aOUString;
+ OUString aOUString;
aData >>= aOUString;
aText = convertLineEnd(aOUString, LINEEND_LF);
}
diff --git a/vcl/source/edit/vclmedit.cxx b/vcl/source/edit/vclmedit.cxx
index e7bc99cac493..c13fc5529e05 100644
--- a/vcl/source/edit/vclmedit.cxx
+++ b/vcl/source/edit/vclmedit.cxx
@@ -295,7 +295,7 @@ void ImpVclMEdit::ImpInitScrollBars()
{
ImpSetScrollBarRanges();
Size aCharBox;
- aCharBox.Width() = mpTextWindow->GetTextWidth( rtl::OUString(sampleChar) );
+ aCharBox.Width() = mpTextWindow->GetTextWidth( OUString(sampleChar) );
aCharBox.Height() = mpTextWindow->GetTextHeight();
Size aOutSz = mpTextWindow->GetOutputSizePixel();
if ( mpHScrollBar )
@@ -653,7 +653,7 @@ Size ImpVclMEdit::CalcSize( sal_uInt16 nColumns, sal_uInt16 nLines ) const
Size aSz;
Size aCharSz;
- aCharSz.Width() = mpTextWindow->GetTextWidth( rtl::OUString(sampleChar) );
+ aCharSz.Width() = mpTextWindow->GetTextWidth( OUString(sampleChar) );
aCharSz.Height() = mpTextWindow->GetTextHeight();
if ( nLines )
@@ -678,7 +678,7 @@ void ImpVclMEdit::GetMaxVisColumnsAndLines( sal_uInt16& rnCols, sal_uInt16& rnLi
{
static const sal_Unicode sampleChar = { 'x' };
Size aOutSz = mpTextWindow->GetOutputSizePixel();
- Size aCharSz( mpTextWindow->GetTextWidth( rtl::OUString(sampleChar) ), mpTextWindow->GetTextHeight() );
+ Size aCharSz( mpTextWindow->GetTextWidth( OUString(sampleChar) ), mpTextWindow->GetTextHeight() );
rnCols = (sal_uInt16) (aOutSz.Width()/aCharSz.Width());
rnLines = (sal_uInt16) (aOutSz.Height()/aCharSz.Height());
}
@@ -779,7 +779,7 @@ void TextWindow::KeyInput( const KeyEvent& rKEvent )
{
// Damit die Selektion erhalten bleibt
mbActivePopup = sal_True;
- rtl::OUString aChars = Edit::GetGetSpecialCharsFunction()( this, GetFont() );
+ OUString aChars = Edit::GetGetSpecialCharsFunction()( this, GetFont() );
if (!aChars.isEmpty())
{
mpExtTextView->InsertText( aChars );
@@ -880,7 +880,7 @@ void TextWindow::Command( const CommandEvent& rCEvt )
break;
case SV_MENU_EDIT_INSERTSYMBOL:
{
- rtl::OUString aChars = Edit::GetGetSpecialCharsFunction()( this, GetFont() );
+ OUString aChars = Edit::GetGetSpecialCharsFunction()( this, GetFont() );
if (!aChars.isEmpty())
{
mpExtTextView->InsertText( aChars );
@@ -1370,7 +1370,7 @@ void VclMultiLineEdit::Draw( OutputDevice* pDev, const Point& rPos, const Size&
}
}
- rtl::OUString aText = GetText();
+ OUString aText = GetText();
Size aTextSz( pDev->GetTextWidth( aText ), pDev->GetTextHeight() );
sal_uLong nLines = (sal_uLong) (aSize.Height() / aTextSz.Height());
if ( !nLines )
@@ -1565,7 +1565,7 @@ void VclMultiLineEdit::EnableCursor( sal_Bool bEnable )
GetTextView()->EnableCursor( bEnable );
}
-bool VclMultiLineEdit::set_property(const rtl::OString &rKey, const rtl::OString &rValue)
+bool VclMultiLineEdit::set_property(const OString &rKey, const OString &rValue)
{
if (rKey == "cursor-visible")
EnableCursor(toBool(rValue));
diff --git a/vcl/source/edit/xtextedt.cxx b/vcl/source/edit/xtextedt.cxx
index 4fe25637a86e..e9b4e73a27b4 100644
--- a/vcl/source/edit/xtextedt.cxx
+++ b/vcl/source/edit/xtextedt.cxx
@@ -31,7 +31,7 @@ using namespace ::com::sun::star;
// -------------------------------------------------------------------------
// class ExtTextEngine
// -------------------------------------------------------------------------
-ExtTextEngine::ExtTextEngine() : maGroupChars(rtl::OUString("(){}[]"))
+ExtTextEngine::ExtTextEngine() : maGroupChars(OUString("(){}[]"))
{
}