diff options
| author | Luboš Luňák <l.lunak@suse.cz> | 2013-04-07 12:06:47 +0200 |
|---|---|---|
| committer | Luboš Luňák <l.lunak@suse.cz> | 2013-04-07 14:23:11 +0200 |
| commit | 1946794ae09ba732022fe6a74ea45e304ab70b84 (patch) | |
| tree | e32bd7ba61fa021ecc7f8c85959df8ca837d6e81 /editeng/source | |
| parent | 5b08c6e7a21dda94d5b755eea0b1ed1e9c199bec (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 'editeng/source')
46 files changed, 280 insertions, 286 deletions
diff --git a/editeng/source/editeng/editattr.cxx b/editeng/source/editeng/editattr.cxx index 59dc36a3e4c7..de847d6adc74 100644 --- a/editeng/source/editeng/editattr.cxx +++ b/editeng/source/editeng/editattr.cxx @@ -319,19 +319,19 @@ void EditCharAttribField::SetFont( SvxFont& rFont, OutputDevice* ) rFont.SetColor( *pTxtColor ); } -const rtl::OUString& EditCharAttribField::GetFieldValue() const +const OUString& EditCharAttribField::GetFieldValue() const { return aFieldValue; } -void EditCharAttribField::SetFieldValue(const rtl::OUString& rVal) +void EditCharAttribField::SetFieldValue(const OUString& rVal) { aFieldValue = rVal; } void EditCharAttribField::Reset() { - aFieldValue = rtl::OUString(); + aFieldValue = OUString(); delete pTxtColor; pTxtColor = NULL; delete pFldColor; pFldColor = NULL; } diff --git a/editeng/source/editeng/editattr.hxx b/editeng/source/editeng/editattr.hxx index 4ac316d223ad..5d8eb3bd05f6 100644 --- a/editeng/source/editeng/editattr.hxx +++ b/editeng/source/editeng/editattr.hxx @@ -333,7 +333,7 @@ public: // ------------------------------------------------------------------------- class EditCharAttribField: public EditCharAttrib { - rtl::OUString aFieldValue; + OUString aFieldValue; Color* pTxtColor; Color* pFldColor; @@ -352,8 +352,8 @@ public: Color*& GetTxtColor() { return pTxtColor; } Color*& GetFldColor() { return pFldColor; } - const rtl::OUString& GetFieldValue() const; - void SetFieldValue(const rtl::OUString& rVal); + const OUString& GetFieldValue() const; + void SetFieldValue(const OUString& rVal); void Reset(); }; diff --git a/editeng/source/editeng/editdbg.cxx b/editeng/source/editeng/editdbg.cxx index 7d3d31b53aa2..3f36098b143f 100644 --- a/editeng/source/editeng/editdbg.cxx +++ b/editeng/source/editeng/editdbg.cxx @@ -58,9 +58,9 @@ #if defined( DBG_UTIL ) || ( OSL_DEBUG_LEVEL > 1 ) -rtl::OString DbgOutItem(const SfxItemPool& rPool, const SfxPoolItem& rItem) +OString DbgOutItem(const SfxItemPool& rPool, const SfxPoolItem& rItem) { - rtl::OStringBuffer aDebStr; + OStringBuffer aDebStr; switch ( rItem.Which() ) { case EE_PARA_WRITINGDIR: @@ -182,7 +182,7 @@ rtl::OString DbgOutItem(const SfxItemPool& rPool, const SfxPoolItem& rItem) case EE_CHAR_FONTINFO_CTL: { aDebStr.append(RTL_CONSTASCII_STRINGPARAM("Font=")); - aDebStr.append(rtl::OUStringToOString(((SvxFontItem&)rItem).GetFamilyName(), RTL_TEXTENCODING_ASCII_US)); + aDebStr.append(OUStringToOString(((SvxFontItem&)rItem).GetFamilyName(), RTL_TEXTENCODING_ASCII_US)); aDebStr.append(RTL_CONSTASCII_STRINGPARAM(" (CharSet: ")); aDebStr.append(static_cast<sal_Int32>(((SvxFontItem&)rItem).GetCharSet())); aDebStr.append(')'); @@ -300,7 +300,7 @@ void DbgOutItemSet( FILE* fp, const SfxItemSet& rSet, sal_Bool bSearchInParent, continue; const SfxPoolItem& rItem = rSet.Get( nWhich, bSearchInParent ); - rtl::OString aDebStr = DbgOutItem( *rSet.GetPool(), rItem ); + OString aDebStr = DbgOutItem( *rSet.GetPool(), rItem ); fprintf( fp, "%s", aDebStr.getStr() ); } } @@ -328,11 +328,11 @@ void EditDbg::ShowEditEngineData( EditEngine* pEE, sal_Bool bInfoBox ) ParaPortion* pPPortion = pEE->pImpEditEngine->GetParaPortions()[nPortion]; fprintf( fp, "\nParagraph %i: Length = %i, Invalid = %i\nText = '%s'", nPortion, pPPortion->GetNode()->Len(), pPPortion->IsInvalid(), - rtl::OUStringToOString(pPPortion->GetNode()->GetString(), RTL_TEXTENCODING_UTF8).getStr() ); + OUStringToOString(pPPortion->GetNode()->GetString(), RTL_TEXTENCODING_UTF8).getStr() ); fprintf( fp, "\nVorlage:" ); SfxStyleSheet* pStyle = pPPortion->GetNode()->GetStyleSheet(); if ( pStyle ) - fprintf( fp, " %s", rtl::OUStringToOString( pStyle->GetName(), RTL_TEXTENCODING_UTF8).getStr() ); + fprintf( fp, " %s", OUStringToOString( pStyle->GetName(), RTL_TEXTENCODING_UTF8).getStr() ); fprintf( fp, "\nParagraph attribute:" ); DbgOutItemSet( fp, pPPortion->GetNode()->GetContentAttribs().GetItems(), sal_False, sal_False ); @@ -342,7 +342,7 @@ void EditDbg::ShowEditEngineData( EditEngine* pEE, sal_Bool bInfoBox ) for ( z = 0; z < pPPortion->GetNode()->GetCharAttribs().Count(); z++ ) { const EditCharAttrib& rAttr = pPPortion->GetNode()->GetCharAttribs().GetAttribs()[z]; - rtl::OStringBuffer aCharAttribs; + OStringBuffer aCharAttribs; aCharAttribs.append(RTL_CONSTASCII_STRINGPARAM("\nA")); aCharAttribs.append(static_cast<sal_Int32>(nPortion)); aCharAttribs.append(RTL_CONSTASCII_STRINGPARAM(": ")); @@ -355,14 +355,14 @@ void EditDbg::ShowEditEngineData( EditEngine* pEE, sal_Bool bInfoBox ) bZeroAttr = sal_True; fprintf(fp, "%s => ", aCharAttribs.getStr()); - rtl::OString aDebStr = DbgOutItem( rPool, *rAttr.GetItem() ); + OString aDebStr = DbgOutItem( rPool, *rAttr.GetItem() ); fprintf( fp, "%s", aDebStr.getStr() ); } if ( bZeroAttr ) fprintf( fp, "\nNULL-Attribute!" ); sal_uInt16 nTextPortions = pPPortion->GetTextPortions().Count(); - rtl::OStringBuffer aPortionStr( + OStringBuffer aPortionStr( RTL_CONSTASCII_STRINGPARAM("\nText portions: #")); aPortionStr.append(static_cast<sal_Int32>(nTextPortions)); aPortionStr.append(RTL_CONSTASCII_STRINGPARAM(" \nA")); @@ -403,7 +403,7 @@ void EditDbg::ShowEditEngineData( EditEngine* pEE, sal_Bool bInfoBox ) { EditLine* pLine = pPPortion->GetLines()[nLine]; - rtl::OString aLine(rtl::OUStringToOString(pPPortion->GetNode()->Copy(pLine->GetStart(), pLine->GetEnd() - pLine->GetStart()), RTL_TEXTENCODING_ASCII_US)); + OString aLine(OUStringToOString(pPPortion->GetNode()->Copy(pLine->GetStart(), pLine->GetEnd() - pLine->GetStart()), RTL_TEXTENCODING_ASCII_US)); fprintf( fp, "\nLine %i\t>%s<", nLine, aLine.getStr() ); } // then the internal data ... @@ -428,9 +428,9 @@ void EditDbg::ShowEditEngineData( EditEngine* pEE, sal_Bool bInfoBox ) SfxStyleSheetBase* pStyle = aIter.First(); while ( pStyle ) { - fprintf( fp, "\nTemplate: %s", rtl::OUStringToOString( pStyle->GetName(), RTL_TEXTENCODING_ASCII_US ).getStr() ); - fprintf( fp, "\nParent: %s", rtl::OUStringToOString( pStyle->GetParent(), RTL_TEXTENCODING_ASCII_US ).getStr() ); - fprintf( fp, "\nFollow: %s", rtl::OUStringToOString( pStyle->GetFollow(), RTL_TEXTENCODING_ASCII_US ).getStr() ); + fprintf( fp, "\nTemplate: %s", OUStringToOString( pStyle->GetName(), RTL_TEXTENCODING_ASCII_US ).getStr() ); + fprintf( fp, "\nParent: %s", OUStringToOString( pStyle->GetParent(), RTL_TEXTENCODING_ASCII_US ).getStr() ); + fprintf( fp, "\nFollow: %s", OUStringToOString( pStyle->GetFollow(), RTL_TEXTENCODING_ASCII_US ).getStr() ); DbgOutItemSet( fp, pStyle->GetItemSet(), sal_False, sal_False ); fprintf( fp, "\n----------------------------------" ); diff --git a/editeng/source/editeng/editdbg.hxx b/editeng/source/editeng/editdbg.hxx index 8b87a432bced..6425f04e5812 100644 --- a/editeng/source/editeng/editdbg.hxx +++ b/editeng/source/editeng/editdbg.hxx @@ -28,7 +28,7 @@ class SfxItemSet; class SfxItemPool; class SfxPoolItem; -rtl::OString DbgOutItem(const SfxItemPool& rPool, const SfxPoolItem& rItem); +OString DbgOutItem(const SfxItemPool& rPool, const SfxPoolItem& rItem); void DbgOutItemSet( FILE* fp, const SfxItemSet& rSet, sal_Bool bSearchInParent, sal_Bool bShowALL ); class EditDbg diff --git a/editeng/source/editeng/editdoc.cxx b/editeng/source/editeng/editdoc.cxx index 568299bd207c..c1899492bb7d 100644 --- a/editeng/source/editeng/editdoc.cxx +++ b/editeng/source/editeng/editdoc.cxx @@ -2027,9 +2027,9 @@ size_t EditDoc::Count() const return maContents.size(); } -rtl::OUString EditDoc::GetSepStr( LineEnd eEnd ) +OUString EditDoc::GetSepStr( LineEnd eEnd ) { - rtl::OUString aSep; + OUString aSep; if ( eEnd == LINEEND_CR ) aSep = aCR; else if ( eEnd == LINEEND_LF ) @@ -2044,9 +2044,9 @@ XubString EditDoc::GetText( LineEnd eEnd ) const sal_uLong nLen = GetTextLen(); size_t nNodes = Count(); if (nNodes == 0) - return rtl::OUString(); + return OUString(); - rtl::OUString aSep = EditDoc::GetSepStr( eEnd ); + OUString aSep = EditDoc::GetSepStr( eEnd ); sal_Int32 nSepSize = aSep.getLength(); if ( nSepSize ) @@ -2067,7 +2067,7 @@ XubString EditDoc::GetText( LineEnd eEnd ) const } } assert(pCur - newStr->buffer == newStr->length); - return rtl::OUString(newStr, SAL_NO_ACQUIRE); + return OUString(newStr, SAL_NO_ACQUIRE); } XubString EditDoc::GetParaAsString( sal_uInt16 nNode ) const @@ -2267,7 +2267,7 @@ EditPaM EditDoc::InsertFeature( EditPaM aPaM, const SfxPoolItem& rItem ) { DBG_ASSERT( aPaM.GetNode(), "Blinder PaM in EditDoc::InsertFeature" ); - aPaM.GetNode()->Insert( rtl::OUString(CH_FEATURE), aPaM.GetIndex() ); + aPaM.GetNode()->Insert( OUString(CH_FEATURE), aPaM.GetIndex() ); aPaM.GetNode()->ExpandAttribs( aPaM.GetIndex(), 1, GetItemPool() ); // Create a feature-attribute for the feature... diff --git a/editeng/source/editeng/editdoc.hxx b/editeng/source/editeng/editdoc.hxx index 59e7ea11229d..e4f370ae42f9 100644 --- a/editeng/source/editeng/editdoc.hxx +++ b/editeng/source/editeng/editdoc.hxx @@ -808,7 +808,7 @@ public: /// does not delete void Release(size_t nPos); - static rtl::OUString GetSepStr( LineEnd eEnd ); + static OUString GetSepStr( LineEnd eEnd ); }; inline EditCharAttrib* GetAttrib(CharAttribList::AttribsType& rAttribs, size_t nAttr) diff --git a/editeng/source/editeng/editeng.cxx b/editeng/source/editeng/editeng.cxx index 57d1434f8e67..10630264e57c 100644 --- a/editeng/source/editeng/editeng.cxx +++ b/editeng/source/editeng/editeng.cxx @@ -1105,10 +1105,10 @@ sal_Bool EditEngine::PostKeyEvent( const KeyEvent& rKeyEvent, EditView* pEditVie if ( rKeyEvent.GetKeyCode().IsMod1() && rKeyEvent.GetKeyCode().IsMod2() ) { bDebugPaint = !bDebugPaint; - rtl::OStringBuffer aInfo(RTL_CONSTASCII_STRINGPARAM( + OStringBuffer aInfo(RTL_CONSTASCII_STRINGPARAM( "DebugPaint: ")); aInfo.append(bDebugPaint ? "On" : "Off"); - InfoBox(NULL, rtl::OStringToOUString(aInfo.makeStringAndClear(), RTL_TEXTENCODING_ASCII_US)).Execute(); + InfoBox(NULL, OStringToOUString(aInfo.makeStringAndClear(), RTL_TEXTENCODING_ASCII_US)).Execute(); } bDone = sal_False; } @@ -1380,7 +1380,7 @@ sal_Bool EditEngine::PostKeyEvent( const KeyEvent& rKeyEvent, EditView* pEditVie const i18n::CalendarItem2* pArr = xItem.getArray(); for( sal_Int32 n = 0; n <= nCount; ++n ) { - const ::rtl::OUString& rDay = pArr[n].FullName; + const OUString& rDay = pArr[n].FullName; if( pTransliteration->isMatch( aWord, rDay) ) { aComplete = rDay; @@ -1395,7 +1395,7 @@ sal_Bool EditEngine::PostKeyEvent( const KeyEvent& rKeyEvent, EditView* pEditVie const i18n::CalendarItem2* pMonthArr = xItem.getArray(); for( sal_Int32 n = 0; n <= nMonthCount; ++n ) { - const ::rtl::OUString& rMon = pMonthArr[n].FullName; + const OUString& rMon = pMonthArr[n].FullName; if( pTransliteration->isMatch( aWord, rMon) ) { aComplete = rMon; @@ -2715,7 +2715,7 @@ Rectangle EditEngine::GetBulletArea( sal_uInt16 ) XubString EditEngine::CalcFieldValue( const SvxFieldItem&, sal_uInt16, sal_uInt16, Color*&, Color*& ) { DBG_CHKTHIS( EditEngine, 0 ); - return rtl::OUString(' '); + return OUString(' '); } void EditEngine::FieldClicked( const SvxFieldItem&, sal_uInt16, sal_uInt16 ) diff --git a/editeng/source/editeng/editobj.cxx b/editeng/source/editeng/editobj.cxx index 64d8e5dc256a..0433ea5aa195 100644 --- a/editeng/source/editeng/editobj.cxx +++ b/editeng/source/editeng/editobj.cxx @@ -871,7 +871,7 @@ void EditTextObjectImpl::StoreData( SvStream& rOStream ) const rOStream << static_cast<sal_uInt16>(nParagraphs); sal_Unicode nUniChar = CH_FEATURE; - char cFeatureConverted = rtl::OString(&nUniChar, 1, eEncoding).toChar(); + char cFeatureConverted = OString(&nUniChar, 1, eEncoding).toChar(); // The individual paragraphs ... for (size_t nPara = 0; nPara < nParagraphs; ++nPara) @@ -879,7 +879,7 @@ void EditTextObjectImpl::StoreData( SvStream& rOStream ) const const ContentInfo& rC = aContents[nPara]; // Text... - rtl::OStringBuffer aBuffer(rtl::OUStringToOString(rC.GetText(), eEncoding)); + OStringBuffer aBuffer(OUStringToOString(rC.GetText(), eEncoding)); // Symbols? bool bSymbolPara = false; @@ -888,7 +888,7 @@ void EditTextObjectImpl::StoreData( SvStream& rOStream ) const const SvxFontItem& rFontItem = (const SvxFontItem&)rC.GetParaAttribs().Get(EE_CHAR_FONTINFO); if ( rFontItem.GetCharSet() == RTL_TEXTENCODING_SYMBOL ) { - aBuffer = rtl::OStringBuffer(rtl::OUStringToOString(rC.GetText(), RTL_TEXTENCODING_SYMBOL)); + aBuffer = OStringBuffer(OUStringToOString(rC.GetText(), RTL_TEXTENCODING_SYMBOL)); bSymbolPara = true; } } @@ -904,7 +904,7 @@ void EditTextObjectImpl::StoreData( SvStream& rOStream ) const { // Not correctly converted String aPart( rC.GetText(), rAttr.GetStart(), rAttr.GetEnd() - rAttr.GetStart() ); - rtl::OString aNew(rtl::OUStringToOString(aPart, rFontItem.GetCharSet())); + OString aNew(OUStringToOString(aPart, rFontItem.GetCharSet())); aBuffer.remove(rAttr.GetStart(), rAttr.GetEnd() - rAttr.GetStart()); aBuffer.insert(rAttr.GetStart(), aNew); } @@ -918,7 +918,7 @@ void EditTextObjectImpl::StoreData( SvStream& rOStream ) const for (sal_uInt16 nChar = rAttr.GetStart(); nChar < rAttr.GetEnd(); ++nChar) { sal_Unicode cOld = rC.GetText().GetChar( nChar ); - char cConv = rtl::OUStringToOString(rtl::OUString(ConvertFontToSubsFontChar(hConv, cOld)), RTL_TEXTENCODING_SYMBOL).toChar(); + char cConv = OUStringToOString(OUString(ConvertFontToSubsFontChar(hConv, cOld)), RTL_TEXTENCODING_SYMBOL).toChar(); if ( cConv ) aBuffer[nChar] = cConv; } @@ -948,7 +948,7 @@ void EditTextObjectImpl::StoreData( SvStream& rOStream ) const if (it == rAttribs.end()) { sal_Unicode cOld = rC.GetText().GetChar( nChar ); - char cConv = rtl::OUStringToOString(rtl::OUString(ConvertFontToSubsFontChar(hConv, cOld)), RTL_TEXTENCODING_SYMBOL).toChar(); + char cConv = OUStringToOString(OUString(ConvertFontToSubsFontChar(hConv, cOld)), RTL_TEXTENCODING_SYMBOL).toChar(); if ( cConv ) aBuffer[nChar] = cConv; } @@ -960,7 +960,7 @@ void EditTextObjectImpl::StoreData( SvStream& rOStream ) const // Convert CH_FEATURE to CH_FEATURE_OLD - rtl::OString aText = aBuffer.makeStringAndClear().replace(cFeatureConverted, CH_FEATURE_OLD); + OString aText = aBuffer.makeStringAndClear().replace(cFeatureConverted, CH_FEATURE_OLD); write_lenPrefixed_uInt8s_FromOString<sal_uInt16>(rOStream, aText); // StyleName and Family... @@ -1058,8 +1058,8 @@ void EditTextObjectImpl::CreateData( SvStream& rIStream ) ContentInfo* pC = CreateAndInsertContent(); // The Text... - rtl::OString aByteString = read_lenPrefixed_uInt8s_ToOString<sal_uInt16>(rIStream); - pC->GetText() = rtl::OStringToOUString(aByteString, eSrcEncoding); + OString aByteString = read_lenPrefixed_uInt8s_ToOString<sal_uInt16>(rIStream); + pC->GetText() = OStringToOUString(aByteString, eSrcEncoding); // StyleName and Family... pC->GetStyle() = rIStream.ReadUniOrByteString(eSrcEncoding); @@ -1094,7 +1094,7 @@ void EditTextObjectImpl::CreateData( SvStream& rIStream ) if ( pItem->Which() == EE_FEATURE_NOTCONV ) { sal_Char cEncodedChar = aByteString[nStart]; - sal_Unicode cChar = rtl::OUString(&cEncodedChar, 1, + sal_Unicode cChar = OUString(&cEncodedChar, 1, ((SvxCharSetColorItem*)pItem)->GetCharSet()).toChar(); pC->GetText().SetChar(nStart, cChar); } @@ -1123,7 +1123,7 @@ void EditTextObjectImpl::CreateData( SvStream& rIStream ) const SvxFontItem& rFontItem = (const SvxFontItem&)pC->GetParaAttribs().Get( EE_CHAR_FONTINFO ); if ( rFontItem.GetCharSet() == RTL_TEXTENCODING_SYMBOL ) { - pC->GetText() = rtl::OStringToOUString(aByteString, RTL_TEXTENCODING_SYMBOL); + pC->GetText() = OStringToOUString(aByteString, RTL_TEXTENCODING_SYMBOL); bSymbolPara = true; } } @@ -1138,8 +1138,8 @@ void EditTextObjectImpl::CreateData( SvStream& rIStream ) || ( bSymbolPara && ( rFontItem.GetCharSet() != RTL_TEXTENCODING_SYMBOL ) ) ) { // Not correctly converted - rtl::OString aPart(aByteString.copy(rAttr.GetStart(), rAttr.GetEnd()-rAttr.GetStart())); - rtl::OUString aNew(rtl::OStringToOUString(aPart, rFontItem.GetCharSet())); + OString aPart(aByteString.copy(rAttr.GetStart(), rAttr.GetEnd()-rAttr.GetStart())); + OUString aNew(OStringToOUString(aPart, rFontItem.GetCharSet())); pC->GetText().Erase( rAttr.GetStart(), rAttr.GetEnd()-rAttr.GetStart() ); pC->GetText().Insert( aNew, rAttr.GetStart() ); } @@ -1254,7 +1254,7 @@ void EditTextObjectImpl::CreateData( SvStream& rIStream ) { rtl_uString *pStr = rtl_uString_alloc(nL); rIStream.Read(pStr->buffer, nL*sizeof(sal_Unicode)); - rC.GetText() = rtl::OUString(pStr, SAL_NO_ACQUIRE); + rC.GetText() = OUString(pStr, SAL_NO_ACQUIRE); } // StyleSheetName @@ -1263,7 +1263,7 @@ void EditTextObjectImpl::CreateData( SvStream& rIStream ) { rtl_uString *pStr = rtl_uString_alloc(nL); rIStream.Read(pStr->buffer, nL*sizeof(sal_Unicode) ); - rC.GetStyle() = rtl::OUString(pStr, SAL_NO_ACQUIRE); + rC.GetStyle() = OUString(pStr, SAL_NO_ACQUIRE); } } } diff --git a/editeng/source/editeng/editundo.cxx b/editeng/source/editeng/editundo.cxx index 4e7b5fb02e26..9365fe2c5aa3 100644 --- a/editeng/source/editeng/editundo.cxx +++ b/editeng/source/editeng/editundo.cxx @@ -134,9 +134,9 @@ sal_Bool EditUndo::CanRepeat(SfxRepeatTarget&) const return sal_False; } -rtl::OUString EditUndo::GetComment() const +OUString EditUndo::GetComment() const { - rtl::OUString aComment; + OUString aComment; if (mpEditEngine) aComment = mpEditEngine->GetUndoComment( GetId() ); diff --git a/editeng/source/editeng/editview.cxx b/editeng/source/editeng/editview.cxx index 7a2f349960ad..8e10abb4dd60 100644 --- a/editeng/source/editeng/editview.cxx +++ b/editeng/source/editeng/editview.cxx @@ -65,7 +65,6 @@ #define PIMPEE pImpEditView->pEditEngine->pImpEditEngine -using ::rtl::OUString; using namespace com::sun::star; using namespace com::sun::star::uno; using namespace com::sun::star::beans; @@ -870,7 +869,7 @@ static Image lcl_GetImageFromPngUrl( const OUString &rFileUrl ) Image aRes; OUString aTmp; osl::FileBase::getSystemPathFromFileURL( rFileUrl, aTmp ); -// ::rtl::OString aPath = OString( aTmp.getStr(), aTmp.getLength(), osl_getThreadTextEncoding() ); +// OString aPath = OString( aTmp.getStr(), aTmp.getLength(), osl_getThreadTextEncoding() ); #if defined(WNT) // aTmp = lcl_Win_GetShortPathName( aTmp ); #endif diff --git a/editeng/source/editeng/edtspell.cxx b/editeng/source/editeng/edtspell.cxx index 8856564a1a06..d1d91f1d9795 100644 --- a/editeng/source/editeng/edtspell.cxx +++ b/editeng/source/editeng/edtspell.cxx @@ -35,7 +35,6 @@ #include <linguistic/lngprops.hxx> #include <com/sun/star/beans/XPropertySet.hpp> -using ::rtl::OUString; using namespace com::sun::star::uno; using namespace com::sun::star::beans; using namespace com::sun::star::linguistic2; diff --git a/editeng/source/editeng/eehtml.hxx b/editeng/source/editeng/eehtml.hxx index d90ee4b21be3..6ae468663d0e 100644 --- a/editeng/source/editeng/eehtml.hxx +++ b/editeng/source/editeng/eehtml.hxx @@ -35,7 +35,7 @@ class EditHTMLParser : public HTMLParser { using HTMLParser::CallParser; private: - ::rtl::OUStringBuffer maStyleSource; + OUStringBuffer maStyleSource; EditSelection aCurSel; String aBaseURL; EditEngine* mpEditEngine; diff --git a/editeng/source/editeng/eeobj.cxx b/editeng/source/editeng/eeobj.cxx index 863be4bd29f1..d6cc23e486a8 100644 --- a/editeng/source/editeng/eeobj.cxx +++ b/editeng/source/editeng/eeobj.cxx @@ -54,7 +54,7 @@ uno::Any EditDataObject::getTransferData( const datatransfer::DataFlavor& rFlavo sal_uLong nT = SotExchange::GetFormat( rFlavor ); if ( nT == SOT_FORMAT_STRING ) { - aAny <<= (::rtl::OUString)GetString(); + aAny <<= (OUString)GetString(); } else if ( ( nT == SOT_FORMATSTR_ID_EDITENGINE ) || ( nT == SOT_FORMAT_RTF ) ) { diff --git a/editeng/source/editeng/impedit.cxx b/editeng/source/editeng/impedit.cxx index d4ffcba7f41f..1cfc48c8b494 100644 --- a/editeng/source/editeng/impedit.cxx +++ b/editeng/source/editeng/impedit.cxx @@ -1316,7 +1316,7 @@ void ImpEditView::Paste( ::com::sun::star::uno::Reference< ::com::sun::star::dat try { uno::Any aData = xDataObj->getTransferData( aFlavor ); - ::rtl::OUString aTmpText; + OUString aTmpText; aData >>= aTmpText; String aText(convertLineEnd(aTmpText, LINEEND_LF)); aText.SearchAndReplaceAll( LINE_SEP, ' ' ); diff --git a/editeng/source/editeng/impedit.hxx b/editeng/source/editeng/impedit.hxx index 87a3d4b77493..f6ab122cbbb3 100644 --- a/editeng/source/editeng/impedit.hxx +++ b/editeng/source/editeng/impedit.hxx @@ -899,7 +899,7 @@ public: // text conversion functions void Convert( EditView* pEditView, LanguageType nSrcLang, LanguageType nDestLang, const Font *pDestFont, sal_Int32 nOptions, sal_Bool bIsInteractive, sal_Bool bMultipleDoc ); - void ImpConvert( rtl::OUString &rConvTxt, LanguageType &rConvTxtLang, EditView* pEditView, LanguageType nSrcLang, const ESelection &rConvRange, + void ImpConvert( OUString &rConvTxt, LanguageType &rConvTxtLang, EditView* pEditView, LanguageType nSrcLang, const ESelection &rConvRange, sal_Bool bAllowImplicitChangesForNotConvertibleText, LanguageType nTargetLang, const Font *pTargetFont ); ConvInfo * GetConvInfo() const { return pConvInfo; } sal_Bool HasConvertibleTextPortion( LanguageType nLang ); diff --git a/editeng/source/editeng/impedit2.cxx b/editeng/source/editeng/impedit2.cxx index 9edd00ffbcd4..75169ca3e593 100644 --- a/editeng/source/editeng/impedit2.cxx +++ b/editeng/source/editeng/impedit2.cxx @@ -1557,7 +1557,7 @@ sal_Bool ImpEditEngine::IsInputSequenceCheckingRequired( sal_Unicode nChar, cons pCTLOptions->IsCTLFontEnabled() && pCTLOptions->IsCTLSequenceChecking() && nFirstPos != 0 && /* first char needs not to be checked */ - _xBI.is() && i18n::ScriptType::COMPLEX == _xBI->getScriptType( rtl::OUString( nChar ), 0 ); + _xBI.is() && i18n::ScriptType::COMPLEX == _xBI->getScriptType( OUString( nChar ), 0 ); return bIsSequenceChecking; } @@ -1595,7 +1595,7 @@ void ImpEditEngine::InitScriptTypes( sal_uInt16 nPara ) const EditCharAttrib* pField = pNode->GetCharAttribs().FindNextAttrib( EE_FEATURE_FIELD, 0 ); while ( pField ) { - rtl::OUString aFldText = static_cast<const EditCharAttribField*>(pField)->GetFieldValue(); + OUString aFldText = static_cast<const EditCharAttribField*>(pField)->GetFieldValue(); if ( !aFldText.isEmpty() ) { aText.SetChar( pField->GetStart(), aFldText.getStr()[0] ); @@ -1625,7 +1625,7 @@ void ImpEditEngine::InitScriptTypes( sal_uInt16 nPara ) pField = pField->GetEnd() ? pNode->GetCharAttribs().FindNextAttrib( EE_FEATURE_FIELD, pField->GetEnd() ) : NULL; } - ::rtl::OUString aOUText( aText ); + OUString aOUText( aText ); sal_uInt16 nTextLen = (sal_uInt16)aOUText.getLength(); sal_Int32 nPos = 0; @@ -2521,8 +2521,8 @@ EditPaM ImpEditEngine::InsertText( const EditSelection& rCurSel, // the text that needs to be checked is only the one // before the current cursor position - rtl::OUString aOldText( aPaM.GetNode()->Copy(0, nTmpPos) ); - rtl::OUString aNewText( aOldText ); + OUString aOldText( aPaM.GetNode()->Copy(0, nTmpPos) ); + OUString aNewText( aOldText ); if (pCTLOptions->IsCTLSequenceCheckingTypeAndReplace()) { /*const xub_StrLen nPrevPos = static_cast< xub_StrLen >*/( _xISC->correctInputSequence( aNewText, nTmpPos - 1, c, nCheckMode ) ); @@ -2560,12 +2560,12 @@ EditPaM ImpEditEngine::InsertText( const EditSelection& rCurSel, if ( IsUndoEnabled() && !IsInUndo() ) { - EditUndoInsertChars* pNewUndo = new EditUndoInsertChars(pEditEngine, CreateEPaM(aPaM), rtl::OUString(c)); + EditUndoInsertChars* pNewUndo = new EditUndoInsertChars(pEditEngine, CreateEPaM(aPaM), OUString(c)); sal_Bool bTryMerge = ( !bDoOverwrite && ( c != ' ' ) ) ? sal_True : sal_False; InsertUndo( pNewUndo, bTryMerge ); } - aEditDoc.InsertText( (const EditPaM&)aPaM, rtl::OUString(c) ); + aEditDoc.InsertText( (const EditPaM&)aPaM, OUString(c) ); ParaPortion* pPortion = FindParaPortion( aPaM.GetNode() ); OSL_ENSURE( pPortion, "Blind Portion in InsertText" ); pPortion->MarkInvalid( aPaM.GetIndex(), 1 ); @@ -2842,7 +2842,7 @@ EditPaM ImpEditEngine::InsertParaBreak( EditSelection aCurSel ) if ( aPrevParaText.GetChar(n) == '\t' ) aPaM = ImpInsertFeature( aPaM, SfxVoidItem( EE_FEATURE_TAB ) ); else - aPaM = ImpInsertText( aPaM, rtl::OUString(aPrevParaText.GetChar(n)) ); + aPaM = ImpInsertText( aPaM, OUString(aPrevParaText.GetChar(n)) ); n++; } @@ -2883,7 +2883,7 @@ sal_Bool ImpEditEngine::UpdateFields() if ( aStatus.MarkFields() ) rField.GetFldColor() = new Color( GetColorConfig().GetColorValue( svtools::WRITERFIELDSHADINGS ).nColor ); - rtl::OUString aFldValue = + OUString aFldValue = GetEditEnginePtr()->CalcFieldValue( static_cast<const SvxFieldItem&>(*rField.GetItem()), nPara, rField.GetStart(), rField.GetTxtColor(), rField.GetFldColor()); @@ -3476,7 +3476,7 @@ EditSelection ImpEditEngine::InsertText( uno::Reference< datatransfer::XTransfer try { uno::Any aData = rxDataObj->getTransferData( aFlavor ); - ::rtl::OUString aText; + OUString aText; aData >>= aText; aNewSelection = ImpInsertText( rPaM, aText ); bDone = sal_True; diff --git a/editeng/source/editeng/impedit3.cxx b/editeng/source/editeng/impedit3.cxx index 896179146d58..1299920e8e2f 100644 --- a/editeng/source/editeng/impedit3.cxx +++ b/editeng/source/editeng/impedit3.cxx @@ -72,7 +72,6 @@ #include <rtl/ustrbuf.hxx> #include <comphelper/string.hxx> -using ::rtl::OUString; using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::beans; @@ -997,7 +996,7 @@ sal_Bool ImpEditEngine::CreateLines( sal_uInt16 nPara, sal_uInt32 nStartPosY ) aTmpFont.SetPhysFont( GetRefDevice() ); ImplInitDigitMode(GetRefDevice(), aTmpFont.GetLanguage()); - rtl::OUString aFieldValue = cChar ? rtl::OUString(cChar) : ((EditCharAttribField*)pNextFeature)->GetFieldValue(); + OUString aFieldValue = cChar ? OUString(cChar) : ((EditCharAttribField*)pNextFeature)->GetFieldValue(); if ( bCalcCharPositions || !pPortion->HasValidSize() ) { pPortion->GetSize() = aTmpFont.QuickGetTextSize( GetRefDevice(), aFieldValue, 0, aFieldValue.getLength(), 0 ); @@ -1946,7 +1945,7 @@ void ImpEditEngine::ImpBreakLine( ParaPortion* pParaPortion, EditLine* pLine, Te // A portion for inserting the separator ... TextPortion* pHyphPortion = new TextPortion( 0 ); pHyphPortion->GetKind() = PORTIONKIND_HYPHENATOR; - String aHyphText(rtl::OUString(CH_HYPH)); + String aHyphText(OUString(CH_HYPH)); if ( cAlternateReplChar ) { TextPortion* pPrev = pParaPortion->GetTextPortions()[nEndPortion]; @@ -1961,7 +1960,7 @@ void ImpEditEngine::ImpBreakLine( ParaPortion* pParaPortion, EditLine* pLine, Te else if ( cAlternateExtraChar ) { pHyphPortion->SetExtraValue( cAlternateExtraChar ); - aHyphText.Insert( rtl::OUString(cAlternateExtraChar), 0 ); + aHyphText.Insert( OUString(cAlternateExtraChar), 0 ); } // Determine the width of the Hyph-Portion: @@ -3048,7 +3047,7 @@ void ImpEditEngine::Paint( OutputDevice* pOutDev, Rectangle aClipRect, Point aSt if ( 0x200B == cChar || 0x2060 == cChar ) { - const rtl::OUString aBlank( ' ' ); + const OUString aBlank( ' ' ); long nHalfBlankWidth = aTmpFont.QuickGetTextSize( pOutDev, aBlank, 0, 1, 0 ).Width() / 2; const long nAdvanceX = ( nTmpIdx == nTmpEnd ? @@ -3093,7 +3092,7 @@ void ImpEditEngine::Paint( OutputDevice* pOutDev, Rectangle aClipRect, Point aSt if ( 0x200B == cChar ) { - const rtl::OUString aSlash( '/' ); + const OUString aSlash( '/' ); const short nOldEscapement = aTmpFont.GetEscapement(); const sal_uInt8 nOldPropr = aTmpFont.GetPropr(); @@ -3377,7 +3376,7 @@ void ImpEditEngine::Paint( OutputDevice* pOutDev, Rectangle aClipRect, Point aSt aTmpFont.SetEscapement( 0 ); aTmpFont.SetPropr( 100 ); aTmpFont.SetPhysFont( pOutDev ); - rtl::OUStringBuffer aBlanks; + OUStringBuffer aBlanks; comphelper::string::padToLength( aBlanks, (sal_Int32) nTextLen, ' ' ); Point aUnderlinePos( aOutPos ); if ( nOrientation ) @@ -3504,7 +3503,7 @@ void ImpEditEngine::Paint( OutputDevice* pOutDev, Rectangle aClipRect, Point aSt aTmpFont.SetEscapement( 0 ); aTmpFont.SetPhysFont( pOutDev ); long nCharWidth = aTmpFont.QuickGetTextSize( pOutDev, - rtl::OUString(pTextPortion->GetExtraValue()), 0, 1, NULL ).Width(); + OUString(pTextPortion->GetExtraValue()), 0, 1, NULL ).Width(); sal_Int32 nChars = 2; if( nCharWidth ) nChars = pTextPortion->GetSize().Width() / nCharWidth; @@ -3513,7 +3512,7 @@ void ImpEditEngine::Paint( OutputDevice* pOutDev, Rectangle aClipRect, Point aSt else if ( nChars == 2 ) nChars = 3; // looks better - rtl::OUStringBuffer aBuf; + OUStringBuffer aBuf; comphelper::string::padToLength(aBuf, nChars, pTextPortion->GetExtraValue()); OUString aText(aBuf.makeStringAndClear()); aTmpFont.QuickDrawText( pOutDev, aTmpPos, aText, 0, aText.getLength(), NULL ); @@ -3531,7 +3530,7 @@ void ImpEditEngine::Paint( OutputDevice* pOutDev, Rectangle aClipRect, Point aSt // StripPortions() data callback GetEditEnginePtr()->DrawingTab( aTmpPos, pTextPortion->GetSize().Width(), - rtl::OUString(pTextPortion->GetExtraValue()), + OUString(pTextPortion->GetExtraValue()), aTmpFont, n, nIndex, pTextPortion->GetRightToLeft(), bEndOfLine, bEndOfParagraph, aOverlineColor, aTextLineColor); diff --git a/editeng/source/editeng/impedit4.cxx b/editeng/source/editeng/impedit4.cxx index f96d83eef2ed..34ef278174f2 100644 --- a/editeng/source/editeng/impedit4.cxx +++ b/editeng/source/editeng/impedit4.cxx @@ -512,7 +512,7 @@ sal_uInt32 ImpEditEngine::WriteRTF( SvStream& rOutput, EditSelection aSel ) rOutput.WriteNumber( nNumber ); // Name of the template ... - rOutput << " " << rtl::OUStringToOString(pStyle->GetName(), eDestEnc).getStr(); + rOutput << " " << OUStringToOString(pStyle->GetName(), eDestEnc).getStr(); rOutput << ";}"; } rOutput << '}'; @@ -985,11 +985,11 @@ void ImpEditEngine::WriteItemAsRTF( const SfxPoolItem& rItem, SvStream& rOutput, // SWG: if ( nEsc ) { - rOutput << "{\\*\\updnprop" << rtl::OString::valueOf( + rOutput << "{\\*\\updnprop" << OString::valueOf( static_cast<sal_Int32>(nProp100)).getStr() << '}'; } long nUpDown = nFontHeight * Abs( nEsc ) / 100; - rtl::OString aUpDown = rtl::OString::valueOf( + OString aUpDown = OString::valueOf( static_cast<sal_Int32>(nUpDown)); if ( nEsc < 0 ) rOutput << OOO_STRING_SVTOOLS_RTF_DN << aUpDown.getStr(); @@ -1636,7 +1636,7 @@ void ImpEditEngine::SetLanguageAndFont( } -void ImpEditEngine::ImpConvert( rtl::OUString &rConvTxt, LanguageType &rConvTxtLang, +void ImpEditEngine::ImpConvert( OUString &rConvTxt, LanguageType &rConvTxtLang, EditView* pEditView, LanguageType nSrcLang, const ESelection &rConvRange, sal_Bool bAllowImplicitChangesForNotConvertibleText, LanguageType nTargetLang, const Font *pTargetFont ) @@ -3029,7 +3029,7 @@ short ImpEditEngine::ReplaceTextOnly( else { DBG_ASSERT( nDiff == 1, "TransliterateText - Diff other than expected! But should work..." ); - GetEditDoc().InsertText( EditPaM( pNode, nCurrentPos ), rtl::OUString(rNewText.GetChar(n)) ); + GetEditDoc().InsertText( EditPaM( pNode, nCurrentPos ), OUString(rNewText.GetChar(n)) ); } nDiffs = sal::static_int_cast< short >(nDiffs + nDiff); diff --git a/editeng/source/editeng/textconv.cxx b/editeng/source/editeng/textconv.cxx index 9be883c2d853..0fc00a418055 100644 --- a/editeng/source/editeng/textconv.cxx +++ b/editeng/source/editeng/textconv.cxx @@ -34,7 +34,6 @@ #include <textconv.hxx> -using ::rtl::OUString; using namespace com::sun::star; using namespace com::sun::star::uno; using namespace com::sun::star::beans; @@ -238,7 +237,7 @@ sal_Bool TextConvWrapper::ConvContinue_impl() // modified version of EditSpellWrapper::SpellContinue // get next convertible text portion and its language - aConvText = rtl::OUString(); + aConvText = OUString(); nConvTextLang = LANGUAGE_NONE; pEditView->GetImpEditEngine()->ImpConvert( aConvText, nConvTextLang, pEditView, GetSourceLanguage(), aConvSel, @@ -298,7 +297,7 @@ void TextConvWrapper::SelectNewUnit_impl( void TextConvWrapper::GetNextPortion( - ::rtl::OUString& /* [out] */ rNextPortion, + OUString& /* [out] */ rNextPortion, LanguageType& /* [out] */ rLangOfPortion, sal_Bool /* [in] */ _bAllowImplicitChangesForNotConvertibleText ) { @@ -339,8 +338,8 @@ namespace void TextConvWrapper::ReplaceUnit( const sal_Int32 nUnitStart, const sal_Int32 nUnitEnd, - const ::rtl::OUString& rOrigText, - const ::rtl::OUString& rReplaceWith, + const OUString& rOrigText, + const OUString& rReplaceWith, const ::com::sun::star::uno::Sequence< sal_Int32 > &rOffsets, ReplacementAction eAction, LanguageType *pNewUnitLanguage ) diff --git a/editeng/source/editeng/textconv.hxx b/editeng/source/editeng/textconv.hxx index 68975ac502ef..2a0bf0b2ecd2 100644 --- a/editeng/source/editeng/textconv.hxx +++ b/editeng/source/editeng/textconv.hxx @@ -29,7 +29,7 @@ class EditView; class TextConvWrapper : public editeng::HangulHanjaConversion { - rtl::OUString aConvText; // convertible text part found last time + OUString aConvText; // convertible text part found last time LanguageType nConvTextLang; // language of aConvText sal_uInt16 nLastPos; // starting position of the last found text portion (word) sal_uInt16 nUnitOffset; // offset of current unit in the current text portion (word) @@ -63,7 +63,7 @@ class TextConvWrapper : public editeng::HangulHanjaConversion const sal_Int32 nUnitEnd ); void ChangeText( const String &rNewText, - const ::rtl::OUString& rOrigText, + const OUString& rOrigText, const ::com::sun::star::uno::Sequence< sal_Int32 > *pOffsets, ESelection *pESelection ); void ChangeText_impl( const String &rNewText, sal_Bool bKeepAttributes ); @@ -73,15 +73,15 @@ class TextConvWrapper : public editeng::HangulHanjaConversion TextConvWrapper & operator= (const TextConvWrapper &); protected: - virtual void GetNextPortion( ::rtl::OUString& /* [out] */ rNextPortion, + virtual void GetNextPortion( OUString& /* [out] */ rNextPortion, LanguageType& /* [out] */ rLangOfPortion, sal_Bool /* [in] */ _bAllowImplicitChangesForNotConvertibleText ); virtual void HandleNewUnit( const sal_Int32 nUnitStart, const sal_Int32 nUnitEnd ); virtual void ReplaceUnit( const sal_Int32 nUnitStart, const sal_Int32 nUnitEnd, - const ::rtl::OUString& rOrigText, - const ::rtl::OUString& rReplaceWith, + const OUString& rOrigText, + const OUString& rReplaceWith, const ::com::sun::star::uno::Sequence< sal_Int32 > &rOffsets, ReplacementAction eAction, LanguageType *pNewUnitLanguage ); diff --git a/editeng/source/items/bulitem.cxx b/editeng/source/items/bulitem.cxx index 42ed83f56b15..0841f53307be 100644 --- a/editeng/source/items/bulitem.cxx +++ b/editeng/source/items/bulitem.cxx @@ -152,7 +152,7 @@ SvxBulletItem::SvxBulletItem( SvStream& rStrm, sal_uInt16 _nWhich ) : char cTmpSymbol; rStrm >> cTmpSymbol; //convert single byte to unicode - cSymbol = rtl::OUString(&cTmpSymbol, 1, aFont.GetCharSet()).toChar(); + cSymbol = OUString(&cTmpSymbol, 1, aFont.GetCharSet()).toChar(); rStrm >> nScale; @@ -352,7 +352,7 @@ SvStream& SvxBulletItem::Store( SvStream& rStrm, sal_uInt16 /*nItemVersion*/ ) c rStrm << static_cast<sal_Int32>(nWidth); rStrm << nStart; rStrm << nJustify; - rStrm << rtl::OUStringToOString(rtl::OUString(cSymbol), aFont.GetCharSet()).toChar(); + rStrm << OUStringToOString(OUString(cSymbol), aFont.GetCharSet()).toChar(); rStrm << nScale; // UNICODE: rStrm << aPrevText; diff --git a/editeng/source/items/flditem.cxx b/editeng/source/items/flditem.cxx index 83dee76661e2..2b3d090b796e 100644 --- a/editeng/source/items/flditem.cxx +++ b/editeng/source/items/flditem.cxx @@ -93,7 +93,7 @@ SvxFieldData* SvxFieldData::Create(const uno::Reference<text::XTextContent>& xTe } case text::textfield::Type::URL: { - rtl::OUString aRep, aTarget, aURL; + OUString aRep, aTarget, aURL; sal_Int16 nFmt = -1; xPropSet->getPropertyValue(UNO_TC_PROP_URL_REPRESENTATION) >>= aRep; xPropSet->getPropertyValue(UNO_TC_PROP_URL_TARGET) >>= aTarget; @@ -120,7 +120,7 @@ SvxFieldData* SvxFieldData::Create(const uno::Reference<text::XTextContent>& xTe } case text::textfield::Type::EXTENDED_FILE: { - rtl::OUString aPresentation; + OUString aPresentation; sal_Bool bIsFixed = false; sal_Int16 nFmt = text::FilenameDisplayFormat::FULL; xPropSet->getPropertyValue(UNO_TC_PROP_IS_FIXED) >>= bIsFixed; @@ -145,7 +145,7 @@ SvxFieldData* SvxFieldData::Create(const uno::Reference<text::XTextContent>& xTe sal_Bool bIsFixed = false; sal_Bool bFullName = false; sal_Int16 nFmt = -1; - rtl::OUString aPresentation, aContent, aFirstName, aLastName; + OUString aPresentation, aContent, aFirstName, aLastName; xPropSet->getPropertyValue(UNO_TC_PROP_IS_FIXED) >>= bIsFixed; xPropSet->getPropertyValue(UNO_TC_PROP_AUTHOR_FULLNAME) >>= bFullName; xPropSet->getPropertyValue(UNO_TC_PROP_CURRENT_PRESENTATION) >>= aPresentation; @@ -171,7 +171,7 @@ SvxFieldData* SvxFieldData::Create(const uno::Reference<text::XTextContent>& xTe // #92009# pass fixed attribute to constructor SvxAuthorField* pData = new SvxAuthorField( - aFirstName, aLastName, rtl::OUString(), bIsFixed ? SVXAUTHORTYPE_FIX : SVXAUTHORTYPE_VAR); + aFirstName, aLastName, OUString(), bIsFixed ? SVXAUTHORTYPE_FIX : SVXAUTHORTYPE_VAR); if (!bFullName) { @@ -425,7 +425,7 @@ void SvxDateField::Save( SvPersistStream & rStm ) // ----------------------------------------------------------------------- -rtl::OUString SvxDateField::GetFormatted( SvNumberFormatter& rFormatter, LanguageType eLang ) const +OUString SvxDateField::GetFormatted( SvNumberFormatter& rFormatter, LanguageType eLang ) const { Date aDate( Date::EMPTY ); if ( eType == SVXDATETYPE_FIX ) @@ -436,7 +436,7 @@ rtl::OUString SvxDateField::GetFormatted( SvNumberFormatter& rFormatter, Languag return GetFormatted( aDate, eFormat, rFormatter, eLang ); } -rtl::OUString SvxDateField::GetFormatted( Date& aDate, SvxDateFormat eFormat, SvNumberFormatter& rFormatter, LanguageType eLang ) +OUString SvxDateField::GetFormatted( Date& aDate, SvxDateFormat eFormat, SvNumberFormatter& rFormatter, LanguageType eLang ) { if ( eFormat == SVXDATEFORMAT_SYSTEM ) { @@ -490,7 +490,7 @@ rtl::OUString SvxDateField::GetFormatted( Date& aDate, SvxDateFormat eFormat, Sv } double fDiffDate = aDate - *(rFormatter.GetNullDate()); - rtl::OUString aStr; + OUString aStr; Color* pColor = NULL; rFormatter.GetOutputString( fDiffDate, nFormatKey, aStr, &pColor ); return aStr; @@ -512,7 +512,7 @@ SvxURLField::SvxURLField() // ----------------------------------------------------------------------- -SvxURLField::SvxURLField( const rtl::OUString& rURL, const rtl::OUString& rRepres, SvxURLFormat eFmt ) +SvxURLField::SvxURLField( const OUString& rURL, const OUString& rRepres, SvxURLFormat eFmt ) : aURL( rURL ), aRepresentation( rRepres ) { eFormat = eFmt; @@ -541,7 +541,7 @@ int SvxURLField::operator==( const SvxFieldData& rOther ) const // ----------------------------------------------------------------------- -static void write_unicode( SvPersistStream & rStm, const rtl::OUString& rString ) +static void write_unicode( SvPersistStream & rStm, const OUString& rString ) { sal_uInt16 nL = sal::static_int_cast<sal_uInt16>(rString.getLength()); rStm << nL; @@ -549,7 +549,7 @@ static void write_unicode( SvPersistStream & rStm, const rtl::OUString& rString rStm.Write( rString.getStr(), nL*sizeof(sal_Unicode) ); } -static rtl::OUString read_unicode( SvPersistStream & rStm ) +static OUString read_unicode( SvPersistStream & rStm ) { rtl_uString *pStr = NULL; sal_uInt16 nL = 0; @@ -561,7 +561,7 @@ static rtl::OUString read_unicode( SvPersistStream & rStm ) rStm.Read(pStr->buffer, nL*sizeof(sal_Unicode)); } //take ownership of buffer and return, otherwise return empty string - return pStr ? rtl::OUString(pStr, SAL_NO_ACQUIRE) : rtl::OUString(); + return pStr ? OUString(pStr, SAL_NO_ACQUIRE) : OUString(); } void SvxURLField::Load( SvPersistStream & rStm ) @@ -805,7 +805,7 @@ void SvxExtTimeField::Save( SvPersistStream & rStm ) //---------------------------------------------------------------------------- -rtl::OUString SvxExtTimeField::GetFormatted( SvNumberFormatter& rFormatter, LanguageType eLang ) const +OUString SvxExtTimeField::GetFormatted( SvNumberFormatter& rFormatter, LanguageType eLang ) const { Time aTime( Time::EMPTY ); if ( eType == SVXTIMETYPE_FIX ) @@ -815,7 +815,7 @@ rtl::OUString SvxExtTimeField::GetFormatted( SvNumberFormatter& rFormatter, Lang return GetFormatted( aTime, eFormat, rFormatter, eLang ); } -rtl::OUString SvxExtTimeField::GetFormatted( Time& aTime, SvxTimeFormat eFormat, SvNumberFormatter& rFormatter, LanguageType eLang ) +OUString SvxExtTimeField::GetFormatted( Time& aTime, SvxTimeFormat eFormat, SvNumberFormatter& rFormatter, LanguageType eLang ) { switch( eFormat ) { @@ -897,7 +897,7 @@ SvxExtFileField::SvxExtFileField() //---------------------------------------------------------------------------- -SvxExtFileField::SvxExtFileField( const rtl::OUString& rStr, SvxFileType eT, SvxFileFormat eF ) +SvxExtFileField::SvxExtFileField( const OUString& rStr, SvxFileType eT, SvxFileFormat eF ) { aFile = rStr; eType = eT; @@ -953,16 +953,16 @@ void SvxExtFileField::Save( SvPersistStream & rStm ) //---------------------------------------------------------------------------- -rtl::OUString SvxExtFileField::GetFormatted() const +OUString SvxExtFileField::GetFormatted() const { - rtl::OUString aString; + OUString aString; INetURLObject aURLObj( aFile ); if( INET_PROT_NOT_VALID == aURLObj.GetProtocol() ) { // invalid? try to interpret string as system file name - rtl::OUString aURLStr; + OUString aURLStr; ::utl::LocalFileHelper::ConvertPhysicalNameToURL( aFile, aURLStr ); @@ -1044,9 +1044,9 @@ SvxAuthorField::SvxAuthorField() //---------------------------------------------------------------------------- -SvxAuthorField::SvxAuthorField( const rtl::OUString& rFirstName, - const rtl::OUString& rLastName, - const rtl::OUString& rShortName, +SvxAuthorField::SvxAuthorField( const OUString& rFirstName, + const OUString& rLastName, + const OUString& rShortName, SvxAuthorType eT, SvxAuthorFormat eF ) { aName = rLastName; @@ -1109,15 +1109,15 @@ void SvxAuthorField::Save( SvPersistStream & rStm ) //---------------------------------------------------------------------------- -rtl::OUString SvxAuthorField::GetFormatted() const +OUString SvxAuthorField::GetFormatted() const { - rtl::OUString aString; + OUString aString; switch( eFormat ) { case SVXAUTHORFORMAT_FULLNAME: { - rtl::OUStringBuffer aBuf(aFirstName); + OUStringBuffer aBuf(aFirstName); aBuf.append(sal_Unicode(' ')); aBuf.append(aName); aString = aBuf.makeStringAndClear(); @@ -1230,10 +1230,10 @@ void SvxDateTimeField::Save( SvPersistStream & /*rStm*/ ) SvxDateTimeField::SvxDateTimeField() {} -rtl::OUString SvxDateTimeField::GetFormatted( +OUString SvxDateTimeField::GetFormatted( Date& rDate, Time& rTime, int eFormat, SvNumberFormatter& rFormatter, LanguageType eLanguage ) { - rtl::OUString aRet; + OUString aRet; SvxDateFormat eDateFormat = (SvxDateFormat)(eFormat & 0x0f); @@ -1246,7 +1246,7 @@ rtl::OUString SvxDateTimeField::GetFormatted( if(eTimeFormat) { - rtl::OUStringBuffer aBuf(aRet); + OUStringBuffer aBuf(aRet); if (!aRet.isEmpty()) aBuf.append(sal_Unicode(' ')); diff --git a/editeng/source/items/frmitems.cxx b/editeng/source/items/frmitems.cxx index 65b5fa0ed34b..8741e69778de 100644 --- a/editeng/source/items/frmitems.cxx +++ b/editeng/source/items/frmitems.cxx @@ -1540,7 +1540,7 @@ sal_uInt16 SvxShadowItem::GetValueCount() const // ----------------------------------------------------------------------- -rtl::OUString SvxShadowItem::GetValueTextByPos( sal_uInt16 nPos ) const +OUString SvxShadowItem::GetValueTextByPos( sal_uInt16 nPos ) const { DBG_ASSERT( nPos < SVX_SHADOW_END, "enum overflow!" ); return EE_RESSTR(RID_SVXITEMS_SHADOW_BEGIN + nPos ); @@ -2928,7 +2928,7 @@ SfxItemPresentation SvxFmtBreakItem::GetPresentation // ----------------------------------------------------------------------- -rtl::OUString SvxFmtBreakItem::GetValueTextByPos( sal_uInt16 nPos ) const +OUString SvxFmtBreakItem::GetValueTextByPos( sal_uInt16 nPos ) const { DBG_ASSERT( nPos < SVX_BREAK_END, "enum overflow!" ); return EE_RESSTR(RID_SVXITEMS_BREAK_BEGIN + nPos); @@ -3598,7 +3598,7 @@ bool SvxBrushItem::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const { OUString sPrefix( UNO_NAME_GRAPHOBJ_URLPREFIX); - OUString sId(rtl::OStringToOUString( + OUString sId(OStringToOUString( pImpl->pGraphicObject->GetUniqueID(), RTL_TEXTENCODING_ASCII_US)); sLink = sPrefix + sId; @@ -3689,7 +3689,7 @@ bool SvxBrushItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId ) { DELETEZ( pStrLink ); String sTmp( sLink ); - rtl::OString sId(rtl::OUStringToOString(sTmp.Copy( + OString sId(OUStringToOString(sTmp.Copy( sizeof(UNO_NAME_GRAPHOBJ_URLPREFIX)-1), RTL_TEXTENCODING_ASCII_US)); GraphicObject *pOldGrfObj = pImpl->pGraphicObject; diff --git a/editeng/source/items/numitem.cxx b/editeng/source/items/numitem.cxx index 719d93950032..7c3ec9c89f09 100644 --- a/editeng/source/items/numitem.cxx +++ b/editeng/source/items/numitem.cxx @@ -125,9 +125,9 @@ String SvxNumberType::GetNumStr( sal_uLong nNo, const Locale& rLocale ) const { Sequence< PropertyValue > aProperties(2); PropertyValue* pValues = aProperties.getArray(); - pValues[0].Name = rtl::OUString("NumberingType"); + pValues[0].Name = OUString("NumberingType"); pValues[0].Value <<= nNumType; - pValues[1].Name = rtl::OUString("Value"); + pValues[1].Name = OUString("Value"); pValues[1].Value <<= (sal_Int32)nNo; try diff --git a/editeng/source/items/paraitem.cxx b/editeng/source/items/paraitem.cxx index ec97047de345..8210fbbe72b5 100644 --- a/editeng/source/items/paraitem.cxx +++ b/editeng/source/items/paraitem.cxx @@ -295,10 +295,10 @@ sal_uInt16 SvxLineSpacingItem::GetValueCount() const // ----------------------------------------------------------------------- -rtl::OUString SvxLineSpacingItem::GetValueTextByPos( sal_uInt16 nPos ) const +OUString SvxLineSpacingItem::GetValueTextByPos( sal_uInt16 nPos ) const { //! load strings from resource - rtl::OUString aText; + OUString aText; switch ( nPos ) { case SVX_LINESPACE_USER: @@ -459,7 +459,7 @@ sal_uInt16 SvxAdjustItem::GetValueCount() const // ----------------------------------------------------------------------- -rtl::OUString SvxAdjustItem::GetValueTextByPos( sal_uInt16 nPos ) const +OUString SvxAdjustItem::GetValueTextByPos( sal_uInt16 nPos ) const { DBG_ASSERT( nPos <= (sal_uInt16)SVX_ADJUST_BLOCKLINE, "enum overflow!" ); return EE_RESSTR(RID_SVXITEMS_ADJUST_BEGIN + nPos); @@ -1021,7 +1021,7 @@ bool SvxTabStopItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId ) } if (!(rAnySeq[2] >>= aSeq[n].DecimalChar)) { - ::rtl::OUString aVal; + OUString aVal; if ( (rAnySeq[2] >>= aVal) && aVal.getLength() == 1 ) aSeq[n].DecimalChar = aVal.toChar(); else @@ -1029,7 +1029,7 @@ bool SvxTabStopItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId ) } if (!(rAnySeq[3] >>= aSeq[n].FillChar)) { - ::rtl::OUString aVal; + OUString aVal; if ( (rAnySeq[3] >>= aVal) && aVal.getLength() == 1 ) aSeq[n].FillChar = aVal.toChar(); else @@ -1319,7 +1319,7 @@ bool SvxPageModelItem::QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMe switch ( nMemberId ) { case MID_AUTO: rVal <<= (sal_Bool) bAuto; break; - case MID_NAME: rVal <<= ::rtl::OUString( GetValue() ); break; + case MID_NAME: rVal <<= OUString( GetValue() ); break; default: OSL_FAIL("Wrong MemberId!"); return sal_False; } @@ -1330,7 +1330,7 @@ bool SvxPageModelItem::PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 { nMemberId &= ~CONVERT_TWIPS; sal_Bool bRet; - ::rtl::OUString aStr; + OUString aStr; switch ( nMemberId ) { case MID_AUTO: bRet = ( rVal >>= bAuto ); break; diff --git a/editeng/source/items/textitem.cxx b/editeng/source/items/textitem.cxx index 87134db022bc..31d316bd82bf 100644 --- a/editeng/source/items/textitem.cxx +++ b/editeng/source/items/textitem.cxx @@ -536,7 +536,7 @@ SfxItemPresentation SvxPostureItem::GetPresentation // ----------------------------------------------------------------------- -rtl::OUString SvxPostureItem::GetValueTextByPos( sal_uInt16 nPos ) const +OUString SvxPostureItem::GetValueTextByPos( sal_uInt16 nPos ) const { DBG_ASSERT( nPos <= (sal_uInt16)ITALIC_NORMAL, "enum overflow!" ); @@ -551,7 +551,7 @@ rtl::OUString SvxPostureItem::GetValueTextByPos( sal_uInt16 nPos ) const default: ;//prevent warning } - return nId ? EE_RESSTR(nId) : rtl::OUString(); + return nId ? EE_RESSTR(nId) : OUString(); } bool SvxPostureItem::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const @@ -701,7 +701,7 @@ SfxItemPresentation SvxWeightItem::GetPresentation // ----------------------------------------------------------------------- -rtl::OUString SvxWeightItem::GetValueTextByPos( sal_uInt16 nPos ) const +OUString SvxWeightItem::GetValueTextByPos( sal_uInt16 nPos ) const { DBG_ASSERT( nPos <= (sal_uInt16)WEIGHT_BLACK, "enum overflow!" ); return EE_RESSTR(RID_SVXITEMS_WEIGHT_BEGIN + nPos); @@ -1360,10 +1360,10 @@ SfxItemPresentation SvxTextLineItem::GetPresentation // ----------------------------------------------------------------------- -rtl::OUString SvxTextLineItem::GetValueTextByPos( sal_uInt16 /*nPos*/ ) const +OUString SvxTextLineItem::GetValueTextByPos( sal_uInt16 /*nPos*/ ) const { OSL_FAIL("SvxTextLineItem::GetValueTextByPos: Pure virtual method"); - return rtl::OUString(); + return OUString(); } bool SvxTextLineItem::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const @@ -1462,7 +1462,7 @@ SfxPoolItem* SvxUnderlineItem::Create(SvStream& rStrm, sal_uInt16) const // ----------------------------------------------------------------------- -rtl::OUString SvxUnderlineItem::GetValueTextByPos( sal_uInt16 nPos ) const +OUString SvxUnderlineItem::GetValueTextByPos( sal_uInt16 nPos ) const { DBG_ASSERT( nPos <= (sal_uInt16)UNDERLINE_BOLDWAVE, "enum overflow!" ); return EE_RESSTR(RID_SVXITEMS_UL_BEGIN + nPos); @@ -1495,7 +1495,7 @@ SfxPoolItem* SvxOverlineItem::Create(SvStream& rStrm, sal_uInt16) const // ----------------------------------------------------------------------- -rtl::OUString SvxOverlineItem::GetValueTextByPos( sal_uInt16 nPos ) const +OUString SvxOverlineItem::GetValueTextByPos( sal_uInt16 nPos ) const { DBG_ASSERT( nPos <= (sal_uInt16)UNDERLINE_BOLDWAVE, "enum overflow!" ); return EE_RESSTR(RID_SVXITEMS_OL_BEGIN + nPos); @@ -1586,7 +1586,7 @@ SfxItemPresentation SvxCrossedOutItem::GetPresentation // ----------------------------------------------------------------------- -rtl::OUString SvxCrossedOutItem::GetValueTextByPos( sal_uInt16 nPos ) const +OUString SvxCrossedOutItem::GetValueTextByPos( sal_uInt16 nPos ) const { DBG_ASSERT( nPos <= (sal_uInt16)STRIKEOUT_X, "enum overflow!" ); return EE_RESSTR(RID_SVXITEMS_STRIKEOUT_BEGIN + nPos); @@ -2283,7 +2283,7 @@ SfxItemPresentation SvxCaseMapItem::GetPresentation // ----------------------------------------------------------------------- -rtl::OUString SvxCaseMapItem::GetValueTextByPos( sal_uInt16 nPos ) const +OUString SvxCaseMapItem::GetValueTextByPos( sal_uInt16 nPos ) const { DBG_ASSERT( nPos < (sal_uInt16)SVX_CASEMAP_END, "enum overflow!" ); return EE_RESSTR(RID_SVXITEMS_CASEMAP_BEGIN + nPos); @@ -2441,7 +2441,7 @@ SfxItemPresentation SvxEscapementItem::GetPresentation // ----------------------------------------------------------------------- -rtl::OUString SvxEscapementItem::GetValueTextByPos( sal_uInt16 nPos ) const +OUString SvxEscapementItem::GetValueTextByPos( sal_uInt16 nPos ) const { DBG_ASSERT( nPos < (sal_uInt16)SVX_ESCAPEMENT_END, "enum overflow!" ); return EE_RESSTR(RID_SVXITEMS_ESCAPEMENT_BEGIN + nPos); @@ -3389,7 +3389,7 @@ sal_uInt16 SvxCharReliefItem::GetVersion( sal_uInt16 nFFVer ) const return SOFFICE_FILEFORMAT_50 > nFFVer ? USHRT_MAX : 0; } -rtl::OUString SvxCharReliefItem::GetValueTextByPos( sal_uInt16 nPos ) const +OUString SvxCharReliefItem::GetValueTextByPos( sal_uInt16 nPos ) const { DBG_ASSERT( RID_SVXITEMS_RELIEF_ENGRAVED - RID_SVXITEMS_RELIEF_NONE, "enum overflow" ); diff --git a/editeng/source/items/xmlcnitm.cxx b/editeng/source/items/xmlcnitm.cxx index 8f04dc78238e..d63487b33aae 100644 --- a/editeng/source/items/xmlcnitm.cxx +++ b/editeng/source/items/xmlcnitm.cxx @@ -116,8 +116,8 @@ bool SvXMLAttrContainerItem::PutValue( const com::sun::star::uno::Any& rVal, sal if( !xContainer.is() ) return sal_False; - const Sequence< ::rtl::OUString > aNameSequence( xContainer->getElementNames() ); - const ::rtl::OUString* pNames = aNameSequence.getConstArray(); + const Sequence< OUString > aNameSequence( xContainer->getElementNames() ); + const OUString* pNames = aNameSequence.getConstArray(); const sal_Int32 nCount = aNameSequence.getLength(); Any aAny; AttributeData* pData; @@ -125,7 +125,7 @@ bool SvXMLAttrContainerItem::PutValue( const com::sun::star::uno::Any& rVal, sal for( nAttr = 0; nAttr < nCount; nAttr++ ) { - const ::rtl::OUString aName( *pNames++ ); + const OUString aName( *pNames++ ); aAny = xContainer->getByName( aName ); if( aAny.getValue() == NULL || aAny.getValueType() != ::getCppuType((AttributeData*)0) ) @@ -135,8 +135,8 @@ bool SvXMLAttrContainerItem::PutValue( const com::sun::star::uno::Any& rVal, sal sal_Int32 pos = aName.indexOf( sal_Unicode(':') ); if( pos != -1 ) { - const ::rtl::OUString aPrefix( aName.copy( 0, pos )); - const ::rtl::OUString aLName( aName.copy( pos+1 )); + const OUString aPrefix( aName.copy( 0, pos )); + const OUString aLName( aName.copy( pos+1 )); if( pData->Namespace.isEmpty() ) { @@ -170,15 +170,15 @@ bool SvXMLAttrContainerItem::PutValue( const com::sun::star::uno::Any& rVal, sal } -sal_Bool SvXMLAttrContainerItem::AddAttr( const ::rtl::OUString& rLName, - const ::rtl::OUString& rValue ) +sal_Bool SvXMLAttrContainerItem::AddAttr( const OUString& rLName, + const OUString& rValue ) { return pImpl->AddAttr( rLName, rValue ); } -sal_Bool SvXMLAttrContainerItem::AddAttr( const ::rtl::OUString& rPrefix, - const ::rtl::OUString& rNamespace, const ::rtl::OUString& rLName, - const ::rtl::OUString& rValue ) +sal_Bool SvXMLAttrContainerItem::AddAttr( const OUString& rPrefix, + const OUString& rNamespace, const OUString& rLName, + const OUString& rValue ) { return pImpl->AddAttr( rPrefix, rNamespace, rLName, rValue ); } @@ -188,22 +188,22 @@ sal_uInt16 SvXMLAttrContainerItem::GetAttrCount() const return (sal_uInt16)pImpl->GetAttrCount(); } -::rtl::OUString SvXMLAttrContainerItem::GetAttrNamespace( sal_uInt16 i ) const +OUString SvXMLAttrContainerItem::GetAttrNamespace( sal_uInt16 i ) const { return pImpl->GetAttrNamespace( i ); } -::rtl::OUString SvXMLAttrContainerItem::GetAttrPrefix( sal_uInt16 i ) const +OUString SvXMLAttrContainerItem::GetAttrPrefix( sal_uInt16 i ) const { return pImpl->GetAttrPrefix( i ); } -const ::rtl::OUString& SvXMLAttrContainerItem::GetAttrLName( sal_uInt16 i ) const +const OUString& SvXMLAttrContainerItem::GetAttrLName( sal_uInt16 i ) const { return pImpl->GetAttrLName( i ); } -const ::rtl::OUString& SvXMLAttrContainerItem::GetAttrValue( sal_uInt16 i ) const +const OUString& SvXMLAttrContainerItem::GetAttrValue( sal_uInt16 i ) const { return pImpl->GetAttrValue( i ); } @@ -219,12 +219,12 @@ sal_uInt16 SvXMLAttrContainerItem::GetNextNamespaceIndex( sal_uInt16 nIdx ) cons return pImpl->GetNextNamespaceIndex( nIdx ); } -const ::rtl::OUString& SvXMLAttrContainerItem::GetNamespace( sal_uInt16 i ) const +const OUString& SvXMLAttrContainerItem::GetNamespace( sal_uInt16 i ) const { return pImpl->GetNamespace( i ); } -const ::rtl::OUString& SvXMLAttrContainerItem::GetPrefix( sal_uInt16 i ) const +const OUString& SvXMLAttrContainerItem::GetPrefix( sal_uInt16 i ) const { return pImpl->GetPrefix( i ); } diff --git a/editeng/source/misc/SvXMLAutoCorrectExport.cxx b/editeng/source/misc/SvXMLAutoCorrectExport.cxx index 2b08c0ff7085..3fb077043733 100644 --- a/editeng/source/misc/SvXMLAutoCorrectExport.cxx +++ b/editeng/source/misc/SvXMLAutoCorrectExport.cxx @@ -30,7 +30,7 @@ using namespace ::rtl; SvXMLAutoCorrectExport::SvXMLAutoCorrectExport( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > xContext, const SvxAutocorrWordList * pNewAutocorr_List, - const rtl::OUString &rFileName, + const OUString &rFileName, com::sun::star::uno::Reference< com::sun::star::xml::sax::XDocumentHandler> &rHandler) : SvXMLExport( xContext, rFileName, util::MeasureUnit::CM, rHandler ), pAutocorr_List( pNewAutocorr_List ) @@ -74,7 +74,7 @@ sal_uInt32 SvXMLAutoCorrectExport::exportDoc(enum XMLTokenEnum /*eClass*/) SvXMLExceptionListExport::SvXMLExceptionListExport( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > xContext, const SvStringsISortDtor &rNewList, - const rtl::OUString &rFileName, + const OUString &rFileName, com::sun::star::uno::Reference< com::sun::star::xml::sax::XDocumentHandler> &rHandler) : SvXMLExport( xContext, rFileName, util::MeasureUnit::CM, rHandler ), rList( rNewList ) diff --git a/editeng/source/misc/SvXMLAutoCorrectExport.hxx b/editeng/source/misc/SvXMLAutoCorrectExport.hxx index 430aca271c4e..3658779fa24e 100644 --- a/editeng/source/misc/SvXMLAutoCorrectExport.hxx +++ b/editeng/source/misc/SvXMLAutoCorrectExport.hxx @@ -33,7 +33,7 @@ public: SvXMLAutoCorrectExport( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > xContext, const SvxAutocorrWordList * pNewAutocorr_List, - const rtl::OUString &rFileName, + const OUString &rFileName, com::sun::star::uno::Reference< com::sun::star::xml::sax::XDocumentHandler> &rHandler); virtual ~SvXMLAutoCorrectExport ( void ) {} @@ -53,7 +53,7 @@ public: SvXMLExceptionListExport( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > xContext, const SvStringsISortDtor &rNewList, - const rtl::OUString &rFileName, + const OUString &rFileName, com::sun::star::uno::Reference< com::sun::star::xml::sax::XDocumentHandler> &rHandler); virtual ~SvXMLExceptionListExport ( void ) {} diff --git a/editeng/source/misc/SvXMLAutoCorrectImport.cxx b/editeng/source/misc/SvXMLAutoCorrectImport.cxx index 5d8fc09fea3d..9b4de022c622 100644 --- a/editeng/source/misc/SvXMLAutoCorrectImport.cxx +++ b/editeng/source/misc/SvXMLAutoCorrectImport.cxx @@ -38,7 +38,7 @@ SvXMLAutoCorrectImport::SvXMLAutoCorrectImport( xStorage ( rNewStorage ) { GetNamespaceMap().Add( - rtl::OUString(aBlockList), + OUString(aBlockList), GetXMLToken ( XML_N_BLOCK_LIST), XML_NAMESPACE_BLOCKLIST ); } @@ -149,7 +149,7 @@ SvXMLExceptionListImport::SvXMLExceptionListImport( rList (rNewList) { GetNamespaceMap().Add( - rtl::OUString(aBlockList), + OUString(aBlockList), GetXMLToken ( XML_N_BLOCK_LIST), XML_NAMESPACE_BLOCKLIST ); } diff --git a/editeng/source/misc/SvXMLAutoCorrectImport.hxx b/editeng/source/misc/SvXMLAutoCorrectImport.hxx index 106ea4023c29..78b2e5571662 100644 --- a/editeng/source/misc/SvXMLAutoCorrectImport.hxx +++ b/editeng/source/misc/SvXMLAutoCorrectImport.hxx @@ -33,7 +33,7 @@ protected: // This method is called after the namespace map has been updated, but // before a context for the current element has been pushed. virtual SvXMLImportContext *CreateContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ); public: @@ -57,11 +57,11 @@ private: public: SvXMLWordListContext ( SvXMLAutoCorrectImport& rImport, sal_uInt16 nPrefix, - const rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ); ~SvXMLWordListContext ( void ); @@ -74,7 +74,7 @@ private: public: SvXMLWordContext ( SvXMLAutoCorrectImport& rImport, sal_uInt16 nPrefix, - const rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ); ~SvXMLWordContext ( void ); @@ -88,7 +88,7 @@ protected: // This method is called after the namespace map has been updated, but // before a context for the current element has been pushed. virtual SvXMLImportContext *CreateContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ); public: @@ -108,11 +108,11 @@ private: public: SvXMLExceptionListContext ( SvXMLExceptionListImport& rImport, sal_uInt16 nPrefix, - const rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ); ~SvXMLExceptionListContext ( void ); @@ -125,7 +125,7 @@ private: public: SvXMLExceptionContext ( SvXMLExceptionListImport& rImport, sal_uInt16 nPrefix, - const rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ); ~SvXMLExceptionContext ( void ); diff --git a/editeng/source/misc/acorrcfg.cxx b/editeng/source/misc/acorrcfg.cxx index 7156590a3f7d..04a9bdf5ffa2 100644 --- a/editeng/source/misc/acorrcfg.cxx +++ b/editeng/source/misc/acorrcfg.cxx @@ -33,7 +33,6 @@ using namespace utl; using namespace com::sun::star::uno; -using ::rtl::OUString; SvxAutoCorrCfg::SvxAutoCorrCfg() : aBaseConfig(*this), @@ -53,7 +52,7 @@ SvxAutoCorrCfg::SvxAutoCorrCfg() : { *pS = sAutoPath.GetToken( n, ';' ); INetURLObject aPath( *pS ); - aPath.insertName(rtl::OUString("acor")); + aPath.insertName(OUString("acor")); *pS = aPath.GetMainURL(INetURLObject::DECODE_TO_IURI); } pAutoCorrect = new SvxAutoCorrect( sSharePath, sUserPath ); @@ -217,7 +216,7 @@ void SvxBaseAutoCorrCfg::Load(sal_Bool bInit) } SvxBaseAutoCorrCfg::SvxBaseAutoCorrCfg(SvxAutoCorrCfg& rPar) : - utl::ConfigItem(rtl::OUString("Office.Common/AutoCorrect")), + utl::ConfigItem(OUString("Office.Common/AutoCorrect")), rParent(rPar) { } @@ -526,7 +525,7 @@ void SvxSwAutoCorrCfg::Load(sal_Bool bInit) } SvxSwAutoCorrCfg::SvxSwAutoCorrCfg(SvxAutoCorrCfg& rPar) : - utl::ConfigItem(rtl::OUString("Office.Writer/AutoFunction")), + utl::ConfigItem(OUString("Office.Writer/AutoFunction")), rParent(rPar) { } diff --git a/editeng/source/misc/hangulhanja.cxx b/editeng/source/misc/hangulhanja.cxx index 2d1e5f2963f1..860a673e1635 100644 --- a/editeng/source/misc/hangulhanja.cxx +++ b/editeng/source/misc/hangulhanja.cxx @@ -58,8 +58,8 @@ namespace editeng class HangulHanjaConversion_Impl { private: - typedef ::std::set< ::rtl::OUString, ::std::less< ::rtl::OUString > > StringBag; - typedef ::std::map< ::rtl::OUString, ::rtl::OUString, ::std::less< ::rtl::OUString > > StringMap; + typedef ::std::set< OUString, ::std::less< OUString > > StringBag; + typedef ::std::map< OUString, OUString, ::std::less< OUString > > StringMap; private: StringBag m_sIgnoreList; @@ -104,14 +104,14 @@ namespace editeng bool m_bAutoReplaceUnique; // state - ::rtl::OUString m_sCurrentPortion; // the text which we are currently working on + OUString m_sCurrentPortion; // the text which we are currently working on LanguageType m_nCurrentPortionLang; // language of m_sCurrentPortion found sal_Int32 m_nCurrentStartIndex; // the start index within m_sCurrentPortion of the current convertible portion sal_Int32 m_nCurrentEndIndex; // the end index (excluding) within m_sCurrentPortion of the current convertible portion sal_Int32 m_nReplacementBaseIndex;// index which ReplaceUnit-calls need to be relative to sal_Int32 m_nCurrentConversionOption; sal_Int16 m_nCurrentConversionType; - Sequence< ::rtl::OUString > + Sequence< OUString > m_aCurrentSuggestions; // the suggestions for the current unit // (means for the text [m_nCurrentStartIndex, m_nCurrentEndIndex) in m_sCurrentPortion) sal_Bool m_bTryBothDirections; // specifies if other conversion directions should be tried when looking for convertible characters @@ -175,7 +175,7 @@ namespace editeng void implProceed( bool _bRepeatCurrentUnit ); // change the current convertible, and do _not_ proceed - void implChange( const ::rtl::OUString& _rChangeInto ); + void implChange( const OUString& _rChangeInto ); /** find the next convertible piece of text, with possibly advancing to the next portion @@ -218,7 +218,7 @@ namespace editeng /** get the string currently considered to be replaced or ignored */ - ::rtl::OUString GetCurrentUnit() const; + OUString GetCurrentUnit() const; /** read options from configuration, update suggestion list and dialog content */ @@ -412,13 +412,13 @@ namespace editeng //put recently used string to front: if( m_bShowRecentlyUsedFirst && m_aCurrentSuggestions.getLength()>1 ) { - ::rtl::OUString sCurrentUnit( GetCurrentUnit() ); + OUString sCurrentUnit( GetCurrentUnit() ); StringMap::const_iterator aRecentlyUsed = m_aRecentlyUsedList.find( sCurrentUnit ); bool bUsedBefore = aRecentlyUsed != m_aRecentlyUsedList.end(); if( bUsedBefore && m_aCurrentSuggestions[0] != aRecentlyUsed->second ) { sal_Int32 nCount = m_aCurrentSuggestions.getLength(); - Sequence< ::rtl::OUString > aTmp(nCount); + Sequence< OUString > aTmp(nCount); aTmp[0]=aRecentlyUsed->second; sal_Int32 nDiff = 1; for( sal_Int32 n=1; n<nCount; n++)//we had 0 already @@ -475,7 +475,7 @@ namespace editeng { sal_Bool bAllowImplicitChanges = m_eConvType == HHC::eConvSimplifiedTraditional; - m_sCurrentPortion = ::rtl::OUString(); + m_sCurrentPortion = OUString(); m_nCurrentPortionLang = LANGUAGE_NONE; m_pAntiImpl->GetNextPortion( m_sCurrentPortion, m_nCurrentPortionLang, bAllowImplicitChanges ); m_nReplacementBaseIndex = 0; @@ -519,7 +519,7 @@ namespace editeng return sal_False; } - ::rtl::OUString HangulHanjaConversion_Impl::GetCurrentUnit() const + OUString HangulHanjaConversion_Impl::GetCurrentUnit() const { DBG_ASSERT( m_nCurrentStartIndex < m_sCurrentPortion.getLength(), "HangulHanjaConversion_Impl::GetCurrentUnit: invalid index into current portion!" ); @@ -528,7 +528,7 @@ namespace editeng DBG_ASSERT( m_nCurrentStartIndex <= m_nCurrentEndIndex, "HangulHanjaConversion_Impl::GetCurrentUnit: invalid interval!" ); - ::rtl::OUString sCurrentUnit = m_sCurrentPortion.copy( m_nCurrentStartIndex, m_nCurrentEndIndex - m_nCurrentStartIndex ); + OUString sCurrentUnit = m_sCurrentPortion.copy( m_nCurrentStartIndex, m_nCurrentEndIndex - m_nCurrentStartIndex ); return sCurrentUnit; } @@ -539,7 +539,7 @@ namespace editeng while ( !bDocumentDone && !bNeedUserInteraction && implNextConvertible( _bRepeatCurrentUnit ) ) { - ::rtl::OUString sCurrentUnit( GetCurrentUnit() ); + OUString sCurrentUnit( GetCurrentUnit() ); // do we need to ignore it? sal_Bool bAlwaysIgnoreThis = m_sIgnoreList.end() != m_sIgnoreList.find( sCurrentUnit ); @@ -704,7 +704,7 @@ namespace editeng } } - void HangulHanjaConversion_Impl::implChange( const ::rtl::OUString& _rChangeInto ) + void HangulHanjaConversion_Impl::implChange( const OUString& _rChangeInto ) { if( _rChangeInto.isEmpty() ) return; @@ -811,7 +811,7 @@ namespace editeng if(m_pConversionDialog) { - ::rtl::OUString sCurrentUnit( GetCurrentUnit() ); + OUString sCurrentUnit( GetCurrentUnit() ); m_pConversionDialog->SetCurrentString( sCurrentUnit, m_aCurrentSuggestions ); m_pConversionDialog->FocusSuggestion(); @@ -873,8 +873,8 @@ namespace editeng DBG_ASSERT( m_pConversionDialog, "HangulHanjaConversion_Impl::OnChangeAll: no dialog! How this?" ); if ( m_pConversionDialog ) { - ::rtl::OUString sCurrentUnit( m_pConversionDialog->GetCurrentString() ); - ::rtl::OUString sChangeInto( m_pConversionDialog->GetCurrentSuggestion( ) ); + OUString sCurrentUnit( m_pConversionDialog->GetCurrentString() ); + OUString sChangeInto( m_pConversionDialog->GetCurrentSuggestion( ) ); if( !sChangeInto.isEmpty() ) { @@ -916,8 +916,8 @@ namespace editeng { try { - ::rtl::OUString sNewOriginal( m_pConversionDialog->GetCurrentSuggestion( ) ); - Sequence< ::rtl::OUString > aSuggestions; + OUString sNewOriginal( m_pConversionDialog->GetCurrentSuggestion( ) ); + Sequence< OUString > aSuggestions; DBG_ASSERT( m_xConverter.is(), "HangulHanjaConversion_Impl::OnFind: no converter!" ); TextConversionResult aToHanja = m_xConverter->getConversions( diff --git a/editeng/source/misc/splwrap.cxx b/editeng/source/misc/splwrap.cxx index aefd764892cc..6b810985e264 100644 --- a/editeng/source/misc/splwrap.cxx +++ b/editeng/source/misc/splwrap.cxx @@ -163,7 +163,7 @@ SvxSpellWrapper::SvxSpellWrapper( Window* pWn, Reference< beans::XPropertySet > xProp( SvxGetLinguPropertySet() ); sal_Bool bWrapReverse = xProp.is() ? *(sal_Bool*)xProp->getPropertyValue( - ::rtl::OUString(UPN_IS_WRAP_REVERSE) ).getValue() + OUString(UPN_IS_WRAP_REVERSE) ).getValue() : sal_False; bReverse = bRevAllow && bWrapReverse; bStartDone = bOther || ( !bReverse && bStart ); @@ -402,7 +402,7 @@ sal_Bool SvxSpellWrapper::SpellNext( ) Reference< beans::XPropertySet > xProp( SvxGetLinguPropertySet() ); sal_Bool bWrapReverse = xProp.is() ? *(sal_Bool*)xProp->getPropertyValue( - ::rtl::OUString(UPN_IS_WRAP_REVERSE) ).getValue() + OUString(UPN_IS_WRAP_REVERSE) ).getValue() : sal_False; sal_Bool bActRev = bRevAllowed && bWrapReverse; @@ -449,7 +449,7 @@ sal_Bool SvxSpellWrapper::SpellNext( ) { sal_Bool bIsSpellSpecial = xProp.is() ? *(sal_Bool*)xProp->getPropertyValue( - ::rtl::OUString(UPN_IS_SPELL_SPECIAL) ).getValue() + OUString(UPN_IS_SPELL_SPECIAL) ).getValue() : sal_False; // Body area done, ask for special area if( !IsHyphen() && bIsSpellSpecial && HasOtherCnt() ) @@ -561,7 +561,7 @@ sal_Bool SvxSpellWrapper::FindSpellError() { if (IsAllRight() && xAllRightDic.is()) { - xAllRightDic->add( xAlt->getWord(), sal_False, ::rtl::OUString() ); + xAllRightDic->add( xAlt->getWord(), sal_False, OUString() ); } else { diff --git a/editeng/source/misc/svxacorr.cxx b/editeng/source/misc/svxacorr.cxx index fe5981eb5153..96f5b8602470 100644 --- a/editeng/source/misc/svxacorr.cxx +++ b/editeng/source/misc/svxacorr.cxx @@ -421,7 +421,7 @@ sal_Bool SvxAutoCorrect::FnCptlSttWrd( SvxAutoCorrDoc& rDoc, const String& rTxt, } } sal_Unicode cSave = rTxt.GetChar( nSttPos ); - rtl::OUString sChar( cSave ); + OUString sChar( cSave ); sChar = rCC.lowercase( sChar ); if( sChar[0] != cSave && rDoc.ReplaceRange( nSttPos, 1, sChar )) { @@ -482,7 +482,7 @@ sal_Bool SvxAutoCorrect::FnChgOrdinalNumber( uno::Reference< i18n::XOrdinalSuffix > xOrdSuffix = i18n::OrdinalSuffix::create( comphelper::getProcessComponentContext() ); - uno::Sequence< rtl::OUString > aSuffixes = xOrdSuffix->getOrdinalSuffix( nNum, rCC.getLanguageTag().getLocale( ) ); + uno::Sequence< OUString > aSuffixes = xOrdSuffix->getOrdinalSuffix( nNum, rCC.getLanguageTag().getLocale( ) ); for ( sal_Int32 nSuff = 0; nSuff < aSuffixes.getLength(); nSuff++ ) { String sSuffix( aSuffixes[ nSuff ] ); @@ -534,17 +534,17 @@ sal_Bool SvxAutoCorrect::FnChgToEnEmDash( ; // found: " --[<AnySttChars>][A-z0-9] - if( rCC.isLetterNumeric( rtl::OUString(cCh) ) ) + if( rCC.isLetterNumeric( OUString(cCh) ) ) { for( n = nSttPos-1; n && lcl_IsInAsciiArr( sImplEndSkipChars,(cCh = rTxt.GetChar( --n ))); ) ; // found: "[A-z0-9][<AnyEndChars>] --[<AnySttChars>][A-z0-9] - if( rCC.isLetterNumeric( rtl::OUString(cCh) )) + if( rCC.isLetterNumeric( OUString(cCh) )) { rDoc.Delete( nSttPos, nSttPos + 2 ); - rDoc.Insert( nSttPos, bAlwaysUseEmDash ? rtl::OUString(cEmDash) : rtl::OUString(cEnDash) ); + rDoc.Insert( nSttPos, bAlwaysUseEmDash ? OUString(cEmDash) : OUString(cEnDash) ); bRet = sal_True; } } @@ -569,17 +569,17 @@ sal_Bool SvxAutoCorrect::FnChgToEnEmDash( ; // found: " - [<AnySttChars>][A-z0-9] - if( rCC.isLetterNumeric( rtl::OUString(cCh) ) ) + if( rCC.isLetterNumeric( OUString(cCh) ) ) { cCh = ' '; for( n = nTmpPos-1; n && lcl_IsInAsciiArr( sImplEndSkipChars,(cCh = rTxt.GetChar( --n ))); ) ; // found: "[A-z0-9][<AnyEndChars>] - [<AnySttChars>][A-z0-9] - if( rCC.isLetterNumeric( rtl::OUString(cCh) )) + if( rCC.isLetterNumeric( OUString(cCh) )) { rDoc.Delete( nTmpPos, nTmpPos + nLen ); - rDoc.Insert( nTmpPos, bAlwaysUseEmDash ? rtl::OUString(cEmDash) : rtl::OUString(cEnDash) ); + rDoc.Insert( nTmpPos, bAlwaysUseEmDash ? OUString(cEmDash) : OUString(cEnDash) ); bRet = sal_True; } } @@ -603,7 +603,7 @@ sal_Bool SvxAutoCorrect::FnChgToEnEmDash( { nSttPos = nSttPos + nFndPos; rDoc.Delete( nSttPos, nSttPos + 2 ); - rDoc.Insert( nSttPos, (bEnDash ? rtl::OUString(cEnDash) : rtl::OUString(cEmDash)) ); + rDoc.Insert( nSttPos, (bEnDash ? OUString(cEnDash) : OUString(cEmDash)) ); bRet = sal_True; } } @@ -650,7 +650,7 @@ sal_Bool SvxAutoCorrect::FnAddNonBrkSpace( // Check the presence of "://" in the word - xub_StrLen nStrPos = rTxt.Search( rtl::OUString( "://" ), nSttWdPos + 1 ); + xub_StrLen nStrPos = rTxt.Search( OUString( "://" ), nSttWdPos + 1 ); if ( STRING_NOTFOUND == nStrPos && nEndPos > 0 ) { // Check the previous char @@ -672,7 +672,7 @@ sal_Bool SvxAutoCorrect::FnAddNonBrkSpace( // Add the non-breaking space at the end pos if ( bHasSpace ) - rDoc.Insert( nPos, rtl::OUString(CHAR_HARDBLANK) ); + rDoc.Insert( nPos, OUString(CHAR_HARDBLANK) ); bRunNext = true; bRet = true; } @@ -868,7 +868,7 @@ sal_Bool SvxAutoCorrect::FnCptlSttSntnc( SvxAutoCorrDoc& rDoc, if( !pPrevPara ) { // valid separator -> replace - rtl::OUString sChar( *pWordStt ); + OUString sChar( *pWordStt ); sChar = rCC.titlecase(sChar); //see fdo#56740 return !comphelper::string::equals(sChar, *pWordStt) && rDoc.ReplaceRange( xub_StrLen( pWordStt - pStart ), 1, sChar ); @@ -1013,7 +1013,7 @@ sal_Bool SvxAutoCorrect::FnCptlSttSntnc( SvxAutoCorrDoc& rDoc, // check on the basis of the exception list if( pExceptStt ) { - sWord = rtl::OUString(pStr, pExceptStt - pStr + 1); + sWord = OUString(pStr, pExceptStt - pStr + 1); if( FindInCplSttExceptList(eLang, sWord) ) return sal_False; @@ -1043,7 +1043,7 @@ sal_Bool SvxAutoCorrect::FnCptlSttSntnc( SvxAutoCorrDoc& rDoc, // Ok, then replace sal_Unicode cSave = *pWordStt; nSttPos = sal::static_int_cast< xub_StrLen >( pWordStt - rTxt.GetBuffer() ); - rtl::OUString sChar( cSave ); + OUString sChar( cSave ); sChar = rCC.titlecase(sChar); //see fdo#56740 sal_Bool bRet = sChar[0] != cSave && rDoc.ReplaceRange( nSttPos, 1, sChar ); @@ -1072,8 +1072,8 @@ bool SvxAutoCorrect::FnCorrectCapsLock( SvxAutoCorrDoc& rDoc, const String& rTxt return false; String aConverted; - aConverted.Append( rCC.uppercase(rtl::OUString(rTxt.GetChar(nSttPos))) ); - aConverted.Append( rCC.lowercase(rtl::OUString(rTxt.GetChar(nSttPos+1))) ); + aConverted.Append( rCC.uppercase(OUString(rTxt.GetChar(nSttPos))) ); + aConverted.Append( rCC.lowercase(OUString(rTxt.GetChar(nSttPos+1))) ); for (xub_StrLen i = nSttPos+2; i < nEndPos; ++i) { @@ -1083,7 +1083,7 @@ bool SvxAutoCorrect::FnCorrectCapsLock( SvxAutoCorrDoc& rDoc, const String& rTxt if ( IsUpperLetter(rCC.getCharacterType(rTxt, i)) ) // Another uppercase letter. Convert it. - aConverted.Append(rCC.lowercase(rtl::OUString(rTxt.GetChar(i)))); + aConverted.Append(rCC.lowercase(OUString(rTxt.GetChar(i)))); else // This is not an alphabetic letter. Leave it as-is. aConverted.Append(rTxt.GetChar(i)); @@ -1134,13 +1134,13 @@ void SvxAutoCorrect::InsertQuote( SvxAutoCorrDoc& rDoc, xub_StrLen nInsPos, LanguageType eLang = rDoc.GetLanguage( nInsPos, sal_False ); sal_Unicode cRet = GetQuote( cInsChar, bSttQuote, eLang ); - rtl::OUString sChg( cInsChar ); + OUString sChg( cInsChar ); if( bIns ) rDoc.Insert( nInsPos, sChg ); else rDoc.Replace( nInsPos, sChg ); - sChg = rtl::OUString(cRet); + sChg = OUString(cRet); if( '\"' == cInsChar ) { @@ -1154,7 +1154,7 @@ void SvxAutoCorrect::InsertQuote( SvxAutoCorrDoc& rDoc, xub_StrLen nInsPos, case LANGUAGE_FRENCH_SWISS: case LANGUAGE_FRENCH_LUXEMBOURG: { - rtl::OUString s( static_cast< sal_Unicode >(0xA0) ); + OUString s( static_cast< sal_Unicode >(0xA0) ); // UNICODE code for no break space if( rDoc.Insert( bSttQuote ? nInsPos+1 : nInsPos, s )) { @@ -1175,7 +1175,7 @@ String SvxAutoCorrect::GetQuote( SvxAutoCorrDoc& rDoc, xub_StrLen nInsPos, LanguageType eLang = rDoc.GetLanguage( nInsPos, sal_False ); sal_Unicode cRet = GetQuote( cInsChar, bSttQuote, eLang ); - String sRet = rtl::OUString(cRet); + String sRet = OUString(cRet); if( '\"' == cInsChar ) { @@ -1237,9 +1237,9 @@ sal_uLong SvxAutoCorrect::AutoCorrect( SvxAutoCorrDoc& rDoc, const String& rTxt, } if( bInsert ) - rDoc.Insert( nInsPos, rtl::OUString(cChar) ); + rDoc.Insert( nInsPos, OUString(cChar) ); else - rDoc.Replace( nInsPos, rtl::OUString(cChar) ); + rDoc.Replace( nInsPos, OUString(cChar) ); // Hardspaces autocorrection if ( IsAutoCorrFlag( AddNonBrkSpace ) ) @@ -1695,8 +1695,8 @@ static void GeneratePackageName ( const String& rShort, String& rPackageName ) rPackageName = rShort; xub_StrLen nPos = 0; sal_Unicode pDelims[] = { '!', '/', ':', '.', '\\', 0 }; - rtl::OString sByte(rtl::OUStringToOString(rPackageName, RTL_TEXTENCODING_UTF7)); - rPackageName = rtl::OStringToOUString(sByte, RTL_TEXTENCODING_ASCII_US); + OString sByte(OUStringToOString(rPackageName, RTL_TEXTENCODING_UTF7)); + rPackageName = OStringToOUString(sByte, RTL_TEXTENCODING_ASCII_US); while( STRING_NOTFOUND != ( nPos = rPackageName.SearchChar( pDelims, nPos ))) { rPackageName.SetChar( nPos, '_' ); @@ -1825,7 +1825,7 @@ sal_Bool SvxAutoCorrect::FindInWrdSttExceptList( LanguageType eLang, static sal_Bool lcl_FindAbbreviation( const SvStringsISortDtor* pList, const String& sWord) { - String sAbk(rtl::OUString('~')); + String sAbk(OUString('~')); SvStringsISortDtor::const_iterator it = pList->find( &sAbk ); sal_uInt16 nPos = it - pList->begin(); if( nPos < pList->size() ) @@ -2071,7 +2071,7 @@ void SvxAutoCorrectLanguageLists::SaveExceptList_Imp( OUString aMime( "text/xml" ); uno::Any aAny; aAny <<= aMime; - xStrm->SetProperty( rtl::OUString("MediaType"), aAny ); + xStrm->SetProperty( OUString("MediaType"), aAny ); uno::Reference< uno::XComponentContext > xContext = @@ -2330,7 +2330,7 @@ void SvxAutoCorrectLanguageLists::MakeUserStorage_Impl() aDest = INetURLObject ( sUserAutoCorrFile ); if ( SotStorage::IsOLEStorage ( sShareAutoCorrFile ) ) { - aDest.SetExtension ( rtl::OUString("bak") ); + aDest.SetExtension ( OUString("bak") ); bConvert = sal_True; } bCopy = sal_True; @@ -2339,7 +2339,7 @@ void SvxAutoCorrectLanguageLists::MakeUserStorage_Impl() { aSource = INetURLObject ( sUserAutoCorrFile ); aDest = INetURLObject ( sUserAutoCorrFile ); - aDest.SetExtension ( rtl::OUString("bak") ); + aDest.SetExtension ( OUString("bak") ); bCopy = bConvert = sal_True; } if (bCopy) @@ -2426,7 +2426,7 @@ sal_Bool SvxAutoCorrectLanguageLists::MakeBlocklist_Imp( SvStorage& rStg ) { refList->SetSize( 0 ); refList->SetBufferSize( 8192 ); - String aPropName( rtl::OUString( "MediaType" ) ); + String aPropName( OUString( "MediaType" ) ); OUString aMime( "text/xml" ); uno::Any aAny; aAny <<= aMime; @@ -2693,8 +2693,8 @@ bool SvxAutocorrWordList::Insert(SvxAutocorrWord *pWord) { if ( maSet.empty() ) // use the hash { - rtl::OUString aShort( pWord->GetShort() ); - return maHash.insert( std::pair<rtl::OUString, SvxAutocorrWord *>( aShort, pWord ) ).second; + OUString aShort( pWord->GetShort() ); + return maHash.insert( std::pair<OUString, SvxAutocorrWord *>( aShort, pWord ) ).second; } else return maSet.insert( pWord ).second; @@ -2771,7 +2771,7 @@ bool SvxAutocorrWordList::WordMatches(const SvxAutocorrWord *pFnd, { TransliterationWrapper& rCmp = GetIgnoreTranslWrapper(); - rtl::OUString sWord(rTxt.GetBuffer() + nCalcStt, rChk.Len()); + OUString sWord(rTxt.GetBuffer() + nCalcStt, rChk.Len()); if( rCmp.isEqual( rChk, sWord )) { rStt = nCalcStt; diff --git a/editeng/source/misc/swafopt.cxx b/editeng/source/misc/swafopt.cxx index d532f57f9026..d291179f5cac 100644 --- a/editeng/source/misc/swafopt.cxx +++ b/editeng/source/misc/swafopt.cxx @@ -24,7 +24,7 @@ #include <editeng/swafopt.hxx> SvxSwAutoFmtFlags::SvxSwAutoFmtFlags() - : aBulletFont( rtl::OUString("StarSymbol"), + : aBulletFont( OUString("StarSymbol"), Size( 0, 14 ) ) { bAutoCorrect = diff --git a/editeng/source/misc/unolingu.cxx b/editeng/source/misc/unolingu.cxx index 64f65dbe1e59..4a0c2490c2bd 100644 --- a/editeng/source/misc/unolingu.cxx +++ b/editeng/source/misc/unolingu.cxx @@ -103,7 +103,7 @@ public: virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XMeaning > > SAL_CALL - queryMeanings( const ::rtl::OUString& rTerm, + queryMeanings( const OUString& rTerm, const ::com::sun::star::lang::Locale& rLocale, const ::com::sun::star::beans::PropertyValues& rProperties ) throw(::com::sun::star::lang::IllegalArgumentException, @@ -190,7 +190,7 @@ sal_Bool SAL_CALL uno::Sequence< uno::Reference< linguistic2::XMeaning > > SAL_CALL ThesDummy_Impl::queryMeanings( - const rtl::OUString& rTerm, + const OUString& rTerm, const lang::Locale& rLocale, const beans::PropertyValues& rProperties ) throw(lang::IllegalArgumentException, @@ -227,13 +227,13 @@ public: // XSpellChecker1 (same as XSpellChecker but sal_Int16 for language) virtual sal_Bool SAL_CALL - isValid( const ::rtl::OUString& rWord, sal_Int16 nLanguage, + isValid( const OUString& rWord, sal_Int16 nLanguage, const ::com::sun::star::beans::PropertyValues& rProperties ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XSpellAlternatives > SAL_CALL - spell( const ::rtl::OUString& rWord, sal_Int16 nLanguage, + spell( const OUString& rWord, sal_Int16 nLanguage, const ::com::sun::star::beans::PropertyValues& rProperties ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); @@ -275,7 +275,7 @@ sal_Bool SAL_CALL sal_Bool SAL_CALL - SpellDummy_Impl::isValid( const rtl::OUString& rWord, sal_Int16 nLanguage, + SpellDummy_Impl::isValid( const OUString& rWord, sal_Int16 nLanguage, const beans::PropertyValues& rProperties ) throw(lang::IllegalArgumentException, uno::RuntimeException) @@ -289,7 +289,7 @@ sal_Bool SAL_CALL uno::Reference< linguistic2::XSpellAlternatives > SAL_CALL - SpellDummy_Impl::spell( const rtl::OUString& rWord, sal_Int16 nLanguage, + SpellDummy_Impl::spell( const OUString& rWord, sal_Int16 nLanguage, const beans::PropertyValues& rProperties ) throw(lang::IllegalArgumentException, uno::RuntimeException) @@ -326,7 +326,7 @@ public: // XHyphenator virtual ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XHyphenatedWord > SAL_CALL - hyphenate( const ::rtl::OUString& rWord, + hyphenate( const OUString& rWord, const ::com::sun::star::lang::Locale& rLocale, sal_Int16 nMaxLeading, const ::com::sun::star::beans::PropertyValues& rProperties ) @@ -334,7 +334,7 @@ public: ::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XHyphenatedWord > SAL_CALL - queryAlternativeSpelling( const ::rtl::OUString& rWord, + queryAlternativeSpelling( const OUString& rWord, const ::com::sun::star::lang::Locale& rLocale, sal_Int16 nIndex, const ::com::sun::star::beans::PropertyValues& rProperties ) @@ -343,7 +343,7 @@ public: virtual ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XPossibleHyphens > SAL_CALL createPossibleHyphens( - const ::rtl::OUString& rWord, + const OUString& rWord, const ::com::sun::star::lang::Locale& rLocale, const ::com::sun::star::beans::PropertyValues& rProperties ) throw(::com::sun::star::lang::IllegalArgumentException, @@ -387,7 +387,7 @@ sal_Bool SAL_CALL uno::Reference< linguistic2::XHyphenatedWord > SAL_CALL HyphDummy_Impl::hyphenate( - const rtl::OUString& rWord, + const OUString& rWord, const lang::Locale& rLocale, sal_Int16 nMaxLeading, const beans::PropertyValues& rProperties ) @@ -404,7 +404,7 @@ uno::Reference< linguistic2::XHyphenatedWord > SAL_CALL uno::Reference< linguistic2::XHyphenatedWord > SAL_CALL HyphDummy_Impl::queryAlternativeSpelling( - const rtl::OUString& rWord, + const OUString& rWord, const lang::Locale& rLocale, sal_Int16 nIndex, const PropertyValues& rProperties ) @@ -421,7 +421,7 @@ uno::Reference< linguistic2::XHyphenatedWord > SAL_CALL uno::Reference< linguistic2::XPossibleHyphens > SAL_CALL HyphDummy_Impl::createPossibleHyphens( - const rtl::OUString& rWord, + const OUString& rWord, const lang::Locale& rLocale, const beans::PropertyValues& rProperties ) throw(lang::IllegalArgumentException, diff --git a/editeng/source/outliner/outliner.cxx b/editeng/source/outliner/outliner.cxx index f76a5f88b67e..d9adae804867 100644 --- a/editeng/source/outliner/outliner.cxx +++ b/editeng/source/outliner/outliner.cxx @@ -653,7 +653,7 @@ XubString Outliner::CalcFieldValue( const SvxFieldItem& rField, sal_uInt16 nPara { DBG_CHKTHIS(Outliner,0); if ( !aCalcFieldValueHdl.IsSet() ) - return rtl::OUString( ' ' ); + return OUString( ' ' ); EditFieldInfo aFldInfo( this, rField, nPara, nPos ); // The FldColor is preset with COL_LIGHTGRAY. diff --git a/editeng/source/rtf/svxrtf.cxx b/editeng/source/rtf/svxrtf.cxx index e5af0b08ca29..c39dc7b469cd 100644 --- a/editeng/source/rtf/svxrtf.cxx +++ b/editeng/source/rtf/svxrtf.cxx @@ -45,7 +45,7 @@ using namespace ::com::sun::star; static CharSet lcl_GetDefaultTextEncodingForRTF() { - ::rtl::OUString aLangString( Application::GetSettings().GetLanguageTag().getLanguage()); + OUString aLangString( Application::GetSettings().GetLanguageTag().getLanguage()); if ( aLangString == "ru" || aLangString == "uk" ) return RTL_TEXTENCODING_MS_1251; @@ -204,7 +204,7 @@ void SvxRTFParser::NextToken( int nToken ) case RTF_LDBLQUOTE: cCh = 0x201C; goto INSINGLECHAR; case RTF_RDBLQUOTE: cCh = 0x201D; goto INSINGLECHAR; INSINGLECHAR: - aToken = rtl::OUString(cCh); + aToken = OUString(cCh); // no Break, aToken is set as Text case RTF_TEXTTOKEN: { @@ -707,7 +707,7 @@ void SvxRTFParser::ReadInfo( const sal_Char* pChkForVerNo ) break; case RTF_KEYWORDS: { - ::rtl::OUString sTemp = GetTextToEndGroup( sStr ); + OUString sTemp = GetTextToEndGroup( sStr ); m_xDocProps->setKeywords( ::comphelper::string::convertCommaSeparated(sTemp) ); break; diff --git a/editeng/source/uno/unofield.cxx b/editeng/source/uno/unofield.cxx index b7b0a001867e..9aa5b0b2b334 100644 --- a/editeng/source/uno/unofield.cxx +++ b/editeng/source/uno/unofield.cxx @@ -452,7 +452,7 @@ SvxFieldData* SvxUnoTextField::CreateFieldData() const throw() case text::textfield::Type::AUTHOR: { - ::rtl::OUString aContent; + OUString aContent; String aFirstName; String aLastName; String aEmpty; @@ -876,7 +876,7 @@ sal_Bool SAL_CALL SvxUnoTextField::supportsService( const OUString& ServiceName return comphelper::ServiceInfoHelper::supportsService( ServiceName, getSupportedServiceNames() ); } -uno::Reference< uno::XInterface > SAL_CALL SvxUnoTextCreateTextField( const ::rtl::OUString& ServiceSpecifier ) throw(::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException) +uno::Reference< uno::XInterface > SAL_CALL SvxUnoTextCreateTextField( const OUString& ServiceSpecifier ) throw(::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException) { uno::Reference< uno::XInterface > xRet; diff --git a/editeng/source/uno/unonrule.cxx b/editeng/source/uno/unonrule.cxx index 7440ca6af899..a69fdc7be1fd 100644 --- a/editeng/source/uno/unonrule.cxx +++ b/editeng/source/uno/unonrule.cxx @@ -35,7 +35,6 @@ #include <editeng/unonrule.hxx> #include <editeng/editids.hrc> -using ::rtl::OUString; using ::com::sun::star::util::XCloneable; using ::com::sun::star::ucb::XAnyCompare; diff --git a/editeng/source/uno/unopracc.cxx b/editeng/source/uno/unopracc.cxx index 30b35357314d..37600abdfce4 100644 --- a/editeng/source/uno/unopracc.cxx +++ b/editeng/source/uno/unopracc.cxx @@ -129,16 +129,16 @@ uno::Sequence< sal_Int8 > SAL_CALL SvxAccessibleTextPropertySet::getImplementati } // XServiceInfo -::rtl::OUString SAL_CALL SAL_CALL SvxAccessibleTextPropertySet::getImplementationName (void) throw (uno::RuntimeException) +OUString SAL_CALL SAL_CALL SvxAccessibleTextPropertySet::getImplementationName (void) throw (uno::RuntimeException) { - return ::rtl::OUString("SvxAccessibleTextPropertySet"); + return OUString("SvxAccessibleTextPropertySet"); } -sal_Bool SAL_CALL SvxAccessibleTextPropertySet::supportsService (const ::rtl::OUString& sServiceName) throw (uno::RuntimeException) +sal_Bool SAL_CALL SvxAccessibleTextPropertySet::supportsService (const OUString& sServiceName) throw (uno::RuntimeException) { // Iterate over all supported service names and return true if on of them // matches the given name. - uno::Sequence< ::rtl::OUString> aSupportedServices ( + uno::Sequence< OUString> aSupportedServices ( getSupportedServiceNames ()); for (int i=0; i<aSupportedServices.getLength(); i++) if (sServiceName == aSupportedServices[i]) @@ -146,7 +146,7 @@ sal_Bool SAL_CALL SvxAccessibleTextPropertySet::supportsService (const ::rtl::OU return sal_False; } -uno::Sequence< ::rtl::OUString> SAL_CALL SvxAccessibleTextPropertySet::getSupportedServiceNames (void) throw (uno::RuntimeException) +uno::Sequence< OUString> SAL_CALL SvxAccessibleTextPropertySet::getSupportedServiceNames (void) throw (uno::RuntimeException) { // TODO return SvxUnoTextRangeBase::getSupportedServiceNames(); diff --git a/editeng/source/uno/unotext.cxx b/editeng/source/uno/unotext.cxx index 20f73674105b..c29240d0dbe3 100644 --- a/editeng/source/uno/unotext.cxx +++ b/editeng/source/uno/unotext.cxx @@ -88,7 +88,7 @@ const SfxItemPropertyMapEntry* ImplGetSvxTextPortionPropertyMap() SVX_UNOEDIT_OUTLINER_PROPERTIES, SVX_UNOEDIT_PARA_PROPERTIES, {MAP_CHAR_LEN("TextField"), EE_FEATURE_FIELD, &::getCppuType((const uno::Reference< text::XTextField >*)0), beans::PropertyAttribute::READONLY, 0 }, - {MAP_CHAR_LEN("TextPortionType"), WID_PORTIONTYPE, &::getCppuType((const ::rtl::OUString*)0), beans::PropertyAttribute::READONLY, 0 }, + {MAP_CHAR_LEN("TextPortionType"), WID_PORTIONTYPE, &::getCppuType((const OUString*)0), beans::PropertyAttribute::READONLY, 0 }, {MAP_CHAR_LEN("TextUserDefinedAttributes"), EE_CHAR_XMLATTRIBS, &::getCppuType((const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >*)0) , 0, 0}, {MAP_CHAR_LEN("ParaUserDefinedAttributes"), EE_PARA_XMLATTRIBS, &::getCppuType((const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >*)0) , 0, 0}, {0,0,0,0,0,0} @@ -762,12 +762,12 @@ void SAL_CALL SvxUnoTextRangeBase::addVetoableChangeListener( const OUString& , void SAL_CALL SvxUnoTextRangeBase::removeVetoableChangeListener( const OUString& , const uno::Reference< beans::XVetoableChangeListener >& ) throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) {} // XMultiPropertySet -void SAL_CALL SvxUnoTextRangeBase::setPropertyValues( const uno::Sequence< ::rtl::OUString >& aPropertyNames, const uno::Sequence< uno::Any >& aValues ) throw (beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException) +void SAL_CALL SvxUnoTextRangeBase::setPropertyValues( const uno::Sequence< OUString >& aPropertyNames, const uno::Sequence< uno::Any >& aValues ) throw (beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException) { _setPropertyValues( aPropertyNames, aValues, -1 ); } -void SAL_CALL SvxUnoTextRangeBase::_setPropertyValues( const uno::Sequence< ::rtl::OUString >& aPropertyNames, const uno::Sequence< uno::Any >& aValues, sal_Int32 nPara ) throw (beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException) +void SAL_CALL SvxUnoTextRangeBase::_setPropertyValues( const uno::Sequence< OUString >& aPropertyNames, const uno::Sequence< uno::Any >& aValues, sal_Int32 nPara ) throw (beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException) { SolarMutexGuard aGuard; @@ -886,12 +886,12 @@ void SAL_CALL SvxUnoTextRangeBase::_setPropertyValues( const uno::Sequence< ::rt } } -uno::Sequence< uno::Any > SAL_CALL SvxUnoTextRangeBase::getPropertyValues( const uno::Sequence< ::rtl::OUString >& aPropertyNames ) throw (uno::RuntimeException) +uno::Sequence< uno::Any > SAL_CALL SvxUnoTextRangeBase::getPropertyValues( const uno::Sequence< OUString >& aPropertyNames ) throw (uno::RuntimeException) { return _getPropertyValues( aPropertyNames, -1 ); } -uno::Sequence< uno::Any > SAL_CALL SvxUnoTextRangeBase::_getPropertyValues( const uno::Sequence< ::rtl::OUString >& aPropertyNames, sal_Int32 nPara ) throw (uno::RuntimeException) +uno::Sequence< uno::Any > SAL_CALL SvxUnoTextRangeBase::_getPropertyValues( const uno::Sequence< OUString >& aPropertyNames, sal_Int32 nPara ) throw (uno::RuntimeException) { SolarMutexGuard aGuard; @@ -930,7 +930,7 @@ uno::Sequence< uno::Any > SAL_CALL SvxUnoTextRangeBase::_getPropertyValues( cons return aValues; } -void SAL_CALL SvxUnoTextRangeBase::addPropertiesChangeListener( const uno::Sequence< ::rtl::OUString >& , const uno::Reference< beans::XPropertiesChangeListener >& ) throw (uno::RuntimeException) +void SAL_CALL SvxUnoTextRangeBase::addPropertiesChangeListener( const uno::Sequence< OUString >& , const uno::Reference< beans::XPropertiesChangeListener >& ) throw (uno::RuntimeException) { } @@ -938,7 +938,7 @@ void SAL_CALL SvxUnoTextRangeBase::removePropertiesChangeListener( const uno::Re { } -void SAL_CALL SvxUnoTextRangeBase::firePropertiesChangeEvent( const uno::Sequence< ::rtl::OUString >& , const uno::Reference< beans::XPropertiesChangeListener >& ) throw (uno::RuntimeException) +void SAL_CALL SvxUnoTextRangeBase::firePropertiesChangeEvent( const uno::Sequence< OUString >& , const uno::Reference< beans::XPropertiesChangeListener >& ) throw (uno::RuntimeException) { } @@ -1877,7 +1877,7 @@ void SAL_CALL SvxUnoTextBase::insertControlCharacter( const uno::Reference< text { case text::ControlCharacter::PARAGRAPH_BREAK: { - const rtl::OUString aText( (sal_Unicode)13 ); // '\r' does not work on Mac + const OUString aText( (sal_Unicode)13 ); // '\r' does not work on Mac insertString( xRange, aText, bAbsorb ); return; @@ -1928,7 +1928,7 @@ void SAL_CALL SvxUnoTextBase::insertControlCharacter( const uno::Reference< text aRange.nEndPos = aRange.nStartPos; pRange->SetSelection( aRange ); - const rtl::OUString aText( (sal_Unicode)13 ); // '\r' geht auf'm Mac nicht + const OUString aText( (sal_Unicode)13 ); // '\r' geht auf'm Mac nicht pRange->setString( aText ); aRange.nStartPos = 0; @@ -2182,7 +2182,7 @@ uno::Reference< text::XTextRange > SAL_CALL SvxUnoTextBase::finishParagraph( } uno::Reference< text::XTextRange > SAL_CALL SvxUnoTextBase::insertTextPortion( - const ::rtl::OUString& /*rText*/, + const OUString& /*rText*/, const uno::Sequence< beans::PropertyValue >& /*rCharAndParaProps*/, const uno::Reference< text::XTextRange>& /*rTextRange*/ ) throw (lang::IllegalArgumentException, beans::UnknownPropertyException, uno::RuntimeException) @@ -2193,7 +2193,7 @@ uno::Reference< text::XTextRange > SAL_CALL SvxUnoTextBase::insertTextPortion( // com::sun::star::text::XTextPortionAppend (new import API) uno::Reference< text::XTextRange > SAL_CALL SvxUnoTextBase::appendTextPortion( - const ::rtl::OUString& rText, + const OUString& rText, const uno::Sequence< beans::PropertyValue >& rCharAndParaProps ) throw (lang::IllegalArgumentException, beans::UnknownPropertyException, uno::RuntimeException) { diff --git a/editeng/source/uno/unotext2.cxx b/editeng/source/uno/unotext2.cxx index bf18992295e4..c358abd060b4 100644 --- a/editeng/source/uno/unotext2.cxx +++ b/editeng/source/uno/unotext2.cxx @@ -314,28 +314,28 @@ uno::Any SAL_CALL SvxUnoTextContent::getPropertyValue( const OUString& PropertyN } // XMultiPropertySet -void SAL_CALL SvxUnoTextContent::setPropertyValues( const uno::Sequence< ::rtl::OUString >& aPropertyNames, const uno::Sequence< uno::Any >& aValues ) throw (beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException) +void SAL_CALL SvxUnoTextContent::setPropertyValues( const uno::Sequence< OUString >& aPropertyNames, const uno::Sequence< uno::Any >& aValues ) throw (beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException) { _setPropertyValues( aPropertyNames, aValues, mnParagraph ); } -uno::Sequence< uno::Any > SAL_CALL SvxUnoTextContent::getPropertyValues( const uno::Sequence< ::rtl::OUString >& aPropertyNames ) throw (uno::RuntimeException) +uno::Sequence< uno::Any > SAL_CALL SvxUnoTextContent::getPropertyValues( const uno::Sequence< OUString >& aPropertyNames ) throw (uno::RuntimeException) { return _getPropertyValues( aPropertyNames, mnParagraph ); } /*// XTolerantMultiPropertySet -uno::Sequence< beans::SetPropertyTolerantFailed > SAL_CALL SvxUnoTextContent::setPropertyValuesTolerant( const uno::Sequence< ::rtl::OUString >& aPropertyNames, const uno::Sequence< uno::Any >& aValues ) throw (lang::IllegalArgumentException, uno::RuntimeException) +uno::Sequence< beans::SetPropertyTolerantFailed > SAL_CALL SvxUnoTextContent::setPropertyValuesTolerant( const uno::Sequence< OUString >& aPropertyNames, const uno::Sequence< uno::Any >& aValues ) throw (lang::IllegalArgumentException, uno::RuntimeException) { return _setPropertyValuesTolerant(aPropertyNames, aValues, mnParagraph); } -uno::Sequence< beans::GetPropertyTolerantResult > SAL_CALL SvxUnoTextContent::getPropertyValuesTolerant( const uno::Sequence< ::rtl::OUString >& aPropertyNames ) throw (uno::RuntimeException) +uno::Sequence< beans::GetPropertyTolerantResult > SAL_CALL SvxUnoTextContent::getPropertyValuesTolerant( const uno::Sequence< OUString >& aPropertyNames ) throw (uno::RuntimeException) { return _getPropertyValuesTolerant(aPropertyNames, mnParagraph); } -uno::Sequence< beans::GetDirectPropertyTolerantResult > SAL_CALL SvxUnoTextContent::getDirectPropertyValuesTolerant( const uno::Sequence< ::rtl::OUString >& aPropertyNames ) +uno::Sequence< beans::GetDirectPropertyTolerantResult > SAL_CALL SvxUnoTextContent::getDirectPropertyValuesTolerant( const uno::Sequence< OUString >& aPropertyNames ) throw (uno::RuntimeException) { return _getDirectPropertyValuesTolerant(aPropertyNames, mnParagraph); diff --git a/editeng/source/xml/xmltxtexp.cxx b/editeng/source/xml/xmltxtexp.cxx index da42d5ce12e5..de686b38ea9d 100644 --- a/editeng/source/xml/xmltxtexp.cxx +++ b/editeng/source/xml/xmltxtexp.cxx @@ -184,19 +184,19 @@ public: // XMultiServiceFactory - virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstance( const ::rtl::OUString& aServiceSpecifier ) throw(::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstanceWithArguments( const ::rtl::OUString& ServiceSpecifier, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& Arguments ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getAvailableServiceNames( ) throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstance( const OUString& aServiceSpecifier ) throw(::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstanceWithArguments( const OUString& ServiceSpecifier, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& Arguments ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getAvailableServiceNames( ) throw(::com::sun::star::uno::RuntimeException); // XStyleFamiliesSupplier virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > SAL_CALL getStyleFamilies( ) throw(::com::sun::star::uno::RuntimeException); // XAnyCompareFactory - virtual ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XAnyCompare > SAL_CALL createAnyCompareByName( const ::rtl::OUString& PropertyName ) throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XAnyCompare > SAL_CALL createAnyCompareByName( const OUString& PropertyName ) throw(::com::sun::star::uno::RuntimeException); // XModel - virtual sal_Bool SAL_CALL attachResource( const ::rtl::OUString& aURL, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aArgs ) throw (::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getURL( ) throw (::com::sun::star::uno::RuntimeException); + virtual sal_Bool SAL_CALL attachResource( const OUString& aURL, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aArgs ) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getURL( ) throw (::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL getArgs( ) throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL connectController( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XController >& xController ) throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL disconnectController( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XController >& xController ) throw (::com::sun::star::uno::RuntimeException); @@ -244,12 +244,12 @@ uno::Reference< uno::XInterface > SAL_CALL SvxSimpleUnoModel::createInstance( co } -uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL SvxSimpleUnoModel::createInstanceWithArguments( const ::rtl::OUString& ServiceSpecifier, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException) +uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL SvxSimpleUnoModel::createInstanceWithArguments( const OUString& ServiceSpecifier, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException) { return createInstance( ServiceSpecifier ); } -Sequence< ::rtl::OUString > SAL_CALL SvxSimpleUnoModel::getAvailableServiceNames( ) throw(::com::sun::star::uno::RuntimeException) +Sequence< OUString > SAL_CALL SvxSimpleUnoModel::getAvailableServiceNames( ) throw(::com::sun::star::uno::RuntimeException) { Sequence< OUString > aSeq; return aSeq; @@ -272,14 +272,14 @@ uno::Reference< container::XNameAccess > SAL_CALL SvxSimpleUnoModel::getStyleFam } // XModel -sal_Bool SAL_CALL SvxSimpleUnoModel::attachResource( const ::rtl::OUString& aURL, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aArgs ) throw (::com::sun::star::uno::RuntimeException) +sal_Bool SAL_CALL SvxSimpleUnoModel::attachResource( const OUString& aURL, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aArgs ) throw (::com::sun::star::uno::RuntimeException) { (void)aURL; (void)aArgs; return sal_False; } -::rtl::OUString SAL_CALL SvxSimpleUnoModel::getURL( ) throw (::com::sun::star::uno::RuntimeException) +OUString SAL_CALL SvxSimpleUnoModel::getURL( ) throw (::com::sun::star::uno::RuntimeException) { OUString aStr; return aStr; @@ -351,7 +351,7 @@ public: const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > xContext, EditEngine* pEditEngine, const ESelection& rSel, - const ::rtl::OUString& rFileName, + const OUString& rFileName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XDocumentHandler > & xHandler ); ~SvxXMLTextExportComponent(); @@ -372,7 +372,7 @@ SvxXMLTextExportComponent::SvxXMLTextExportComponent( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > xContext, EditEngine* pEditEngine, const ESelection& rSel, - const ::rtl::OUString& rFileName, + const OUString& rFileName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XDocumentHandler > & xHandler) : SvXMLExport( xContext, rFileName, xHandler, ((frame::XModel*)new SvxSimpleUnoModel()), MAP_CM ), maSelection( rSel ) diff --git a/editeng/source/xml/xmltxtimp.cxx b/editeng/source/xml/xmltxtimp.cxx index 81963096b3e1..5220dbfdb624 100644 --- a/editeng/source/xml/xmltxtimp.cxx +++ b/editeng/source/xml/xmltxtimp.cxx @@ -114,7 +114,7 @@ public: virtual ~SvxXMLXTextImportComponent() throw (); - static sal_Bool load( const rtl::OUString& rUrl, const com::sun::star::uno::Reference< com::sun::star::container::XNameContainer >& xTable ) throw(); + static sal_Bool load( const OUString& rUrl, const com::sun::star::uno::Reference< com::sun::star::container::XNameContainer >& xTable ) throw(); protected: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const uno::Reference< XAttributeList >& xAttrList ); |