diff options
Diffstat (limited to 'sc/source/filter')
285 files changed, 2590 insertions, 2772 deletions
diff --git a/sc/source/filter/dif/difexp.cxx b/sc/source/filter/dif/difexp.cxx index a4c225699f25..704edb1a8770 100644 --- a/sc/source/filter/dif/difexp.cxx +++ b/sc/source/filter/dif/difexp.cxx @@ -60,8 +60,8 @@ FltError ScFormatFilterPluginImpl::ScExportDif( SvStream& rOut, ScDocument* pDoc rOut.SetStreamCharSet( eCharSet ); sal_Unicode cStrDelim('"'); - rtl::OString aStrDelimEncoded; // only used if not Unicode - rtl::OUString aStrDelimDecoded; // only used if context encoding + OString aStrDelimEncoded; // only used if not Unicode + OUString aStrDelimDecoded; // only used if context encoding bool bContextOrNotAsciiEncoding; if ( eCharSet == RTL_TEXTENCODING_UNICODE ) { @@ -70,7 +70,7 @@ FltError ScFormatFilterPluginImpl::ScExportDif( SvStream& rOut, ScDocument* pDoc } else { - aStrDelimEncoded = rtl::OString(&cStrDelim, 1, eCharSet); + aStrDelimEncoded = OString(&cStrDelim, 1, eCharSet); rtl_TextEncodingInfo aInfo; aInfo.StructSize = sizeof(aInfo); if ( rtl_getTextEncodingInfo( eCharSet, &aInfo ) ) @@ -79,7 +79,7 @@ FltError ScFormatFilterPluginImpl::ScExportDif( SvStream& rOut, ScDocument* pDoc (((aInfo.Flags & RTL_TEXTENCODING_INFO_CONTEXT) != 0) || ((aInfo.Flags & RTL_TEXTENCODING_INFO_ASCII) == 0)); if ( bContextOrNotAsciiEncoding ) - aStrDelimDecoded = rtl::OStringToOUString(aStrDelimEncoded, eCharSet); + aStrDelimDecoded = OStringToOUString(aStrDelimEncoded, eCharSet); } else bContextOrNotAsciiEncoding = false; @@ -93,8 +93,8 @@ FltError ScFormatFilterPluginImpl::ScExportDif( SvStream& rOut, ScDocument* pDoc const sal_Char* pNumDataERROR = "0,0\nERROR\n"; FltError eRet = eERR_OK; - rtl::OUStringBuffer aOS; - rtl::OUString aString; + OUStringBuffer aOS; + OUString aString; SCCOL nEndCol = rRange.aEnd.Col(); SCROW nEndRow = rRange.aEnd.Row(); SCCOL nNumCols = nEndCol - rRange.aStart.Col() + 1; @@ -243,14 +243,14 @@ FltError ScFormatFilterPluginImpl::ScExportDif( SvStream& rOut, ScDocument* pDoc else if ( bContextOrNotAsciiEncoding ) { // to byte encoding - rtl::OString aStrEnc = rtl::OUStringToOString(aTmpStr, eCharSet); + OString aStrEnc = OUStringToOString(aTmpStr, eCharSet); // back to Unicode - rtl::OUString aStrDec = rtl::OStringToOUString(aStrEnc, eCharSet); + OUString aStrDec = OStringToOUString(aStrEnc, eCharSet); // search on re-decoded string sal_Int32 nPos = aStrDec.indexOf(aStrDelimDecoded); while (nPos >= 0) { - rtl::OUStringBuffer aBuf(aStrDec); + OUStringBuffer aBuf(aStrDec); aBuf.insert(nPos, aStrDelimDecoded); aStrDec = aBuf.makeStringAndClear(); nPos = aStrDec.indexOf( @@ -263,12 +263,12 @@ FltError ScFormatFilterPluginImpl::ScExportDif( SvStream& rOut, ScDocument* pDoc } else { - rtl::OString aStrEnc = rtl::OUStringToOString(aTmpStr, eCharSet); + OString aStrEnc = OUStringToOString(aTmpStr, eCharSet); // search on encoded string sal_Int32 nPos = aStrEnc.indexOf(aStrDelimEncoded); while (nPos >= 0) { - rtl::OStringBuffer aBuf(aStrEnc); + OStringBuffer aBuf(aStrEnc); aBuf.insert(nPos, aStrDelimEncoded); aStrEnc = aBuf.makeStringAndClear(); nPos = aStrEnc.indexOf( diff --git a/sc/source/filter/dif/difimp.cxx b/sc/source/filter/dif/difimp.cxx index 7e2ae9dc1a4d..734253a6de93 100644 --- a/sc/source/filter/dif/difimp.cxx +++ b/sc/source/filter/dif/difimp.cxx @@ -61,7 +61,7 @@ FltError ScFormatFilterPluginImpl::ScImportDif( SvStream& rIn, ScDocument* pDoc, bool bSyntErrWarn = false; bool bOverflowWarn = false; - rtl::OUString aData = aDifParser.aData; + OUString aData = aDifParser.aData; bool bData = false; rIn.Seek( 0 ); @@ -308,7 +308,7 @@ TOPIC DifParser::GetNextTopic( void ) }; STATE eS = S_START; - rtl::OUString aLine; + OUString aLine; nVector = 0; nVal = 0; @@ -430,7 +430,7 @@ DATASET DifParser::GetNumberDataset( const sal_Unicode* pPossibleNumericData ) else { // ...und zur Strafe mit'm Numberformatter... OSL_ENSURE( pNumFormatter, "-DifParser::GetNextDataset(): No Formatter, more fun!" ); - rtl::OUString aTestVal( pPossibleNumericData ); + OUString aTestVal( pPossibleNumericData ); sal_uInt32 nFormat = 0; double fTmpVal; if( pNumFormatter->IsNumberFormat( aTestVal, nFormat, fTmpVal ) ) @@ -445,7 +445,7 @@ DATASET DifParser::GetNumberDataset( const sal_Unicode* pPossibleNumericData ) return eRet; } -bool DifParser::ReadNextLine( rtl::OUString& rStr ) +bool DifParser::ReadNextLine( OUString& rStr ) { if( aLookAheadLine.isEmpty() ) { @@ -454,7 +454,7 @@ bool DifParser::ReadNextLine( rtl::OUString& rStr ) else { rStr = aLookAheadLine; - aLookAheadLine = rtl::OUString(); + aLookAheadLine = OUString(); return true; } } @@ -502,7 +502,7 @@ bool DifParser::LookAhead() DATASET DifParser::GetNextDataset( void ) { DATASET eRet = D_UNKNOWN; - rtl::OUString aLine; + OUString aLine; const sal_Unicode* pAktBuffer; ReadNextLine( aLine ); @@ -529,7 +529,7 @@ DATASET DifParser::GetNextDataset( void ) { pAktBuffer++; eRet = GetNumberDataset(pAktBuffer); - rtl::OUString aTmpLine; + OUString aTmpLine; ReadNextLine( aTmpLine ); if ( eRet == D_SYNT_ERROR ) { // for broken records write "#ERR: data" to cell diff --git a/sc/source/filter/excel/excdoc.cxx b/sc/source/filter/excel/excdoc.cxx index 5ac3c6063d29..a6571ab729a5 100644 --- a/sc/source/filter/excel/excdoc.cxx +++ b/sc/source/filter/excel/excdoc.cxx @@ -76,7 +76,6 @@ #include <oox/token/tokens.hxx> #include <boost/shared_ptr.hpp> -using ::rtl::OString; using namespace oox; static String lcl_GetVbaTabName( SCTAB n ) @@ -180,7 +179,7 @@ void ExcTable::FillAsHeader( ExcBoundsheetList& rBoundsheetList ) Add( new ExcBofW8 ); SCTAB nC; - rtl::OUString aTmpString; + OUString aTmpString; SCTAB nScTabCount = rTabInfo.GetScTabCount(); sal_uInt16 nExcTabCount = rTabInfo.GetXclTabCount(); sal_uInt16 nCodenames = static_cast< sal_uInt16 >( GetExtDocOptions().GetCodeNameCount() ); @@ -425,7 +424,7 @@ void ExcTable::FillAsTable( SCTAB nCodeNameIdx ) // notes const ScPostIt* pScNote = itr->second; ScAddress aScPos( itr->first.first, itr->first.second, mnScTab ); - mxNoteList->AppendNewRecord( new XclExpNote( GetRoot(), aScPos, pScNote, rtl::OUString() ) ); + mxNoteList->AppendNewRecord( new XclExpNote( GetRoot(), aScPos, pScNote, OUString() ) ); } if( GetOutput() != EXC_OUTPUT_BINARY ) diff --git a/sc/source/filter/excel/excform8.cxx b/sc/source/filter/excel/excform8.cxx index 5007456fcd36..e288d8326b43 100644 --- a/sc/source/filter/excel/excform8.cxx +++ b/sc/source/filter/excel/excform8.cxx @@ -33,8 +33,6 @@ #include <vector> #include <cstring> -using ::rtl::OUString; -using ::rtl::OUStringBuffer; using ::std::vector; namespace { diff --git a/sc/source/filter/excel/excimp8.cxx b/sc/source/filter/excel/excimp8.cxx index 59f93976b2e7..8ac6a11ab531 100644 --- a/sc/source/filter/excel/excimp8.cxx +++ b/sc/source/filter/excel/excimp8.cxx @@ -106,7 +106,6 @@ using namespace com::sun::star; using namespace ::comphelper; -using ::rtl::OUString; //OleNameOverrideContainer @@ -115,8 +114,8 @@ typedef ::cppu::WeakImplHelper1< container::XNameContainer > OleNameOverrideCont class OleNameOverrideContainer : public OleNameOverrideContainer_BASE { private: - typedef boost::unordered_map< rtl::OUString, uno::Reference< container::XIndexContainer >, ::rtl::OUStringHash, - ::std::equal_to< ::rtl::OUString > > NamedIndexToOleName; + typedef boost::unordered_map< OUString, uno::Reference< container::XIndexContainer >, OUStringHash, + ::std::equal_to< OUString > > NamedIndexToOleName; NamedIndexToOleName IdToOleNameHash; ::osl::Mutex m_aMutex; public: @@ -128,25 +127,25 @@ public: return ( IdToOleNameHash.size() > 0 ); } // XNameAcess - virtual uno::Any SAL_CALL getByName( const ::rtl::OUString& aName ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException) + virtual uno::Any SAL_CALL getByName( const OUString& aName ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); if ( !hasByName(aName) ) throw container::NoSuchElementException(); return uno::makeAny( IdToOleNameHash[ aName ] ); } - virtual uno::Sequence< ::rtl::OUString > SAL_CALL getElementNames( ) throw (uno::RuntimeException) + virtual uno::Sequence< OUString > SAL_CALL getElementNames( ) throw (uno::RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); - uno::Sequence< ::rtl::OUString > aResult( IdToOleNameHash.size() ); + uno::Sequence< OUString > aResult( IdToOleNameHash.size() ); NamedIndexToOleName::iterator it = IdToOleNameHash.begin(); NamedIndexToOleName::iterator it_end = IdToOleNameHash.end(); - rtl::OUString* pName = aResult.getArray(); + OUString* pName = aResult.getArray(); for (; it != it_end; ++it, ++pName ) *pName = it->first; return aResult; } - virtual ::sal_Bool SAL_CALL hasByName( const ::rtl::OUString& aName ) throw (uno::RuntimeException) + virtual ::sal_Bool SAL_CALL hasByName( const OUString& aName ) throw (uno::RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); return ( IdToOleNameHash.find( aName ) != IdToOleNameHash.end() ); @@ -159,7 +158,7 @@ public: return IdToOleNameHash.size(); } // XNameContainer - virtual void SAL_CALL insertByName( const ::rtl::OUString& aName, const uno::Any& aElement ) throw(lang::IllegalArgumentException, container::ElementExistException, lang::WrappedTargetException, uno::RuntimeException) + virtual void SAL_CALL insertByName( const OUString& aName, const uno::Any& aElement ) throw(lang::IllegalArgumentException, container::ElementExistException, lang::WrappedTargetException, uno::RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); if ( hasByName( aName ) ) @@ -169,14 +168,14 @@ public: throw lang::IllegalArgumentException(); IdToOleNameHash[ aName ] = xElement; } - virtual void SAL_CALL removeByName( const ::rtl::OUString& aName ) throw(container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException) + virtual void SAL_CALL removeByName( const OUString& aName ) throw(container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); if ( !hasByName( aName ) ) throw container::NoSuchElementException(); IdToOleNameHash.erase( IdToOleNameHash.find( aName ) ); } - virtual void SAL_CALL replaceByName( const ::rtl::OUString& aName, const uno::Any& aElement ) throw(lang::IllegalArgumentException, container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException) + virtual void SAL_CALL replaceByName( const OUString& aName, const uno::Any& aElement ) throw(lang::IllegalArgumentException, container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); if ( !hasByName( aName ) ) @@ -244,7 +243,7 @@ void ImportExcel8::Boundsheet( void ) aIn.EnableDecryption(); aIn >> nGrbit >> nLen; - rtl::OUString aName( aIn.ReadUniString( nLen ) ); + OUString aName( aIn.ReadUniString( nLen ) ); GetTabInfo().AppendXclTabName( aName, nBdshtTab ); SCTAB nScTab = static_cast< SCTAB >( nBdshtTab ); @@ -477,7 +476,7 @@ XclImpAutoFilterData::XclImpAutoFilterData( RootData* pRoot, const ScRange& rRan } -void XclImpAutoFilterData::CreateFromDouble( rtl::OUString& rStr, double fVal ) +void XclImpAutoFilterData::CreateFromDouble( OUString& rStr, double fVal ) { rStr += ::rtl::math::doubleToUString(fVal, rtl_math_StringFormat_Automatic, rtl_math_DecimalPlaces_Max, @@ -633,7 +632,7 @@ void XclImpAutoFilterData::ReadAutoFilter( XclImpStream& rStrm ) rStrm.Ignore( 4 ); rStrm >> nStrLen[ nE ]; rStrm.Ignore( 3 ); - rItem.maString = rtl::OUString(); + rItem.maString = OUString(); break; case EXC_AFTYPE_BOOLERR: rStrm >> nBoolErr >> nVal; @@ -765,7 +764,7 @@ void XclImpAutoFilterData::CreateScDBData() if( bActive || bCriteria) { ScDocument* pDoc = pExcRoot->pIR->GetDocPtr(); - String aNewName = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(STR_DB_LOCAL_NONAME)); + String aNewName = OUString(RTL_CONSTASCII_USTRINGPARAM(STR_DB_LOCAL_NONAME)); pCurrDBData = new ScDBData(aNewName , Tab(), StartCol(),StartRow(), EndCol(),EndRow() ); if(bCriteria) diff --git a/sc/source/filter/excel/excrecds.cxx b/sc/source/filter/excel/excrecds.cxx index d788b2dfe914..91a5bc10cdc4 100644 --- a/sc/source/filter/excel/excrecds.cxx +++ b/sc/source/filter/excel/excrecds.cxx @@ -83,7 +83,6 @@ using namespace ::oox; using ::com::sun::star::uno::Sequence; -using ::rtl::OString; //--------------------------------------------------------- class ExcDummy_00 - const sal_uInt8 ExcDummy_00::pMyData[] = { @@ -392,9 +391,9 @@ sal_uInt16 ExcBundlesheetBase::GetNum( void ) const ExcBundlesheet::ExcBundlesheet( RootData& rRootData, SCTAB _nTab ) : ExcBundlesheetBase( rRootData, _nTab ) { - rtl::OUString sTabName = rRootData.pER->GetTabInfo().GetScTabName( _nTab ); + OUString sTabName = rRootData.pER->GetTabInfo().GetScTabName( _nTab ); OSL_ENSURE( sTabName.getLength() < 256, "ExcBundlesheet::ExcBundlesheet - table name too long" ); - aName = rtl::OUStringToOString(sTabName, rRootData.pER->GetTextEncoding()); + aName = OUStringToOString(sTabName, rRootData.pER->GetTextEncoding()); } @@ -678,7 +677,7 @@ bool XclExpAutofilter::AddEntry( const ScQueryEntry& rEntry ) bool bConflict = false; String sText; const ScQueryEntry::Item& rItem = rItems[0]; - const rtl::OUString& rQueryStr = rItem.maString; + const OUString& rQueryStr = rItem.maString; if (!rQueryStr.isEmpty()) { sText.Assign(rQueryStr); @@ -841,10 +840,10 @@ void XclExpAutofilter::SaveXml( XclExpXmlStream& rStrm ) case MultiValue: { rWorksheet->startElement(XML_filters, FSEND); - std::vector<rtl::OUString>::const_iterator itr = maMultiValues.begin(), itrEnd = maMultiValues.end(); + std::vector<OUString>::const_iterator itr = maMultiValues.begin(), itrEnd = maMultiValues.end(); for (; itr != itrEnd; ++itr) { - const char* pz = rtl::OUStringToOString(*itr, RTL_TEXTENCODING_UTF8).getStr(); + const char* pz = OUStringToOString(*itr, RTL_TEXTENCODING_UTF8).getStr(); rWorksheet->singleElement(XML_filter, XML_val, pz, FSEND); } rWorksheet->endElement(XML_filters); diff --git a/sc/source/filter/excel/expop2.cxx b/sc/source/filter/excel/expop2.cxx index a3b0d6b28119..cab727e8b279 100644 --- a/sc/source/filter/excel/expop2.cxx +++ b/sc/source/filter/excel/expop2.cxx @@ -80,7 +80,7 @@ FltError ExportBiff5::Write() SvxImportMSVBasic aBasicImport( *pDocShell, *xRootStrg ); sal_uLong nErr = aBasicImport.SaveOrDelMSVBAStorage( sal_True, EXC_STORAGE_VBA_PROJECT ); if( nErr != ERRCODE_NONE ) - pDocShell->SetError( nErr, ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ) ); + pDocShell->SetError( nErr, OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ) ); } pExcDoc->ReadDoc(); // ScDoc -> ExcDoc diff --git a/sc/source/filter/excel/impop.cxx b/sc/source/filter/excel/impop.cxx index b7ac26ce9d07..1c128616f53e 100644 --- a/sc/source/filter/excel/impop.cxx +++ b/sc/source/filter/excel/impop.cxx @@ -713,7 +713,7 @@ void ImportExcel::Boundsheet( void ) aIn >> nGrbit; } - rtl::OUString aName( aIn.ReadByteString( false ) ); + OUString aName( aIn.ReadByteString( false ) ); SCTAB nScTab = static_cast< SCTAB >( nBdshtTab ); if( nScTab > 0 ) diff --git a/sc/source/filter/excel/read.cxx b/sc/source/filter/excel/read.cxx index 8ffa93580ac2..a611374e61b0 100644 --- a/sc/source/filter/excel/read.cxx +++ b/sc/source/filter/excel/read.cxx @@ -825,7 +825,7 @@ FltError ImportExcel8::Read( void ) bool bSheetHasCodeName = false; - std::vector<rtl::OUString> aCodeNames; + std::vector<OUString> aCodeNames; std::vector < SCTAB > nTabsWithNoCodeName; while( eAkt != EXC_STATE_END ) @@ -1104,7 +1104,7 @@ FltError ImportExcel8::Read( void ) case 0x0A: // EOF [ 2345 ] { eAkt = EXC_STATE_SHEET; - rtl::OUString sName; + OUString sName; GetDoc().GetName( GetCurrScTab(), sName ); if ( !bSheetHasCodeName ) { @@ -1113,10 +1113,10 @@ FltError ImportExcel8::Read( void ) } else { - rtl::OUString sCodeName; + OUString sCodeName; GetDoc().GetCodeName( GetCurrScTab(), sCodeName ); OSL_TRACE("Have CodeName %s for SheetName %s", - rtl::OUStringToOString( sCodeName, RTL_TEXTENCODING_UTF8 ).getStr(), rtl::OUStringToOString( sName, RTL_TEXTENCODING_UTF8 ).getStr() ); + OUStringToOString( sCodeName, RTL_TEXTENCODING_UTF8 ).getStr(), OUStringToOString( sName, RTL_TEXTENCODING_UTF8 ).getStr() ); aCodeNames.push_back( sCodeName ); } @@ -1252,12 +1252,12 @@ FltError ImportExcel8::Read( void ) OSL_TRACE("Trying to find suitable codename for %d", *it ); while ( true ) { - rtl::OUStringBuffer aBuf; + OUStringBuffer aBuf; aBuf.appendAscii("Sheet"); aBuf.append(static_cast<sal_Int32>(nTab++)); - rtl::OUString sTmpName = aBuf.makeStringAndClear(); - std::vector<rtl::OUString>::iterator codeName_It = aCodeNames.begin(); - std::vector<rtl::OUString>::iterator codeName_It_end = aCodeNames.end(); + OUString sTmpName = aBuf.makeStringAndClear(); + std::vector<OUString>::iterator codeName_It = aCodeNames.begin(); + std::vector<OUString>::iterator codeName_It_end = aCodeNames.end(); // search for codename for ( ; codeName_It != codeName_It_end; ++codeName_It ) { @@ -1267,7 +1267,7 @@ FltError ImportExcel8::Read( void ) if ( codeName_It == codeName_It_end ) // generated codename not found { - OSL_TRACE("Using generated codename %s", rtl::OUStringToOString( sTmpName, RTL_TEXTENCODING_UTF8 ).getStr() ); + OSL_TRACE("Using generated codename %s", OUStringToOString( sTmpName, RTL_TEXTENCODING_UTF8 ).getStr() ); // Set new codename GetDoc().SetCodeName( *it, sTmpName ); // Record newly used codename diff --git a/sc/source/filter/excel/xechart.cxx b/sc/source/filter/excel/xechart.cxx index 56afd712f7b1..2df9da410f56 100644 --- a/sc/source/filter/excel/xechart.cxx +++ b/sc/source/filter/excel/xechart.cxx @@ -70,7 +70,6 @@ #include "xepage.hxx" #include "xestyle.hxx" -using ::rtl::OUString; using ::com::sun::star::uno::Any; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Sequence; @@ -1146,7 +1145,7 @@ void XclExpChFrLabelProps::Convert( const ScfPropertySet& rPropSet, bool bShowSe // label value separator maData.maSeparator = rPropSet.GetStringProperty( EXC_CHPROP_LABELSEPARATOR ); if( maData.maSeparator.isEmpty() ) - maData.maSeparator = rtl::OUString(' '); + maData.maSeparator = OUString(' '); } void XclExpChFrLabelProps::WriteBody( XclExpStream& rStrm ) @@ -1229,7 +1228,7 @@ void XclExpChText::ConvertTitle( Reference< XTitle > xTitle, sal_uInt16 nTarget, if (pSubTitle) { // append subtitle as the 2nd line of the title. - String aSubTitle = rtl::OUString("\n"); + String aSubTitle = OUString("\n"); aSubTitle.Append(*pSubTitle); mxSrcLink->AppendString(aSubTitle); } diff --git a/sc/source/filter/excel/xecontent.cxx b/sc/source/filter/excel/xecontent.cxx index 7ad587475cce..63a4e907ffb0 100644 --- a/sc/source/filter/excel/xecontent.cxx +++ b/sc/source/filter/excel/xecontent.cxx @@ -58,9 +58,6 @@ using ::com::sun::star::frame::XModel; using ::com::sun::star::table::CellRangeAddress; using ::com::sun::star::sheet::XAreaLinks; using ::com::sun::star::sheet::XAreaLink; -using ::rtl::OString; -using ::rtl::OUString; -using ::rtl::OUStringBuffer; // Shared string table ======================================================== @@ -367,7 +364,7 @@ XclExpHyperlink::XclExpHyperlink( const XclExpRoot& rRoot, const SvxURLField& rU { // #n382718# (and #n261623#) Convert smb notation to '\\' aFileName = aUrlObj.GetMainURL( INetURLObject::NO_DECODE ); - aFileName = rtl::OUString( aFileName.GetBuffer() + 4 ); // skip the 'smb:' part + aFileName = OUString( aFileName.GetBuffer() + 4 ); // skip the 'smb:' part aFileName.SearchAndReplaceAll( '/', '\\' ); } @@ -375,7 +372,7 @@ XclExpHyperlink::XclExpHyperlink( const XclExpRoot& rRoot, const SvxURLField& rU mnFlags |= EXC_HLINK_ABS; mnFlags |= EXC_HLINK_BODY; - rtl::OString aAsciiLink(rtl::OUStringToOString(aFileName, + OString aAsciiLink(OUStringToOString(aFileName, rRoot.GetTextEncoding())); XclExpString aLink( aFileName, EXC_STR_FORCEUNICODE, 255 ); aXclStrm << XclTools::maGuidFileMoniker @@ -903,14 +900,14 @@ void XclExpCFImpl::SaveXml( XclExpXmlStream& rStrm ) || eOperation == SC_COND_BOTTOM_PERCENT; sal_Int32 nPercent = eOperation == SC_COND_TOP_PERCENT || eOperation == SC_COND_BOTTOM_PERCENT; - rtl::OString aRank("0"); + OString aRank("0"); if(IsTopBottomRule(eOperation)) { // position and formula grammar are not important // we only store a number there aRank = XclXmlUtils::ToOString(mrFormatEntry.GetExpression(ScAddress(0,0,0), 0)); } - rtl::OString aText; + OString aText; if(IsTextRule(eOperation)) { // we need to write the text without quotes @@ -1049,7 +1046,7 @@ XclExpCfvo::XclExpCfvo(const XclExpRoot& rRoot, const ScColorScaleEntry& rEntry, namespace { -rtl::OString getColorScaleType( const ScColorScaleEntry& rEntry, bool bFirst ) +OString getColorScaleType( const ScColorScaleEntry& rEntry, bool bFirst ) { switch(rEntry.GetType()) { @@ -1081,12 +1078,12 @@ void XclExpCfvo::SaveXml( XclExpXmlStream& rStrm ) { sax_fastparser::FSHelperPtr& rWorksheet = rStrm.GetCurrentStream(); - rtl::OString aValue; + OString aValue; if(mrEntry.GetType() == COLORSCALE_FORMULA) { - rtl::OUString aFormula = XclXmlUtils::ToOUString( GetRoot().GetDoc(), maSrcPos, + OUString aFormula = XclXmlUtils::ToOUString( GetRoot().GetDoc(), maSrcPos, mrEntry.GetFormula()->Clone(), GetRoot().GetOpCodeMap() ); - aValue = rtl::OUStringToOString(aFormula, RTL_TEXTENCODING_UTF8 ); + aValue = OUStringToOString(aFormula, RTL_TEXTENCODING_UTF8 ); } else { @@ -1238,17 +1235,17 @@ void XclExpColorScale::SaveXml( XclExpXmlStream& rStrm ) namespace { -rtl::OString createHexStringFromDigit(sal_uInt8 nDigit) +OString createHexStringFromDigit(sal_uInt8 nDigit) { - rtl::OString aString = rtl::OString::valueOf( static_cast<sal_Int32>(nDigit), 16 ); + OString aString = OString::valueOf( static_cast<sal_Int32>(nDigit), 16 ); if(aString.getLength() == 1) aString = aString + OString::number(0); return aString; } -rtl::OString createGuidStringFromInt(sal_uInt8 nGuid[16]) +OString createGuidStringFromInt(sal_uInt8 nGuid[16]) { - rtl::OStringBuffer aBuffer; + OStringBuffer aBuffer; aBuffer.append('{'); for(size_t i = 0; i < 16; ++i) { @@ -1257,7 +1254,7 @@ rtl::OString createGuidStringFromInt(sal_uInt8 nGuid[16]) aBuffer.append('-'); } aBuffer.append('}'); - rtl::OString aString = aBuffer.makeStringAndClear(); + OString aString = aBuffer.makeStringAndClear(); return aString.toAsciiUpperCase(); } @@ -1570,7 +1567,7 @@ XclExpDV::XclExpDV( const XclExpRoot& rRoot, sal_uLong nScHandle ) : String aToken( aString.GetToken( 0, '\n', nStringIx ) ); if( nToken > 0 ) { - mxString1->Append(rtl::OUString(static_cast<sal_Unicode>('\0'))); + mxString1->Append(OUString(static_cast<sal_Unicode>('\0'))); sFormulaBuf.append( (sal_Unicode) ',' ); } mxString1->Append( aToken ); diff --git a/sc/source/filter/excel/xeescher.cxx b/sc/source/filter/excel/xeescher.cxx index 4221d0c40e90..6a18478e9e30 100644 --- a/sc/source/filter/excel/xeescher.cxx +++ b/sc/source/filter/excel/xeescher.cxx @@ -80,9 +80,6 @@ #include <oox/export/utils.hxx> #include <boost/shared_ptr.hpp> -using ::rtl::OString; -using ::rtl::OUString; -using ::rtl::OUStringBuffer; using ::com::sun::star::uno::UNO_QUERY; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Sequence; @@ -1225,7 +1222,7 @@ XclExpNote::XclExpNote( const XclExpRoot& rRoot, const ScAddress& rScPos, switch( rRoot.GetBiff() ) { case EXC_BIFF5: - maNoteText = rtl::OUStringToOString(aNoteText, rRoot.GetTextEncoding()); + maNoteText = OUStringToOString(aNoteText, rRoot.GetTextEncoding()); break; case EXC_BIFF8: @@ -1410,7 +1407,7 @@ XclMacroHelper::SetMacroLink( const ScriptEventDescriptor& rEvent, const XclTbxE bool XclMacroHelper::SetMacroLink( const String& rMacroName ) { - OSL_TRACE("SetMacroLink( macroname:=%s )", rtl::OUStringToOString( rMacroName, RTL_TEXTENCODING_UTF8 ).getStr() ); + OSL_TRACE("SetMacroLink( macroname:=%s )", OUStringToOString( rMacroName, RTL_TEXTENCODING_UTF8 ).getStr() ); if( rMacroName.Len() ) { sal_uInt16 nExtSheet = GetLocalLinkManager().FindExtSheet( EXC_EXTSH_OWNDOC ); diff --git a/sc/source/filter/excel/xeextlst.cxx b/sc/source/filter/excel/xeextlst.cxx index c4ba7df17a18..58594fe01a13 100644 --- a/sc/source/filter/excel/xeextlst.cxx +++ b/sc/source/filter/excel/xeextlst.cxx @@ -59,16 +59,16 @@ XclExpExtCfvo::XclExpExtCfvo( const XclExpRoot& rRoot, const ScColorScaleEntry& if( rEntry.GetType() == COLORSCALE_FORMULA ) { const ScTokenArray* pArr = rEntry.GetFormula(); - rtl::OUString aFormula; + OUString aFormula; if(pArr) { aFormula = XclXmlUtils::ToOUString( GetRoot().GetDoc(), rSrcPos, pArr->Clone(), GetRoot().GetOpCodeMap() ); } - maValue = rtl::OUStringToOString(aFormula, RTL_TEXTENCODING_UTF8 ); + maValue = OUStringToOString(aFormula, RTL_TEXTENCODING_UTF8 ); } else - maValue = rtl::OString::valueOf(rEntry.GetValue()); + maValue = OString::valueOf(rEntry.GetValue()); } namespace { @@ -159,7 +159,7 @@ void XclExpExtDataBar::SaveXml( XclExpXmlStream& rStrm ) rWorksheet->endElementNS( XML_x14, XML_dataBar ); } -XclExpExtCfRule::XclExpExtCfRule( const XclExpRoot& rRoot, const ScDataBarFormat& rFormat, const ScAddress& rPos, const rtl::OString& rId ): +XclExpExtCfRule::XclExpExtCfRule( const XclExpRoot& rRoot, const ScDataBarFormat& rFormat, const ScAddress& rPos, const OString& rId ): XclExpRoot(rRoot), maId(rId) { @@ -180,7 +180,7 @@ void XclExpExtCfRule::SaveXml( XclExpXmlStream& rStrm ) } -XclExpExtConditionalFormatting::XclExpExtConditionalFormatting( const XclExpRoot& rRoot, const ScDataBarFormat& rFormat, const ScAddress& rPos, const rtl::OString& rId ): +XclExpExtConditionalFormatting::XclExpExtConditionalFormatting( const XclExpRoot& rRoot, const ScDataBarFormat& rFormat, const ScAddress& rPos, const OString& rId ): XclExpRoot(rRoot) { maCfRule.reset( new XclExpExtCfRule( *this, rFormat, rPos, rId ) ); @@ -206,7 +206,7 @@ void XclExpExtConditionalFormatting::SaveXml( XclExpXmlStream& rStrm ) XclExpExtCondFormat::XclExpExtCondFormat( const XclExpRoot& rRoot ): XclExpExt( rRoot ) { - maURI = rtl::OString("{78C0D931-6437-407d-A8EE-F0AAD7539E65}"); + maURI = OString("{78C0D931-6437-407d-A8EE-F0AAD7539E65}"); } void XclExpExtCondFormat::SaveXml( XclExpXmlStream& rStrm ) diff --git a/sc/source/filter/excel/xeformula.cxx b/sc/source/filter/excel/xeformula.cxx index 893321b5c263..1ef37c34fd9e 100644 --- a/sc/source/filter/excel/xeformula.cxx +++ b/sc/source/filter/excel/xeformula.cxx @@ -2136,7 +2136,7 @@ void XclExpFmlaCompImpl::ProcessExternalName( const XclExpScToken& rTokData ) // insert the new external name and create the tNameX token sal_uInt16 nExtSheet = 0, nExtName = 0; - const ::rtl::OUString* pFile = rExtRefMgr.getExternalFileName( nFileId ); + const OUString* pFile = rExtRefMgr.getExternalFileName( nFileId ); if( pFile && mxData->mpLinkMgr->InsertExtName( nExtSheet, nExtName, *pFile, rName, xArray ) ) { AppendNameXToken( nExtSheet, nExtName, rTokData.mnSpaces ); @@ -2346,7 +2346,7 @@ void XclExpFmlaCompImpl::AppendMacroCallToken( const XclExpExtFuncData& rExtFunc void XclExpFmlaCompImpl::AppendAddInCallToken( const XclExpExtFuncData& rExtFuncData, sal_uInt8 nSpaces ) { - ::rtl::OUString aXclFuncName; + OUString aXclFuncName; if( mxData->mpLinkMgr && ScGlobal::GetAddInCollection()->GetExcelName( rExtFuncData.maFuncName, GetUILanguage(), aXclFuncName ) ) { sal_uInt16 nExtSheet, nExtName; diff --git a/sc/source/filter/excel/xehelper.cxx b/sc/source/filter/excel/xehelper.cxx index 27821544c5c2..a56fdc390a50 100644 --- a/sc/source/filter/excel/xehelper.cxx +++ b/sc/source/filter/excel/xehelper.cxx @@ -47,7 +47,6 @@ #include "xelink.hxx" #include "xehelper.hxx" -using ::rtl::OUString; using ::com::sun::star::uno::Reference; using ::com::sun::star::i18n::XBreakIterator; @@ -274,9 +273,9 @@ void XclExpAddressConverter::ConvertRangeList( XclRangeList& rXclRanges, namespace { -rtl::OUString lclGetUrlRepresentation( const SvxURLField& rUrlField ) +OUString lclGetUrlRepresentation( const SvxURLField& rUrlField ) { - const rtl::OUString& aRepr = rUrlField.GetRepresentation(); + const OUString& aRepr = rUrlField.GetRepresentation(); // no representation -> use URL return aRepr.isEmpty() ? rUrlField.GetURL() : aRepr; } @@ -296,9 +295,9 @@ XclExpHyperlinkHelper::~XclExpHyperlinkHelper() { } -rtl::OUString XclExpHyperlinkHelper::ProcessUrlField( const SvxURLField& rUrlField ) +OUString XclExpHyperlinkHelper::ProcessUrlField( const SvxURLField& rUrlField ) { - rtl::OUString aUrlRepr; + OUString aUrlRepr; if( GetBiff() == EXC_BIFF8 ) // no HLINK records in BIFF2-BIFF7 { @@ -555,7 +554,7 @@ void XclExpStringHelper::AppendString( XclExpString& rXclString, const XclExpRoo void XclExpStringHelper::AppendChar( XclExpString& rXclString, const XclExpRoot& rRoot, sal_Unicode cChar ) { if( rRoot.GetBiff() == EXC_BIFF8 ) - rXclString.Append( rtl::OUString(cChar) ); + rXclString.Append( OUString(cChar) ); else rXclString.AppendByte( cChar, rRoot.GetTextEncoding() ); } @@ -848,7 +847,7 @@ void XclExpHFConverter::AppendPortion( const EditTextObject* pTextObj, sal_Unico else { String aPortionText( mrEE.GetText( aSel ) ); - aPortionText.SearchAndReplaceAll( rtl::OUString('&'), rtl::OUString("&&") ); + aPortionText.SearchAndReplaceAll( OUString('&'), OUString("&&") ); // #i17440# space between font height and numbers in text if( bFontHtChanged && aParaText.Len() && aPortionText.Len() ) { @@ -885,14 +884,14 @@ namespace { /** Encodes special parts of the URL, i.e. directory separators and volume names. @param pTableName Pointer to a table name to be encoded in this URL, or 0. */ -rtl::OUString lclEncodeDosUrl( - XclBiff eBiff, const rtl::OUString& rUrl, const rtl::OUString& rBase, const rtl::OUString* pTableName) +OUString lclEncodeDosUrl( + XclBiff eBiff, const OUString& rUrl, const OUString& rBase, const OUString* pTableName) { - rtl::OUStringBuffer aBuf; + OUStringBuffer aBuf; if (!rUrl.isEmpty()) { - rtl::OUString aOldUrl = rUrl; + OUString aOldUrl = rUrl; aBuf.append(EXC_URLSTART_ENCODED); if ( aOldUrl.getLength() > 2 && aOldUrl.copy(0,2) == "\\\\" ) @@ -961,16 +960,16 @@ rtl::OUString lclEncodeDosUrl( // ---------------------------------------------------------------------------- -rtl::OUString XclExpUrlHelper::EncodeUrl( const XclExpRoot& rRoot, const rtl::OUString& rAbsUrl, const rtl::OUString* pTableName ) +OUString XclExpUrlHelper::EncodeUrl( const XclExpRoot& rRoot, const OUString& rAbsUrl, const OUString* pTableName ) { - rtl::OUString aDosUrl = INetURLObject(rAbsUrl).getFSysPath(INetURLObject::FSYS_DOS); - rtl::OUString aDosBase = INetURLObject(rRoot.GetBasePath()).getFSysPath(INetURLObject::FSYS_DOS); + OUString aDosUrl = INetURLObject(rAbsUrl).getFSysPath(INetURLObject::FSYS_DOS); + OUString aDosBase = INetURLObject(rRoot.GetBasePath()).getFSysPath(INetURLObject::FSYS_DOS); return lclEncodeDosUrl(rRoot.GetBiff(), aDosUrl, aDosBase, pTableName); } -rtl::OUString XclExpUrlHelper::EncodeDde( const rtl::OUString& rApplic, const rtl::OUString& rTopic ) +OUString XclExpUrlHelper::EncodeDde( const OUString& rApplic, const OUString& rTopic ) { - rtl::OUStringBuffer aBuf; + OUStringBuffer aBuf; aBuf.append(rApplic).append(EXC_DDE_DELIM).append(rTopic); return aBuf.makeStringAndClear(); } diff --git a/sc/source/filter/excel/xelink.cxx b/sc/source/filter/excel/xelink.cxx index 8c2b451cb7dc..a9ff73ae6187 100644 --- a/sc/source/filter/excel/xelink.cxx +++ b/sc/source/filter/excel/xelink.cxx @@ -34,7 +34,6 @@ using ::std::auto_ptr; using ::std::find_if; using ::std::vector; -using ::rtl::OUString; using ::com::sun::star::uno::Any; // ============================================================================ @@ -772,10 +771,10 @@ bool XclExpTabInfo::IsMirroredTab( SCTAB nScTab ) const return GetFlag( nScTab, EXC_TABBUF_MIRRORED ); } -rtl::OUString XclExpTabInfo::GetScTabName( SCTAB nScTab ) const +OUString XclExpTabInfo::GetScTabName( SCTAB nScTab ) const { OSL_ENSURE( nScTab < mnScCnt, "XclExpTabInfo::IsActiveTab - sheet out of range" ); - return (nScTab < mnScCnt) ? maTabInfoVec[ nScTab ].maScName : rtl::OUString(); + return (nScTab < mnScCnt) ? maTabInfoVec[ nScTab ].maScName : OUString(); } sal_uInt16 XclExpTabInfo::GetXclTab( SCTAB nScTab ) const @@ -834,7 +833,7 @@ void XclExpTabInfo::CalcXclIndexes() // result: first occur all exported sheets, followed by all external sheets } -typedef ::std::pair< rtl::OUString, SCTAB > XclExpTabName; +typedef ::std::pair< OUString, SCTAB > XclExpTabName; typedef ::std::vector< XclExpTabName > XclExpTabNameVec; inline bool operator<( const XclExpTabName& rArg1, const XclExpTabName& rArg2 ) @@ -1325,14 +1324,14 @@ void XclExpExternSheetBase::WriteExtNameBuffer( XclExpStream& rStrm ) XclExpExternSheet::XclExpExternSheet( const XclExpRoot& rRoot, sal_Unicode cCode ) : XclExpExternSheetBase( rRoot, EXC_ID_EXTERNSHEET ) { - Init( rtl::OUString(cCode) ); + Init( OUString(cCode) ); } XclExpExternSheet::XclExpExternSheet( const XclExpRoot& rRoot, const String& rTabName ) : XclExpExternSheetBase( rRoot, EXC_ID_EXTERNSHEET ) { // reference to own sheet: \03<sheetname> - Init(rtl::OUString(EXC_EXTSH_TABNAME) + rTabName); + Init(OUString(EXC_EXTSH_TABNAME) + rTabName); } void XclExpExternSheet::Save( XclExpStream& rStrm ) diff --git a/sc/source/filter/excel/xename.cxx b/sc/source/filter/excel/xename.cxx index 7e7a76025bea..276624cd2e64 100644 --- a/sc/source/filter/excel/xename.cxx +++ b/sc/source/filter/excel/xename.cxx @@ -36,7 +36,6 @@ using namespace ::oox; -using ::rtl::OString; // ============================================================================ // *** Helper classes *** diff --git a/sc/source/filter/excel/xepage.cxx b/sc/source/filter/excel/xepage.cxx index c678691c10e2..8e1ffb114352 100644 --- a/sc/source/filter/excel/xepage.cxx +++ b/sc/source/filter/excel/xepage.cxx @@ -40,7 +40,6 @@ using namespace ::oox; -using ::rtl::OString; using ::std::set; using ::std::numeric_limits; diff --git a/sc/source/filter/excel/xepivot.cxx b/sc/source/filter/excel/xepivot.cxx index 3402fbcaad9c..4653e2de7fe6 100644 --- a/sc/source/filter/excel/xepivot.cxx +++ b/sc/source/filter/excel/xepivot.cxx @@ -56,9 +56,6 @@ using ::com::sun::star::sheet::DataPilotFieldAutoShowInfo; using ::com::sun::star::sheet::DataPilotFieldLayoutInfo; using ::com::sun::star::sheet::DataPilotFieldReference; -using ::rtl::OString; -using ::rtl::OUString; -using ::rtl::OUStringBuffer; // ============================================================================ // Pivot cache @@ -138,7 +135,7 @@ XclExpPCItem::XclExpPCItem( bool bValue ) : // ---------------------------------------------------------------------------- -bool XclExpPCItem::EqualsText( const rtl::OUString& rText ) const +bool XclExpPCItem::EqualsText( const OUString& rText ) const { return rText.isEmpty() ? IsEmpty() : (GetText() && (*GetText() == rText)); } @@ -162,7 +159,7 @@ bool XclExpPCItem::EqualsBool( bool bValue ) const void XclExpPCItem::WriteBody( XclExpStream& rStrm ) { - if( const rtl::OUString* pText = GetText() ) + if( const OUString* pText = GetText() ) { rStrm << XclExpString( *pText ); } @@ -282,7 +279,7 @@ const XclExpPCItem* XclExpPCField::GetItem( sal_uInt16 nItemIdx ) const return GetVisItemList().GetRecord( nItemIdx ).get(); } -sal_uInt16 XclExpPCField::GetItemIndex( const rtl::OUString& rItemName ) const +sal_uInt16 XclExpPCField::GetItemIndex( const OUString& rItemName ) const { const XclExpPCItemList& rItemList = GetVisItemList(); for( size_t nPos = 0, nSize = rItemList.GetSize(); nPos < nSize; ++nPos ) @@ -389,7 +386,7 @@ void XclExpPCField::InitStdGroupField( const XclExpPCField& rBaseField, const Sc // loop over all elements of one group for( size_t nElemIdx = 0, nElemCount = pGroupItem->GetElementCount(); nElemIdx < nElemCount; ++nElemIdx ) { - if (const rtl::OUString* pElemName = pGroupItem->GetElementByIndex(nElemIdx)) + if (const OUString* pElemName = pGroupItem->GetElementByIndex(nElemIdx)) { // try to find the item that is part of the group in the base field sal_uInt16 nBaseItemIdx = rBaseField.GetItemIndex( *pElemName ); @@ -549,7 +546,7 @@ void XclExpPCField::InsertNumDateGroupItems( const ScDPObject& rDPObj, const ScD const ScDPItemData* pData = aDPData.GetMemberById(nDim , aMemberIds[nIdx]); if ( pData ) { - rtl::OUString aStr = pCache->GetFormattedString(nDim, *pData); + OUString aStr = pCache->GetFormattedString(nDim, *pData); InsertGroupItem(new XclExpPCItem(aStr)); } } @@ -974,9 +971,9 @@ XclExpPTItem::XclExpPTItem( sal_uInt16 nItemType, sal_uInt16 nCacheIdx, bool bUs maItemInfo.maVisName.mbUseCache = bUseCache; } -rtl::OUString XclExpPTItem::GetItemName() const +OUString XclExpPTItem::GetItemName() const { - return mpCacheItem ? mpCacheItem->ConvertToText() : rtl::OUString(); + return mpCacheItem ? mpCacheItem->ConvertToText() : OUString(); } void XclExpPTItem::SetPropertiesFromMember( const ScDPSaveMember& rSaveMem ) @@ -1014,9 +1011,9 @@ XclExpPTField::XclExpPTField( const XclExpPivotTable& rPTable, sal_uInt16 nCache // data access ---------------------------------------------------------------- -rtl::OUString XclExpPTField::GetFieldName() const +OUString XclExpPTField::GetFieldName() const { - return mpCacheField ? mpCacheField->GetFieldName() : rtl::OUString(); + return mpCacheField ? mpCacheField->GetFieldName() : OUString(); } sal_uInt16 XclExpPTField::GetFieldIndex() const @@ -1032,7 +1029,7 @@ sal_uInt16 XclExpPTField::GetLastDataInfoIndex() const return static_cast< sal_uInt16 >( maDataInfoVec.size() - 1 ); } -sal_uInt16 XclExpPTField::GetItemIndex( const rtl::OUString& rName, sal_uInt16 nDefaultIdx ) const +sal_uInt16 XclExpPTField::GetItemIndex( const OUString& rName, sal_uInt16 nDefaultIdx ) const { for( size_t nPos = 0, nSize = maItemList.GetSize(); nPos < nSize; ++nPos ) if( maItemList.GetRecord( nPos )->GetItemName() == rName ) @@ -1082,11 +1079,11 @@ void XclExpPTField::SetPropertiesFromDim( const ScDPSaveDimension& rSaveDim ) if (pLayoutName && !pLayoutName->equals(GetFieldName())) maFieldInfo.SetVisName(*pLayoutName); - const rtl::OUString* pSubtotalName = rSaveDim.GetSubtotalName(); + const OUString* pSubtotalName = rSaveDim.GetSubtotalName(); if (pSubtotalName) { OUString aSubName = lcl_convertCalcSubtotalName(*pSubtotalName); - maFieldExtInfo.mpFieldTotalName.reset(new rtl::OUString(aSubName)); + maFieldExtInfo.mpFieldTotalName.reset(new OUString(aSubName)); } // subtotals @@ -1149,7 +1146,7 @@ void XclExpPTField::SetDataPropertiesFromDim( const ScDPSaveDimension& rSaveDim rDataInfo.SetApiAggFunc( eFunc ); // visible name - const rtl::OUString* pVisName = rSaveDim.GetLayoutName(); + const OUString* pVisName = rSaveDim.GetLayoutName(); if (pVisName) rDataInfo.SetVisName(*pVisName); else @@ -1215,7 +1212,7 @@ void XclExpPTField::Save( XclExpStream& rStrm ) // private -------------------------------------------------------------------- -XclExpPTItem* XclExpPTField::GetItemAcc( const rtl::OUString& rName ) +XclExpPTItem* XclExpPTField::GetItemAcc( const OUString& rName ) { XclExpPTItem* pItem = 0; for( size_t nPos = 0, nSize = maItemList.GetSize(); !pItem && (nPos < nSize); ++nPos ) @@ -1309,12 +1306,12 @@ const XclExpPTField* XclExpPivotTable::GetField( sal_uInt16 nFieldIdx ) const return (nFieldIdx == EXC_SXIVD_DATA) ? &maDataOrientField : maFieldList.GetRecord( nFieldIdx ).get(); } -const XclExpPTField* XclExpPivotTable::GetField( const rtl::OUString& rName ) const +const XclExpPTField* XclExpPivotTable::GetField( const OUString& rName ) const { return const_cast< XclExpPivotTable* >( this )->GetFieldAcc( rName ); } -sal_uInt16 XclExpPivotTable::GetDataFieldIndex( const rtl::OUString& rName, sal_uInt16 nDefaultIdx ) const +sal_uInt16 XclExpPivotTable::GetDataFieldIndex( const OUString& rName, sal_uInt16 nDefaultIdx ) const { for( XclPTDataFieldPosVec::const_iterator aIt = maDataFields.begin(), aEnd = maDataFields.end(); aIt != aEnd; ++aIt ) if( const XclExpPTField* pField = GetField( aIt->first ) ) @@ -1492,7 +1489,7 @@ void XclExpPivotTable::SaveXml( XclExpXmlStream& rStrm ) // private -------------------------------------------------------------------- -XclExpPTField* XclExpPivotTable::GetFieldAcc( const rtl::OUString& rName ) +XclExpPTField* XclExpPivotTable::GetFieldAcc( const OUString& rName ) { XclExpPTField* pField = 0; for( size_t nPos = 0, nSize = maFieldList.GetSize(); !pField && (nPos < nSize); ++nPos ) @@ -1508,7 +1505,7 @@ XclExpPTField* XclExpPivotTable::GetFieldAcc( const ScDPSaveDimension& rSaveDim return &maDataOrientField; // a real dimension - rtl::OUString aFieldName = ScDPUtil::getSourceDimensionName(rSaveDim.GetName()); + OUString aFieldName = ScDPUtil::getSourceDimensionName(rSaveDim.GetName()); return aFieldName.isEmpty() ? NULL : GetFieldAcc(aFieldName); } @@ -1524,7 +1521,7 @@ void XclExpPivotTable::SetPropertiesFromDP( const ScDPSaveData& rSaveData ) if (!pDim) return; - const rtl::OUString* pLayoutName = pDim->GetLayoutName(); + const OUString* pLayoutName = pDim->GetLayoutName(); if (pLayoutName) maPTInfo.maDataName = *pLayoutName; else diff --git a/sc/source/filter/excel/xerecord.cxx b/sc/source/filter/excel/xerecord.cxx index 54724bbd681c..b7f2f8eb20dc 100644 --- a/sc/source/filter/excel/xerecord.cxx +++ b/sc/source/filter/excel/xerecord.cxx @@ -179,7 +179,7 @@ void XclExpValueRecord<double>::SaveXml( XclExpXmlStream& rStrm ) if( mnAttribute == -1 ) return; rStrm.WriteAttributes( - mnAttribute, rtl::OString::valueOf( maValue ).getStr(), + mnAttribute, OString::valueOf( maValue ).getStr(), FSEND ); } diff --git a/sc/source/filter/excel/xeroot.cxx b/sc/source/filter/excel/xeroot.cxx index 475a0c251813..b72503f8f3d4 100644 --- a/sc/source/filter/excel/xeroot.cxx +++ b/sc/source/filter/excel/xeroot.cxx @@ -302,7 +302,7 @@ bool XclExpRoot::IsDocumentEncrypted() const return false; } -uno::Sequence< beans::NamedValue > XclExpRoot::GenerateEncryptionData( const ::rtl::OUString& aPass ) const +uno::Sequence< beans::NamedValue > XclExpRoot::GenerateEncryptionData( const OUString& aPass ) const { uno::Sequence< beans::NamedValue > aEncryptionData; diff --git a/sc/source/filter/excel/xestream.cxx b/sc/source/filter/excel/xestream.cxx index 2356793ffdef..29d5bd766fc6 100644 --- a/sc/source/filter/excel/xestream.cxx +++ b/sc/source/filter/excel/xestream.cxx @@ -62,9 +62,6 @@ using ::com::sun::star::registry::InvalidRegistryException; using ::com::sun::star::registry::XRegistryKey; using ::com::sun::star::uno::Exception; using ::com::sun::star::uno::XInterface; -using ::rtl::OString; -using ::rtl::OUString; -using ::rtl::OUStringBuffer; using ::utl::OStreamWrapper; using ::std::vector; @@ -330,7 +327,7 @@ void XclExpStream::WriteUnicodeBuffer( const ScfUInt16Vec& rBuffer, sal_uInt8 nF // Xcl has an obscure sense of whether starting a new record or not, // and crashes if it encounters the string header at the very end of a record. // Thus we add 1 to give some room, seems like they do it that way but with another count (10?) -void XclExpStream::WriteByteString( const rtl::OString& rString, sal_uInt16 nMaxLen, bool b16BitCount ) +void XclExpStream::WriteByteString( const OString& rString, sal_uInt16 nMaxLen, bool b16BitCount ) { SetSliceSize( 0 ); sal_Size nLen = ::std::min< sal_Size >( rString.getLength(), nMaxLen ); diff --git a/sc/source/filter/excel/xestring.cxx b/sc/source/filter/excel/xestring.cxx index fa0f1f14b3c6..b1cc1af1e157 100644 --- a/sc/source/filter/excel/xestring.cxx +++ b/sc/source/filter/excel/xestring.cxx @@ -27,8 +27,6 @@ using namespace ::oox; -using ::rtl::OString; -using ::rtl::OUString; // ============================================================================ @@ -136,7 +134,7 @@ void XclExpString::AssignByte( const String& rString, rtl_TextEncoding eTextEnc, XclStrFlags nFlags, sal_uInt16 nMaxLen ) { // length may differ from length of rString - rtl::OString aByteStr(rtl::OUStringToOString(rString, eTextEnc)); + OString aByteStr(OUStringToOString(rString, eTextEnc)); Build(aByteStr.getStr(), aByteStr.getLength(), nFlags, nMaxLen); } @@ -152,7 +150,7 @@ void XclExpString::AppendByte( const String& rString, rtl_TextEncoding eTextEnc if( rString.Len() > 0 ) { // length may differ from length of rString - rtl::OString aByteStr(rtl::OUStringToOString(rString, eTextEnc)); + OString aByteStr(OUStringToOString(rString, eTextEnc)); BuildAppend(aByteStr.getStr(), aByteStr.getLength()); } } @@ -166,7 +164,7 @@ void XclExpString::AppendByte( sal_Unicode cChar, rtl_TextEncoding eTextEnc ) } else { - rtl::OString aByteStr( &cChar, 1, eTextEnc ); // length may be >1 + OString aByteStr( &cChar, 1, eTextEnc ); // length may be >1 BuildAppend( aByteStr.getStr(), aByteStr.getLength() ); } } diff --git a/sc/source/filter/excel/xestyle.cxx b/sc/source/filter/excel/xestyle.cxx index 34304bfb6b67..b7e054d43afb 100644 --- a/sc/source/filter/excel/xestyle.cxx +++ b/sc/source/filter/excel/xestyle.cxx @@ -52,8 +52,6 @@ #include <oox/token/tokens.hxx> #include <boost/ptr_container/ptr_vector.hpp> -using ::rtl::OString; -using ::rtl::OUString; using namespace ::com::sun::star; using namespace oox; @@ -1214,7 +1212,7 @@ void XclExpNumFmt::SaveXml( XclExpXmlStream& rStrm ) sax_fastparser::FSHelperPtr& rStyleSheet = rStrm.GetCurrentStream(); rStyleSheet->singleElement( XML_numFmt, XML_numFmtId, OString::number( mnXclNumFmt ).getStr(), - XML_formatCode, rtl::OUStringToOString(maNumFmtString, RTL_TEXTENCODING_UTF8).getStr(), + XML_formatCode, OUStringToOString(maNumFmtString, RTL_TEXTENCODING_UTF8).getStr(), FSEND ); } @@ -2896,7 +2894,7 @@ XclExpDxfs::XclExpDxfs( const XclExpRoot& rRoot ) pFormatEntry->GetType() != condformat::DATE)) continue; - rtl::OUString aStyleName; + OUString aStyleName; if(pFormatEntry->GetType() == condformat::CONDITION) { const ScCondFormatEntry* pEntry = static_cast<const ScCondFormatEntry*>(pFormatEntry); @@ -2910,7 +2908,7 @@ XclExpDxfs::XclExpDxfs( const XclExpRoot& rRoot ) if (maStyleNameToDxfId.find(aStyleName) == maStyleNameToDxfId.end()) { - maStyleNameToDxfId.insert(std::pair<rtl::OUString, sal_Int32>(aStyleName, nIndex)); + maStyleNameToDxfId.insert(std::pair<OUString, sal_Int32>(aStyleName, nIndex)); SfxStyleSheetBase* pStyle = rRoot.GetDoc().GetStyleSheetPool()->Find(aStyleName); if(!pStyle) @@ -2973,9 +2971,9 @@ XclExpDxfs::XclExpDxfs( const XclExpRoot& rRoot ) } } -sal_Int32 XclExpDxfs::GetDxfId( const rtl::OUString& rStyleName ) +sal_Int32 XclExpDxfs::GetDxfId( const OUString& rStyleName ) { - std::map<rtl::OUString, sal_Int32>::iterator itr = maStyleNameToDxfId.find(rStyleName); + std::map<OUString, sal_Int32>::iterator itr = maStyleNameToDxfId.find(rStyleName); if(itr!= maStyleNameToDxfId.end()) return itr->second; return -1; diff --git a/sc/source/filter/excel/xetable.cxx b/sc/source/filter/excel/xetable.cxx index 423798851c24..0c85a4d9ddcd 100644 --- a/sc/source/filter/excel/xetable.cxx +++ b/sc/source/filter/excel/xetable.cxx @@ -37,9 +37,6 @@ using namespace ::oox; -using ::rtl::OString; -using ::rtl::OUString; -using ::rtl::OUStringBuffer; namespace ApiScriptType = ::com::sun::star::i18n::ScriptType; diff --git a/sc/source/filter/excel/xeview.cxx b/sc/source/filter/excel/xeview.cxx index ba3a09578e69..763b9e778eb4 100644 --- a/sc/source/filter/excel/xeview.cxx +++ b/sc/source/filter/excel/xeview.cxx @@ -26,7 +26,6 @@ using namespace ::oox; -using ::rtl::OString; // Workbook view settings records ============================================= diff --git a/sc/source/filter/excel/xichart.cxx b/sc/source/filter/excel/xichart.cxx index aa8d576f1b4c..7f8cc941bfb5 100644 --- a/sc/source/filter/excel/xichart.cxx +++ b/sc/source/filter/excel/xichart.cxx @@ -81,8 +81,6 @@ #include "xipage.hxx" #include "xiview.hxx" -using ::rtl::OUString; -using ::rtl::OUStringBuffer; using ::com::sun::star::uno::Any; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Sequence; @@ -1111,7 +1109,7 @@ void XclImpChText::ConvertDataLabel( ScfPropertySet& rPropSet, const XclChTypeIn // create API struct for label values, set API label separator cssc2::DataPointLabel aPointLabel( bShowValue, bShowPercent, bShowCateg, bShowSymbol ); rPropSet.SetProperty( EXC_CHPROP_LABEL, aPointLabel ); - String aSep = mxLabelProps ? mxLabelProps->maSeparator : rtl::OUString('\n'); + String aSep = mxLabelProps ? mxLabelProps->maSeparator : OUString('\n'); if( aSep.Len() == 0 ) aSep = CREATE_STRING( "; " ); rPropSet.SetStringProperty( EXC_CHPROP_LABELSEPARATOR, aSep ); diff --git a/sc/source/filter/excel/xicontent.cxx b/sc/source/filter/excel/xicontent.cxx index 542a3fe7b7f7..0f423ef5bc13 100644 --- a/sc/source/filter/excel/xicontent.cxx +++ b/sc/source/filter/excel/xicontent.cxx @@ -351,7 +351,7 @@ void XclImpHyperlink::ConvertToValidTabName(String& rUrl) // the 1st character must be '#'. return; - String aNewUrl(rtl::OUString('#')), aTabName; + String aNewUrl(OUString('#')), aTabName; bool bInQuote = false; bool bQuoteTabName = false; diff --git a/sc/source/filter/excel/xiescher.cxx b/sc/source/filter/excel/xiescher.cxx index 89d55be8e2f4..ede6c114fb35 100644 --- a/sc/source/filter/excel/xiescher.cxx +++ b/sc/source/filter/excel/xiescher.cxx @@ -107,8 +107,6 @@ #include <comphelper/mediadescriptor.hxx> #include <sfx2/docfile.hxx> -using ::rtl::OUString; -using ::rtl::OUStringBuffer; using ::com::sun::star::uno::Any; using ::com::sun::star::uno::Exception; using ::com::sun::star::uno::Reference; @@ -390,7 +388,7 @@ void XclImpDrawObjBase::SetAnchor( const XclObjAnchor& rAnchor ) } void XclImpDrawObjBase::SetDffData( - const DffObjData& rDffObjData, const rtl::OUString& rObjName, const rtl::OUString& rHyperlink, + const DffObjData& rDffObjData, const OUString& rObjName, const OUString& rHyperlink, bool bVisible, bool bAutoMargin ) { mnDffShapeId = rDffObjData.nShapeId; @@ -505,7 +503,7 @@ void XclImpDrawObjBase::PostProcessSdrObject( XclImpDffConverter& rDffConv, SdrO void XclImpDrawObjBase::ReadName5( XclImpStream& rStrm, sal_uInt16 nNameLen ) { - maObjName = rtl::OUString(); + maObjName = OUString(); if( nNameLen > 0 ) { // name length field is repeated before the name @@ -517,7 +515,7 @@ void XclImpDrawObjBase::ReadName5( XclImpStream& rStrm, sal_uInt16 nNameLen ) void XclImpDrawObjBase::ReadMacro3( XclImpStream& rStrm, sal_uInt16 nMacroSize ) { - maMacroName = rtl::OUString(); + maMacroName = OUString(); rStrm.Ignore( nMacroSize ); // skip padding byte for word boundaries, not contained in nMacroSize if( rStrm.GetRecPos() & 1 ) rStrm.Ignore( 1 ); @@ -525,19 +523,19 @@ void XclImpDrawObjBase::ReadMacro3( XclImpStream& rStrm, sal_uInt16 nMacroSize ) void XclImpDrawObjBase::ReadMacro4( XclImpStream& rStrm, sal_uInt16 nMacroSize ) { - maMacroName = rtl::OUString(); + maMacroName = OUString(); rStrm.Ignore( nMacroSize ); } void XclImpDrawObjBase::ReadMacro5( XclImpStream& rStrm, sal_uInt16 nMacroSize ) { - maMacroName = rtl::OUString(); + maMacroName = OUString(); rStrm.Ignore( nMacroSize ); } void XclImpDrawObjBase::ReadMacro8( XclImpStream& rStrm ) { - maMacroName = rtl::OUString(); + maMacroName = OUString(); if( rStrm.GetRecLeft() > 6 ) { // macro is stored in a tNameXR token containing a link to a defined name @@ -1453,7 +1451,7 @@ void XclImpTextObj::DoPreProcessSdrObj( XclImpDffConverter& rDffConv, SdrObject& { double fAngle = 180.0; com::sun::star::beans::PropertyValue aTextRotateAngle; - aTextRotateAngle.Name = rtl::OUString( "TextRotateAngle" ); + aTextRotateAngle.Name = OUString( "TextRotateAngle" ); aTextRotateAngle.Value <<= fAngle; SdrCustomShapeGeometryItem aGeometryItem((SdrCustomShapeGeometryItem&)pObjCustomShape->GetMergedItem( SDRATTR_CUSTOMSHAPE_GEOMETRY )); aGeometryItem.SetPropertyValue( aTextRotateAngle ); @@ -2228,10 +2226,10 @@ void XclImpOptionButtonObj::DoProcessControl( ScfPropertySet& rPropSet ) const if ( xCtrlModel.is() ) { ScfPropertySet aProps( xCtrlModel ); - rtl::OUString sGroupName = rtl::OUString::valueOf( static_cast< sal_Int32 >( pLeader->GetDffShapeId() ) ); + OUString sGroupName = OUString::valueOf( static_cast< sal_Int32 >( pLeader->GetDffShapeId() ) ); aProps.SetStringProperty( "GroupName", sGroupName ); - aProps.SetStringProperty( "RefValue", rtl::OUString::valueOf( nRefVal++ ) ); + aProps.SetStringProperty( "RefValue", OUString::valueOf( nRefVal++ ) ); if ( pLeader->HasCellLink() && !pTbxObj->HasCellLink() ) { // propagate cell link info @@ -3207,7 +3205,7 @@ XclImpDffConverter::~XclImpDffConverter() String XclImpObjectManager::GetOleNameOverride( SCTAB nTab, sal_uInt16 nObjId ) { - rtl::OUString sOleName; + OUString sOleName; String sCodeName = GetExtDocOptions().GetCodeName( nTab ); if (mxOleCtrlNameOverride.is() && mxOleCtrlNameOverride->hasByName(sCodeName)) @@ -3217,8 +3215,8 @@ String XclImpObjectManager::GetOleNameOverride( SCTAB nTab, sal_uInt16 nObjId ) xIdToOleName->getByIndex( nObjId ) >>= sOleName; } OSL_TRACE("XclImpObjectManager::GetOleNameOverride tab %d, ( module %s ) object id ( %d ) is %s", nTab, - rtl::OUStringToOString( sCodeName, RTL_TEXTENCODING_UTF8 ).getStr(), nObjId, - rtl::OUStringToOString( sOleName, RTL_TEXTENCODING_UTF8 ).getStr() ); + OUStringToOString( sCodeName, RTL_TEXTENCODING_UTF8 ).getStr(), nObjId, + OUStringToOString( sOleName, RTL_TEXTENCODING_UTF8 ).getStr() ); return sOleName; } @@ -4191,7 +4189,7 @@ void XclImpObjectManager::ConvertObjects() OUString XclImpObjectManager::GetDefaultObjName( const XclImpDrawObjBase& rDrawObj ) const { - rtl::OUStringBuffer aDefName; + OUStringBuffer aDefName; DefObjNameMap::const_iterator aIt = maDefObjNames.find( rDrawObj.GetObjType() ); if( aIt != maDefObjNames.end() ) aDefName.append(aIt->second); diff --git a/sc/source/filter/excel/xihelper.cxx b/sc/source/filter/excel/xihelper.cxx index 1656634b0e9f..c002ae9b5197 100644 --- a/sc/source/filter/excel/xihelper.cxx +++ b/sc/source/filter/excel/xihelper.cxx @@ -563,7 +563,7 @@ void XclImpHFConverter::InsertField( const SvxFieldItem& rFieldItem ) void XclImpHFConverter::InsertLineBreak() { ESelection& rSel = GetCurrSel(); - mrEE.QuickInsertText( rtl::OUString('\n'), ESelection( rSel.nEndPara, rSel.nEndPos, rSel.nEndPara, rSel.nEndPos ) ); + mrEE.QuickInsertText( OUString('\n'), ESelection( rSel.nEndPara, rSel.nEndPos, rSel.nEndPara, rSel.nEndPos ) ); ++rSel.nEndPara; rSel.nEndPos = 0; GetCurrInfo().mnHeight += GetCurrMaxLineHeight(); @@ -761,7 +761,7 @@ void XclImpUrlHelper::DecodeUrl( } void XclImpUrlHelper::DecodeUrl( - ::rtl::OUString& rUrl, bool& rbSameWb, const XclImpRoot& rRoot, const ::rtl::OUString& rEncodedUrl ) + OUString& rUrl, bool& rbSameWb, const XclImpRoot& rRoot, const OUString& rEncodedUrl ) { String aTabName; String aUrl; diff --git a/sc/source/filter/excel/xilink.cxx b/sc/source/filter/excel/xilink.cxx index 6b4d2c3aece2..a89d36625b5a 100644 --- a/sc/source/filter/excel/xilink.cxx +++ b/sc/source/filter/excel/xilink.cxx @@ -33,8 +33,6 @@ #include <boost/ptr_container/ptr_vector.hpp> using ::std::vector; -using ::rtl::OUString; -using ::rtl::OUStringBuffer; // ============================================================================ diff --git a/sc/source/filter/excel/xipage.cxx b/sc/source/filter/excel/xipage.cxx index d472e4ed47e5..dcc4168938a0 100644 --- a/sc/source/filter/excel/xipage.cxx +++ b/sc/source/filter/excel/xipage.cxx @@ -215,10 +215,10 @@ void XclImpPageSettings::Finalize() // *** create page style sheet *** - rtl::OUStringBuffer aStyleName; + OUStringBuffer aStyleName; aStyleName.appendAscii("PageStyle_"); - rtl::OUString aTableName; + OUString aTableName; if( GetDoc().GetName( nScTab, aTableName ) ) aStyleName.append(aTableName); else diff --git a/sc/source/filter/excel/xipivot.cxx b/sc/source/filter/excel/xipivot.cxx index 8ba8d0e69d73..a79d05a3b326 100644 --- a/sc/source/filter/excel/xipivot.cxx +++ b/sc/source/filter/excel/xipivot.cxx @@ -53,8 +53,6 @@ using namespace com::sun::star; -using ::rtl::OUString; -using ::rtl::OUStringBuffer; using ::com::sun::star::sheet::DataPilotFieldOrientation; using ::com::sun::star::sheet::DataPilotFieldOrientation_DATA; using ::com::sun::star::sheet::DataPilotFieldSortInfo; @@ -97,7 +95,7 @@ void lclSetValue( const XclImpRoot& rRoot, const ScAddress& rScPos, double fValu void XclImpPCItem::WriteToSource( const XclImpRoot& rRoot, const ScAddress& rScPos ) const { ScDocument& rDoc = rRoot.GetDoc(); - if( const rtl::OUString* pText = GetText() ) + if( const OUString* pText = GetText() ) rDoc.SetString( rScPos.Col(), rScPos.Row(), rScPos.Tab(), *pText ); else if( const double* pfValue = GetDouble() ) rDoc.SetValue( rScPos.Col(), rScPos.Row(), rScPos.Tab(), *pfValue ); @@ -190,11 +188,11 @@ XclImpPCField::~XclImpPCField() // general field/item access -------------------------------------------------- -const rtl::OUString& XclImpPCField::GetFieldName( const ScfStringVec& rVisNames ) const +const OUString& XclImpPCField::GetFieldName( const ScfStringVec& rVisNames ) const { if( IsGroupChildField() && (mnFieldIdx < rVisNames.size()) ) { - const rtl::OUString& rVisName = rVisNames[ mnFieldIdx ]; + const OUString& rVisName = rVisNames[ mnFieldIdx ]; if (!rVisName.isEmpty()) return rVisName; } @@ -705,10 +703,10 @@ void XclImpPivotCache::ReadPivotCacheStream( XclImpStream& rStrm ) nScTab = rDoc.GetTableCount(); rDoc.MakeTable( nScTab ); - rtl::OUStringBuffer aDummyName(rtl::OUString("DPCache")); + OUStringBuffer aDummyName(OUString("DPCache")); if( maTabName.Len() > 0 ) aDummyName.append( '_' ).append( maTabName ); - rtl::OUString aName = aDummyName.makeStringAndClear(); + OUString aName = aDummyName.makeStringAndClear(); rDoc.CreateValidTabName( aName ); rDoc.RenameTab( nScTab, aName ); // set sheet index to source range @@ -889,7 +887,7 @@ XclImpPTItem::XclImpPTItem( const XclImpPCField* pCacheField ) : { } -const rtl::OUString* XclImpPTItem::GetItemName() const +const OUString* XclImpPTItem::GetItemName() const { if( mpCacheField ) if( const XclImpPCItem* pCacheItem = mpCacheField->GetItem( maItemInfo.mnCacheIdx ) ) @@ -905,7 +903,7 @@ void XclImpPTItem::ReadSxvi( XclImpStream& rStrm ) void XclImpPTItem::ConvertItem( ScDPSaveDimension& rSaveDim ) const { - if (const rtl::OUString* pItemName = GetItemName()) + if (const OUString* pItemName = GetItemName()) { ScDPSaveMember& rMember = *rSaveDim.GetMemberByName( *pItemName ); rMember.SetIsVisible( !::get_flag( maItemInfo.mnFlags, EXC_SXVI_HIDDEN ) ); @@ -931,16 +929,16 @@ const XclImpPCField* XclImpPTField::GetCacheField() const return xPCache ? xPCache->GetField( maFieldInfo.mnCacheIdx ) : 0; } -rtl::OUString XclImpPTField::GetFieldName() const +OUString XclImpPTField::GetFieldName() const { const XclImpPCField* pField = GetCacheField(); - return pField ? pField->GetFieldName( mrPTable.GetVisFieldNames() ) : rtl::OUString(); + return pField ? pField->GetFieldName( mrPTable.GetVisFieldNames() ) : OUString(); } -rtl::OUString XclImpPTField::GetVisFieldName() const +OUString XclImpPTField::GetVisFieldName() const { - const rtl::OUString* pVisName = maFieldInfo.GetVisName(); - return pVisName ? *pVisName : rtl::OUString(); + const OUString* pVisName = maFieldInfo.GetVisName(); + return pVisName ? *pVisName : OUString(); } const XclImpPTItem* XclImpPTField::GetItem( sal_uInt16 nItemIdx ) const @@ -948,7 +946,7 @@ const XclImpPTItem* XclImpPTField::GetItem( sal_uInt16 nItemIdx ) const return (nItemIdx < maItems.size()) ? maItems[ nItemIdx ].get() : 0; } -const rtl::OUString* XclImpPTField::GetItemName( sal_uInt16 nItemIdx ) const +const OUString* XclImpPTField::GetItemName( sal_uInt16 nItemIdx ) const { const XclImpPTItem* pItem = GetItem( nItemIdx ); return pItem ? pItem->GetItemName() : 0; @@ -997,7 +995,7 @@ void XclImpPTField::ConvertPageField( ScDPSaveData& rSaveData ) const OSL_ENSURE( maFieldInfo.mnAxes & EXC_SXVD_AXIS_PAGE, "XclImpPTField::ConvertPageField - no page field" ); if( ScDPSaveDimension* pSaveDim = ConvertRCPField( rSaveData ) ) { - const rtl::OUString* pName = GetItemName( maPageInfo.mnSelItem ); + const OUString* pName = GetItemName( maPageInfo.mnSelItem ); if (pName) pSaveDim->SetCurrentPage(pName); } @@ -1031,7 +1029,7 @@ void XclImpPTField::ConvertDataField( ScDPSaveData& rSaveData ) const if (maDataInfoList.empty()) return; - rtl::OUString aFieldName = GetFieldName(); + OUString aFieldName = GetFieldName(); if (aFieldName.isEmpty()) return; @@ -1095,7 +1093,7 @@ ScDPSaveDimension* XclImpPTField::ConvertRCPField( ScDPSaveData& rSaveData ) con ConvertFieldInfo( rSaveDim ); // visible name - if (const rtl::OUString* pVisName = maFieldInfo.GetVisName()) + if (const OUString* pVisName = maFieldInfo.GetVisName()) if (!pVisName->isEmpty()) rSaveDim.SetLayoutName( *pVisName ); @@ -1158,7 +1156,7 @@ void XclImpPTField::ConvertDataField( ScDPSaveDimension& rSaveDim, const XclPTDa void XclImpPTField::ConvertDataFieldInfo( ScDPSaveDimension& rSaveDim, const XclPTDataFieldInfo& rDataInfo ) const { // visible name - const rtl::OUString* pVisName = rDataInfo.GetVisName(); + const OUString* pVisName = rDataInfo.GetVisName(); if (pVisName && !pVisName->isEmpty()) rSaveDim.SetLayoutName(*pVisName); @@ -1176,7 +1174,7 @@ void XclImpPTField::ConvertDataFieldInfo( ScDPSaveDimension& rSaveDim, const Xcl aFieldRef.ReferenceItemType = rDataInfo.GetApiRefItemType(); if (aFieldRef.ReferenceItemType == sheet::DataPilotFieldReferenceItemType::NAMED) { - const rtl::OUString* pRefItemName = pRefField->GetItemName(rDataInfo.mnRefItem); + const OUString* pRefItemName = pRefField->GetItemName(rDataInfo.mnRefItem); if (pRefItemName) aFieldRef.ReferenceItemName = *pRefItemName; } @@ -1230,11 +1228,11 @@ const XclImpPTField* XclImpPivotTable::GetDataField( sal_uInt16 nDataFieldIdx ) return 0; } -rtl::OUString XclImpPivotTable::GetDataFieldName( sal_uInt16 nDataFieldIdx ) const +OUString XclImpPivotTable::GetDataFieldName( sal_uInt16 nDataFieldIdx ) const { if( const XclImpPTField* pField = GetDataField( nDataFieldIdx ) ) return pField->GetFieldName(); - return rtl::OUString(); + return OUString(); } // records -------------------------------------------------------------------- @@ -1479,7 +1477,7 @@ void XclImpPivotTable::ApplyMergeFlags(const ScRange& rOutRange, const ScDPSaveD rDoc.ApplyFlagsTab(itr->Col(), itr->Row(), itr->Col(), itr->Row(), itr->Tab(), SC_MF_BUTTON); sal_uInt16 nMFlag = SC_MF_BUTTON_POPUP; - rtl::OUString aName = rDoc.GetString(itr->Col(), itr->Row(), itr->Tab()); + OUString aName = rDoc.GetString(itr->Col(), itr->Row(), itr->Tab()); if (rSaveData.HasInvisibleMember(aName)) nMFlag |= SC_MF_HIDDEN_MEMBER; diff --git a/sc/source/filter/excel/xiroot.cxx b/sc/source/filter/excel/xiroot.cxx index f59542ee562d..206a0930dfda 100644 --- a/sc/source/filter/excel/xiroot.cxx +++ b/sc/source/filter/excel/xiroot.cxx @@ -268,7 +268,7 @@ XclImpTabViewSettings& XclImpRoot::GetTabViewSettings() const String XclImpRoot::GetScAddInName( const String& rXclName ) const { - ::rtl::OUString aScName; + OUString aScName; if( ScGlobal::GetAddInCollection()->GetCalcName( rXclName, aScName ) ) return aScName; return rXclName; diff --git a/sc/source/filter/excel/xistream.cxx b/sc/source/filter/excel/xistream.cxx index 9d68955eb5ac..33dd89c1e231 100644 --- a/sc/source/filter/excel/xistream.cxx +++ b/sc/source/filter/excel/xistream.cxx @@ -27,9 +27,6 @@ #include <vector> -using ::rtl::OString; -using ::rtl::OUString; -using ::rtl::OUStringToOString; using namespace ::com::sun::star; @@ -64,7 +61,7 @@ XclImpDecrypterRef XclImpDecrypter::Clone() const return xNewDecr; } -::comphelper::DocPasswordVerifierResult XclImpDecrypter::verifyPassword( const ::rtl::OUString& rPassword, uno::Sequence< beans::NamedValue >& o_rEncryptionData ) +::comphelper::DocPasswordVerifierResult XclImpDecrypter::verifyPassword( const OUString& rPassword, uno::Sequence< beans::NamedValue >& o_rEncryptionData ) { o_rEncryptionData = OnVerifyPassword( rPassword ); mnError = o_rEncryptionData.getLength() ? ERRCODE_NONE : ERRCODE_ABORT; @@ -132,7 +129,7 @@ XclImpBiff5Decrypter* XclImpBiff5Decrypter::OnClone() const return new XclImpBiff5Decrypter( *this ); } -uno::Sequence< beans::NamedValue > XclImpBiff5Decrypter::OnVerifyPassword( const ::rtl::OUString& rPassword ) +uno::Sequence< beans::NamedValue > XclImpBiff5Decrypter::OnVerifyPassword( const OUString& rPassword ) { maEncryptionData.realloc( 0 ); @@ -226,7 +223,7 @@ XclImpBiff8Decrypter* XclImpBiff8Decrypter::OnClone() const return new XclImpBiff8Decrypter( *this ); } -uno::Sequence< beans::NamedValue > XclImpBiff8Decrypter::OnVerifyPassword( const ::rtl::OUString& rPassword ) +uno::Sequence< beans::NamedValue > XclImpBiff8Decrypter::OnVerifyPassword( const OUString& rPassword ) { maEncryptionData.realloc( 0 ); diff --git a/sc/source/filter/excel/xlchart.cxx b/sc/source/filter/excel/xlchart.cxx index ed27b335eacf..20965db3ace4 100644 --- a/sc/source/filter/excel/xlchart.cxx +++ b/sc/source/filter/excel/xlchart.cxx @@ -51,7 +51,6 @@ #include "xlroot.hxx" #include "xlstyle.hxx" -using ::rtl::OUString; using ::com::sun::star::uno::Any; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::UNO_QUERY; diff --git a/sc/source/filter/excel/xlescher.cxx b/sc/source/filter/excel/xlescher.cxx index 53713923acb5..974155aac6d4 100644 --- a/sc/source/filter/excel/xlescher.cxx +++ b/sc/source/filter/excel/xlescher.cxx @@ -29,7 +29,6 @@ #include "xlroot.hxx" #include "xltools.hxx" -using ::rtl::OUString; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::UNO_QUERY; using ::com::sun::star::drawing::XShape; diff --git a/sc/source/filter/excel/xlpivot.cxx b/sc/source/filter/excel/xlpivot.cxx index 8a902e09279c..29d78d8ff5cb 100644 --- a/sc/source/filter/excel/xlpivot.cxx +++ b/sc/source/filter/excel/xlpivot.cxx @@ -51,10 +51,10 @@ XclPCItem::~XclPCItem() void XclPCItem::SetEmpty() { meType = EXC_PCITEM_EMPTY; - maText = rtl::OUString(); + maText = OUString(); } -void XclPCItem::SetText( const rtl::OUString& rText ) +void XclPCItem::SetText( const OUString& rText ) { meType = EXC_PCITEM_TEXT; maText = rText; @@ -64,7 +64,7 @@ void XclPCItem::SetDouble( double fValue ) { meType = EXC_PCITEM_DOUBLE; //! TODO convert double to string - maText = rtl::OUString(); + maText = OUString(); mfValue = fValue; } @@ -72,7 +72,7 @@ void XclPCItem::SetDateTime( const DateTime& rDateTime ) { meType = EXC_PCITEM_DATETIME; //! TODO convert date to string - maText = rtl::OUString(); + maText = OUString(); maDateTime = rDateTime; } @@ -86,7 +86,7 @@ void XclPCItem::SetInteger( sal_Int16 nValue ) void XclPCItem::SetError( sal_uInt16 nError ) { meType = EXC_PCITEM_ERROR; - maText = rtl::OUString(); + maText = OUString(); mnError = nError; switch( nError ) { @@ -105,7 +105,7 @@ void XclPCItem::SetBool( bool bValue ) { meType = EXC_PCITEM_BOOL; //! TODO convert boolean to string - maText = rtl::OUString(); + maText = OUString(); mbValue = bValue; } @@ -133,7 +133,7 @@ bool XclPCItem::IsEmpty() const return meType == EXC_PCITEM_EMPTY; } -const rtl::OUString* XclPCItem::GetText() const +const OUString* XclPCItem::GetText() const { return (meType == EXC_PCITEM_TEXT || meType == EXC_PCITEM_ERROR) ? &maText : NULL; } @@ -188,7 +188,7 @@ XclImpStream& operator>>( XclImpStream& rStrm, XclPCFieldInfo& rInfo ) if( rStrm.GetRecLeft() >= 3 ) rInfo.maName = rStrm.ReadUniString(); else - rInfo.maName = rtl::OUString(); + rInfo.maName = OUString(); return rStrm; } @@ -398,7 +398,7 @@ XclImpStream& operator>>( XclImpStream& rStrm, XclPTCachedName& rCachedName ) rStrm >> nStrLen; rCachedName.mbUseCache = nStrLen == EXC_PT_NOSTRING; if( rCachedName.mbUseCache ) - rCachedName.maName = rtl::OUString(); + rCachedName.maName = OUString(); else rCachedName.maName = rStrm.ReadUniString( nStrLen ); return rStrm; @@ -415,12 +415,12 @@ XclExpStream& operator<<( XclExpStream& rStrm, const XclPTCachedName& rCachedNam // ---------------------------------------------------------------------------- -const rtl::OUString* XclPTVisNameInfo::GetVisName() const +const OUString* XclPTVisNameInfo::GetVisName() const { return HasVisName() ? &maVisName.maName : 0; } -void XclPTVisNameInfo::SetVisName( const rtl::OUString& rName ) +void XclPTVisNameInfo::SetVisName( const OUString& rName ) { maVisName.maName = rName; maVisName.mbUseCache = rName.isEmpty(); @@ -640,7 +640,7 @@ XclImpStream& operator>>( XclImpStream& rStrm, XclPTFieldExtInfo& rInfo ) rStrm.Ignore(10); if (nNameLen != 0xFF) // Custom field total name is used. Pick it up. - rInfo.mpFieldTotalName.reset(new rtl::OUString(rStrm.ReadUniString(nNameLen, 0))); + rInfo.mpFieldTotalName.reset(new OUString(rStrm.ReadUniString(nNameLen, 0))); return rStrm; } @@ -654,7 +654,7 @@ XclExpStream& operator<<( XclExpStream& rStrm, const XclPTFieldExtInfo& rInfo ) if (rInfo.mpFieldTotalName.get() && !rInfo.mpFieldTotalName->isEmpty()) { - rtl::OUString aFinalName = *rInfo.mpFieldTotalName; + OUString aFinalName = *rInfo.mpFieldTotalName; if (aFinalName.getLength() >= 254) aFinalName = aFinalName.copy(0, 254); sal_uInt8 nNameLen = static_cast<sal_uInt8>(aFinalName.getLength()); @@ -992,7 +992,7 @@ void XclPTViewEx9Info::Init( const ScDPObject& rDPObj ) const ScDPSaveData* pData = rDPObj.GetSaveData(); if (pData) { - const rtl::OUString* pGrandTotal = pData->GetGrandTotalName(); + const OUString* pGrandTotal = pData->GetGrandTotalName(); if (pGrandTotal) maGrandTotalName = *pGrandTotal; } diff --git a/sc/source/filter/excel/xlroot.cxx b/sc/source/filter/excel/xlroot.cxx index 3e4b44b62928..f8c613cf87e5 100644 --- a/sc/source/filter/excel/xlroot.cxx +++ b/sc/source/filter/excel/xlroot.cxx @@ -52,7 +52,6 @@ namespace ApiScriptType = ::com::sun::star::i18n::ScriptType; -using ::rtl::OUString; using ::com::sun::star::uno::Exception; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::UNO_QUERY_THROW; @@ -211,7 +210,7 @@ void XclRoot::SetCharWidth( const XclFontData& rFontData ) aFont.SetCharSet( rFontData.GetFontEncoding() ); aFont.SetWeight( rFontData.GetScWeight() ); pPrinter->SetFont( aFont ); - mrData.mnCharWidth = pPrinter->GetTextWidth( rtl::OUString('0') ); + mrData.mnCharWidth = pPrinter->GetTextWidth( OUString('0') ); } if( mrData.mnCharWidth <= 0 ) { diff --git a/sc/source/filter/excel/xltoolbar.cxx b/sc/source/filter/excel/xltoolbar.cxx index fd02260ae039..56542006028c 100644 --- a/sc/source/filter/excel/xltoolbar.cxx +++ b/sc/source/filter/excel/xltoolbar.cxx @@ -45,7 +45,7 @@ #include <map> using namespace com::sun::star; -typedef std::map< sal_Int16, rtl::OUString > IdToString; +typedef std::map< sal_Int16, OUString > IdToString; class MSOExcelCommandConvertor : public MSOCommandConvertor { @@ -53,8 +53,8 @@ class MSOExcelCommandConvertor : public MSOCommandConvertor IdToString tcidToOOcmd; public: MSOExcelCommandConvertor(); - virtual rtl::OUString MSOCommandToOOCommand( sal_Int16 msoCmd ); - virtual rtl::OUString MSOTCIDToOOCommand( sal_Int16 key ); + virtual OUString MSOCommandToOOCommand( sal_Int16 msoCmd ); + virtual OUString MSOTCIDToOOCommand( sal_Int16 key ); }; MSOExcelCommandConvertor::MSOExcelCommandConvertor() @@ -62,27 +62,27 @@ MSOExcelCommandConvertor::MSOExcelCommandConvertor() /* // mso command id to ooo command string // #FIXME and *HUNDREDS* of id's to added here - msoToOOcmd[ 0x20b ] = rtl::OUString(".uno:CloseDoc"); - msoToOOcmd[ 0x50 ] = rtl::OUString(".uno:Open"); + msoToOOcmd[ 0x20b ] = OUString(".uno:CloseDoc"); + msoToOOcmd[ 0x50 ] = OUString(".uno:Open"); // mso tcid to ooo command string // #FIXME and *HUNDREDS* of id's to added here - tcidToOOcmd[ 0x9d9 ] = rtl::OUString(".uno:Print"); + tcidToOOcmd[ 0x9d9 ] = OUString(".uno:Print"); */ } -rtl::OUString MSOExcelCommandConvertor::MSOCommandToOOCommand( sal_Int16 key ) +OUString MSOExcelCommandConvertor::MSOCommandToOOCommand( sal_Int16 key ) { - rtl::OUString sResult; + OUString sResult; IdToString::iterator it = msoToOOcmd.find( key ); if ( it != msoToOOcmd.end() ) sResult = it->second; return sResult; } -rtl::OUString MSOExcelCommandConvertor::MSOTCIDToOOCommand( sal_Int16 key ) +OUString MSOExcelCommandConvertor::MSOTCIDToOOCommand( sal_Int16 key ) { - rtl::OUString sResult; + OUString sResult; IdToString::iterator it = tcidToOOcmd.find( key ); if ( it != tcidToOOcmd.end() ) sResult = it->second; @@ -167,7 +167,7 @@ bool ScCTB::ImportMenuTB( ScCTBWrapper& rWrapper, const css::uno::Reference< css bool ScCTB::ImportCustomToolBar( ScCTBWrapper& rWrapper, CustomToolBarImportHelper& helper ) { - static rtl::OUString sToolbarPrefix( "private:resource/toolbar/custom_" ); + static OUString sToolbarPrefix( "private:resource/toolbar/custom_" ); bool bRes = false; try { @@ -180,16 +180,16 @@ bool ScCTB::ImportCustomToolBar( ScCTBWrapper& rWrapper, CustomToolBarImportHelp uno::Reference< beans::XPropertySet > xProps( xIndexContainer, uno::UNO_QUERY_THROW ); WString& name = tb.getName(); // set UI name for toolbar - xProps->setPropertyValue( rtl::OUString("UIName"), uno::makeAny( name.getString() ) ); + xProps->setPropertyValue( OUString("UIName"), uno::makeAny( name.getString() ) ); - rtl::OUString sToolBarName = sToolbarPrefix.concat( name.getString() ); + OUString sToolBarName = sToolbarPrefix.concat( name.getString() ); for ( std::vector< ScTBC >::iterator it = rTBC.begin(); it != rTBC.end(); ++it ) { if ( !it->ImportToolBarControl( rWrapper, xIndexContainer, helper, IsMenuToolbar() ) ) return false; } - OSL_TRACE("Name of toolbar :-/ %s", rtl::OUStringToOString( sToolBarName, RTL_TEXTENCODING_UTF8 ).getStr() ); + OSL_TRACE("Name of toolbar :-/ %s", OUStringToOString( sToolBarName, RTL_TEXTENCODING_UTF8 ).getStr() ); helper.getCfgManager()->insertSettings( sToolBarName, xIndexAccess ); helper.applyIcons(); @@ -305,7 +305,7 @@ bool ScTBC::ImportToolBarControl( ScCTBWrapper& rWrapper, const css::uno::Refere else { beans::PropertyValue aProp; - aProp.Name = rtl::OUString("ItemDescriptorContainer"); + aProp.Name = OUString("ItemDescriptorContainer"); aProp.Value <<= xMenuDesc; props.push_back( aProp ); } @@ -316,7 +316,7 @@ bool ScTBC::ImportToolBarControl( ScCTBWrapper& rWrapper, const css::uno::Refere { // insert spacer uno::Sequence< beans::PropertyValue > sProps( 1 ); - sProps[ 0 ].Name = rtl::OUString("Type"); + sProps[ 0 ].Name = OUString("Type"); sProps[ 0 ].Value = uno::makeAny( ui::ItemType::SEPARATOR_LINE ); toolbarcontainer->insertByIndex( toolbarcontainer->getCount(), uno::makeAny( sProps ) ); } @@ -399,7 +399,7 @@ ScCTBWrapper::Print( FILE* fp ) } } -ScCTB* ScCTBWrapper::GetCustomizationData( const rtl::OUString& sTBName ) +ScCTB* ScCTBWrapper::GetCustomizationData( const OUString& sTBName ) { ScCTB* pCTB = NULL; for ( std::vector< ScCTB >::iterator it = rCTB.begin(); it != rCTB.end(); ++it ) @@ -425,7 +425,7 @@ bool ScCTBWrapper::ImportCustomToolBar( SfxObjectShell& rDocSh ) for ( std::vector<ScCTB>::iterator it = rCTB.begin(); it != it_end; ++it ) { // for each customtoolbar - CustomToolBarImportHelper helper( rDocSh, xAppCfgSupp->getUIConfigurationManager( rtl::OUString("com.sun.star.sheet.SpreadsheetDocument" ) ) ); + CustomToolBarImportHelper helper( rDocSh, xAppCfgSupp->getUIConfigurationManager( OUString("com.sun.star.sheet.SpreadsheetDocument" ) ) ); helper.setMSOCommandMap( new MSOExcelCommandConvertor() ); // Ignore menu toolbars, excel doesn't ( afaics ) store // menu customizations ( but you can have menus in a customtoolbar diff --git a/sc/source/filter/excel/xltoolbar.hxx b/sc/source/filter/excel/xltoolbar.hxx index 41b10028f016..7344a4d4e158 100644 --- a/sc/source/filter/excel/xltoolbar.hxx +++ b/sc/source/filter/excel/xltoolbar.hxx @@ -79,7 +79,7 @@ public: bool IsMenuToolbar(); bool ImportCustomToolBar( ScCTBWrapper&, CustomToolBarImportHelper& ); bool ImportMenuTB( ScCTBWrapper&, const css::uno::Reference< css::container::XIndexContainer >&, CustomToolBarImportHelper& ); - rtl::OUString GetName() { return tb.getName().getString(); } + OUString GetName() { return tb.getName().getString(); } }; @@ -115,7 +115,7 @@ public: bool Read(SvStream &rS); void Print( FILE* ); bool ImportCustomToolBar( SfxObjectShell& rDocSh ); - ScCTB* GetCustomizationData( const rtl::OUString& name ); + ScCTB* GetCustomizationData( const OUString& name ); }; diff --git a/sc/source/filter/excel/xltools.cxx b/sc/source/filter/excel/xltools.cxx index 4834122038f8..1bb40c6f4a24 100644 --- a/sc/source/filter/excel/xltools.cxx +++ b/sc/source/filter/excel/xltools.cxx @@ -38,7 +38,6 @@ #include "xiroot.hxx" #include "xltools.hxx" -using ::rtl::OUString; // GUID import/export ========================================================= @@ -482,21 +481,21 @@ OUString XclTools::GetXclBuiltInDefName( sal_Unicode cBuiltIn ) "XclTools::GetXclBuiltInDefName - built-in defined name list modified" ); if( cBuiltIn < SAL_N_ELEMENTS( ppcDefNames ) ) - return rtl::OUString::createFromAscii(ppcDefNames[cBuiltIn]); + return OUString::createFromAscii(ppcDefNames[cBuiltIn]); else return OUString::number(cBuiltIn); } OUString XclTools::GetBuiltInDefName( sal_Unicode cBuiltIn ) { - rtl::OUStringBuffer aBuf(maDefNamePrefix); + OUStringBuffer aBuf(maDefNamePrefix); aBuf.append(GetXclBuiltInDefName(cBuiltIn)); return aBuf.makeStringAndClear(); } OUString XclTools::GetBuiltInDefNameXml( sal_Unicode cBuiltIn ) { - rtl::OUStringBuffer aBuf(maDefNamePrefixXml); + OUStringBuffer aBuf(maDefNamePrefixXml); aBuf.append(GetXclBuiltInDefName(cBuiltIn)); return aBuf.makeStringAndClear(); } @@ -552,7 +551,7 @@ OUString XclTools::GetBuiltInStyleName( sal_uInt8 nStyleId, const OUString& rNam } else { - rtl::OUStringBuffer aBuf(maStyleNamePrefix1); + OUStringBuffer aBuf(maStyleNamePrefix1); if( nStyleId < SAL_N_ELEMENTS( ppcStyleNames ) ) aBuf.appendAscii(ppcStyleNames[nStyleId]); else if (!rName.isEmpty()) @@ -594,7 +593,7 @@ bool XclTools::IsBuiltInStyleName( const OUString& rStyleName, sal_uInt8* pnStyl { if( nId != EXC_STYLE_NORMAL ) { - OUString aShortName = rtl::OUString::createFromAscii(ppcStyleNames[nId]); + OUString aShortName = OUString::createFromAscii(ppcStyleNames[nId]); if( String(rStyleName).EqualsIgnoreCaseAscii( aShortName, nPrefixLen, aShortName.getLength() ) && (nNextChar < nPrefixLen + aShortName.getLength())) { @@ -651,9 +650,9 @@ bool XclTools::GetBuiltInStyleId( sal_uInt8& rnStyleId, sal_uInt8& rnLevel, cons const OUString XclTools::maCFStyleNamePrefix1( RTL_CONSTASCII_USTRINGPARAM( "Excel_CondFormat_" ) ); const OUString XclTools::maCFStyleNamePrefix2( RTL_CONSTASCII_USTRINGPARAM( "ConditionalStyle_" ) ); -rtl::OUString XclTools::GetCondFormatStyleName( SCTAB nScTab, sal_Int32 nFormat, sal_uInt16 nCondition ) +OUString XclTools::GetCondFormatStyleName( SCTAB nScTab, sal_Int32 nFormat, sal_uInt16 nCondition ) { - rtl::OUStringBuffer aBuf(maCFStyleNamePrefix1); + OUStringBuffer aBuf(maCFStyleNamePrefix1); aBuf.append(static_cast<sal_Int32>(nScTab+1)); aBuf.append(sal_Unicode('_')); aBuf.append(static_cast<sal_Int32>(nFormat+1)); @@ -711,7 +710,7 @@ OUString XclTools::GetXclMacroName( const OUString& rSbMacroUrl ) sal_Int32 nPrjDot = rSbMacroUrl.indexOf( '.', maSbMacroPrefix.getLength() ) + 1; return rSbMacroUrl.copy( nPrjDot, nSbMacroUrlLen - nPrjDot - maSbMacroSuffix.getLength() ); } - return rtl::OUString(); + return OUString(); } // read/write colors ---------------------------------------------------------- diff --git a/sc/source/filter/excel/xltracer.cxx b/sc/source/filter/excel/xltracer.cxx index 58d2737246af..7250053ec69a 100644 --- a/sc/source/filter/excel/xltracer.cxx +++ b/sc/source/filter/excel/xltracer.cxx @@ -21,7 +21,6 @@ #include <com/sun/star/beans/PropertyValue.hpp> #include "address.hxx" -using ::rtl::OUString; using ::com::sun::star::uno::Sequence; using ::com::sun::star::beans::PropertyValue; diff --git a/sc/source/filter/ftools/fapihelper.cxx b/sc/source/filter/ftools/fapihelper.cxx index c97612d8b6cc..47f35c0d2cf1 100644 --- a/sc/source/filter/ftools/fapihelper.cxx +++ b/sc/source/filter/ftools/fapihelper.cxx @@ -37,7 +37,6 @@ #include <svl/itemset.hxx> #include "miscuno.hxx" -using ::rtl::OUString; using ::com::sun::star::uno::Any; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Sequence; @@ -110,7 +109,7 @@ uno::Sequence< beans::NamedValue > ScfApiHelper::QueryEncryptionDataForMedium( S if ( pEncryptionDataItem ) pEncryptionDataItem->GetValue() >>= aEncryptionData; - ::rtl::OUString aPassword; + OUString aPassword; SFX_ITEMSET_ARG( rMedium.GetItemSet(), pPasswordItem, SfxStringItem, SID_PASSWORD, false); if ( pPasswordItem ) aPassword = pPasswordItem->GetValue(); @@ -190,7 +189,7 @@ bool ScfPropertySet::GetAnyProperty( Any& rValue, const OUString& rPropName ) co return bHasValue; } -bool ScfPropertySet::GetBoolProperty( const ::rtl::OUString& rPropName ) const +bool ScfPropertySet::GetBoolProperty( const OUString& rPropName ) const { Any aAny; return GetAnyProperty( aAny, rPropName ) && ScUnoHelpFunctions::GetBoolFromAny( aAny ); @@ -203,7 +202,7 @@ OUString ScfPropertySet::GetStringProperty( const OUString& rPropName ) const return aOUString; } -bool ScfPropertySet::GetColorProperty( Color& rColor, const ::rtl::OUString& rPropName ) const +bool ScfPropertySet::GetColorProperty( Color& rColor, const OUString& rPropName ) const { sal_Int32 nApiColor = 0; bool bRet = GetProperty( nApiColor, rPropName ); @@ -247,9 +246,9 @@ void ScfPropertySet::SetAnyProperty( const OUString& rPropName, const Any& rValu } catch (const Exception&) { - OSL_FAIL(rtl::OStringBuffer(RTL_CONSTASCII_STRINGPARAM( + OSL_FAIL(OStringBuffer(RTL_CONSTASCII_STRINGPARAM( "ScfPropertySet::SetAnyProperty - cannot set property \"")) - .append(rtl::OUStringToOString(rPropName, + .append(OUStringToOString(rPropName, RTL_TEXTENCODING_ASCII_US)) .append('"').getStr()); } diff --git a/sc/source/filter/ftools/ftools.cxx b/sc/source/filter/ftools/ftools.cxx index 5cf7042db873..4a9cdcdb0846 100644 --- a/sc/source/filter/ftools/ftools.cxx +++ b/sc/source/filter/ftools/ftools.cxx @@ -261,9 +261,9 @@ ScStyleSheet& ScfTools::MakePageStyleSheet( ScStyleSheetPool& rPool, const OUStr // *** byte string import operations *** -------------------------------------- -rtl::OString ScfTools::read_zeroTerminated_uInt8s_ToOString(SvStream& rStrm, sal_Int32& rnBytesLeft) +OString ScfTools::read_zeroTerminated_uInt8s_ToOString(SvStream& rStrm, sal_Int32& rnBytesLeft) { - rtl::OString aRet(::read_zeroTerminated_uInt8s_ToOString(rStrm)); + OString aRet(::read_zeroTerminated_uInt8s_ToOString(rStrm)); rnBytesLeft -= aRet.getLength(); //we read this number of bytes anyway if (rStrm.good()) //if the stream is happy we read the null terminator as well --rnBytesLeft; diff --git a/sc/source/filter/html/htmlexp.cxx b/sc/source/filter/html/htmlexp.cxx index 826797db1523..cb4b1645df07 100644 --- a/sc/source/filter/html/htmlexp.cxx +++ b/sc/source/filter/html/htmlexp.cxx @@ -144,9 +144,9 @@ FltError ScFormatFilterPluginImpl::ScExportHTML( SvStream& rStrm, const String& } -static rtl::OString lcl_getColGroupString(sal_Int32 nSpan, sal_Int32 nWidth) +static OString lcl_getColGroupString(sal_Int32 nSpan, sal_Int32 nWidth) { - rtl::OStringBuffer aByteStr(OOO_STRING_SVTOOLS_HTML_colgroup); + OStringBuffer aByteStr(OOO_STRING_SVTOOLS_HTML_colgroup); aByteStr.append(' '); if( nSpan > 1 ) { @@ -196,9 +196,9 @@ static void lcl_AddStamp( String& rStr, const String& rName, } -static rtl::OString lcl_makeHTMLColorTriplet(const Color& rColor) +static OString lcl_makeHTMLColorTriplet(const Color& rColor) { - rtl::OStringBuffer aStr(RTL_CONSTASCII_STRINGPARAM("\"#")); + OStringBuffer aStr(RTL_CONSTASCII_STRINGPARAM("\"#")); // <font COLOR="#00FF40">hallo</font> sal_Char buf[64]; sal_Char* p = buf; @@ -415,7 +415,7 @@ void ScHTMLExport::WriteOverview() OUT_STR( ScGlobal::GetRscString( STR_OVERVIEW ) ); TAG_OFF_LF( OOO_STRING_SVTOOLS_HTML_head1 ); - rtl::OUString aStr; + OUString aStr; const SCTAB nCount = pDoc->GetTableCount(); for ( SCTAB nTab = 0; nTab < nCount; nTab++ ) @@ -486,10 +486,10 @@ const SfxItemSet& ScHTMLExport::PageDefaults( SCTAB nTab ) } -rtl::OString ScHTMLExport::BorderToStyle(const char* pBorderName, +OString ScHTMLExport::BorderToStyle(const char* pBorderName, const SvxBorderLine* pLine, bool& bInsertSemicolon) { - rtl::OStringBuffer aOut; + OStringBuffer aOut; if ( pLine ) { @@ -637,7 +637,7 @@ void ScHTMLExport::WriteTables() { const SCTAB nTabCount = pDoc->GetTableCount(); const OUString aStrTable( ScResId( SCSTR_TABLE ) ); - rtl::OUString aStr; + OUString aStr; OUString aStrOut; SCCOL nStartCol; SCROW nStartRow; @@ -708,7 +708,7 @@ void ScHTMLExport::WriteTables() } // <TABLE ...> - rtl::OStringBuffer aByteStrOut(OOO_STRING_SVTOOLS_HTML_table); + OStringBuffer aByteStrOut(OOO_STRING_SVTOOLS_HTML_table); bTabHasGraphics = bTabAlignedLeft = false; if ( bAll && pDrawLayer ) @@ -1086,7 +1086,7 @@ void ScHTMLExport::WriteCell( SCCOL nCol, SCROW nRow, SCTAB nTab ) if ( bSetFont ) { - rtl::OStringBuffer aStr(OOO_STRING_SVTOOLS_HTML_font); + OStringBuffer aStr(OOO_STRING_SVTOOLS_HTML_font); if ( bSetFontName ) { aStr.append(' ').append(OOO_STRING_SVTOOLS_HTML_O_face). @@ -1094,7 +1094,7 @@ void ScHTMLExport::WriteCell( SCCOL nCol, SCROW nRow, SCTAB nTab ) xub_StrLen nFonts = comphelper::string::getTokenCount(rFontItem.GetFamilyName(), ';'); if ( nFonts == 1 ) { - rtl::OString aTmpStr = HTMLOutFuncs::ConvertStringToHTML( + OString aTmpStr = HTMLOutFuncs::ConvertStringToHTML( rFontItem.GetFamilyName(), eDestEnc, &aNonConvertibleChars); aStr.append(aTmpStr); } @@ -1103,7 +1103,7 @@ void ScHTMLExport::WriteCell( SCCOL nCol, SCROW nRow, SCTAB nTab ) const String& rList = rFontItem.GetFamilyName(); for ( sal_Int32 j = 0, nPos = 0; j < (sal_Int32)nFonts; j++ ) { - rtl::OString aTmpStr = HTMLOutFuncs::ConvertStringToHTML( + OString aTmpStr = HTMLOutFuncs::ConvertStringToHTML( rList.GetToken( 0, ';', nPos ), eDestEnc, &aNonConvertibleChars); aStr.append(aTmpStr); diff --git a/sc/source/filter/html/htmlexp2.cxx b/sc/source/filter/html/htmlexp2.cxx index 0d31c275b3a4..67f7642a1f81 100644 --- a/sc/source/filter/html/htmlexp2.cxx +++ b/sc/source/filter/html/htmlexp2.cxx @@ -123,7 +123,7 @@ void ScHTMLExport::FillGraphList( const SdrPage* pPage, SCTAB nTab, void ScHTMLExport::WriteGraphEntry( ScHTMLGraphEntry* pE ) { SdrObject* pObject = pE->pObject; - rtl::OStringBuffer aBuf; + OStringBuffer aBuf; aBuf.append(' ').append(OOO_STRING_SVTOOLS_HTML_O_width).append('='). append(static_cast<sal_Int32>(pE->aSize.Width())); aBuf.append(' ').append(OOO_STRING_SVTOOLS_HTML_O_height).append('='). @@ -135,7 +135,7 @@ void ScHTMLExport::WriteGraphEntry( ScHTMLGraphEntry* pE ) aBuf.append(' ').append(OOO_STRING_SVTOOLS_HTML_O_vspace).append('='). append(static_cast<sal_Int32>(pE->aSpace.Height())); } - rtl::OString aOpt = aBuf.makeStringAndClear(); + OString aOpt = aBuf.makeStringAndClear(); switch ( pObject->GetObjIdentifier() ) { case OBJ_GRAF: @@ -182,7 +182,7 @@ void ScHTMLExport::WriteGraphEntry( ScHTMLGraphEntry* pE ) void ScHTMLExport::WriteImage( String& rLinkName, const Graphic& rGrf, - const rtl::OString& rImgOptions, sal_uLong nXOutFlags ) + const OString& rImgOptions, sal_uLong nXOutFlags ) { // Embedded graphic -> create an image file if( !rLinkName.Len() ) diff --git a/sc/source/filter/html/htmlpars.cxx b/sc/source/filter/html/htmlpars.cxx index 5510241440ae..40d4fd173625 100644 --- a/sc/source/filter/html/htmlpars.cxx +++ b/sc/source/filter/html/htmlpars.cxx @@ -65,11 +65,11 @@ using namespace ::com::sun::star; ScHTMLStyles::ScHTMLStyles() : maEmpty() {} void ScHTMLStyles::add(const char* pElemName, size_t nElemName, const char* pClassName, size_t nClassName, - const rtl::OUString& aProp, const rtl::OUString& aValue) + const OUString& aProp, const OUString& aValue) { if (pElemName) { - rtl::OUString aElem(pElemName, nElemName, RTL_TEXTENCODING_UTF8); + OUString aElem(pElemName, nElemName, RTL_TEXTENCODING_UTF8); aElem = aElem.toAsciiLowerCase(); if (pClassName) { @@ -90,7 +90,7 @@ void ScHTMLStyles::add(const char* pElemName, size_t nElemName, const char* pCla } NamePropsType* pClsProps = itrElem->second; - rtl::OUString aClass(pClassName, nClassName, RTL_TEXTENCODING_UTF8); + OUString aClass(pClassName, nClassName, RTL_TEXTENCODING_UTF8); aClass = aClass.toAsciiLowerCase(); insertProp(*pClsProps, aClass, aProp, aValue); } @@ -105,15 +105,15 @@ void ScHTMLStyles::add(const char* pElemName, size_t nElemName, const char* pCla if (pClassName) { // Class name only. Add it to the global. - rtl::OUString aClass(pClassName, nClassName, RTL_TEXTENCODING_UTF8); + OUString aClass(pClassName, nClassName, RTL_TEXTENCODING_UTF8); aClass = aClass.toAsciiLowerCase(); insertProp(maGlobalProps, aClass, aProp, aValue); } } } -const rtl::OUString& ScHTMLStyles::getPropertyValue( - const rtl::OUString& rElem, const rtl::OUString& rClass, const rtl::OUString& rPropName) const +const OUString& ScHTMLStyles::getPropertyValue( + const OUString& rElem, const OUString& rClass, const OUString& rPropName) const { // First, look into the element-class storage. { @@ -158,8 +158,8 @@ const rtl::OUString& ScHTMLStyles::getPropertyValue( } void ScHTMLStyles::insertProp( - NamePropsType& rStore, const rtl::OUString& aName, - const rtl::OUString& aProp, const rtl::OUString& aValue) + NamePropsType& rStore, const OUString& aName, + const OUString& aProp, const OUString& aValue) { NamePropsType::iterator itr = rStore.find(aName); if (itr == rStore.end()) @@ -294,11 +294,11 @@ sal_uLong ScHTMLLayoutParser::Read( SvStream& rStream, const String& rBaseURL ) const sal_Char* pCharSet = rtl_getBestMimeCharsetFromTextEncoding( RTL_TEXTENCODING_UTF8 ); if( pCharSet ) { - String aContentType = rtl::OUString( "text/html; charset=" ); + String aContentType = OUString( "text/html; charset=" ); aContentType.AppendAscii( pCharSet ); xValues = new SvKeyValueIterator; - xValues->Append( SvKeyValue( rtl::OUString( OOO_STRING_SVTOOLS_HTML_META_content_type ), aContentType ) ); + xValues->Append( SvKeyValue( OUString( OOO_STRING_SVTOOLS_HTML_META_content_type ), aContentType ) ); pAttributes = xValues; } } @@ -1060,12 +1060,12 @@ void ScHTMLLayoutParser::TableDataOn( ImportInfo* pInfo ) break; case HTML_O_SDVAL: { - pActEntry->pValStr = new rtl::OUString( rOption.GetString() ); + pActEntry->pValStr = new OUString( rOption.GetString() ); } break; case HTML_O_SDNUM: { - pActEntry->pNumStr = new rtl::OUString( rOption.GetString() ); + pActEntry->pNumStr = new OUString( rOption.GetString() ); } break; } @@ -1397,7 +1397,7 @@ void ScHTMLLayoutParser::Image( ImportInfo* pInfo ) if ( !pActEntry->bHasGraphic ) { // ALT text only if not any image loaded if (!pActEntry->aAltText.isEmpty()) - pActEntry->aAltText += rtl::OUString("; "); + pActEntry->aAltText += OUString("; "); pActEntry->aAltText += rOption.GetString(); } @@ -1443,7 +1443,7 @@ void ScHTMLLayoutParser::Image( ImportInfo* pInfo ) if ( !pActEntry->bHasGraphic ) { // discard any ALT text in this cell if we have any image pActEntry->bHasGraphic = true; - pActEntry->aAltText = rtl::OUString(); + pActEntry->aAltText = OUString(); } pImage->aFilterName = rFilter.GetImportFormatName( nFormat ); pImage->pGraphic = pGraphic; @@ -1523,7 +1523,7 @@ void ScHTMLLayoutParser::AnchorOn( ImportInfo* pInfo ) { case HTML_O_NAME: { - pActEntry->pName = new rtl::OUString(rOption.GetString()); + pActEntry->pName = new OUString(rOption.GetString()); } break; } @@ -1612,7 +1612,7 @@ void ScHTMLLayoutParser::ProcToken( ImportInfo* pInfo ) case HTML_TITLE_ON: { bInTitle = true; - aString = rtl::OUString(); + aString = OUString(); } break; case HTML_TITLE_OFF: @@ -2158,9 +2158,9 @@ namespace { * Decode a numbert format string stored in Excel-generated HTML's CSS * region. */ -rtl::OUString decodeNumberFormat(const rtl::OUString& rFmt) +OUString decodeNumberFormat(const OUString& rFmt) { - rtl::OUStringBuffer aBuf; + OUStringBuffer aBuf; const sal_Unicode* p = rFmt.getStr(); sal_Int32 n = rFmt.getLength(); for (sal_Int32 i = 0; i < n; ++i, ++p) @@ -2186,7 +2186,7 @@ rtl::OUString decodeNumberFormat(const rtl::OUString& rFmt) } if (nDigitCount) { - sal_Int32 nVal = rtl::OUString(p1, nDigitCount).toInt32(16); + sal_Int32 nVal = OUString(p1, nDigitCount).toInt32(16); aBuf.append(static_cast<sal_Unicode>(nVal)); } } @@ -2206,7 +2206,7 @@ void ScHTMLTable::DataOn( const ImportInfo& rInfo ) // read needed options from the <td> tag ScHTMLSize aSpanSize( 1, 1 ); SAL_WNODEPRECATED_DECLARATIONS_PUSH - ::std::auto_ptr<rtl::OUString> pValStr, pNumStr; + ::std::auto_ptr<OUString> pValStr, pNumStr; SAL_WNODEPRECATED_DECLARATIONS_POP const HTMLOptions& rOptions = static_cast<HTMLParser*>(rInfo.pParser)->GetOptions(); HTMLOptions::const_iterator itr = rOptions.begin(), itrEnd = rOptions.end(); @@ -2222,21 +2222,21 @@ void ScHTMLTable::DataOn( const ImportInfo& rInfo ) aSpanSize.mnRows = static_cast<SCROW>( getLimitedValue<sal_Int32>( itr->GetString().ToInt32(), 1, 256 ) ); break; case HTML_O_SDVAL: - pValStr.reset(new rtl::OUString(itr->GetString())); + pValStr.reset(new OUString(itr->GetString())); break; case HTML_O_SDNUM: - pNumStr.reset(new rtl::OUString(itr->GetString())); + pNumStr.reset(new OUString(itr->GetString())); break; case HTML_O_CLASS: { // Pick up the number format associated with this class (if // any). - rtl::OUString aElem("td"); - rtl::OUString aClass = itr->GetString(); - rtl::OUString aProp("mso-number-format"); + OUString aElem("td"); + OUString aClass = itr->GetString(); + OUString aProp("mso-number-format"); const ScHTMLStyles& rStyles = mpParser->GetStyles(); - const rtl::OUString& rVal = rStyles.getPropertyValue(aElem, aClass, aProp); - rtl::OUString aNumFmt = decodeNumberFormat(rVal); + const OUString& rVal = rStyles.getPropertyValue(aElem, aClass, aProp); + OUString aNumFmt = decodeNumberFormat(rVal); nNumberFormat = GetFormatTable()->GetEntryKey(aNumFmt); if (nNumberFormat == NUMBERFORMAT_ENTRY_NOT_FOUND) @@ -2940,11 +2940,11 @@ sal_uLong ScHTMLQueryParser::Read( SvStream& rStrm, const String& rBaseURL ) const sal_Char* pCharSet = rtl_getBestMimeCharsetFromTextEncoding( RTL_TEXTENCODING_UTF8 ); if( pCharSet ) { - String aContentType = rtl::OUString( "text/html; charset=" ); + String aContentType = OUString( "text/html; charset=" ); aContentType.AppendAscii( pCharSet ); xValues = new SvKeyValueIterator; - xValues->Append( SvKeyValue( rtl::OUString( OOO_STRING_SVTOOLS_HTML_META_content_type ), aContentType ) ); + xValues->Append( SvKeyValue( OUString( OOO_STRING_SVTOOLS_HTML_META_content_type ), aContentType ) ); pAttributes = xValues; } } @@ -3121,7 +3121,7 @@ void ScHTMLQueryParser::TitleOff( const ImportInfo& rInfo ) { if( mbTitleOn ) { - rtl::OUString aTitle = maTitle.makeStringAndClear().trim(); + OUString aTitle = maTitle.makeStringAndClear().trim(); if (!aTitle.isEmpty() && mpDoc->GetDocumentShell()) { uno::Reference<document::XDocumentPropertiesSupplier> xDPS( @@ -3236,8 +3236,8 @@ public: const SelectorName& rSelName = *itr; const MemStr& rElem = rSelName.first; const MemStr& rClass = rSelName.second; - rtl::OUString aName(maPropName.mp, maPropName.mn, RTL_TEXTENCODING_UTF8); - rtl::OUString aValue(maPropValue.mp, maPropValue.mn, RTL_TEXTENCODING_UTF8); + OUString aName(maPropName.mp, maPropName.mn, RTL_TEXTENCODING_UTF8); + OUString aValue(maPropValue.mp, maPropValue.mn, RTL_TEXTENCODING_UTF8); mrStyles.add(rElem.mp, rElem.mn, rClass.mp, rClass.mn, aName, aValue); } maPropName = MemStr(); @@ -3247,9 +3247,9 @@ public: } -void ScHTMLQueryParser::ParseStyle(const rtl::OUString& rStrm) +void ScHTMLQueryParser::ParseStyle(const OUString& rStrm) { - rtl::OString aStr = rtl::OUStringToOString(rStrm, RTL_TEXTENCODING_UTF8); + OString aStr = OUStringToOString(rStrm, RTL_TEXTENCODING_UTF8); CSSHandler aHdl(GetStyles()); orcus::css_parser<CSSHandler> aParser(aStr.getStr(), aStr.getLength(), aHdl); try diff --git a/sc/source/filter/inc/addressconverter.hxx b/sc/source/filter/inc/addressconverter.hxx index 90576467d949..dded94eb74aa 100644 --- a/sc/source/filter/inc/addressconverter.hxx +++ b/sc/source/filter/inc/addressconverter.hxx @@ -209,7 +209,7 @@ public: */ static bool parseOoxAddress2d( sal_Int32& ornColumn, sal_Int32& ornRow, - const ::rtl::OUString& rString, + const OUString& rString, sal_Int32 nStart = 0, sal_Int32 nLength = SAL_MAX_INT32 ); @@ -234,7 +234,7 @@ public: static bool parseOoxRange2d( sal_Int32& ornStartColumn, sal_Int32& ornStartRow, sal_Int32& ornEndColumn, sal_Int32& ornEndRow, - const ::rtl::OUString& rString, + const OUString& rString, sal_Int32 nStart = 0, sal_Int32 nLength = SAL_MAX_INT32 ); @@ -313,7 +313,7 @@ public: */ bool convertToCellAddressUnchecked( ::com::sun::star::table::CellAddress& orAddress, - const ::rtl::OUString& rString, + const OUString& rString, sal_Int16 nSheet ); /** Tries to convert the passed string to a single cell address. @@ -327,7 +327,7 @@ public: */ bool convertToCellAddress( ::com::sun::star::table::CellAddress& orAddress, - const ::rtl::OUString& rString, + const OUString& rString, sal_Int16 nSheet, bool bTrackOverflow ); @@ -340,7 +340,7 @@ public: @return A valid API cell address struct. */ ::com::sun::star::table::CellAddress createValidCellAddress( - const ::rtl::OUString& rString, + const OUString& rString, sal_Int16 nSheet, bool bTrackOverflow ); @@ -445,7 +445,7 @@ public: */ bool convertToCellRangeUnchecked( ::com::sun::star::table::CellRangeAddress& orRange, - const ::rtl::OUString& rString, + const OUString& rString, sal_Int16 nSheet ); /** Tries to convert the passed string to a cell range address. @@ -474,7 +474,7 @@ public: */ bool convertToCellRange( ::com::sun::star::table::CellRangeAddress& orRange, - const ::rtl::OUString& rString, + const OUString& rString, sal_Int16 nSheet, bool bAllowOverflow, bool bTrackOverflow ); @@ -549,7 +549,7 @@ public: */ void convertToCellRangeList( ApiCellRangeList& orRanges, - const ::rtl::OUString& rString, + const OUString& rString, sal_Int16 nSheet, bool bTrackOverflow ); diff --git a/sc/source/filter/inc/autofilterbuffer.hxx b/sc/source/filter/inc/autofilterbuffer.hxx index 6cfc7c55cad9..05c3e1dade56 100644 --- a/sc/source/filter/inc/autofilterbuffer.hxx +++ b/sc/source/filter/inc/autofilterbuffer.hxx @@ -46,8 +46,8 @@ struct ApiFilterSettings explicit ApiFilterSettings(); void appendField( bool bAnd, sal_Int32 nOperator, double fValue ); - void appendField( bool bAnd, sal_Int32 nOperator, const ::rtl::OUString& rValue ); - void appendField( bool bAnd, const std::vector<rtl::OUString>& rValues ); + void appendField( bool bAnd, sal_Int32 nOperator, const OUString& rValue ); + void appendField( bool bAnd, const std::vector<OUString>& rValues ); }; // ============================================================================ @@ -89,7 +89,7 @@ public: virtual ApiFilterSettings finalizeImport( sal_Int32 nMaxCount ); private: - typedef ::std::vector< ::rtl::OUString > FilterValueVector; + typedef ::std::vector< OUString > FilterValueVector; FilterValueVector maValues; sal_Int32 mnCalendarType; diff --git a/sc/source/filter/inc/biffcodec.hxx b/sc/source/filter/inc/biffcodec.hxx index 03949a55ac30..de43c47fed97 100644 --- a/sc/source/filter/inc/biffcodec.hxx +++ b/sc/source/filter/inc/biffcodec.hxx @@ -45,7 +45,7 @@ public: inline BiffDecoderBase* clone() { return implClone(); } /** Implementation of the ::comphelper::IDocPasswordVerifier interface. */ - virtual ::comphelper::DocPasswordVerifierResult verifyPassword( const ::rtl::OUString& rPassword, ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >& o_rEncryptionData ); + virtual ::comphelper::DocPasswordVerifierResult verifyPassword( const OUString& rPassword, ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >& o_rEncryptionData ); virtual ::comphelper::DocPasswordVerifierResult verifyEncryptionData( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >& o_rEncryptionData ); /** Returns true, if the decoder has been initialized correctly. */ @@ -64,7 +64,7 @@ private: /** Derived classes implement password verification and initialization of the decoder. */ - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue > implVerifyPassword( const ::rtl::OUString& rPassword ) = 0; + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue > implVerifyPassword( const OUString& rPassword ) = 0; virtual bool implVerifyEncryptionData( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >& rEncryptionData ) = 0; /** Implementation of decryption of a memory block. */ @@ -93,7 +93,7 @@ private: virtual BiffDecoder_XOR* implClone(); /** Implements password verification and initialization of the decoder. */ - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue > implVerifyPassword( const ::rtl::OUString& rPassword ); + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue > implVerifyPassword( const OUString& rPassword ); virtual bool implVerifyEncryptionData( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >& rEncryptionData ); @@ -124,7 +124,7 @@ private: virtual BiffDecoder_RCF* implClone(); /** Implements password verification and initialization of the decoder. */ - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue > implVerifyPassword( const ::rtl::OUString& rPassword ); + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue > implVerifyPassword( const OUString& rPassword ); virtual bool implVerifyEncryptionData( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >& rEncryptionData ); /** Implementation of decryption of a memory block. */ diff --git a/sc/source/filter/inc/biffhelper.hxx b/sc/source/filter/inc/biffhelper.hxx index 6aac201cfd79..cd5f1e3e7878 100644 --- a/sc/source/filter/inc/biffhelper.hxx +++ b/sc/source/filter/inc/biffhelper.hxx @@ -605,7 +605,7 @@ public: // BIFF12 import ---------------------------------------------------------- /** Reads a BIFF12 string with leading 16-bit or 32-bit length field. */ - static ::rtl::OUString readString( SequenceInputStream& rStrm, bool b32BitLen = true, bool bAllowNulChars = false ); + static OUString readString( SequenceInputStream& rStrm, bool b32BitLen = true, bool bAllowNulChars = false ); // BIFF2-BIFF8 import ----------------------------------------------------- @@ -635,8 +635,8 @@ private: // ---------------------------------------------------------------------------- -/** BIFF12 stream operator for an ::rtl::OUString, reads 32-bit string length and Unicode array. */ -inline SequenceInputStream& operator>>( SequenceInputStream& rStrm, ::rtl::OUString& orString ) +/** BIFF12 stream operator for an OUString, reads 32-bit string length and Unicode array. */ +inline SequenceInputStream& operator>>( SequenceInputStream& rStrm, OUString& orString ) { orString = BiffHelper::readString( rStrm ); return rStrm; diff --git a/sc/source/filter/inc/biffinputstream.hxx b/sc/source/filter/inc/biffinputstream.hxx index 942e2aff6a2b..645a7c941f84 100644 --- a/sc/source/filter/inc/biffinputstream.hxx +++ b/sc/source/filter/inc/biffinputstream.hxx @@ -243,7 +243,7 @@ public: True = NUL characters are inserted into the imported string. False = NUL characters are replaced by question marks (default). */ - ::rtl::OString readByteString( bool b16BitLen, bool bAllowNulChars = false ); + OString readByteString( bool b16BitLen, bool bAllowNulChars = false ); /** Reads 8/16 bit string length and character array, and returns a Unicode string. @param b16BitLen @@ -254,7 +254,7 @@ public: True = NUL characters are inserted into the imported string. False = NUL characters are replaced by question marks (default). */ - ::rtl::OUString readByteStringUC( bool b16BitLen, rtl_TextEncoding eTextEnc, bool bAllowNulChars = false ); + OUString readByteStringUC( bool b16BitLen, rtl_TextEncoding eTextEnc, bool bAllowNulChars = false ); // Unicode strings -------------------------------------------------------- @@ -267,7 +267,7 @@ public: True = NUL characters are inserted into the imported string. False = NUL characters are replaced by question marks (default). */ - ::rtl::OUString readUniStringChars( sal_uInt16 nChars, bool b16BitChars, bool bAllowNulChars = false ); + OUString readUniStringChars( sal_uInt16 nChars, bool b16BitChars, bool bAllowNulChars = false ); /** Reads 8-bit flags, extended header, nChar characters, extended data of a BIFF8 string, and returns the string. @@ -276,7 +276,7 @@ public: True = NUL characters are inserted into the imported string. False = NUL characters are replaced by question marks (default). */ - ::rtl::OUString readUniStringBody( sal_uInt16 nChars, bool bAllowNulChars = false ); + OUString readUniStringBody( sal_uInt16 nChars, bool bAllowNulChars = false ); /** Reads 16-bit character count, 8-bit flags, extended header, character array, extended data of a BIFF8 string, and returns the string. @@ -284,7 +284,7 @@ public: True = NUL characters are inserted into the imported string. False = NUL characters are replaced by question marks (default). */ - ::rtl::OUString readUniString( bool bAllowNulChars = false ); + OUString readUniString( bool bAllowNulChars = false ); // ------------------------------------------------------------------------ private: diff --git a/sc/source/filter/inc/chartsheetfragment.hxx b/sc/source/filter/inc/chartsheetfragment.hxx index ac067ff71bd2..fa7a995de489 100644 --- a/sc/source/filter/inc/chartsheetfragment.hxx +++ b/sc/source/filter/inc/chartsheetfragment.hxx @@ -32,11 +32,11 @@ class ChartsheetFragment : public WorksheetFragmentBase public: explicit ChartsheetFragment( const WorksheetHelper& rHelper, - const ::rtl::OUString& rFragmentPath ); + const OUString& rFragmentPath ); protected: virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ); - virtual void onCharacters( const ::rtl::OUString& rChars ); + virtual void onCharacters( const OUString& rChars ); virtual ::oox::core::ContextHandlerRef onCreateRecordContext( sal_Int32 nRecId, SequenceInputStream& rStrm ); diff --git a/sc/source/filter/inc/commentsbuffer.hxx b/sc/source/filter/inc/commentsbuffer.hxx index 626aad0f4e42..5aa3e65485f6 100644 --- a/sc/source/filter/inc/commentsbuffer.hxx +++ b/sc/source/filter/inc/commentsbuffer.hxx @@ -34,7 +34,7 @@ struct CommentModel ::com::sun::star::table::CellRangeAddress maRange; /// Position of the comment in the worksheet. RichStringRef mxText; /// Formatted text of the comment (not used in BIFF8). - ::rtl::OUString maAuthor; /// Comment author (BIFF8 only). + OUString maAuthor; /// Comment author (BIFF8 only). sal_Int32 mnAuthorId; /// Identifier of the comment's author (OOXML and BIFF12 only). sal_uInt16 mnObjId; /// Drawing object identifier (BIFF8 only). sal_Bool mbAutoFill; /// Auto Selection of comment object's fill style @@ -85,7 +85,7 @@ public: explicit CommentsBuffer( const WorksheetHelper& rHelper ); /** Appends a new author to the list of comment authors. */ - void appendAuthor( const ::rtl::OUString& rAuthor ); + void appendAuthor( const OUString& rAuthor ); /** Creates and returns a new comment. */ CommentRef createComment(); @@ -93,7 +93,7 @@ public: void finalizeImport(); private: - typedef ::std::vector< ::rtl::OUString > OUStringVector; + typedef ::std::vector< OUString > OUStringVector; typedef RefVector< Comment > CommentVector; OUStringVector maAuthors; diff --git a/sc/source/filter/inc/commentsfragment.hxx b/sc/source/filter/inc/commentsfragment.hxx index fe0ff51b46df..fe534f129a4a 100644 --- a/sc/source/filter/inc/commentsfragment.hxx +++ b/sc/source/filter/inc/commentsfragment.hxx @@ -33,10 +33,10 @@ class CommentsFragment : public WorksheetFragmentBase public: explicit CommentsFragment( const WorksheetHelper& rHelper, - const ::rtl::OUString& rFragmentPath ); + const OUString& rFragmentPath ); protected: virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ); - virtual void onCharacters( const ::rtl::OUString& rChars ); + virtual void onCharacters( const OUString& rChars ); virtual void onEndElement(); virtual ::oox::core::ContextHandlerRef onCreateRecordContext( sal_Int32 nRecId, SequenceInputStream& rStrm ); diff --git a/sc/source/filter/inc/condformatbuffer.hxx b/sc/source/filter/inc/condformatbuffer.hxx index 25bae462410a..e81ca732f899 100644 --- a/sc/source/filter/inc/condformatbuffer.hxx +++ b/sc/source/filter/inc/condformatbuffer.hxx @@ -49,7 +49,7 @@ struct CondFormatRuleModel typedef ::std::vector< ApiTokenSequence > ApiTokenSequenceVector; ApiTokenSequenceVector maFormulas; /// Formulas for rule conditions. - ::rtl::OUString maText; /// Text for 'contains' rules. + OUString maText; /// Text for 'contains' rules. sal_Int32 mnPriority; /// Priority of this rule. sal_Int32 mnType; /// Type of the rule. sal_Int32 mnOperator; /// In cell-is rules: Comparison operator. @@ -81,7 +81,7 @@ struct ColorScaleRuleModelEntry bool mbMax; bool mbPercent; bool mbPercentile; - rtl::OUString maFormula; + OUString maFormula; ColorScaleRuleModelEntry(): maColor(), @@ -140,7 +140,7 @@ public: private: std::vector< ColorScaleRuleModelEntry > maEntries; ScIconSetFormatData* mpFormatData; - rtl::OUString maIconSetType; + OUString maIconSetType; }; @@ -156,7 +156,7 @@ public: /** Imports rule settings from the cfRule element. */ void importCfRule( const AttributeList& rAttribs ); /** Appends a new condition formula string. */ - void appendFormula( const ::rtl::OUString& rFormula ); + void appendFormula( const OUString& rFormula ); /** Imports rule settings from a CFRULE record. */ void importCfRule( SequenceInputStream& rStrm ); diff --git a/sc/source/filter/inc/condformatcontext.hxx b/sc/source/filter/inc/condformatcontext.hxx index 89c1e944181a..167a3a3025e2 100644 --- a/sc/source/filter/inc/condformatcontext.hxx +++ b/sc/source/filter/inc/condformatcontext.hxx @@ -73,7 +73,7 @@ public: protected: virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ); virtual void onStartElement( const AttributeList& rAttribs ); - virtual void onCharacters( const ::rtl::OUString& rChars ); + virtual void onCharacters( const OUString& rChars ); virtual void onEndElement(); virtual ::oox::core::ContextHandlerRef onCreateRecordContext( sal_Int32 nRecId, SequenceInputStream& rStrm ); diff --git a/sc/source/filter/inc/connectionsbuffer.hxx b/sc/source/filter/inc/connectionsbuffer.hxx index bd8c62bb079e..fdcba12e0f3a 100644 --- a/sc/source/filter/inc/connectionsbuffer.hxx +++ b/sc/source/filter/inc/connectionsbuffer.hxx @@ -46,9 +46,9 @@ struct WebPrModel typedef ::std::vector< ::com::sun::star::uno::Any > TablesVector; TablesVector maTables; /// Names or indexes of the web query tables. - ::rtl::OUString maUrl; /// Source URL to refresh the data. - ::rtl::OUString maPostMethod; /// POST method to query data. - ::rtl::OUString maEditPage; /// Web page showing query data (for XML queries). + OUString maUrl; /// Source URL to refresh the data. + OUString maPostMethod; /// POST method to query data. + OUString maEditPage; /// Web page showing query data (for XML queries). sal_Int32 mnHtmlFormat; /// Plain text, rich text, or HTML. bool mbXml; /// True = XML query, false = HTML query. bool mbSourceData; /// True = import XML source data referred by HTML table. @@ -71,11 +71,11 @@ struct ConnectionModel typedef ::std::auto_ptr< WebPrModel > WebPrModelPtr; WebPrModelPtr mxWebPr; /// Special settings for web queries. - ::rtl::OUString maName; /// Unique name of this connection. - ::rtl::OUString maDescription; /// User description of this connection. - ::rtl::OUString maSourceFile; /// URL of a source data file. - ::rtl::OUString maSourceConnFile; /// URL of a source connection file. - ::rtl::OUString maSsoId; /// Single sign-on identifier. + OUString maName; /// Unique name of this connection. + OUString maDescription; /// User description of this connection. + OUString maSourceFile; /// URL of a source data file. + OUString maSourceConnFile; /// URL of a source connection file. + OUString maSsoId; /// Single sign-on identifier. sal_Int32 mnId; /// Unique connection identifier. sal_Int32 mnType; /// Data source type. sal_Int32 mnReconnectMethod; /// Reconnection method. diff --git a/sc/source/filter/inc/connectionsfragment.hxx b/sc/source/filter/inc/connectionsfragment.hxx index d110865dedce..91c0bb1d6170 100644 --- a/sc/source/filter/inc/connectionsfragment.hxx +++ b/sc/source/filter/inc/connectionsfragment.hxx @@ -52,7 +52,7 @@ class ConnectionsFragment : public WorkbookFragmentBase public: explicit ConnectionsFragment( const WorkbookHelper& rHelper, - const ::rtl::OUString& rFragmentPath ); + const OUString& rFragmentPath ); protected: virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ); diff --git a/sc/source/filter/inc/defnamesbuffer.hxx b/sc/source/filter/inc/defnamesbuffer.hxx index 3b81404dd6c8..d45783e746cb 100644 --- a/sc/source/filter/inc/defnamesbuffer.hxx +++ b/sc/source/filter/inc/defnamesbuffer.hxx @@ -55,8 +55,8 @@ const sal_Unicode BIFF_DEFNAME_UNKNOWN = '\x0E'; struct DefinedNameModel { - ::rtl::OUString maName; /// The original name. - ::rtl::OUString maFormula; /// The formula string. + OUString maName; /// The original name. + OUString maFormula; /// The formula string. sal_Int32 mnSheet; /// Sheet index for local names. sal_Int32 mnFuncGroupId; /// Function group identifier. bool mbMacro; /// True = Macro name (VBA or sheet macro). @@ -76,12 +76,12 @@ public: explicit DefinedNameBase( const WorkbookHelper& rHelper ); /** Returns the original name as imported from or exported to the file. */ - inline const ::rtl::OUString& getModelName() const { return maModel.maName; } + inline const OUString& getModelName() const { return maModel.maName; } /** Returns the name as used in the Calc document. */ - inline const ::rtl::OUString& getCalcName() const { return maCalcName; } + inline const OUString& getCalcName() const { return maCalcName; } /** Returns the original name as imported from or exported to the file. */ - const ::rtl::OUString& getUpcaseModelName() const; + const OUString& getUpcaseModelName() const; /** Returns an Any with a SingleReference or ComplexReference, or an empty Any. */ ::com::sun::star::uno::Any getReference( const ::com::sun::star::table::CellAddress& rBaseAddr ) const; @@ -95,8 +95,8 @@ protected: protected: DefinedNameModel maModel; /// Model data for this defined name. - mutable ::rtl::OUString maUpModelName; /// Model name converted to uppercase ASCII. - ::rtl::OUString maCalcName; /// Final name used in the Calc document. + mutable OUString maUpModelName; /// Model name converted to uppercase ASCII. + OUString maCalcName; /// Final name used in the Calc document. ::com::sun::star::uno::Any maRefAny; /// Single cell/range reference. }; @@ -110,7 +110,7 @@ public: /** Sets the attributes for this defined name from the passed attribute set. */ void importDefinedName( const AttributeList& rAttribs ); /** Sets the formula string from the body of the definedName element. */ - void setFormula( const ::rtl::OUString& rFormula ); + void setFormula( const OUString& rFormula ); /** Imports the defined name from a DEFINEDNAME record in the passed stream. */ void importDefinedName( SequenceInputStream& rStrm ); @@ -181,7 +181,7 @@ public: @param nSheet The sheet index for local names or -1 for global names. If no local name is found, tries to find a matching global name. @return Reference to the defined name or empty reference. */ - DefinedNameRef getByModelName( const ::rtl::OUString& rModelName, sal_Int16 nCalcSheet = -1 ) const; + DefinedNameRef getByModelName( const OUString& rModelName, sal_Int16 nCalcSheet = -1 ) const; /** Returns a built-in defined name by its built-in identifier. @param nSheet The sheet index of the built-in name. @return Reference to the defined name or empty reference. */ @@ -191,7 +191,7 @@ private: DefinedNameRef createDefinedName(); private: - typedef ::std::pair< sal_Int16, ::rtl::OUString > SheetNameKey; + typedef ::std::pair< sal_Int16, OUString > SheetNameKey; typedef ::std::pair< sal_Int16, sal_Unicode > BuiltinKey; typedef RefVector< DefinedName > DefNameVector; diff --git a/sc/source/filter/inc/dif.hxx b/sc/source/filter/inc/dif.hxx index a8a0a568fd59..b9dabff235ed 100644 --- a/sc/source/filter/inc/dif.hxx +++ b/sc/source/filter/inc/dif.hxx @@ -72,9 +72,9 @@ private: SvNumberFormatter* pNumFormatter; SvStream& rIn; sal_Bool bPlain; - rtl::OUString aLookAheadLine; + OUString aLookAheadLine; - bool ReadNextLine( rtl::OUString& rStr ); + bool ReadNextLine( OUString& rStr ); bool LookAhead(); DATASET GetNumberDataset( const sal_Unicode* pPossibleNumericData ); static inline sal_Bool IsBOT( const sal_Unicode* pRef ); diff --git a/sc/source/filter/inc/drawingbase.hxx b/sc/source/filter/inc/drawingbase.hxx index de19882ecfe5..be11622aece9 100644 --- a/sc/source/filter/inc/drawingbase.hxx +++ b/sc/source/filter/inc/drawingbase.hxx @@ -98,9 +98,9 @@ public: /** Imports the shape client data from the xdr:clientData element. */ void importClientData( const AttributeList& rAttribs ); /** Sets an attribute of the cell-dependent anchor position from xdr:from and xdr:to elements. */ - void setCellPos( sal_Int32 nElement, sal_Int32 nParentContext, const ::rtl::OUString& rValue ); + void setCellPos( sal_Int32 nElement, sal_Int32 nParentContext, const OUString& rValue ); /** Imports the client anchor settings from a VML element. */ - void importVmlAnchor( const ::rtl::OUString& rAnchor ); + void importVmlAnchor( const OUString& rAnchor ); /** Calculates the resulting shape anchor in EMUs. */ ::oox::drawingml::EmuRectangle calcAnchorRectEmu( diff --git a/sc/source/filter/inc/drawingfragment.hxx b/sc/source/filter/inc/drawingfragment.hxx index 0799d6f8f862..29902b763b58 100644 --- a/sc/source/filter/inc/drawingfragment.hxx +++ b/sc/source/filter/inc/drawingfragment.hxx @@ -47,11 +47,11 @@ namespace xls { class ShapeMacroAttacher : public ::oox::ole::VbaMacroAttacherBase { public: - explicit ShapeMacroAttacher( const ::rtl::OUString& rMacroName, + explicit ShapeMacroAttacher( const OUString& rMacroName, const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >& rxShape ); private: - virtual void attachMacro( const ::rtl::OUString& rMacroUrl ); + virtual void attachMacro( const OUString& rMacroUrl ); private: ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > mxShape; @@ -73,7 +73,7 @@ protected: const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes >& rxShapes ); private: - ::rtl::OUString maMacroName; + OUString maMacroName; }; // ============================================================================ @@ -113,11 +113,11 @@ class DrawingFragment : public WorksheetFragmentBase public: explicit DrawingFragment( const WorksheetHelper& rHelper, - const ::rtl::OUString& rFragmentPath ); + const OUString& rFragmentPath ); protected: virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ); - virtual void onCharacters( const ::rtl::OUString& rChars ); + virtual void onCharacters( const OUString& rChars ); virtual void onEndElement(); private: @@ -136,12 +136,12 @@ private: class VmlControlMacroAttacher : public ::oox::ole::VbaMacroAttacherBase { public: - explicit VmlControlMacroAttacher( const ::rtl::OUString& rMacroName, + explicit VmlControlMacroAttacher( const OUString& rMacroName, const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexContainer >& rxCtrlFormIC, sal_Int32 nCtrlIndex, sal_Int32 nCtrlType, sal_Int32 nDropStyle ); private: - virtual void attachMacro( const ::rtl::OUString& rMacroUrl ); + virtual void attachMacro( const OUString& rMacroUrl ); private: ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexContainer > mxCtrlFormIC; @@ -164,12 +164,12 @@ public: virtual bool isShapeSupported( const ::oox::vml::ShapeBase& rShape ) const; /** Returns additional base names for automatic shape name creation. */ - virtual ::rtl::OUString getShapeBaseName( const ::oox::vml::ShapeBase& rShape ) const; + virtual OUString getShapeBaseName( const ::oox::vml::ShapeBase& rShape ) const; /** Calculates the shape rectangle from a cell anchor string. */ virtual bool convertClientAnchor( ::com::sun::star::awt::Rectangle& orShapeRect, - const ::rtl::OUString& rShapeAnchor ) const; + const OUString& rShapeAnchor ) const; /** Creates a UNO control shape for legacy drawing controls. */ virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > @@ -186,7 +186,7 @@ public: private: /** Converts the passed VML textbox text color to an OLE color. */ - sal_uInt32 convertControlTextColor( const ::rtl::OUString& rTextColor ) const; + sal_uInt32 convertControlTextColor( const OUString& rTextColor ) const; /** Converts the passed VML textbox font to an ActiveX form control font. */ void convertControlFontData( ::oox::ole::AxFontData& rAxFontData, sal_uInt32& rnOleTextColor, @@ -194,7 +194,7 @@ private: /** Converts the caption, the font settings, and the horizontal alignment from the passed VML textbox to ActiveX form control settings. */ void convertControlText( - ::oox::ole::AxFontData& rAxFontData, sal_uInt32& rnOleTextColor, ::rtl::OUString& rCaption, + ::oox::ole::AxFontData& rAxFontData, sal_uInt32& rnOleTextColor, OUString& rCaption, const ::oox::vml::TextBox* pTextBox, sal_Int32 nTextHAlign ) const; /** Converts the passed VML shape background formatting to ActiveX control formatting. */ void convertControlBackground( @@ -213,7 +213,7 @@ class VmlDrawingFragment : public ::oox::vml::DrawingFragment, public WorksheetH public: explicit VmlDrawingFragment( const WorksheetHelper& rHelper, - const ::rtl::OUString& rFragmentPath ); + const OUString& rFragmentPath ); protected: virtual void finalizeImport(); diff --git a/sc/source/filter/inc/drawingmanager.hxx b/sc/source/filter/inc/drawingmanager.hxx index 9c85a2fbb53d..791d8bb572b2 100644 --- a/sc/source/filter/inc/drawingmanager.hxx +++ b/sc/source/filter/inc/drawingmanager.hxx @@ -146,9 +146,9 @@ protected: private: ShapeAnchor maAnchor; /// Position of the drawing object. - ::rtl::OUString maObjName; /// Name of the object. - ::rtl::OUString maMacroName; /// Name of an attached macro. - ::rtl::OUString maHyperlink; /// On-click hyperlink URL. + OUString maObjName; /// Name of the object. + OUString maMacroName; /// Name of an attached macro. + OUString maHyperlink; /// On-click hyperlink URL. sal_uInt16 mnObjId; /// The object identifier (unique per drawing). sal_uInt16 mnObjType; /// The object type from OBJ record. bool mbHidden; /// True = object is hidden. diff --git a/sc/source/filter/inc/eeparser.hxx b/sc/source/filter/inc/eeparser.hxx index 2ca73b985a12..62b0673059a9 100644 --- a/sc/source/filter/inc/eeparser.hxx +++ b/sc/source/filter/inc/eeparser.hxx @@ -35,10 +35,10 @@ const sal_Char nHoriVerti = nHorizontal | nVertical; struct ScHTMLImage { - rtl::OUString aURL; + OUString aURL; Size aSize; Point aSpace; - rtl::OUString aFilterName; + OUString aFilterName; Graphic* pGraphic; // wird von WriteToDocument uebernommen sal_Char nDir; // 1==hori, 2==verti, 3==beides @@ -54,10 +54,10 @@ struct ScEEParseEntry { SfxItemSet aItemSet; ESelection aSel; // Selection in EditEngine - rtl::OUString* pValStr; // HTML evtl. SDVAL String - rtl::OUString* pNumStr; // HTML evtl. SDNUM String - rtl::OUString* pName; // HTML evtl. Anchor/RangeName - rtl::OUString aAltText; // HTML IMG ALT Text + OUString* pValStr; // HTML evtl. SDVAL String + OUString* pNumStr; // HTML evtl. SDNUM String + OUString* pName; // HTML evtl. Anchor/RangeName + OUString aAltText; // HTML IMG ALT Text boost::ptr_vector< ScHTMLImage > maImageList; // Grafiken in dieser Zelle SCCOL nCol; // relativ zum Beginn des Parse SCROW nRow; diff --git a/sc/source/filter/inc/excelfilter.hxx b/sc/source/filter/inc/excelfilter.hxx index 5e826bd3e4a9..fc108c311f09 100644 --- a/sc/source/filter/inc/excelfilter.hxx +++ b/sc/source/filter/inc/excelfilter.hxx @@ -67,7 +67,7 @@ public: private: virtual GraphicHelper* implCreateGraphicHelper() const; virtual ::oox::ole::VbaProject* implCreateVbaProject() const; - virtual ::rtl::OUString implGetImplementationName() const; + virtual OUString implGetImplementationName() const; }; } // namespace xls diff --git a/sc/source/filter/inc/excelhandlers.hxx b/sc/source/filter/inc/excelhandlers.hxx index 8175e41124e0..ed2805869254 100644 --- a/sc/source/filter/inc/excelhandlers.hxx +++ b/sc/source/filter/inc/excelhandlers.hxx @@ -66,7 +66,7 @@ class WorkbookFragmentBase : public ::oox::core::FragmentHandler2, public Workbo public: explicit WorkbookFragmentBase( const WorkbookHelper& rHelper, - const ::rtl::OUString& rFragmentPath ); + const OUString& rFragmentPath ); }; // ============================================================================ @@ -80,7 +80,7 @@ class WorksheetFragmentBase : public ::oox::core::FragmentHandler2, public Works public: explicit WorksheetFragmentBase( const WorksheetHelper& rHelper, - const ::rtl::OUString& rFragmentPath ); + const OUString& rFragmentPath ); }; // ============================================================================ @@ -135,7 +135,7 @@ public: /** Opens the stream with the passed full name. */ explicit BiffFragmentHandler( const ::oox::core::FilterBase& rFilter, - const ::rtl::OUString& rStrmName ); + const OUString& rStrmName ); virtual ~BiffFragmentHandler(); @@ -178,7 +178,7 @@ class BiffWorkbookFragmentBase : public BiffFragmentHandler, public WorkbookHelp protected: explicit BiffWorkbookFragmentBase( const WorkbookHelper& rHelper, - const ::rtl::OUString& rStrmName, + const OUString& rStrmName, bool bCloneDecoder = false ); }; diff --git a/sc/source/filter/inc/excform.hxx b/sc/source/filter/inc/excform.hxx index 2568ef8b3f65..1b7786fa6aaf 100644 --- a/sc/source/filter/inc/excform.hxx +++ b/sc/source/filter/inc/excform.hxx @@ -105,7 +105,7 @@ public: struct ExternalTabInfo { ScRange maRange; - ::rtl::OUString maTabName; + OUString maTabName; sal_uInt16 mnFileId; bool mbExternal; diff --git a/sc/source/filter/inc/excimp8.hxx b/sc/source/filter/inc/excimp8.hxx index 94bc2a6558f4..d4a54cc20013 100644 --- a/sc/source/filter/inc/excimp8.hxx +++ b/sc/source/filter/inc/excimp8.hxx @@ -70,7 +70,7 @@ private: private: // represents codename ( and associated modules ) // not speficied directly in the binary format - std::vector<rtl::OUString> maAutoGeneratedCodeNames; + std::vector<OUString> maAutoGeneratedCodeNames; ExcScenarioList maScenList; }; @@ -89,7 +89,7 @@ private: bool bCriteria:1; bool bAutoOrAdvanced:1; - void CreateFromDouble( rtl::OUString& rStr, double fVal ); + void CreateFromDouble( OUString& rStr, double fVal ); void SetCellAttribs(); void InsertQueryParam(); diff --git a/sc/source/filter/inc/excrecds.hxx b/sc/source/filter/inc/excrecds.hxx index 45dba0db12d5..fe70907bd330 100644 --- a/sc/source/filter/inc/excrecds.hxx +++ b/sc/source/filter/inc/excrecds.hxx @@ -271,7 +271,7 @@ public: class ExcBundlesheet : public ExcBundlesheetBase { private: - rtl::OString aName; + OString aName; virtual void SaveCont( XclExpStream& rStrm ); @@ -383,7 +383,7 @@ private: sal_uInt16 nCol; sal_uInt16 nFlags; ExcFilterCondition aCond[ 2 ]; - std::vector<rtl::OUString> maMultiValues; + std::vector<OUString> maMultiValues; bool AddCondition( ScQueryConnect eConn, sal_uInt8 nType, sal_uInt8 nOp, double fVal, String* pText, diff --git a/sc/source/filter/inc/externallinkbuffer.hxx b/sc/source/filter/inc/externallinkbuffer.hxx index 7160d8aebdf2..17519c17dc20 100644 --- a/sc/source/filter/inc/externallinkbuffer.hxx +++ b/sc/source/filter/inc/externallinkbuffer.hxx @@ -104,9 +104,9 @@ public: /** Returns the complete DDE link data of this DDE item. */ bool getDdeLinkData( - ::rtl::OUString& orDdeServer, - ::rtl::OUString& orDdeTopic, - ::rtl::OUString& orDdeItem ); + OUString& orDdeServer, + OUString& orDdeTopic, + OUString& orDdeItem ); private: /** Sets the size of the result matrix. */ @@ -236,11 +236,11 @@ public: inline bool isInternalLink() const { return (meLinkType == LINKTYPE_SELF) || (meLinkType == LINKTYPE_INTERNAL); } /** Returns the relation identifier for the external link fragment. */ - inline const ::rtl::OUString& getRelId() const { return maRelId; } + inline const OUString& getRelId() const { return maRelId; } /** Returns the class name of this external link. */ - inline const ::rtl::OUString& getClassName() const { return maClassName; } + inline const OUString& getClassName() const { return maClassName; } /** Returns the target URL of this external link. */ - inline const ::rtl::OUString& getTargetUrl() const { return maTargetUrl; } + inline const OUString& getTargetUrl() const { return maTargetUrl; } /** Returns the link info needed by the XML formula parser. */ ::com::sun::star::sheet::ExternalLinkInfo getLinkInfo() const; @@ -262,12 +262,12 @@ public: ExternalNameRef getNameByIndex( sal_Int32 nIndex ) const; private: - void setExternalTargetUrl( const ::rtl::OUString& rTargetUrl, const ::rtl::OUString& rTargetType ); - void setDdeOleTargetUrl( const ::rtl::OUString& rClassName, const ::rtl::OUString& rTargetUrl, ExternalLinkType eLinkType ); - void parseExternalReference( const ::oox::core::Relations& rRelations, const ::rtl::OUString& rRelId ); + void setExternalTargetUrl( const OUString& rTargetUrl, const OUString& rTargetType ); + void setDdeOleTargetUrl( const OUString& rClassName, const OUString& rTargetUrl, ExternalLinkType eLinkType ); + void parseExternalReference( const ::oox::core::Relations& rRelations, const OUString& rRelId ); /** Creates an external locument link and the sheet cache for the passed sheet name. */ - void insertExternalSheet( const ::rtl::OUString& rSheetName ); + void insertExternalSheet( const OUString& rSheetName ); ExternalNameRef createExternalName(); @@ -278,9 +278,9 @@ private: ExternalLinkType meLinkType; /// Type of this link object. FunctionLibraryType meFuncLibType; /// Type of the function library, if link type is LINKTYPE_LIBRARY. - ::rtl::OUString maRelId; /// Relation identifier for the external link fragment. - ::rtl::OUString maClassName; /// DDE service, OLE class name. - ::rtl::OUString maTargetUrl; /// Target link, DDE topic, OLE target. + OUString maRelId; /// Relation identifier for the external link fragment. + OUString maClassName; /// DDE service, OLE class name. + OUString maTargetUrl; /// Target link, DDE topic, OLE target. ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XExternalDocLink > mxDocLink; /// Interface for an external document. Int16Vector maCalcSheets; /// Internal sheet indexes. diff --git a/sc/source/filter/inc/externallinkfragment.hxx b/sc/source/filter/inc/externallinkfragment.hxx index 08f382064e4e..c6e20186740b 100644 --- a/sc/source/filter/inc/externallinkfragment.hxx +++ b/sc/source/filter/inc/externallinkfragment.hxx @@ -45,7 +45,7 @@ public: protected: virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ); - virtual void onCharacters( const ::rtl::OUString& rChars ); + virtual void onCharacters( const OUString& rChars ); virtual ::oox::core::ContextHandlerRef onCreateRecordContext( sal_Int32 nRecId, SequenceInputStream& rStrm ); @@ -81,12 +81,12 @@ class ExternalLinkFragment : public WorkbookFragmentBase public: explicit ExternalLinkFragment( const WorkbookHelper& rHelper, - const ::rtl::OUString& rFragmentPath, + const OUString& rFragmentPath, ExternalLink& rExtLink ); protected: virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ); - virtual void onCharacters( const ::rtl::OUString& rChars ); + virtual void onCharacters( const OUString& rChars ); virtual void onEndElement(); virtual ::oox::core::ContextHandlerRef onCreateRecordContext( sal_Int32 nRecId, SequenceInputStream& rStrm ); @@ -99,7 +99,7 @@ private: private: ExternalLink& mrExtLink; ExternalNameRef mxExtName; - ::rtl::OUString maResultValue; + OUString maResultValue; sal_Int32 mnResultType; }; diff --git a/sc/source/filter/inc/extlstcontext.hxx b/sc/source/filter/inc/extlstcontext.hxx index 9663cfae25a8..de1d14dd71f9 100644 --- a/sc/source/filter/inc/extlstcontext.hxx +++ b/sc/source/filter/inc/extlstcontext.hxx @@ -68,7 +68,7 @@ public: protected: virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ); virtual void onStartElement( const AttributeList& rAttribs ); - virtual void onCharacters( const ::rtl::OUString& rChars ); + virtual void onCharacters( const OUString& rChars ); private: void* mpTarget; diff --git a/sc/source/filter/inc/fapihelper.hxx b/sc/source/filter/inc/fapihelper.hxx index 7c744c36159c..b4b696af1c7f 100644 --- a/sc/source/filter/inc/fapihelper.hxx +++ b/sc/source/filter/inc/fapihelper.hxx @@ -64,7 +64,7 @@ public: VectorToSequence( const ::std::vector< Type >& rVector ); /** Returns the service name provided via the XServiceName interface, or an empty string on error. */ - static ::rtl::OUString GetServiceName( XInterfaceRef xInt ); + static OUString GetServiceName( XInterfaceRef xInt ); /** Returns the multi service factory from a document shell. */ static XServiceFactoryRef GetServiceFactory( SfxObjectShell* pShell ); @@ -72,21 +72,21 @@ public: /** Creates an instance from the passed service name, using the passed service factory. */ static XInterfaceRef CreateInstance( XServiceFactoryRef xFactory, - const ::rtl::OUString& rServiceName ); + const OUString& rServiceName ); /** Creates an instance from the passed service name, using the service factory of the passed object. */ static XInterfaceRef CreateInstance( SfxObjectShell* pShell, - const ::rtl::OUString& rServiceName ); + const OUString& rServiceName ); /** Creates an instance from the passed service name, using the process service factory. */ - static XInterfaceRef CreateInstance( const ::rtl::OUString& rServiceName ); + static XInterfaceRef CreateInstance( const OUString& rServiceName ); /** Opens a password dialog and returns the encryption data. @return The encryption data or an empty sequence on 'Cancel' or any error. */ static ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue > QueryEncryptionDataForMedium( SfxMedium& rMedium, ::comphelper::IDocPasswordVerifier& rVerifier, - const ::std::vector< ::rtl::OUString >* pDefaultPasswords = 0 ); + const ::std::vector< OUString >* pDefaultPasswords = 0 ); }; template< typename Type > @@ -122,7 +122,7 @@ public: ::com::sun::star::beans::XMultiPropertySet > XMultiPropSetRef; typedef ::com::sun::star::uno::Any UnoAny; typedef ::com::sun::star::uno::Sequence< UnoAny > UnoAnySequence; - typedef ::com::sun::star::uno::Sequence< ::rtl::OUString > OUStringSequence; + typedef ::com::sun::star::uno::Sequence< OUString > OUStringSequence; public: inline explicit ScfPropertySet() {} @@ -148,33 +148,33 @@ public: inline XPropertySetRef GetApiPropertySet() const { return mxPropSet; } /** Returns the service name provided via the XServiceName interface, or an empty string on error. */ - ::rtl::OUString GetServiceName() const; + OUString GetServiceName() const; // Get properties --------------------------------------------------------- /** Returns true, if the property set contains the specified property. */ - bool HasProperty( const ::rtl::OUString& rPropName ) const; + bool HasProperty( const OUString& rPropName ) const; /** Gets the specified property from the property set. @return true, if the Any could be filled with the property value. */ - bool GetAnyProperty( UnoAny& rValue, const ::rtl::OUString& rPropName ) const; + bool GetAnyProperty( UnoAny& rValue, const OUString& rPropName ) const; /** Gets the specified property from the property set. @return true, if the passed variable could be filled with the property value. */ template< typename Type > - inline bool GetProperty( Type& rValue, const ::rtl::OUString& rPropName ) const + inline bool GetProperty( Type& rValue, const OUString& rPropName ) const { UnoAny aAny; return GetAnyProperty( aAny, rPropName ) && (aAny >>= rValue); } /** Gets the specified Boolean property from the property set. @return true = property contains true; false = property contains false or error occurred. */ - bool GetBoolProperty( const ::rtl::OUString& rPropName ) const; + bool GetBoolProperty( const OUString& rPropName ) const; /** Gets the specified Boolean property from the property set. */ - rtl::OUString GetStringProperty( const ::rtl::OUString& rPropName ) const; + OUString GetStringProperty( const OUString& rPropName ) const; /** Gets the specified color property from the property set. @return true, if the passed color variable could be filled with the property value. */ - bool GetColorProperty( Color& rColor, const ::rtl::OUString& rPropName ) const; + bool GetColorProperty( Color& rColor, const OUString& rPropName ) const; /** Gets the specified properties from the property set. Tries to use the XMultiPropertySet interface. @param rPropNames The property names. MUST be ordered alphabetically. @@ -184,23 +184,23 @@ public: // Set properties --------------------------------------------------------- /** Puts the passed Any into the property set. */ - void SetAnyProperty( const ::rtl::OUString& rPropName, const UnoAny& rValue ); + void SetAnyProperty( const OUString& rPropName, const UnoAny& rValue ); /** Puts the passed value into the property set. */ template< typename Type > - inline void SetProperty( const ::rtl::OUString& rPropName, const Type& rValue ) + inline void SetProperty( const OUString& rPropName, const Type& rValue ) { SetAnyProperty( rPropName, ::com::sun::star::uno::makeAny( rValue ) ); } /** Puts the passed Boolean value into the property set. */ - inline void SetBoolProperty( const ::rtl::OUString& rPropName, bool bValue ) + inline void SetBoolProperty( const OUString& rPropName, bool bValue ) { SetAnyProperty( rPropName, ::comphelper::makeBoolAny( bValue ) ); } /** Puts the passed string into the property set. */ - inline void SetStringProperty( const ::rtl::OUString& rPropName, const String& rValue ) - { SetProperty( rPropName, ::rtl::OUString( rValue ) ); } + inline void SetStringProperty( const OUString& rPropName, const String& rValue ) + { SetProperty( rPropName, OUString( rValue ) ); } /** Puts the passed color into the property set. */ - inline void SetColorProperty( const ::rtl::OUString& rPropName, const Color& rColor ) + inline void SetColorProperty( const OUString& rPropName, const Color& rColor ) { SetProperty( rPropName, ScfApiHelper::ConvertToApiColor( rColor ) ); } /** Puts the passed properties into the property set. Tries to use the XMultiPropertySet interface. @@ -268,7 +268,7 @@ public: void WriteValue( const UnoAny& rAny ); /** Writes a tools string to the value sequence. */ inline void WriteValue( const String& rString ) - { WriteValue( ::rtl::OUString( rString ) ); } + { WriteValue( OUString( rString ) ); } /** Writes a color value to the value sequence. */ inline void WriteValue( const Color& rColor ) { WriteValue( ScfApiHelper::ConvertToApiColor( rColor ) ); } @@ -284,7 +284,7 @@ private: UnoAny* GetNextAny(); private: - typedef ::com::sun::star::uno::Sequence< ::rtl::OUString > OUStringSequence; + typedef ::com::sun::star::uno::Sequence< OUString > OUStringSequence; typedef ::com::sun::star::uno::Sequence< UnoAny > UnoAnySequence; OUStringSequence maNameSeq; /// Sequence of property names. diff --git a/sc/source/filter/inc/formulabase.hxx b/sc/source/filter/inc/formulabase.hxx index 082f3c604965..cb2785ecdca0 100644 --- a/sc/source/filter/inc/formulabase.hxx +++ b/sc/source/filter/inc/formulabase.hxx @@ -484,10 +484,10 @@ enum FunctionLibraryType */ struct FunctionInfo { - ::rtl::OUString maOdfFuncName; /// ODF function name. - ::rtl::OUString maOoxFuncName; /// OOXML function name. - ::rtl::OUString maBiffMacroName; /// Expected macro name in EXTERN.CALL function. - ::rtl::OUString maExtProgName; /// Programmatic function name for external functions. + OUString maOdfFuncName; /// ODF function name. + OUString maOoxFuncName; /// OOXML function name. + OUString maBiffMacroName; /// Expected macro name in EXTERN.CALL function. + OUString maExtProgName; /// Programmatic function name for external functions. FunctionLibraryType meFuncLibType; /// The external library this function is part of. sal_Int32 mnApiOpCode; /// API function opcode. sal_uInt16 mnBiff12FuncId; /// BIFF12 function identifier. @@ -544,7 +544,7 @@ public: virtual ~FunctionProvider(); /** Returns the function info for an OOXML function name, or 0 on error. */ - const FunctionInfo* getFuncInfoFromOoxFuncName( const ::rtl::OUString& rFuncName ) const; + const FunctionInfo* getFuncInfoFromOoxFuncName( const OUString& rFuncName ) const; /** Returns the function info for a BIFF12 function index, or 0 on error. */ const FunctionInfo* getFuncInfoFromBiff12FuncId( sal_uInt16 nFuncId ) const; @@ -554,11 +554,11 @@ public: /** Returns the function info for a macro function referred by the EXTERN.CALL function, or 0 on error. */ - const FunctionInfo* getFuncInfoFromMacroName( const ::rtl::OUString& rFuncName ) const; + const FunctionInfo* getFuncInfoFromMacroName( const OUString& rFuncName ) const; /** Returns the library type associated with the passed URL of a function library (function add-in). */ - FunctionLibraryType getFuncLibTypeFromLibraryName( const ::rtl::OUString& rLibraryName ) const; + FunctionLibraryType getFuncLibTypeFromLibraryName( const OUString& rLibraryName ) const; protected: /** Returns the list of all function infos. */ @@ -616,7 +616,7 @@ public: /** Calls the XFormulaParser::parseFormula() function of the API parser. */ ApiTokenSequence parseFormula( - const ::rtl::OUString& rFormula, + const OUString& rFormula, const ::com::sun::star::table::CellAddress& rRefPos ); private: @@ -641,7 +641,7 @@ public: @param rAddress The cell address containing column and row index. @param bAbsolute True = adds dollar signs before column and row. */ - static ::rtl::OUString generateAddress2dString( + static OUString generateAddress2dString( const ::com::sun::star::table::CellAddress& rAddress, bool bAbsolute ); @@ -651,7 +651,7 @@ public: @param rAddress The cell address containing column and row index. @param bAbsolute True = adds dollar signs before column and row. */ - static ::rtl::OUString generateAddress2dString( + static OUString generateAddress2dString( const BinAddress& rAddress, bool bAbsolute ); @@ -664,14 +664,14 @@ public: @return The string enclosed in double quotes, where all contained quote characters are doubled. */ - static ::rtl::OUString generateApiString( const ::rtl::OUString& rString ); + static OUString generateApiString( const OUString& rString ); /** Generates an array string in Calc formula notation from the passed matrix with Any's containing double values or strings. @param rMatrix The matrix containing double values or strings. */ - static ::rtl::OUString generateApiArray( const Matrix< ::com::sun::star::uno::Any >& rMatrix ); + static OUString generateApiArray( const Matrix< ::com::sun::star::uno::Any >& rMatrix ); // ------------------------------------------------------------------------ @@ -750,7 +750,7 @@ public: contains the string extracted from the token sequence. */ bool extractString( - ::rtl::OUString& orString, + OUString& orString, const ApiTokenSequence& rTokens ) const; /** Tries to extract information about a special token used for array diff --git a/sc/source/filter/inc/formulabuffer.hxx b/sc/source/filter/inc/formulabuffer.hxx index a0b96ce6d558..73009f552891 100644 --- a/sc/source/filter/inc/formulabuffer.hxx +++ b/sc/source/filter/inc/formulabuffer.hxx @@ -34,18 +34,18 @@ private: struct SharedFormulaEntry { ::com::sun::star::table::CellAddress maAddress; - rtl::OUString maTokenStr; + OUString maTokenStr; sal_Int32 mnSharedId; ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XFormulaTokens > mxFormulaTokens; - SharedFormulaEntry( const ::com::sun::star::table::CellAddress& rAddress, const rtl::OUString& rTokenStr, sal_Int32 nSharedId ) : maAddress( rAddress ), maTokenStr( rTokenStr ), mnSharedId( nSharedId ) {} + SharedFormulaEntry( const ::com::sun::star::table::CellAddress& rAddress, const OUString& rTokenStr, sal_Int32 nSharedId ) : maAddress( rAddress ), maTokenStr( rTokenStr ), mnSharedId( nSharedId ) {} }; struct TokenAddressItem { - ::rtl::OUString maTokenStr; + OUString maTokenStr; ::com::sun::star::table::CellAddress maCellAddress; - TokenAddressItem( const rtl::OUString& rTokenStr, const ::com::sun::star::table::CellAddress& rCellAddress ) : maTokenStr( rTokenStr ), maCellAddress( rCellAddress ) {} + TokenAddressItem( const OUString& rTokenStr, const ::com::sun::star::table::CellAddress& rCellAddress ) : maTokenStr( rTokenStr ), maCellAddress( rCellAddress ) {} }; struct TokenRangeAddressItem @@ -69,7 +69,7 @@ typedef ::std::map< sal_Int32, SharedIdToTokenIndex > SheetToSharedIdToTokenInde typedef ::std::pair< ::com::sun::star::table::CellAddress, double > ValueAddressPair; typedef ::std::map< sal_Int32, std::vector< ValueAddressPair > > FormulaValueMap; - void createSharedFormula( const ::com::sun::star::table::CellAddress& rAddress, sal_Int32 nSharedId, const rtl::OUString& rTokens ); + void createSharedFormula( const ::com::sun::star::table::CellAddress& rAddress, sal_Int32 nSharedId, const OUString& rTokens ); ::com::sun::star::uno::Reference< com::sun::star::table::XCellRange > getRange( const ::com::sun::star::table::CellRangeAddress& rRange); com::sun::star::uno::Reference< com::sun::star::sheet::XSpreadsheet > mxCurrSheet; FormulaDataMap cellFormulas; @@ -87,11 +87,11 @@ typedef ::std::map< sal_Int32, std::vector< ValueAddressPair > > FormulaValueMap public: explicit FormulaBuffer( const WorkbookHelper& rHelper ); void finalizeImport(); - void setCellFormula( const ::com::sun::star::table::CellAddress& rAddress, const rtl::OUString& ); + void setCellFormula( const ::com::sun::star::table::CellAddress& rAddress, const OUString& ); void setCellFormula( const ::com::sun::star::table::CellAddress& rAddress, sal_Int32 nSharedId ); void setCellFormulaValue( const ::com::sun::star::table::CellAddress& rAddress, double fValue ); - void setCellArrayFormula( const ::com::sun::star::table::CellRangeAddress& rRangeAddress, const ::com::sun::star::table::CellAddress& rTokenAddress, const rtl::OUString& ); - void createSharedFormulaMapEntry( const ::com::sun::star::table::CellAddress& rAddress, sal_Int32 nSharedId, const rtl::OUString& rTokens ); + void setCellArrayFormula( const ::com::sun::star::table::CellRangeAddress& rRangeAddress, const ::com::sun::star::table::CellAddress& rTokenAddress, const OUString& ); + void createSharedFormulaMapEntry( const ::com::sun::star::table::CellAddress& rAddress, sal_Int32 nSharedId, const OUString& rTokens ); }; } } diff --git a/sc/source/filter/inc/formulaparser.hxx b/sc/source/filter/inc/formulaparser.hxx index 68fffcc03e3d..33135ab0e5d3 100644 --- a/sc/source/filter/inc/formulaparser.hxx +++ b/sc/source/filter/inc/formulaparser.hxx @@ -56,7 +56,7 @@ protected: @param rTokenData The string that has been found in an OPCODE_BAD token preceding the function parentheses. */ - virtual const FunctionInfo* resolveBadFuncName( const ::rtl::OUString& rTokenData ) const; + virtual const FunctionInfo* resolveBadFuncName( const OUString& rTokenData ) const; /** Derived classed may try to find the name of a defined name with the passed index extracted from an OPCODE_NAME token. @@ -64,7 +64,7 @@ protected: @param nTokenIndex The index of the defined name that has been found in an OPCODE_NAME token preceding the function parentheses. */ - virtual ::rtl::OUString resolveDefinedName( sal_Int32 nTokenIndex ) const; + virtual OUString resolveDefinedName( sal_Int32 nTokenIndex ) const; private: typedef ::std::vector< const ApiToken* > ParameterPosVector; @@ -108,7 +108,7 @@ public: /** Converts an OOXML formula string. */ ApiTokenSequence importFormula( const ::com::sun::star::table::CellAddress& rBaseAddr, - const ::rtl::OUString& rFormulaString ) const; + const OUString& rFormulaString ) const; /** Imports and converts a BIFF12 token array from the passed stream. */ ApiTokenSequence importFormula( @@ -135,13 +135,13 @@ public: ApiTokenSequence convertNameToFormula( sal_Int32 nTokenIndex ) const; /** Converts the passed XML formula to an OLE link target. */ - ::rtl::OUString importOleTargetLink( const ::rtl::OUString& rFormulaString ); + OUString importOleTargetLink( const OUString& rFormulaString ); /** Imports and converts an OLE link target from the passed stream. */ - ::rtl::OUString importOleTargetLink( SequenceInputStream& rStrm ); + OUString importOleTargetLink( SequenceInputStream& rStrm ); /** Converts the passed formula to a macro name for a drawing shape. */ - ::rtl::OUString importMacroName( const ::rtl::OUString& rFormulaString ); + OUString importMacroName( const OUString& rFormulaString ); private: ::std::auto_ptr< FormulaParserImpl > mxImpl; diff --git a/sc/source/filter/inc/ftools.hxx b/sc/source/filter/inc/ftools.hxx index fa5aee6d13fe..cfa80fe86dc4 100644 --- a/sc/source/filter/inc/ftools.hxx +++ b/sc/source/filter/inc/ftools.hxx @@ -224,11 +224,11 @@ public: // *** byte string import operations *** -------------------------------------- /** Reads and returns a zero terminated byte string and decreases a stream counter. */ - static rtl::OString read_zeroTerminated_uInt8s_ToOString(SvStream& rStrm, sal_Int32& rnBytesLeft); + static OString read_zeroTerminated_uInt8s_ToOString(SvStream& rStrm, sal_Int32& rnBytesLeft); /** Reads and returns a zero terminated byte string and decreases a stream counter. */ - inline static rtl::OUString read_zeroTerminated_uInt8s_ToOUString(SvStream& rStrm, sal_Int32& rnBytesLeft, rtl_TextEncoding eTextEnc) + inline static OUString read_zeroTerminated_uInt8s_ToOUString(SvStream& rStrm, sal_Int32& rnBytesLeft, rtl_TextEncoding eTextEnc) { - return rtl::OStringToOUString(read_zeroTerminated_uInt8s_ToOString(rStrm, rnBytesLeft), eTextEnc); + return OStringToOUString(read_zeroTerminated_uInt8s_ToOString(rStrm, rnBytesLeft), eTextEnc); } /** Appends a zero terminated byte string. */ @@ -273,7 +273,7 @@ typedef ::std::vector< sal_Int16 > ScfInt16Vec; typedef ::std::vector< sal_uInt16 > ScfUInt16Vec; typedef ::std::vector< sal_Int32 > ScfInt32Vec; typedef ::std::vector< sal_uInt32 > ScfUInt32Vec; -typedef ::std::vector< ::rtl::OUString > ScfStringVec; +typedef ::std::vector< OUString > ScfStringVec; // ---------------------------------------------------------------------------- diff --git a/sc/source/filter/inc/htmlexp.hxx b/sc/source/filter/inc/htmlexp.hxx index 71fc58bb099a..585f7a21a0b5 100644 --- a/sc/source/filter/inc/htmlexp.hxx +++ b/sc/source/filter/inc/htmlexp.hxx @@ -123,7 +123,7 @@ class ScHTMLExport : public ScExportBase void WriteCell( SCCOL nCol, SCROW nRow, SCTAB nTab ); void WriteGraphEntry( ScHTMLGraphEntry* ); void WriteImage( String& rLinkName, - const Graphic&, const rtl::OString& rImgOptions, + const Graphic&, const OString& rImgOptions, sal_uLong nXOutFlags = 0 ); // nXOutFlags fuer XOutBitmap::WriteGraphic @@ -143,7 +143,7 @@ class ScHTMLExport : public ScExportBase SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow ); - rtl::OString BorderToStyle(const char* pBorderName, + OString BorderToStyle(const char* pBorderName, const ::editeng::SvxBorderLine* pLine, bool& bInsertSemicolon); sal_uInt16 GetFontSizeNumber( sal_uInt16 nHeight ); diff --git a/sc/source/filter/inc/htmlpars.hxx b/sc/source/filter/inc/htmlpars.hxx index 88ce724f0124..cbae0643b5e8 100644 --- a/sc/source/filter/inc/htmlpars.hxx +++ b/sc/source/filter/inc/htmlpars.hxx @@ -50,30 +50,30 @@ class ScHTMLTable; */ class ScHTMLStyles { - typedef ::boost::unordered_map<rtl::OUString, rtl::OUString, rtl::OUStringHash> PropsType; - typedef ::boost::ptr_map<rtl::OUString, PropsType> NamePropsType; - typedef ::boost::ptr_map<rtl::OUString, NamePropsType> ElemsType; + typedef ::boost::unordered_map<OUString, OUString, OUStringHash> PropsType; + typedef ::boost::ptr_map<OUString, PropsType> NamePropsType; + typedef ::boost::ptr_map<OUString, NamePropsType> ElemsType; NamePropsType maGlobalProps; /// global properties (for a given class for all elements) NamePropsType maElemGlobalProps; /// element global properties (no class specified) ElemsType maElemProps; /// element to class to properties (both element and class are given) - const rtl::OUString maEmpty; /// just a persistent empty string. + const OUString maEmpty; /// just a persistent empty string. public: ScHTMLStyles(); void add(const char* pElemName, size_t nElemName, const char* pClassName, size_t nClassName, - const rtl::OUString& aProp, const rtl::OUString& aValue); + const OUString& aProp, const OUString& aValue); /** * Find best-matching property value for given element and class names. */ - const rtl::OUString& getPropertyValue( - const rtl::OUString& rElem, const rtl::OUString& rClass, const rtl::OUString& rPropName) const; + const OUString& getPropertyValue( + const OUString& rElem, const OUString& rClass, const OUString& rPropName) const; private: static void insertProp( - NamePropsType& rProps, const rtl::OUString& aName, - const rtl::OUString& aProp, const rtl::OUString& aValue); + NamePropsType& rProps, const OUString& aName, + const OUString& aProp, const OUString& aValue); }; /** Base class for HTML parser classes. */ @@ -165,9 +165,9 @@ class ScHTMLLayoutParser : public ScHTMLParser { private: Size aPageSize; - rtl::OUString aBaseURL; + OUString aBaseURL; ScHTMLTableStack aTableStack; - rtl::OUString aString; + OUString aString; ScRangeListRef xLockedList; // je Table OuterMap* pTables; ScHTMLColOffset* pColOffset; @@ -382,7 +382,7 @@ public: virtual ~ScHTMLTable(); /** Returns the name of the table, specified in the TABLE tag. */ - inline const rtl::OUString& GetTableName() const { return maTableName; } + inline const OUString& GetTableName() const { return maTableName; } /** Returns the unique identifier of the table. */ inline ScHTMLTableId GetTableId() const { return maTableId.mnTableId; } /** Returns the table size. */ @@ -565,7 +565,7 @@ private: private: ScHTMLTable* mpParentTable; /// Pointer to parent table. ScHTMLTableMapPtr mxNestedTables; /// Table of nested HTML tables. - rtl::OUString maTableName; /// Table name from <table id> option. + OUString maTableName; /// Table name from <table id> option. ScHTMLTableAutoId maTableId; /// Unique identifier of this table. SfxItemSet maTableItemSet; /// Items for the entire table. SfxItemSetPtr mxRowItemSet; /// Items for the current table row. @@ -653,14 +653,14 @@ private: /** Closes the current table, regardless on opening tag. */ void CloseTable( const ImportInfo& rInfo ); - void ParseStyle(const rtl::OUString& rStrm); + void ParseStyle(const OUString& rStrm); DECL_LINK( HTMLImportHdl, const ImportInfo* ); private: typedef ::std::auto_ptr< ScHTMLGlobalTable > ScHTMLGlobalTablePtr; - rtl::OUStringBuffer maTitle; /// The title of the document. + OUStringBuffer maTitle; /// The title of the document. ScHTMLGlobalTablePtr mxGlobTable; /// Contains the entire imported document. ScHTMLTable* mpCurrTable; /// Pointer to current table (performance). ScHTMLTableId mnUnusedId; /// First unused table identifier. diff --git a/sc/source/filter/inc/numberformatsbuffer.hxx b/sc/source/filter/inc/numberformatsbuffer.hxx index af1d7df7cfb6..32c36111c69b 100644 --- a/sc/source/filter/inc/numberformatsbuffer.hxx +++ b/sc/source/filter/inc/numberformatsbuffer.hxx @@ -38,7 +38,7 @@ namespace xls { struct NumFmtModel { ::com::sun::star::lang::Locale maLocale; - ::rtl::OUString maFmtCode; + OUString maFmtCode; sal_Int16 mnPredefId; explicit NumFmtModel(); @@ -63,7 +63,7 @@ public: explicit NumberFormat( const WorkbookHelper& rHelper ); /** Sets the passed format code. */ - void setFormatCode( const ::rtl::OUString& rFmtCode ); + void setFormatCode( const OUString& rFmtCode ); /** Sets the passed format code, encoded in UTF-8. */ void setFormatCode( const ::com::sun::star::lang::Locale& rLocale, @@ -96,7 +96,7 @@ public: explicit NumberFormatsBuffer( const WorkbookHelper& rHelper ); /** Inserts a new number format. */ - NumberFormatRef createNumFmt( sal_Int32 nNumFmtId, const ::rtl::OUString& rFmtCode ); + NumberFormatRef createNumFmt( sal_Int32 nNumFmtId, const OUString& rFmtCode ); /** Inserts a new number format code. */ NumberFormatRef importNumFmt( const AttributeList& rAttribs ); @@ -119,7 +119,7 @@ private: typedef RefMap< sal_Int32, NumberFormat > NumberFormatMap; NumberFormatMap maNumFmts; /// List of number formats. - ::rtl::OUString maLocaleStr; /// Current office locale. + OUString maLocaleStr; /// Current office locale. sal_Int32 mnHighestId; }; diff --git a/sc/source/filter/inc/orcusfiltersimpl.hxx b/sc/source/filter/inc/orcusfiltersimpl.hxx index a97a50c5d4b9..de5f988f03dc 100644 --- a/sc/source/filter/inc/orcusfiltersimpl.hxx +++ b/sc/source/filter/inc/orcusfiltersimpl.hxx @@ -18,23 +18,23 @@ class ScOrcusFiltersImpl : public ScOrcusFilters { public: - static rtl::OString toSystemPath(const rtl::OUString& rPath); + static OString toSystemPath(const OUString& rPath); - virtual bool importCSV(ScDocument& rDoc, const rtl::OUString& rPath) const; - virtual bool importGnumeric(ScDocument& rDoc, const rtl::OUString& rPath) const; + virtual bool importCSV(ScDocument& rDoc, const OUString& rPath) const; + virtual bool importGnumeric(ScDocument& rDoc, const OUString& rPath) const; - virtual ScOrcusXMLContext* createXMLContext(ScDocument& rDoc, const rtl::OUString& rPath) const; + virtual ScOrcusXMLContext* createXMLContext(ScDocument& rDoc, const OUString& rPath) const; }; class ScOrcusXMLContextImpl : public ScOrcusXMLContext { ScDocument& mrDoc; - rtl::OUString maPath; + OUString maPath; orcus::xmlns_repository maNsRepo; /// XML namespace repository for this context. public: - ScOrcusXMLContextImpl(ScDocument& rDoc, const rtl::OUString& rPath); + ScOrcusXMLContextImpl(ScDocument& rDoc, const OUString& rPath); virtual ~ScOrcusXMLContextImpl(); virtual bool loadXMLStructure(SvTreeListBox& rTreeCtrl, ScOrcusXMLTreeParam& rParam); diff --git a/sc/source/filter/inc/pagesettings.hxx b/sc/source/filter/inc/pagesettings.hxx index 9ba982353c1a..47f6239b97fe 100644 --- a/sc/source/filter/inc/pagesettings.hxx +++ b/sc/source/filter/inc/pagesettings.hxx @@ -35,14 +35,14 @@ class HeaderFooterParser; /** Holds page style data for a single sheet. */ struct PageSettingsModel { - ::rtl::OUString maGraphicUrl; /// URL of the graphic object. - ::rtl::OUString maBinSettPath; /// Relation identifier of binary printer settings. - ::rtl::OUString maOddHeader; /// Header string for odd pages. - ::rtl::OUString maOddFooter; /// Footer string for odd pages. - ::rtl::OUString maEvenHeader; /// Header string for even pages. - ::rtl::OUString maEvenFooter; /// Footer string for even pages. - ::rtl::OUString maFirstHeader; /// Header string for first page of the sheet. - ::rtl::OUString maFirstFooter; /// Footer string for first page of the sheet. + OUString maGraphicUrl; /// URL of the graphic object. + OUString maBinSettPath; /// Relation identifier of binary printer settings. + OUString maOddHeader; /// Header string for odd pages. + OUString maOddFooter; /// Footer string for odd pages. + OUString maEvenHeader; /// Header string for even pages. + OUString maEvenFooter; /// Footer string for even pages. + OUString maFirstHeader; /// Header string for first page of the sheet. + OUString maFirstFooter; /// Footer string for first page of the sheet. double mfLeftMargin; /// Margin between left edge of page and begin of sheet area. double mfRightMargin; /// Margin between end of sheet area and right edge of page. double mfTopMargin; /// Margin between top egde of page and begin of sheet area. @@ -99,7 +99,7 @@ public: /** Imports header and footer settings from a headerFooter element. */ void importHeaderFooter( const AttributeList& rAttribs ); /** Imports header/footer characters from a headerFooter element. */ - void importHeaderFooterCharacters( const ::rtl::OUString& rChars, sal_Int32 nElement ); + void importHeaderFooterCharacters( const OUString& rChars, sal_Int32 nElement ); /** Imports the picture element. */ void importPicture( const ::oox::core::Relations& rRelations, const AttributeList& rAttribs ); @@ -124,7 +124,7 @@ public: private: /** Imports the binary picture data from the fragment with the passed identifier. */ - void importPictureData( const ::oox::core::Relations& rRelations, const ::rtl::OUString& rRelId ); + void importPictureData( const ::oox::core::Relations& rRelations, const OUString& rRelId ); private: PageSettingsModel maModel; @@ -162,8 +162,8 @@ private: void convertHeaderFooterData( PropertySet& rPropSet, HFHelperData& orHFData, - const ::rtl::OUString rOddContent, - const ::rtl::OUString rEvenContent, + const OUString rOddContent, + const OUString rEvenContent, bool bUseEvenContent, double fPageMargin, double fContentMargin ); @@ -171,7 +171,7 @@ private: sal_Int32 writeHeaderFooter( PropertySet& rPropSet, sal_Int32 nPropId, - const ::rtl::OUString& rContent ); + const OUString& rContent ); private: typedef ::std::auto_ptr< HeaderFooterParser > HeaderFooterParserPtr; diff --git a/sc/source/filter/inc/pivotcachebuffer.hxx b/sc/source/filter/inc/pivotcachebuffer.hxx index 7491a97941ba..484e25fd5b58 100644 --- a/sc/source/filter/inc/pivotcachebuffer.hxx +++ b/sc/source/filter/inc/pivotcachebuffer.hxx @@ -40,7 +40,7 @@ class WorksheetHelper; // ============================================================================ -typedef ::std::pair< sal_Int32, rtl::OUString > IdCaptionPair; +typedef ::std::pair< sal_Int32, OUString > IdCaptionPair; typedef ::std::vector< IdCaptionPair > IdCaptionPairList; class PivotCacheItem @@ -92,14 +92,14 @@ public: /** Returns the value of the item. */ inline const ::com::sun::star::uno::Any& getValue() const { return maValue; } /** Returns the string representation of the item. */ - ::rtl::OUString getName() const; + OUString getName() const; /** Returns true if the item is unused. */ inline bool isUnused() const { return mbUnused; } private: friend class PivotCacheItemList; // #FIXME hack Sets the value of this item to the given string ( and overwrites type if necessary - void setStringValue( const rtl::OUString& sName ); + void setStringValue( const OUString& sName ); ::com::sun::star::uno::Any maValue; /// Value of the item. sal_Int32 mnType; /// Value type (OOXML token identifier). bool mbUnused; @@ -127,7 +127,7 @@ public: /** Returns the specified item. */ const PivotCacheItem* getCacheItem( sal_Int32 nItemIdx ) const; /** Returns the names of all items. */ - void getCacheItemNames( ::std::vector< ::rtl::OUString >& orItemNames ) const; + void getCacheItemNames( ::std::vector< OUString >& orItemNames ) const; void applyItemCaptions( const IdCaptionPairList& vCaptions ); private: @@ -145,10 +145,10 @@ private: struct PCFieldModel { - ::rtl::OUString maName; /// Fixed name of the cache field. - ::rtl::OUString maCaption; /// Caption of the ccahe field. - ::rtl::OUString maPropertyName; /// OLAP property name. - ::rtl::OUString maFormula; /// Formula of a calculated field. + OUString maName; /// Fixed name of the cache field. + OUString maCaption; /// Caption of the ccahe field. + OUString maPropertyName; /// OLAP property name. + OUString maFormula; /// Formula of a calculated field. sal_Int32 mnNumFmtId; /// Number format for all items. sal_Int32 mnSqlType; /// Data type from ODBC data source. sal_Int32 mnHierarchy; /// Hierarchy this field is part of. @@ -208,10 +208,10 @@ struct PCFieldGroupModel /** Helper struct for mapping original item names from/to group item names. */ struct PivotCacheGroupItem { - ::rtl::OUString maOrigName; - ::rtl::OUString maGroupName; + OUString maOrigName; + OUString maGroupName; - inline explicit PivotCacheGroupItem( const ::rtl::OUString& rItemName ) : + inline explicit PivotCacheGroupItem( const OUString& rItemName ) : maOrigName( rItemName ), maGroupName( rItemName ) {} }; @@ -278,7 +278,7 @@ public: inline bool hasParentGrouping() const { return maFieldGroupModel.mnParentField >= 0; } /** Returns the name of the cache field. */ - inline const ::rtl::OUString& getName() const { return maFieldModel.maName; } + inline const OUString& getName() const { return maFieldModel.maName; } /** Returns the index of the parent group field that groups the items of this field. */ inline sal_Int32 getParentGroupField() const { return maFieldGroupModel.mnParentField; } /** Returns the index of the base field grouping is based on. */ @@ -287,7 +287,7 @@ public: /** Returns the shared or group item with the specified index. */ const PivotCacheItem* getCacheItem( sal_Int32 nItemIdx ) const; /** Returns the names of all shared or group items. */ - void getCacheItemNames( ::std::vector< ::rtl::OUString >& orItemNames ) const; + void getCacheItemNames( ::std::vector< OUString >& orItemNames ) const; /** Returns shared or group items. */ PivotCacheItemList getCacheItems() const; @@ -295,10 +295,10 @@ public: void convertNumericGrouping( const ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XDataPilotField >& rxDPField ) const; /** Creates inplace date grouping settings or a new date group field. */ - ::rtl::OUString createDateGroupField( + OUString createDateGroupField( const ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XDataPilotField >& rxBaseDPField ) const; /** Creates a new grouped DataPilot field and returns its name. */ - ::rtl::OUString createParentGroupField( + OUString createParentGroupField( const ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XDataPilotField >& rxBaseDPField, const PivotCacheField& rBaseCacheField, PivotCacheGroupItemVector& orItemNames ) const; @@ -341,8 +341,8 @@ private: struct PCDefinitionModel { - ::rtl::OUString maRelId; /// Relation identifier for cache records fragment. - ::rtl::OUString maRefreshedBy; /// Name of user who last refreshed the cache. + OUString maRelId; /// Relation identifier for cache records fragment. + OUString maRefreshedBy; /// Name of user who last refreshed the cache. double mfRefreshedDate; /// Date/time of last refresh. sal_Int32 mnRecords; /// Number of data records in the cache. sal_Int32 mnMissItemsLimit; /// Limit for discarding unused items. @@ -375,9 +375,9 @@ struct PCSourceModel struct PCWorksheetSourceModel { - ::rtl::OUString maRelId; /// Relation identifier for an external document URL. - ::rtl::OUString maSheet; /// Sheet name for cell range or sheet-local defined names. - ::rtl::OUString maDefName; /// Defined name containing a cell range if present. + OUString maRelId; /// Relation identifier for an external document URL. + OUString maSheet; /// Sheet name for cell range or sheet-local defined names. + OUString maDefName; /// Defined name containing a cell range if present. ::com::sun::star::table::CellRangeAddress maRange; /// Source cell range of the data. @@ -422,7 +422,7 @@ public: inline const ::com::sun::star::table::CellRangeAddress& getSourceRange() const { return maSheetSrcModel.maRange; } /** Returns the relation identifier of the pivot cache records fragment. */ - inline const ::rtl::OUString& getRecordsRelId() const { return maDefModel.maRelId; } + inline const OUString& getRecordsRelId() const { return maDefModel.maRelId; } /** Returns the number of pivot cache fields. */ sal_Int32 getCacheFieldCount() const; @@ -467,7 +467,7 @@ private: PCSourceModel maSourceModel; /// Pivot cache source settings. PCWorksheetSourceModel maSheetSrcModel; /// Sheet source data if cache type is sheet. ValueRangeSet maColSpans; /// Column spans used by SheetDataBuffer for optimized cell import. - ::rtl::OUString maTargetUrl; /// URL of an external source document. + OUString maTargetUrl; /// URL of an external source document. mutable sal_Int32 mnCurrRow; /// Current row index in dummy sheet. bool mbValidSource; /// True = pivot cache is based on supported data source. bool mbDummySheet; /// True = pivot cache is based on a dummy sheet. @@ -481,7 +481,7 @@ public: explicit PivotCacheBuffer( const WorkbookHelper& rHelper ); /** Registers a pivot cache definition fragment. The fragment will be loaded on demand (OOXML/BIFF12 only). */ - void registerPivotCacheFragment( sal_Int32 nCacheId, const ::rtl::OUString& rFragmentPath ); + void registerPivotCacheFragment( sal_Int32 nCacheId, const OUString& rFragmentPath ); /** Imports and stores a pivot cache definition fragment on first call, returns the imported cache on subsequent calls with the same identifier. */ @@ -492,7 +492,7 @@ private: PivotCache& createPivotCache( sal_Int32 nCacheId ); private: - typedef ::std::map< sal_Int32, ::rtl::OUString > FragmentPathMap; + typedef ::std::map< sal_Int32, OUString > FragmentPathMap; typedef RefMap< sal_Int32, PivotCache > PivotCacheMap; typedef ::std::vector< sal_Int32 > PivotCacheIdVector; diff --git a/sc/source/filter/inc/pivotcachefragment.hxx b/sc/source/filter/inc/pivotcachefragment.hxx index c617d98626f2..de973aefd604 100644 --- a/sc/source/filter/inc/pivotcachefragment.hxx +++ b/sc/source/filter/inc/pivotcachefragment.hxx @@ -54,7 +54,7 @@ class PivotCacheDefinitionFragment : public WorkbookFragmentBase public: explicit PivotCacheDefinitionFragment( const WorkbookHelper& rHelper, - const ::rtl::OUString& rFragmentPath, + const OUString& rFragmentPath, PivotCache& rPivotCache ); protected: @@ -74,7 +74,7 @@ class PivotCacheRecordsFragment : public WorksheetFragmentBase public: explicit PivotCacheRecordsFragment( const WorksheetHelper& rHelper, - const ::rtl::OUString& rFragmentPath, + const OUString& rFragmentPath, const PivotCache& rPivotCache ); protected: @@ -102,7 +102,7 @@ class BiffPivotCacheFragment : public BiffWorkbookFragmentBase public: explicit BiffPivotCacheFragment( const WorkbookHelper& rHelper, - const ::rtl::OUString& rStrmName, + const OUString& rStrmName, PivotCache& rPivotCache ); /** Imports the entire fragment, returns true, if EOF record has been reached. */ diff --git a/sc/source/filter/inc/pivottablebuffer.hxx b/sc/source/filter/inc/pivottablebuffer.hxx index 3de6ad11b83d..f1c1e6dd2f42 100644 --- a/sc/source/filter/inc/pivottablebuffer.hxx +++ b/sc/source/filter/inc/pivottablebuffer.hxx @@ -42,7 +42,7 @@ struct PTFieldItemModel { sal_Int32 mnCacheItem; /// Index to shared item in pivot cache. sal_Int32 mnType; /// Type of the item. - rtl::OUString msCaption; /// User caption of the item + OUString msCaption; /// User caption of the item bool mbShowDetails; /// True = show item details (items of child fields). bool mbHidden; /// True = item is hidden. @@ -95,7 +95,7 @@ struct PTFieldModel struct PTPageFieldModel { - ::rtl::OUString maName; /// Unique name of the page field. + OUString maName; /// Unique name of the page field. sal_Int32 mnField; /// Base pivot field. sal_Int32 mnItem; /// Index of field item that is shown by the page field. @@ -106,7 +106,7 @@ struct PTPageFieldModel struct PTDataFieldModel { - ::rtl::OUString maName; /// Name of the data field. + OUString maName; /// Name of the data field. sal_Int32 mnField; /// Base pivot field. sal_Int32 mnSubtotal; /// Subtotal aggregation function. sal_Int32 mnShowDataAs; /// Show data as, based on another field. @@ -161,7 +161,7 @@ public: PivotCacheGroupItemVector& orItemNames ); /** Returns the name of the DataPilot field in the fields collection. */ - inline const ::rtl::OUString& getDPFieldName() const { return maDPFieldName; } + inline const OUString& getDPFieldName() const { return maDPFieldName; } /** Converts dimension and other settings for a row field. */ void convertRowField(); @@ -185,7 +185,7 @@ private: PivotTable& mrPivotTable; /// The parent pivot table object. ItemModelVector maItems; /// All items of this field. PTFieldModel maModel; /// Pivot field settings. - ::rtl::OUString maDPFieldName; /// Name of the field in DataPilot field collection. + OUString maDPFieldName; /// Name of the field in DataPilot field collection. sal_Int32 mnFieldIndex; /// Zero-based index of this field. }; @@ -193,10 +193,10 @@ private: struct PTFilterModel { - ::rtl::OUString maName; /// Name of the field filter. - ::rtl::OUString maDescription; /// Description of the field filter. - ::rtl::OUString maStrValue1; /// First string value for label filter. - ::rtl::OUString maStrValue2; /// Second string value for label filter. + OUString maName; /// Name of the field filter. + OUString maDescription; /// Description of the field filter. + OUString maStrValue1; /// First string value for label filter. + OUString maStrValue2; /// Second string value for label filter. double mfValue; /// Number of items or percent or sum to be shown. sal_Int32 mnField; /// Base pivot field. sal_Int32 mnMemPropField; /// Member property field. @@ -239,17 +239,17 @@ private: struct PTDefinitionModel : public AutoFormatModel { - ::rtl::OUString maName; - ::rtl::OUString maDataCaption; - ::rtl::OUString maGrandTotalCaption; - ::rtl::OUString maRowHeaderCaption; - ::rtl::OUString maColHeaderCaption; - ::rtl::OUString maErrorCaption; - ::rtl::OUString maMissingCaption; - ::rtl::OUString maPageStyle; - ::rtl::OUString maPivotTableStyle; - ::rtl::OUString maVacatedStyle; - ::rtl::OUString maTag; + OUString maName; + OUString maDataCaption; + OUString maGrandTotalCaption; + OUString maRowHeaderCaption; + OUString maColHeaderCaption; + OUString maErrorCaption; + OUString maMissingCaption; + OUString maPageStyle; + OUString maPivotTableStyle; + OUString maVacatedStyle; + OUString maTag; sal_Int32 mnCacheId; sal_Int32 mnDataPosition; sal_Int32 mnPageWrap; @@ -352,7 +352,7 @@ public: /** Returns the associated data pilot field for the specified pivot table field. */ ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XDataPilotField > - getDataPilotField( const ::rtl::OUString& rFieldName ) const; + getDataPilotField( const OUString& rFieldName ) const; /** Returns the associated data pilot field for the specified pivot table field. */ ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XDataPilotField > getDataPilotField( sal_Int32 nFieldIdx ) const; diff --git a/sc/source/filter/inc/pivottablefragment.hxx b/sc/source/filter/inc/pivottablefragment.hxx index c86a4d4de02b..b9a7f22ea4e3 100644 --- a/sc/source/filter/inc/pivottablefragment.hxx +++ b/sc/source/filter/inc/pivottablefragment.hxx @@ -75,7 +75,7 @@ class PivotTableFragment : public WorksheetFragmentBase public: explicit PivotTableFragment( const WorksheetHelper& rHelper, - const ::rtl::OUString& rFragmentPath ); + const OUString& rFragmentPath ); protected: virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ); diff --git a/sc/source/filter/inc/querytablebuffer.hxx b/sc/source/filter/inc/querytablebuffer.hxx index a0fd51754101..4cbae0fd8950 100644 --- a/sc/source/filter/inc/querytablebuffer.hxx +++ b/sc/source/filter/inc/querytablebuffer.hxx @@ -30,7 +30,7 @@ namespace xls { struct QueryTableModel : public AutoFormatModel { - ::rtl::OUString maDefName; /// Defined name containing the target cell range. + OUString maDefName; /// Defined name containing the target cell range. sal_Int32 mnConnId; /// Identifier of the external connection used to query the data. sal_Int32 mnGrowShrinkType; /// Behaviour when source data size changes. bool mbHeaders; /// True = source data contains a header row. diff --git a/sc/source/filter/inc/querytablefragment.hxx b/sc/source/filter/inc/querytablefragment.hxx index b54af742bec4..e442bb6990e3 100644 --- a/sc/source/filter/inc/querytablefragment.hxx +++ b/sc/source/filter/inc/querytablefragment.hxx @@ -34,7 +34,7 @@ class QueryTableFragment : public WorksheetFragmentBase public: explicit QueryTableFragment( const WorksheetHelper& rHelper, - const ::rtl::OUString& rFragmentPath ); + const OUString& rFragmentPath ); protected: virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ); diff --git a/sc/source/filter/inc/richstring.hxx b/sc/source/filter/inc/richstring.hxx index a0f8761a1fe1..96065d3fbe23 100644 --- a/sc/source/filter/inc/richstring.hxx +++ b/sc/source/filter/inc/richstring.hxx @@ -55,7 +55,7 @@ public: explicit RichStringPortion( const WorkbookHelper& rHelper ); /** Sets text data for this portion. */ - void setText( const ::rtl::OUString& rText ); + void setText( const OUString& rText ); /** Creates and returns a new font formatting object. */ FontRef createFont(); /** Links this portion to a font object from the global font list. */ @@ -65,7 +65,7 @@ public: void finalizeImport(); /** Returns the text data of this portion. */ - inline const ::rtl::OUString& getText() const { return maText; } + inline const OUString& getText() const { return maText; } /** Returns true, if the portion fontains font formatting. */ inline bool hasFont() const { return mxFont.get() != 0; } @@ -81,7 +81,7 @@ public: const Font* pFont ) const; private: - ::rtl::OUString maText; /// Portion text. + OUString maText; /// Portion text. FontRef mxFont; /// Embedded portion font, may be empty. sal_Int32 mnFontId; /// Link to global font list. }; @@ -173,14 +173,14 @@ public: explicit RichStringPhonetic( const WorkbookHelper& rHelper ); /** Sets text data for this phonetic portion. */ - void setText( const ::rtl::OUString& rText ); + void setText( const OUString& rText ); /** Imports attributes of a phonetic run (rPh element). */ void importPhoneticRun( const AttributeList& rAttribs ); /** Sets the associated range in base text for this phonetic portion. */ void setBaseRange( sal_Int32 nBasePos, sal_Int32 nBaseEnd ); private: - ::rtl::OUString maText; /// Portion text. + OUString maText; /// Portion text. sal_Int32 mnBasePos; /// Start position in base text. sal_Int32 mnBaseEnd; /// One-past-end position in base text. }; @@ -244,7 +244,7 @@ public: /** Tries to extract a plain string from this object. Returns the string, if there is only one unformatted portion. */ bool extractPlainString( - ::rtl::OUString& orString, + OUString& orString, const Font* pFirstPortionFont = 0 ) const; /** Converts the string and writes it into the passed XText. @@ -265,9 +265,9 @@ private: RichStringPhoneticRef createPhonetic(); /** Create base text portions from the passed string and character formatting. */ - void createTextPortions( const ::rtl::OUString& rText, FontPortionModelList& rPortions ); + void createTextPortions( const OUString& rText, FontPortionModelList& rPortions ); /** Create phonetic text portions from the passed string and portion data. */ - void createPhoneticPortions( const ::rtl::OUString& rText, PhoneticPortionModelList& rPortions, sal_Int32 nBaseLen ); + void createPhoneticPortions( const OUString& rText, PhoneticPortionModelList& rPortions, sal_Int32 nBaseLen ); private: typedef RefVector< RichStringPortion > PortionVector; diff --git a/sc/source/filter/inc/richstringcontext.hxx b/sc/source/filter/inc/richstringcontext.hxx index f79ca3caaa8a..feed7f5d3e3c 100644 --- a/sc/source/filter/inc/richstringcontext.hxx +++ b/sc/source/filter/inc/richstringcontext.hxx @@ -36,7 +36,7 @@ public: protected: virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ); - virtual void onCharacters( const ::rtl::OUString& rChars ); + virtual void onCharacters( const OUString& rChars ); private: RichStringRef mxString; /// Processed string. diff --git a/sc/source/filter/inc/scenariobuffer.hxx b/sc/source/filter/inc/scenariobuffer.hxx index 26e2d7386bb3..b0e7dc889d6f 100644 --- a/sc/source/filter/inc/scenariobuffer.hxx +++ b/sc/source/filter/inc/scenariobuffer.hxx @@ -33,7 +33,7 @@ namespace xls { struct ScenarioCellModel { ::com::sun::star::table::CellAddress maPos; - ::rtl::OUString maValue; + OUString maValue; sal_Int32 mnNumFmtId; bool mbDeleted; @@ -44,9 +44,9 @@ struct ScenarioCellModel struct ScenarioModel { - ::rtl::OUString maName; /// Name of the scenario. - ::rtl::OUString maComment; /// Comment. - ::rtl::OUString maUser; /// Name of user created the scenario. + OUString maName; /// Name of the scenario. + OUString maComment; /// Comment. + OUString maUser; /// Name of user created the scenario. bool mbLocked; /// True = input cell values locked. bool mbHidden; /// True = scenario is hidden. diff --git a/sc/source/filter/inc/sharedstringsfragment.hxx b/sc/source/filter/inc/sharedstringsfragment.hxx index 325fdca387f7..4986b6f71c0b 100644 --- a/sc/source/filter/inc/sharedstringsfragment.hxx +++ b/sc/source/filter/inc/sharedstringsfragment.hxx @@ -32,7 +32,7 @@ class SharedStringsFragment : public WorkbookFragmentBase public: explicit SharedStringsFragment( const WorkbookHelper& rHelper, - const ::rtl::OUString& rFragmentPath ); + const OUString& rFragmentPath ); protected: virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ); diff --git a/sc/source/filter/inc/sheetdatabuffer.hxx b/sc/source/filter/inc/sheetdatabuffer.hxx index 62f42daeed19..103418aa7d7a 100644 --- a/sc/source/filter/inc/sheetdatabuffer.hxx +++ b/sc/source/filter/inc/sheetdatabuffer.hxx @@ -69,8 +69,8 @@ struct CellFormulaModel /** Stores data about table operations. */ struct DataTableModel { - ::rtl::OUString maRef1; /// First reference cell for table operations. - ::rtl::OUString maRef2; /// Second reference cell for table operations. + OUString maRef1; /// First reference cell for table operations. + OUString maRef2; /// Second reference cell for table operations. bool mb2dTable; /// True = 2-dimensional data table. bool mbRowTable; /// True = row oriented data table. bool mbRef1Deleted; /// True = first reference cell deleted. @@ -118,7 +118,7 @@ public: /** Inserts a value cell into the sheet. */ void setValueCell( const CellModel& rModel, double fValue ); /** Inserts a simple string cell into the sheet. */ - void setStringCell( const CellModel& rModel, const ::rtl::OUString& rText ); + void setStringCell( const CellModel& rModel, const OUString& rText ); /** Inserts a rich-string cell into the sheet. */ void setStringCell( const CellModel& rModel, const RichStringRef& rxString ); /** Inserts a shared string cell into the sheet. */ @@ -128,7 +128,7 @@ public: /** Inserts a boolean cell into the sheet and adjusts number format. */ void setBooleanCell( const CellModel& rModel, bool bValue ); /** Inserts an error cell from the passed error code into the sheet. */ - void setErrorCell( const CellModel& rModel, const ::rtl::OUString& rErrorCode ); + void setErrorCell( const CellModel& rModel, const OUString& rErrorCode ); /** Inserts an error cell from the passed BIFF error code into the sheet. */ void setErrorCell( const CellModel& rModel, sal_uInt8 nErrorCode ); /** Inserts a formula cell into the sheet. */ diff --git a/sc/source/filter/inc/sheetdatacontext.hxx b/sc/source/filter/inc/sheetdatacontext.hxx index 52d20da27985..9054f5b9bd83 100644 --- a/sc/source/filter/inc/sheetdatacontext.hxx +++ b/sc/source/filter/inc/sheetdatacontext.hxx @@ -59,7 +59,7 @@ public: protected: virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ); - virtual void onCharacters( const ::rtl::OUString& rChars ); + virtual void onCharacters( const OUString& rChars ); virtual void onEndElement(); virtual ::oox::core::ContextHandlerRef onCreateRecordContext( sal_Int32 nRecId, SequenceInputStream& rStrm ); @@ -110,9 +110,9 @@ private: void importSharedFmla( SequenceInputStream& rStrm ); private: - ::rtl::OUString maCellValue; /// Cell value string (OOXML only). + OUString maCellValue; /// Cell value string (OOXML only). RichStringRef mxInlineStr; /// Inline rich string (OOXML only). - ::rtl::OUString maFormulaStr; + OUString maFormulaStr; DataTableModel maTableData; /// Settings for table operations. BinAddress maCurrPos; /// Current cell position (BIFF12 only). bool mbHasFormula; /// True = current cell has formula data (OOXML only). diff --git a/sc/source/filter/inc/stylesbuffer.hxx b/sc/source/filter/inc/stylesbuffer.hxx index c9223c436395..77654c7b2af4 100644 --- a/sc/source/filter/inc/stylesbuffer.hxx +++ b/sc/source/filter/inc/stylesbuffer.hxx @@ -152,7 +152,7 @@ private: /** Contains all XML font attributes, e.g. from a font or rPr element. */ struct FontModel { - ::rtl::OUString maName; /// Font name. + OUString maName; /// Font name. Color maColor; /// Font color. sal_Int32 mnScheme; /// Major/minor scheme font. sal_Int32 mnFamily; /// Font family. @@ -209,7 +209,7 @@ struct ApiFontUsedFlags /** Contains API font name, family, and charset for a script type. */ struct ApiScriptFontName { - ::rtl::OUString maName; /// Font name. + OUString maName; /// Font name. sal_Int16 mnFamily; /// Font family. sal_Int16 mnTextEnc; /// Font text encoding. @@ -786,7 +786,7 @@ typedef ::boost::shared_ptr< Dxf > DxfRef; /** Contains attributes of a cell style, e.g. from the cellStyle element. */ struct CellStyleModel { - ::rtl::OUString maName; /// Cell style name. + OUString maName; /// Cell style name. sal_Int32 mnXfId; /// Formatting for this cell style. sal_Int32 mnBuiltinId; /// Identifier for builtin styles. sal_Int32 mnLevel; /// Level for builtin column/row styles. @@ -818,16 +818,16 @@ public: void createCellStyle(); /** Stores tha passed final style name and creates the cell style, if it is user-defined or modified built-in. */ - void finalizeImport( const ::rtl::OUString& rFinalName ); + void finalizeImport( const OUString& rFinalName ); /** Returns the cell style model structure. */ inline const CellStyleModel& getModel() const { return maModel; } /** Returns the final style name used in the document. */ - inline const ::rtl::OUString& getFinalStyleName() const { return maFinalName; } + inline const OUString& getFinalStyleName() const { return maFinalName; } inline ::ScStyleSheet* getStyleSheet() { return mpStyleSheet; } private: CellStyleModel maModel; - ::rtl::OUString maFinalName; /// Final style name used in API. + OUString maFinalName; /// Final style name used in API. bool mbCreated; /// True = style sheet created. ::ScStyleSheet* mpStyleSheet; /// Calc cell style sheet. @@ -853,16 +853,16 @@ public: /** Returns the XF identifier associated to the default cell style. */ sal_Int32 getDefaultXfId() const; /** Returns the default style sheet for unused cells. */ - ::rtl::OUString getDefaultStyleName() const; + OUString getDefaultStyleName() const; /** Creates the style sheet described by the style XF with the passed identifier. */ - ::rtl::OUString createCellStyle( sal_Int32 nXfId ) const; + OUString createCellStyle( sal_Int32 nXfId ) const; ::ScStyleSheet* getCellStyleSheet( sal_Int32 nXfId ) const; private: /** Inserts the passed cell style object into the internal maps. */ void insertCellStyle( CellStyleRef xCellStyle ); /** Creates the style sheet described by the passed cell style object. */ - ::rtl::OUString createCellStyle( const CellStyleRef& rxCellStyle ) const; + OUString createCellStyle( const CellStyleRef& rxCellStyle ) const; ::ScStyleSheet* getCellStyleSheet( const CellStyleRef& rxCellStyle ) const; private: @@ -901,7 +901,7 @@ public: @param opnFontId (out-param) The identifier of the new font object. */ FontRef createFont( sal_Int32* opnFontId = 0 ); /** Creates a number format. */ - NumberFormatRef createNumFmt( sal_Int32 nNumFmtId, const ::rtl::OUString& rFmtCode ); + NumberFormatRef createNumFmt( sal_Int32 nNumFmtId, const OUString& rFmtCode ); sal_Int32 nextFreeNumFmtId(); /** Creates a new empty border object. @param opnBorderId (out-param) The identifier of the new border object. */ @@ -960,12 +960,12 @@ public: bool equalFills( sal_Int32 nFillId1, sal_Int32 nFillId2 ) const; /** Returns the default style sheet for unused cells. */ - ::rtl::OUString getDefaultStyleName() const; + OUString getDefaultStyleName() const; /** Creates the style sheet described by the style XF with the passed identifier. */ - ::rtl::OUString createCellStyle( sal_Int32 nXfId ) const; + OUString createCellStyle( sal_Int32 nXfId ) const; ::ScStyleSheet* getCellStyleSheet( sal_Int32 nXfId ) const; /** Creates the style sheet described by the DXF with the passed identifier. */ - ::rtl::OUString createDxfStyle( sal_Int32 nDxfId ) const; + OUString createDxfStyle( sal_Int32 nDxfId ) const; void writeFontToItemSet( SfxItemSet& rItemSet, sal_Int32 nFontId, bool bSkipPoolDefs = false ) const; /** Writes the font attributes of the specified font data to the passed property map. */ @@ -993,7 +993,7 @@ private: typedef RefVector< Fill > FillVector; typedef RefVector< Xf > XfVector; typedef RefVector< Dxf > DxfVector; - typedef ::std::map< sal_Int32, ::rtl::OUString > DxfStyleMap; + typedef ::std::map< sal_Int32, OUString > DxfStyleMap; ColorPalette maPalette; /// Color palette. FontVector maFonts; /// List of font objects. diff --git a/sc/source/filter/inc/stylesfragment.hxx b/sc/source/filter/inc/stylesfragment.hxx index 093a13e63195..5e8f1770c34d 100644 --- a/sc/source/filter/inc/stylesfragment.hxx +++ b/sc/source/filter/inc/stylesfragment.hxx @@ -129,7 +129,7 @@ class StylesFragment : public WorkbookFragmentBase public: explicit StylesFragment( const WorkbookHelper& rHelper, - const ::rtl::OUString& rFragmentPath ); + const OUString& rFragmentPath ); protected: virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ); diff --git a/sc/source/filter/inc/tablebuffer.hxx b/sc/source/filter/inc/tablebuffer.hxx index 5ed673bb9bf3..9d4a2c7cd7ed 100644 --- a/sc/source/filter/inc/tablebuffer.hxx +++ b/sc/source/filter/inc/tablebuffer.hxx @@ -33,8 +33,8 @@ struct TableModel { ::com::sun::star::table::CellRangeAddress maRange; /// Original (unchecked) range of the table. - ::rtl::OUString maProgName; /// Programmatical name. - ::rtl::OUString maDisplayName; /// Display name. + OUString maProgName; /// Programmatical name. + OUString maDisplayName; /// Display name. sal_Int32 mnId; /// Unique table identifier. sal_Int32 mnType; /// Table type (worksheet, query, etc.). sal_Int32 mnHeaderRows; /// Number of header rows. @@ -65,7 +65,7 @@ public: /** Returns the token index used in API token arrays (com.sun.star.sheet.FormulaToken). */ inline sal_Int32 getTokenIndex() const { return mnTokenIndex; } /** Returns the original display name of the table. */ - inline const ::rtl::OUString& getDisplayName() const { return maModel.maDisplayName; } + inline const OUString& getDisplayName() const { return maModel.maDisplayName; } /** Returns the original (unchecked) total range of the table. */ inline const ::com::sun::star::table::CellRangeAddress& getOriginalRange() const { return maModel.maRange; } @@ -83,7 +83,7 @@ public: private: TableModel maModel; AutoFilterBuffer maAutoFilters; /// Filter settings for this table. - ::rtl::OUString maDBRangeName; /// Name of the databae range in the Calc document. + OUString maDBRangeName; /// Name of the databae range in the Calc document. ::com::sun::star::table::CellRangeAddress maDestRange; /// Validated range of the table in the worksheet. sal_Int32 mnTokenIndex; /// Token index used in API token array. @@ -107,7 +107,7 @@ public: /** Returns a table by its identifier. */ TableRef getTable( sal_Int32 nTableId ) const; /** Returns a table by its display name. */ - TableRef getTable( const ::rtl::OUString& rDispName ) const; + TableRef getTable( const OUString& rDispName ) const; private: /** Inserts the passed table into the maps according to its identifier and name. */ @@ -116,7 +116,7 @@ private: private: typedef RefVector< Table > TableVector; typedef RefMap< sal_Int32, Table > TableIdMap; - typedef RefMap< ::rtl::OUString, Table > TableNameMap; + typedef RefMap< OUString, Table > TableNameMap; TableVector maTables; TableIdMap maIdTables; diff --git a/sc/source/filter/inc/tablefragment.hxx b/sc/source/filter/inc/tablefragment.hxx index 77ed04d73f3f..92bc84e55075 100644 --- a/sc/source/filter/inc/tablefragment.hxx +++ b/sc/source/filter/inc/tablefragment.hxx @@ -34,7 +34,7 @@ class TableFragment : public WorksheetFragmentBase public: explicit TableFragment( const WorksheetHelper& rHelper, - const ::rtl::OUString& rFragmentPath ); + const OUString& rFragmentPath ); protected: virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ); diff --git a/sc/source/filter/inc/unitconverter.hxx b/sc/source/filter/inc/unitconverter.hxx index 4056430b8e72..88921d1ceb5b 100644 --- a/sc/source/filter/inc/unitconverter.hxx +++ b/sc/source/filter/inc/unitconverter.hxx @@ -86,18 +86,18 @@ public: ::com::sun::star::util::DateTime calcDateTimeFromSerial( double fSerial ) const; /** Returns a BIFF error code from the passed error string. */ - sal_uInt8 calcBiffErrorCode( const ::rtl::OUString& rErrorCode ) const; + sal_uInt8 calcBiffErrorCode( const OUString& rErrorCode ) const; private: /** Adds an error code to the internal maps. */ - void addErrorCode( sal_uInt8 nErrorCode, const ::rtl::OUString& rErrorCode ); + void addErrorCode( sal_uInt8 nErrorCode, const OUString& rErrorCode ); /** Returns the conversion coefficient for the passed unit. */ double getCoefficient( Unit eUnit ) const; private: typedef ::std::vector< double > DoubleVector; - typedef ::std::map< ::rtl::OUString, sal_uInt8 > OoxErrorCodeMap; - typedef ::std::map< sal_uInt8, ::rtl::OUString > BiffErrorCodeMap; + typedef ::std::map< OUString, sal_uInt8 > OoxErrorCodeMap; + typedef ::std::map< sal_uInt8, OUString > BiffErrorCodeMap; DoubleVector maCoeffs; /// Coefficients for unit conversion. OoxErrorCodeMap maOoxErrCodes; /// Maps error code strings to BIFF error constants. diff --git a/sc/source/filter/inc/workbookfragment.hxx b/sc/source/filter/inc/workbookfragment.hxx index ae90b5128036..88042abee875 100644 --- a/sc/source/filter/inc/workbookfragment.hxx +++ b/sc/source/filter/inc/workbookfragment.hxx @@ -35,11 +35,11 @@ class WorkbookFragment : public WorkbookFragmentBase public: explicit WorkbookFragment( const WorkbookHelper& rHelper, - const ::rtl::OUString& rFragmentPath ); + const OUString& rFragmentPath ); protected: virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ); - virtual void onCharacters( const ::rtl::OUString& rChars ); + virtual void onCharacters( const OUString& rChars ); virtual ::oox::core::ContextHandlerRef onCreateRecordContext( sal_Int32 nRecId, SequenceInputStream& rStrm ); @@ -55,7 +55,7 @@ private: void importPivotCache( SequenceInputStream& rStrm ); void importExternalLinkFragment( ExternalLink& rExtLink ); - void importPivotCacheDefFragment( const ::rtl::OUString& rRelId, sal_Int32 nCacheId ); + void importPivotCacheDefFragment( const OUString& rRelId, sal_Int32 nCacheId ); private: DefinedNameRef mxCurrName; diff --git a/sc/source/filter/inc/workbookhelper.hxx b/sc/source/filter/inc/workbookhelper.hxx index 0e1b87d70a70..fa1ce19529b6 100644 --- a/sc/source/filter/inc/workbookhelper.hxx +++ b/sc/source/filter/inc/workbookhelper.hxx @@ -77,7 +77,7 @@ enum FilterType /** Functor for case-insensitive string comparison, usable in maps etc. */ struct IgnoreCaseCompare { - bool operator()( const ::rtl::OUString& rName1, const ::rtl::OUString& rName2 ) const; + bool operator()( const OUString& rName1, const OUString& rName2 ) const; }; // ============================================================================ @@ -157,7 +157,7 @@ public: getSheetFromDoc( sal_Int16 nSheet ) const; /** Returns a reference to the specified spreadsheet in the document model. */ ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XSpreadsheet > - getSheetFromDoc( const ::rtl::OUString& rSheet ) const; + getSheetFromDoc( const OUString& rSheet ) const; /** Returns the XCellRange interface for the passed cell range address. */ ::com::sun::star::uno::Reference< ::com::sun::star::table::XCellRange > @@ -169,13 +169,13 @@ public: getStyleFamily( bool bPageStyles ) const; /** Returns the specified cell or page style from the Calc document. */ ::com::sun::star::uno::Reference< ::com::sun::star::style::XStyle > - getStyleObject( const ::rtl::OUString& rStyleName, bool bPageStyle ) const; + getStyleObject( const OUString& rStyleName, bool bPageStyle ) const; /** Creates and returns a defined name on-the-fly in the Calc document. The name will not be buffered in the global defined names buffer. @param orName (in/out-parameter) Returns the resulting used name. */ ScRangeData* createNamedRangeObject( - ::rtl::OUString& orName, + OUString& orName, const ::com::sun::star::uno::Sequence< ::com::sun::star::sheet::FormulaToken>& rTokens, sal_Int32 nIndex, sal_Int32 nNameFlags = 0 ) const; @@ -184,7 +184,7 @@ public: The name will not be buffered in the global defined names buffer. @param orName (in/out-parameter) Returns the resulting used name. */ ScRangeData* createLocalNamedRangeObject( - ::rtl::OUString& orName, + OUString& orName, const ::com::sun::star::uno::Sequence< ::com::sun::star::sheet::FormulaToken>& rTokens, sal_Int32 nIndex, sal_Int32 nNameFlags = 0, sal_Int32 nTab = -1 ) const; @@ -194,7 +194,7 @@ public: @param orName (in/out-parameter) Returns the resulting used name. */ ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XDatabaseRange > createDatabaseRangeObject( - ::rtl::OUString& orName, + OUString& orName, const ::com::sun::star::table::CellRangeAddress& rRangeAddr ) const; /** Creates and returns an unnamed database range on-the-fly in the Calc document. @@ -206,7 +206,7 @@ public: /** Creates and returns a com.sun.star.style.Style object for cells or pages. */ ::com::sun::star::uno::Reference< ::com::sun::star::style::XStyle > createStyleObject( - ::rtl::OUString& orStyleName, + OUString& orStyleName, bool bPageStyle ) const; // buffers ---------------------------------------------------------------- diff --git a/sc/source/filter/inc/workbooksettings.hxx b/sc/source/filter/inc/workbooksettings.hxx index 8fb3ec8a4ffe..6d2423a7cbaf 100644 --- a/sc/source/filter/inc/workbooksettings.hxx +++ b/sc/source/filter/inc/workbooksettings.hxx @@ -32,7 +32,7 @@ namespace xls { /** Settings for workbook write protection. */ struct FileSharingModel { - ::rtl::OUString maUserName; /// User who added the write protection password. + OUString maUserName; /// User who added the write protection password. sal_uInt16 mnPasswordHash; /// Hash value of the write protection password. bool mbRecommendReadOnly; /// True = recommend read-only mode on opening. @@ -44,7 +44,7 @@ struct FileSharingModel /** Global workbook settings. */ struct WorkbookSettingsModel { - ::rtl::OUString maCodeName; /// VBA codename for the workbook. + OUString maCodeName; /// VBA codename for the workbook. sal_Int32 mnShowObjectMode; /// Specifies how objects are shown. sal_Int32 mnUpdateLinksMode; /// Specifies how external links are updated. sal_Int32 mnDefaultThemeVer; /// Default theme version. diff --git a/sc/source/filter/inc/worksheetbuffer.hxx b/sc/source/filter/inc/worksheetbuffer.hxx index d58a49017c46..54b47d15177b 100644 --- a/sc/source/filter/inc/worksheetbuffer.hxx +++ b/sc/source/filter/inc/worksheetbuffer.hxx @@ -37,8 +37,8 @@ namespace xls { /** Contains data from the 'sheet' element describing a sheet in the workbook. */ struct SheetInfoModel { - ::rtl::OUString maRelId; /// Relation identifier for the sheet substream. - ::rtl::OUString maName; /// Original name of the sheet. + OUString maRelId; /// Relation identifier for the sheet substream. + OUString maName; /// Original name of the sheet. sal_Int64 mnBiffHandle; /// BIFF record handle of the sheet substream. sal_Int32 mnSheetId; /// Sheet identifier. sal_Int32 mnState; /// Visibility state. @@ -65,41 +65,41 @@ public: void importSheet( SequenceInputStream& rStrm ); /** Inserts a new empty sheet into the document. Looks for an unused name. @return Index of the new sheet in the Calc document. */ - sal_Int16 insertEmptySheet( const ::rtl::OUString& rPreferredName, bool bVisible ); + sal_Int16 insertEmptySheet( const OUString& rPreferredName, bool bVisible ); /** Returns the number of original sheets contained in the workbook. */ sal_Int32 getWorksheetCount() const; /** Returns the OOXML relation identifier of the specified worksheet. */ - ::rtl::OUString getWorksheetRelId( sal_Int32 nWorksheet ) const; + OUString getWorksheetRelId( sal_Int32 nWorksheet ) const; /** Returns the Calc index of the specified worksheet. */ sal_Int16 getCalcSheetIndex( sal_Int32 nWorksheet ) const; /** Returns the finalized name of the specified worksheet. */ - ::rtl::OUString getCalcSheetName( sal_Int32 nWorksheet ) const; + OUString getCalcSheetName( sal_Int32 nWorksheet ) const; /** Returns the Calc index of the sheet with the passed original worksheet name. */ - sal_Int16 getCalcSheetIndex( const ::rtl::OUString& rWorksheetName ) const; + sal_Int16 getCalcSheetIndex( const OUString& rWorksheetName ) const; /** Returns the finalized name of the sheet with the passed worksheet name. */ - ::rtl::OUString getCalcSheetName( const ::rtl::OUString& rWorksheetName ) const; + OUString getCalcSheetName( const OUString& rWorksheetName ) const; /** Converts sSheetNameRef (e.g. '#SheetName!A1' to '#SheetName.A1' ) if sSheetNameRef doesn't start with '#' it is ignored and not modified */ - void convertSheetNameRef( ::rtl::OUString& sSheetNameRef ) const; + void convertSheetNameRef( OUString& sSheetNameRef ) const; private: struct SheetInfo : public SheetInfoModel { - ::rtl::OUString maCalcName; - ::rtl::OUString maCalcQuotedName; + OUString maCalcName; + OUString maCalcQuotedName; sal_Int16 mnCalcSheet; - explicit SheetInfo( const SheetInfoModel& rModel, sal_Int16 nCalcSheet, const ::rtl::OUString& rCalcName ); + explicit SheetInfo( const SheetInfoModel& rModel, sal_Int16 nCalcSheet, const OUString& rCalcName ); }; - typedef ::std::pair< sal_Int16, ::rtl::OUString > IndexNamePair; + typedef ::std::pair< sal_Int16, OUString > IndexNamePair; /** Creates a new sheet in the Calc document. Does not insert anything in the own lists. */ - IndexNamePair createSheet( const ::rtl::OUString& rPreferredName, sal_Int32 nSheetPos, bool bVisible ); + IndexNamePair createSheet( const OUString& rPreferredName, sal_Int32 nSheetPos, bool bVisible ); /** Creates a new sheet in the Calc document and inserts the related SheetInfo. */ void insertSheet( const SheetInfoModel& rModel ); @@ -107,7 +107,7 @@ private: typedef RefVector< SheetInfo > SheetInfoVector; SheetInfoVector maSheetInfos; - typedef RefMap< ::rtl::OUString, SheetInfo, IgnoreCaseCompare > SheetInfoMap; + typedef RefMap< OUString, SheetInfo, IgnoreCaseCompare > SheetInfoMap; SheetInfoMap maSheetInfosByName; }; diff --git a/sc/source/filter/inc/worksheetfragment.hxx b/sc/source/filter/inc/worksheetfragment.hxx index 25dbdf7cf9ca..49f23c7b1bfe 100644 --- a/sc/source/filter/inc/worksheetfragment.hxx +++ b/sc/source/filter/inc/worksheetfragment.hxx @@ -34,7 +34,7 @@ public: protected: virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ); - virtual void onCharacters( const ::rtl::OUString& rChars ); + virtual void onCharacters( const OUString& rChars ); virtual void onEndElement(); virtual ::oox::core::ContextHandlerRef onCreateRecordContext( sal_Int32 nRecId, SequenceInputStream& rStrm ); @@ -56,11 +56,11 @@ class WorksheetFragment : public WorksheetFragmentBase public: explicit WorksheetFragment( const WorksheetHelper& rHelper, - const ::rtl::OUString& rFragmentPath ); + const OUString& rFragmentPath ); protected: virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ); - virtual void onCharacters( const ::rtl::OUString& rChars ); + virtual void onCharacters( const OUString& rChars ); virtual ::oox::core::ContextHandlerRef onCreateRecordContext( sal_Int32 nRecId, SequenceInputStream& rStrm ); @@ -114,7 +114,7 @@ private: void importControl( SequenceInputStream& rStrm ); /** Imports the binary data of an embedded OLE object from the fragment with the passed ID. */ - void importEmbeddedOleData( StreamDataSequence& orEmbeddedData, const ::rtl::OUString& rRelId ); + void importEmbeddedOleData( StreamDataSequence& orEmbeddedData, const OUString& rRelId ); }; } // namespace xls diff --git a/sc/source/filter/inc/worksheethelper.hxx b/sc/source/filter/inc/worksheethelper.hxx index 2efa6e4a19cd..53b7ed1084c1 100644 --- a/sc/source/filter/inc/worksheethelper.hxx +++ b/sc/source/filter/inc/worksheethelper.hxx @@ -57,7 +57,7 @@ class SheetViewSettings; class VmlDrawing; class WorksheetSettings; -typedef ::std::map< rtl::OUString, void* > ExtLst; +typedef ::std::map< OUString, void* > ExtLst; // ============================================================================ // ============================================================================ @@ -139,7 +139,7 @@ struct HyperlinkModel : public ::oox::ole::StdHlinkInfo { ::com::sun::star::table::CellRangeAddress maRange; /// The cell area containing the hyperlink. - ::rtl::OUString maTooltip; /// Additional tooltip text. + OUString maTooltip; /// Additional tooltip text. explicit HyperlinkModel(); }; @@ -152,10 +152,10 @@ struct ValidationModel ApiCellRangeList maRanges; ApiTokenSequence maTokens1; ApiTokenSequence maTokens2; - ::rtl::OUString maInputTitle; - ::rtl::OUString maInputMessage; - ::rtl::OUString maErrorTitle; - ::rtl::OUString maErrorMessage; + OUString maInputTitle; + OUString maInputMessage; + OUString maErrorTitle; + OUString maErrorMessage; sal_Int32 mnType; sal_Int32 mnOperator; sal_Int32 mnErrorStyle; @@ -247,9 +247,9 @@ public: /** Inserts the data validation settings into the spreadsheet. */ void setValidation( const ValidationModel& rModel ); /** Sets the path to the DrawingML fragment of this sheet. */ - void setDrawingPath( const ::rtl::OUString& rDrawingPath ); + void setDrawingPath( const OUString& rDrawingPath ); /** Sets the path to the legacy VML drawing fragment of this sheet. */ - void setVmlDrawingPath( const ::rtl::OUString& rVmlDrawingPath ); + void setVmlDrawingPath( const OUString& rVmlDrawingPath ); /** Extends the used area of this sheet by the passed cell position. */ void extendUsedArea( const ::com::sun::star::table::CellAddress& rAddress ); @@ -288,7 +288,7 @@ public: /** Inserts a string cell directly into the Calc sheet. */ void putString( const ::com::sun::star::table::CellAddress& rAddress, - const ::rtl::OUString& rText ) const; + const OUString& rText ) const; /** Inserts a rich-string cell directly into the Calc sheet. */ void putRichString( const ::com::sun::star::table::CellAddress& rAddress, @@ -306,10 +306,10 @@ public: /** Final import of drawing objects. Has to be called after all content has been imported */ void finalizeDrawingImport(); - void setCellFormula( const ::com::sun::star::table::CellAddress& rTokenAddress, const rtl::OUString& ); + void setCellFormula( const ::com::sun::star::table::CellAddress& rTokenAddress, const OUString& ); void setCellFormula( const ::com::sun::star::table::CellAddress& rTokenAddress, sal_Int32 ); - void setCellArrayFormula( const ::com::sun::star::table::CellRangeAddress& rRangeAddress, const ::com::sun::star::table::CellAddress& rTokenAddress, const rtl::OUString& ); - void createSharedFormulaMapEntry( const ::com::sun::star::table::CellAddress& rAddress, sal_Int32 nSharedId, const rtl::OUString& rTokens ); + void setCellArrayFormula( const ::com::sun::star::table::CellRangeAddress& rRangeAddress, const ::com::sun::star::table::CellAddress& rTokenAddress, const OUString& ); + void createSharedFormulaMapEntry( const ::com::sun::star::table::CellAddress& rAddress, sal_Int32 nSharedId, const OUString& rTokens ); void setCellFormulaValue( const ::com::sun::star::table::CellAddress& rAddress, double fValue ); private: diff --git a/sc/source/filter/inc/worksheetsettings.hxx b/sc/source/filter/inc/worksheetsettings.hxx index a6209aa27cbe..9fc17a3bf253 100644 --- a/sc/source/filter/inc/worksheetsettings.hxx +++ b/sc/source/filter/inc/worksheetsettings.hxx @@ -31,7 +31,7 @@ namespace xls { /** Sheet and outline settings. */ struct SheetSettingsModel { - ::rtl::OUString maCodeName; /// VBA module codename. + OUString maCodeName; /// VBA module codename. Color maTabColor; /// Sheet tab color. bool mbFilterMode; /// True = sheet contains active filter. bool mbApplyStyles; /// True = automatic styles when creating outlines. diff --git a/sc/source/filter/inc/xechart.hxx b/sc/source/filter/inc/xechart.hxx index 10f27f4f1402..3ccdf7306b55 100644 --- a/sc/source/filter/inc/xechart.hxx +++ b/sc/source/filter/inc/xechart.hxx @@ -94,7 +94,7 @@ public: /** Returns chart type info for a unique chart type identifier. */ const XclChTypeInfo& GetChartTypeInfo( XclChTypeId eType ) const; /** Returns the first fitting chart type info for the passed service name. */ - const XclChTypeInfo& GetChartTypeInfo( const ::rtl::OUString& rServiceName ) const; + const XclChTypeInfo& GetChartTypeInfo( const OUString& rServiceName ) const; /** Returns an info struct about auto formatting for the passed object type. */ const XclChFormatInfo& GetFormatInfo( XclChObjectType eObjType ) const; @@ -758,7 +758,7 @@ public: /** Converts the passed data series for stock charts. */ bool ConvertStockSeries( XDataSeriesRef xDataSeries, - const ::rtl::OUString& rValueRole, + const OUString& rValueRole, sal_uInt16 nGroupIdx, sal_uInt16 nFormatIdx, bool bCloseSymbol ); /** Converts the passed error bar settings (called at trend line child series). */ bool ConvertTrendLine( const XclExpChSeries& rParent, XRegressionCurveRef xRegCurve ); @@ -777,11 +777,11 @@ private: void CreateTrendLines( XDataSeriesRef xDataSeries ); /** Tries to create positive and negative error bar series objects (called at parent series). */ void CreateErrorBars( const ScfPropertySet& rPropSet, - const ::rtl::OUString& rBarPropName, + const OUString& rBarPropName, sal_uInt8 nPosBarId, sal_uInt8 nNegBarId ); /** Tries to create an error bar series object (called at parent series). */ void CreateErrorBar( const ScfPropertySet& rPropSet, - const ::rtl::OUString& rShowPropName, sal_uInt8 nBarId ); + const OUString& rShowPropName, sal_uInt8 nBarId ); virtual void WriteBody( XclExpStream& rStrm ); @@ -979,7 +979,7 @@ private: XDataSeriesRef xDataSeries ); /** Creates a single data series of a stock chart. */ bool CreateStockSeries( XDataSeriesRef xDataSeries, - const ::rtl::OUString& rValueRole, bool bCloseSymbol ); + const OUString& rValueRole, bool bCloseSymbol ); virtual void WriteBody( XclExpStream& rStrm ); diff --git a/sc/source/filter/inc/xecontent.hxx b/sc/source/filter/inc/xecontent.hxx index 1328a403de61..b972da45773c 100644 --- a/sc/source/filter/inc/xecontent.hxx +++ b/sc/source/filter/inc/xecontent.hxx @@ -129,7 +129,7 @@ private: SvStreamPtr mxVarData; /// Buffer stream with variable data. sal_uInt32 mnFlags; /// Option flags. XclExpStringRef mxTextMark; /// Location within mxRepr - ::rtl::OUString msTarget; /// Target URL + OUString msTarget; /// Target URL }; typedef XclExpRecordList< XclExpHyperlink > XclExpHyperlinkList; @@ -278,7 +278,7 @@ private: const ScDataBarFormat& mrFormat; sal_Int32 mnPriority; - rtl::OString maGuid; + OString maGuid; }; class XclExpIconSet : public XclExpRecord, protected XclExpRoot @@ -349,9 +349,9 @@ private: XclExpString maErrorText; /// The error text. XclExpStringRef mxString1; /// String for first condition formula. XclTokenArrayRef mxTokArr1; /// Formula for first condition. - ::rtl::OUString msFormula1; /// OOXML Formula for first condition. + OUString msFormula1; /// OOXML Formula for first condition. XclTokenArrayRef mxTokArr2; /// Formula for second condition. - ::rtl::OUString msFormula2; /// OOXML Formula for second condition. + OUString msFormula2; /// OOXML Formula for second condition. sal_uInt32 mnFlags; /// Miscellaneous flags. sal_uLong mnScHandle; /// The core handle for quick list search. }; diff --git a/sc/source/filter/inc/xeescher.hxx b/sc/source/filter/inc/xeescher.hxx index 6eb9e7636470..205b4cbf04ab 100644 --- a/sc/source/filter/inc/xeescher.hxx +++ b/sc/source/filter/inc/xeescher.hxx @@ -368,7 +368,7 @@ private: private: XclExpString maAuthor; /// Name of the author. String maOrigNoteText; /// Original main text of the note. - rtl::OString maNoteText; /// Main text of the note (<=BIFF7). + OString maNoteText; /// Main text of the note (<=BIFF7). XclExpStringRef mpNoteContents; /// Text and formatting data (OOXML) ScAddress maScPos; /// Calc cell address of the note. sal_uInt16 mnObjId; /// Escher object ID (BIFF8). diff --git a/sc/source/filter/inc/xeextlst.hxx b/sc/source/filter/inc/xeextlst.hxx index fe0ccdef75cd..c32e23e6f978 100644 --- a/sc/source/filter/inc/xeextlst.hxx +++ b/sc/source/filter/inc/xeextlst.hxx @@ -34,7 +34,7 @@ public: virtual XclExpExtType GetType() = 0; protected: - rtl::OString maURI; + OString maURI; }; class XclExpExtCfvo : public XclExpRecordBase, protected XclExpRoot @@ -45,7 +45,7 @@ public: private: ScColorScaleEntryType meType; - rtl::OString maValue; + OString maValue; bool mbFirst; }; @@ -90,12 +90,12 @@ typedef boost::shared_ptr<XclExpExtDataBar> XclExpExtDataBarRef; class XclExpExtCfRule : public XclExpRecordBase, protected XclExpRoot { public: - XclExpExtCfRule( const XclExpRoot& rRoot, const ScDataBarFormat& rFormat, const ScAddress& rPos, const rtl::OString& rId ); + XclExpExtCfRule( const XclExpRoot& rRoot, const ScDataBarFormat& rFormat, const ScAddress& rPos, const OString& rId ); virtual void SaveXml( XclExpXmlStream& rStrm ); private: XclExpExtDataBarRef maDataBar; - rtl::OString maId; + OString maId; }; typedef boost::shared_ptr<XclExpExt> XclExpExtRef; @@ -104,7 +104,7 @@ typedef boost::shared_ptr<XclExpExtCfRule> XclExpExtCfRuleRef; class XclExpExtConditionalFormatting : public XclExpRecordBase, protected XclExpRoot { public: - explicit XclExpExtConditionalFormatting( const XclExpRoot& rRoot, const ScDataBarFormat& rFormat, const ScAddress& rPos, const rtl::OString& rId ); + explicit XclExpExtConditionalFormatting( const XclExpRoot& rRoot, const ScDataBarFormat& rFormat, const ScAddress& rPos, const OString& rId ); virtual void SaveXml( XclExpXmlStream& rStrm ); private: diff --git a/sc/source/filter/inc/xehelper.hxx b/sc/source/filter/inc/xehelper.hxx index b5e5a89eb854..04ecc2b0e001 100644 --- a/sc/source/filter/inc/xehelper.hxx +++ b/sc/source/filter/inc/xehelper.hxx @@ -184,7 +184,7 @@ public: /** Processes the passed URL field (tries to create a HLINK record). @return The representation string of the URL field. */ - rtl::OUString ProcessUrlField( const SvxURLField& rUrlField ); + OUString ProcessUrlField( const SvxURLField& rUrlField ); /** Returns true, if a single HLINK record has been created. */ bool HasLinkRecord() const; @@ -402,9 +402,9 @@ class XclExpUrlHelper : boost::noncopyable public: /** Encodes and returns the URL passed in rAbsUrl to an Excel like URL. @param pTableName Optional pointer to a table name to be encoded in this URL. */ - static rtl::OUString EncodeUrl( const XclExpRoot& rRoot, const rtl::OUString& rAbsUrl, const rtl::OUString* pTableName = 0 ); + static OUString EncodeUrl( const XclExpRoot& rRoot, const OUString& rAbsUrl, const OUString* pTableName = 0 ); /** Encodes and returns the passed DDE link to an Excel like DDE link. */ - static rtl::OUString EncodeDde( const rtl::OUString& rApplic, const rtl::OUString& rTopic ); + static OUString EncodeDde( const OUString& rApplic, const OUString& rTopic ); private: /** We don't want anybody to instantiate this class, since it is just a diff --git a/sc/source/filter/inc/xelink.hxx b/sc/source/filter/inc/xelink.hxx index f19a8e840440..56cb6f6e358f 100644 --- a/sc/source/filter/inc/xelink.hxx +++ b/sc/source/filter/inc/xelink.hxx @@ -66,7 +66,7 @@ public: /** Returns true, if the specified Calc sheet is displayed in right-to-left mode. */ bool IsMirroredTab( SCTAB nScTab ) const; /** Returns the Calc name of the specified sheet. */ - rtl::OUString GetScTabName( SCTAB nScTab ) const; + OUString GetScTabName( SCTAB nScTab ) const; /** Returns the Excel sheet index for a given Calc sheet. */ sal_uInt16 GetXclTab( SCTAB nScTab ) const; @@ -104,7 +104,7 @@ private: /** Data structure with infoemation about one Calc sheet. */ struct XclExpTabInfoEntry { - rtl::OUString maScName; + OUString maScName; sal_uInt16 mnXclTab; sal_uInt8 mnFlags; inline explicit XclExpTabInfoEntry() : mnXclTab( 0 ), mnFlags( 0 ) {} diff --git a/sc/source/filter/inc/xepivot.hxx b/sc/source/filter/inc/xepivot.hxx index 080eab7aef29..4a7a53fc8ac5 100644 --- a/sc/source/filter/inc/xepivot.hxx +++ b/sc/source/filter/inc/xepivot.hxx @@ -49,7 +49,7 @@ public: inline sal_uInt16 GetTypeFlag() const { return mnTypeFlag; } - bool EqualsText( const rtl::OUString& rText ) const; + bool EqualsText( const OUString& rText ) const; bool EqualsDouble( double fValue ) const; bool EqualsDateTime( const DateTime& rDateTime ) const; bool EqualsBool( bool bValue ) const; @@ -85,14 +85,14 @@ public: void ConvertToNumGroup( const ScDPObject& rDPObj, const ScDPSaveNumGroupDimension& rNumGroupDim ); /** Returns the name of this cache field. */ - inline const rtl::OUString& GetFieldName() const { return maFieldInfo.maName; } + inline const OUString& GetFieldName() const { return maFieldInfo.maName; } /** Returns the number of visible items of this field. */ sal_uInt16 GetItemCount() const; /** Returns the specified pivot cache item (returns visible items in groupings). */ const XclExpPCItem* GetItem( sal_uInt16 nItemIdx ) const; /** Returns the index of a pivot cache item, or EXC_PC_NOITEM on error. */ - sal_uInt16 GetItemIndex( const rtl::OUString& rItemName ) const; + sal_uInt16 GetItemIndex( const OUString& rItemName ) const; /** Returns the size an item index needs to write out. */ sal_Size GetIndexSize() const; @@ -230,8 +230,8 @@ private: XclPCInfo maPCInfo; /// Pivot cache settings (SXDB record). XclExpPCFieldList maFieldList; /// List of all pivot cache fields. - rtl::OUString maTabName; /// Name of source data sheet. - rtl::OUString maSrcRangeName; /// Range name for source data. + OUString maTabName; /// Name of source data sheet. + OUString maSrcRangeName; /// Range name for source data. ScRange maOrigSrcRange; /// The original sheet source range. ScRange maExpSrcRange; /// The exported sheet source range. ScRange maDocSrcRange; /// The range used to build the cache fields and items. @@ -257,7 +257,7 @@ public: explicit XclExpPTItem( sal_uInt16 nItemType, sal_uInt16 nCacheIdx, bool bUseCache ); /** Returns the internal name of this item. */ - rtl::OUString GetItemName() const; + OUString GetItemName() const; /** Fills this item with properties from the passed save member. */ void SetPropertiesFromMember( const ScDPSaveMember& rSaveMem ); @@ -281,7 +281,7 @@ public: // data access ------------------------------------------------------------ /** Returns the name of this field. */ - rtl::OUString GetFieldName() const; + OUString GetFieldName() const; /** Returns the pivot table field list index of this field. */ sal_uInt16 GetFieldIndex() const; @@ -290,7 +290,7 @@ public: /** Returns the list index of an item by its name. @param nDefaultIdx This value will be returned, if the item could not be found. */ - sal_uInt16 GetItemIndex( const rtl::OUString& rName, sal_uInt16 nDefaultIdx ) const; + sal_uInt16 GetItemIndex( const OUString& rName, sal_uInt16 nDefaultIdx ) const; // fill data -------------------------------------------------------------- @@ -315,7 +315,7 @@ public: // ------------------------------------------------------------------------ private: /** Returns an item by its name. */ - XclExpPTItem* GetItemAcc( const rtl::OUString& rName ); + XclExpPTItem* GetItemAcc( const OUString& rName ); /** Appends a special item describing a field subtotal entry. */ void AppendSubtotalItem( sal_uInt16 nItemType ); @@ -355,11 +355,11 @@ public: /** Returns a pivot table field by its name. */ const XclExpPTField* GetField( sal_uInt16 nFieldIdx ) const; /** Returns a pivot table field by its name. */ - const XclExpPTField* GetField( const rtl::OUString& rName ) const; + const XclExpPTField* GetField( const OUString& rName ) const; /** Returns the data-field-only index of the first data field with the passed name. @param nDefaultIdx This value will be returned, if the field could not be found. */ - sal_uInt16 GetDataFieldIndex( const rtl::OUString& rName, sal_uInt16 nDefaultIdx ) const; + sal_uInt16 GetDataFieldIndex( const OUString& rName, sal_uInt16 nDefaultIdx ) const; /** Writes the entire pivot table. */ virtual void Save( XclExpStream& rStrm ); @@ -368,7 +368,7 @@ public: // ------------------------------------------------------------------------ private: /** Returns a pivot table field by its name. */ - XclExpPTField* GetFieldAcc( const rtl::OUString& rName ); + XclExpPTField* GetFieldAcc( const OUString& rName ); /** Returns a pivot table field corresponding to the passed save dimension. */ XclExpPTField* GetFieldAcc( const ScDPSaveDimension& rSaveDim ); diff --git a/sc/source/filter/inc/xerecord.hxx b/sc/source/filter/inc/xerecord.hxx index ddaad2054465..27f272e478d6 100644 --- a/sc/source/filter/inc/xerecord.hxx +++ b/sc/source/filter/inc/xerecord.hxx @@ -222,7 +222,7 @@ void XclExpValueRecord< Type >::SaveXml( XclExpXmlStream& rStrm ) if( mnAttribute == -1 ) return; rStrm.WriteAttributes( - mnAttribute, rtl::OString::valueOf( (sal_Int32) maValue ).getStr(), + mnAttribute, OString::valueOf( (sal_Int32) maValue ).getStr(), FSEND ); } diff --git a/sc/source/filter/inc/xeroot.hxx b/sc/source/filter/inc/xeroot.hxx index 5eb6e5371eb3..a0978a72b4da 100644 --- a/sc/source/filter/inc/xeroot.hxx +++ b/sc/source/filter/inc/xeroot.hxx @@ -162,7 +162,7 @@ public: bool IsDocumentEncrypted() const; - ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue > GenerateEncryptionData( const ::rtl::OUString& aPass ) const; + ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue > GenerateEncryptionData( const OUString& aPass ) const; ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue > GetEncryptionData() const; ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue > GenerateDefaultEncryptionData() const; diff --git a/sc/source/filter/inc/xestream.hxx b/sc/source/filter/inc/xestream.hxx index 2fb371249ab8..0ac31d4617f1 100644 --- a/sc/source/filter/inc/xestream.hxx +++ b/sc/source/filter/inc/xestream.hxx @@ -134,9 +134,9 @@ public: // *** write 8-bit-strings *** // (slice length setting has no effect here -> disabled automatically) - /** Writes string length field and rtl::OString buffer. */ + /** Writes string length field and OString buffer. */ void WriteByteString( - const rtl::OString& rString, + const OString& rString, sal_uInt16 nMaxLen = 0x00FF, bool b16BitCount = false ); @@ -269,27 +269,27 @@ class XclXmlUtils XclXmlUtils(const XclXmlUtils&); XclXmlUtils& operator=(const XclXmlUtils&); public: - static void GetFormulaTypeAndValue( ScFormulaCell& rCell, const char*& sType, ::rtl::OUString& rValue); - static ::rtl::OUString GetStreamName( const char* sStreamDir, const char* sStream, sal_Int32 nId ); - - static ::rtl::OString ToOString( const Color& rColor ); - static ::rtl::OString ToOString( const ::rtl::OUString& s ); - static ::rtl::OString ToOString( const ScfUInt16Vec& rBuffer ); - static ::rtl::OString ToOString( const String& s ); - static ::rtl::OString ToOString( const ScAddress& rRange ); - static ::rtl::OString ToOString( const ScRange& rRange ); - static ::rtl::OString ToOString( const ScRangeList& rRangeList ); - static ::rtl::OString ToOString( const XclAddress& rAddress ); - static ::rtl::OString ToOString( const XclExpString& s ); - static ::rtl::OString ToOString( const XclRange& rRange ); - static ::rtl::OString ToOString( const XclRangeList& rRangeList ); - - static ::rtl::OUString ToOUString( const char* s ); - static ::rtl::OUString ToOUString( const ScfUInt16Vec& rBuffer, sal_Int32 nStart = 0, sal_Int32 nLength = -1 ); - static ::rtl::OUString ToOUString( const String& s ); - static ::rtl::OUString ToOUString( ScDocument& rDocument, const ScAddress& rAddress, + static void GetFormulaTypeAndValue( ScFormulaCell& rCell, const char*& sType, OUString& rValue); + static OUString GetStreamName( const char* sStreamDir, const char* sStream, sal_Int32 nId ); + + static OString ToOString( const Color& rColor ); + static OString ToOString( const OUString& s ); + static OString ToOString( const ScfUInt16Vec& rBuffer ); + static OString ToOString( const String& s ); + static OString ToOString( const ScAddress& rRange ); + static OString ToOString( const ScRange& rRange ); + static OString ToOString( const ScRangeList& rRangeList ); + static OString ToOString( const XclAddress& rAddress ); + static OString ToOString( const XclExpString& s ); + static OString ToOString( const XclRange& rRange ); + static OString ToOString( const XclRangeList& rRangeList ); + + static OUString ToOUString( const char* s ); + static OUString ToOUString( const ScfUInt16Vec& rBuffer, sal_Int32 nStart = 0, sal_Int32 nLength = -1 ); + static OUString ToOUString( const String& s ); + static OUString ToOUString( ScDocument& rDocument, const ScAddress& rAddress, ScTokenArray* pTokenArray, const ScCompiler::OpCodeMapPtr & xOpCodeMap ); - static ::rtl::OUString ToOUString( const XclExpString& s ); + static OUString ToOUString( const XclExpString& s ); static const char* ToPsz( bool b ); static sax_fastparser::FSHelperPtr WriteElement( sax_fastparser::FSHelperPtr pStream, sal_Int32 nElement, sal_Int32 nValue ); @@ -311,7 +311,7 @@ public: void PushStream( sax_fastparser::FSHelperPtr aStream ); void PopStream(); - sax_fastparser::FSHelperPtr GetStreamForPath( const ::rtl::OUString& rPath ); + sax_fastparser::FSHelperPtr GetStreamForPath( const OUString& rPath ); sax_fastparser::FSHelperPtr& WriteAttributes( sal_Int32 nAttribute, const char* value, FSEND_t ) { return WriteAttributesInternal( nAttribute, value, FSEND_internal ); } @@ -319,12 +319,12 @@ public: { return WriteAttributesInternal( nAttribute, value.getStr(), FSEND_internal ); } sax_fastparser::FSHelperPtr CreateOutputStream ( - const ::rtl::OUString& sFullStream, - const ::rtl::OUString& sRelativeStream, + const OUString& sFullStream, + const OUString& sRelativeStream, const ::com::sun::star::uno::Reference< ::com::sun::star::io::XOutputStream >& xParentRelation, const char* sContentType, const char* sRelationshipType, - ::rtl::OUString* pRelationshipId = NULL ); + OUString* pRelationshipId = NULL ); // ignore virtual bool exportDocument() throw(); @@ -368,12 +368,12 @@ public: private: virtual ::oox::ole::VbaProject* implCreateVbaProject() const; - virtual ::rtl::OUString implGetImplementationName() const; + virtual OUString implGetImplementationName() const; ScDocShell *getDocShell(); sax_fastparser::FSHelperPtr& WriteAttributesInternal( sal_Int32 nAttribute, ... ); - typedef std::map< ::rtl::OUString, - std::pair< ::rtl::OUString, + typedef std::map< OUString, + std::pair< OUString, sax_fastparser::FSHelperPtr > > XclExpXmlPathToStateMap; const XclExpRoot* mpRoot; diff --git a/sc/source/filter/inc/xestring.hxx b/sc/source/filter/inc/xestring.hxx index 2731e324f7b9..de23884c7c85 100644 --- a/sc/source/filter/inc/xestring.hxx +++ b/sc/source/filter/inc/xestring.hxx @@ -65,7 +65,7 @@ public: @param nFlags Modifiers for string export. @param nMaxLen The maximum number of characters to store in this string. */ explicit XclExpString( - const ::rtl::OUString& rString, + const OUString& rString, XclStrFlags nFlags = EXC_STR_DEFAULT, sal_uInt16 nMaxLen = EXC_STR_MAXLEN ); @@ -83,7 +83,7 @@ public: @param nFlags Modifiers for string export. @param nMaxLen The maximum number of characters to store in this string. */ void Assign( - const ::rtl::OUString& rString, + const OUString& rString, XclStrFlags nFlags = EXC_STR_DEFAULT, sal_uInt16 nMaxLen = EXC_STR_MAXLEN ); diff --git a/sc/source/filter/inc/xestyle.hxx b/sc/source/filter/inc/xestyle.hxx index aa1f6f59d4ff..a0903bcc49b4 100644 --- a/sc/source/filter/inc/xestyle.hxx +++ b/sc/source/filter/inc/xestyle.hxx @@ -268,9 +268,9 @@ struct XclExpNumFmt { sal_uLong mnScNumFmt; /// Core index of the number format. sal_uInt16 mnXclNumFmt; /// Resulting Excel format index. - rtl::OUString maNumFmtString; /// format string + OUString maNumFmtString; /// format string - inline explicit XclExpNumFmt( sal_uLong nScNumFmt, sal_uInt16 nXclNumFmt, const rtl::OUString& rFrmt ) : + inline explicit XclExpNumFmt( sal_uLong nScNumFmt, sal_uInt16 nXclNumFmt, const OUString& rFrmt ) : mnScNumFmt( nScNumFmt ), mnXclNumFmt( nXclNumFmt ), maNumFmtString( rFrmt ) {} void SaveXml( XclExpXmlStream& rStrm ); @@ -753,12 +753,12 @@ public: XclExpDxfs( const XclExpRoot& rRoot ); virtual ~XclExpDxfs() {} - sal_Int32 GetDxfId(const rtl::OUString& rName); + sal_Int32 GetDxfId(const OUString& rName); virtual void SaveXml( XclExpXmlStream& rStrm); private: typedef boost::ptr_vector<XclExpDxf> DxfContainer; - std::map<rtl::OUString, sal_Int32> maStyleNameToDxfId; + std::map<OUString, sal_Int32> maStyleNameToDxfId; DxfContainer maDxf; SvNumberFormatterPtr mxFormatter; /// Special number formatter for conversion. boost::scoped_ptr<NfKeywordTable> mpKeywordTable; /// Replacement table. diff --git a/sc/source/filter/inc/xichart.hxx b/sc/source/filter/inc/xichart.hxx index 7c444126822b..c1a2cbcc57fe 100644 --- a/sc/source/filter/inc/xichart.hxx +++ b/sc/source/filter/inc/xichart.hxx @@ -422,7 +422,7 @@ public: void ConvertNumFmt( ScfPropertySet& rPropSet, bool bPercent ) const; /** Creates a data sequence containing the link into the Calc document. */ - XDataSequenceRef CreateDataSequence( const ::rtl::OUString& rRole ) const; + XDataSequenceRef CreateDataSequence( const OUString& rRole ) const; /** Creates a sequence of formatted string objects. */ XFormattedStringSeq CreateStringSequence( const XclImpChRoot& rRoot, sal_uInt16 nLeadFontIdx, const Color& rLeadFontColor ) const; @@ -834,9 +834,9 @@ public: inline bool HasSpline() const { return mxSeriesFmt && mxSeriesFmt->HasSpline(); } /** Creates a labeled data sequence object from value data link. */ - XLabeledDataSeqRef CreateValueSequence( const ::rtl::OUString& rValueRole ) const; + XLabeledDataSeqRef CreateValueSequence( const OUString& rValueRole ) const; /** Creates a labeled data sequence object from category data link. */ - XLabeledDataSeqRef CreateCategSequence( const ::rtl::OUString& rCategRole ) const; + XLabeledDataSeqRef CreateCategSequence( const OUString& rCategRole ) const; /** Creates a data series object with initialized source links. */ XDataSeriesRef CreateDataSeries() const; @@ -1390,7 +1390,7 @@ public: const ::com::sun::star::uno::Reference< com::sun::star::chart2::XChartDocument>& xChartDoc, XclImpDffConverter& rDffConv, - const ::rtl::OUString& rObjName, + const OUString& rObjName, const Rectangle& rChartRect ) const; private: @@ -1488,7 +1488,7 @@ public: /** Creates the chart object in the passed component. */ void Convert( XModelRef xModel, XclImpDffConverter& rDffConv, - const ::rtl::OUString& rObjName, + const OUString& rObjName, const Rectangle& rChartRect ) const; private: diff --git a/sc/source/filter/inc/xiescher.hxx b/sc/source/filter/inc/xiescher.hxx index 07655516b419..088c6d500e34 100644 --- a/sc/source/filter/inc/xiescher.hxx +++ b/sc/source/filter/inc/xiescher.hxx @@ -72,7 +72,7 @@ public: void SetAnchor( const XclObjAnchor& rAnchor ); /** Sets shape data from DFF stream. */ void SetDffData( - const DffObjData& rDffObjData, const rtl::OUString& rObjName, const rtl::OUString& rHyperlink, + const DffObjData& rDffObjData, const OUString& rObjName, const OUString& rHyperlink, bool bVisible, bool bAutoMargin ); /** If set to false, the SdrObject will not be created, processed, or inserted into the draw page. */ @@ -87,9 +87,9 @@ public: /** Returns the Excel object type from OBJ record. */ inline sal_uInt16 GetObjType() const { return mnObjType; } /** Returns the name of this object, may generate a default name. */ - virtual rtl::OUString GetObjName() const; + virtual OUString GetObjName() const; /** Returns associated macro name, if set, otherwise zero length string. */ - inline const rtl::OUString& GetMacroName() const { return maMacroName; } + inline const OUString& GetMacroName() const { return maMacroName; } /** Returns the shape identifier used in the DFF stream. */ inline sal_uInt32 GetDffShapeId() const { return mnDffShapeId; } @@ -185,9 +185,9 @@ private: sal_uInt16 mnObjType; /// The Excel object type from OBJ record. sal_uInt32 mnDffShapeId; /// Shape ID from DFF stream. sal_uInt32 mnDffFlags; /// Shape flags from DFF stream. - rtl::OUString maObjName; /// Name of the object. - rtl::OUString maMacroName; /// Name of an attached macro. - rtl::OUString maHyperlink; /// On-click hyperlink URL. + OUString maObjName; /// Name of the object. + OUString maMacroName; /// Name of an attached macro. + OUString maHyperlink; /// On-click hyperlink URL. bool mbHasAnchor; /// true = maAnchor is initialized. bool mbHidden; /// true = Object is hidden. bool mbVisible; /// true = Object is visible. @@ -526,7 +526,7 @@ public: void SetDffProperties( const DffPropSet& rDffPropSet ); /** Returns the service name of the control component to be created. */ - inline ::rtl::OUString GetServiceName() const { return DoGetServiceName(); } + inline OUString GetServiceName() const { return DoGetServiceName(); } /** Fills the passed macro event descriptor. */ bool FillMacroDescriptor( ::com::sun::star::script::ScriptEventDescriptor& rDescriptor ) const; @@ -543,7 +543,7 @@ protected: virtual void DoPreProcessSdrObj( XclImpDffConverter& rDffConv, SdrObject& rSdrObj ) const; /** Derived classes return the service name of the control component to be created. */ - virtual ::rtl::OUString DoGetServiceName() const = 0; + virtual OUString DoGetServiceName() const = 0; /** Derived classes return the type of the macro event to be created. */ virtual XclTbxEventType DoGetEventType() const = 0; }; @@ -560,7 +560,7 @@ protected: /** Sets additional properties for the current form control. */ virtual void DoProcessControl( ScfPropertySet& rPropSet ) const; /** Returns the service name of the control component to be created. */ - virtual ::rtl::OUString DoGetServiceName() const; + virtual OUString DoGetServiceName() const; /** Returns the type of the macro event to be created. */ virtual XclTbxEventType DoGetEventType() const; }; @@ -581,7 +581,7 @@ protected: /** Sets additional properties for the current form control. */ virtual void DoProcessControl( ScfPropertySet& rPropSet ) const; /** Returns the service name of the control component to be created. */ - virtual ::rtl::OUString DoGetServiceName() const; + virtual OUString DoGetServiceName() const; /** Returns the type of the macro event to be created. */ virtual XclTbxEventType DoGetEventType() const; @@ -606,7 +606,7 @@ protected: /** Sets additional properties for the current form control. */ virtual void DoProcessControl( ScfPropertySet& rPropSet ) const; /** Returns the service name of the control component to be created. */ - virtual ::rtl::OUString DoGetServiceName() const; + virtual OUString DoGetServiceName() const; /** Returns the type of the macro event to be created. */ virtual XclTbxEventType DoGetEventType() const; @@ -628,7 +628,7 @@ protected: /** Sets additional properties for the current form control. */ virtual void DoProcessControl( ScfPropertySet& rPropSet ) const; /** Returns the service name of the control component to be created. */ - virtual ::rtl::OUString DoGetServiceName() const; + virtual OUString DoGetServiceName() const; /** Returns the type of the macro event to be created. */ virtual XclTbxEventType DoGetEventType() const; }; @@ -649,7 +649,7 @@ protected: /** Sets additional properties for the current form control. */ virtual void DoProcessControl( ScfPropertySet& rPropSet ) const; /** Returns the service name of the control component to be created. */ - virtual ::rtl::OUString DoGetServiceName() const; + virtual OUString DoGetServiceName() const; /** Returns the type of the macro event to be created. */ virtual XclTbxEventType DoGetEventType() const; @@ -669,7 +669,7 @@ protected: /** Sets additional properties for the current form control. */ virtual void DoProcessControl( ScfPropertySet& rPropSet ) const; /** Returns the service name of the control component to be created. */ - virtual ::rtl::OUString DoGetServiceName() const; + virtual OUString DoGetServiceName() const; /** Returns the type of the macro event to be created. */ virtual XclTbxEventType DoGetEventType() const; }; @@ -693,7 +693,7 @@ protected: /** Sets additional properties for the current form control. */ virtual void DoProcessControl( ScfPropertySet& rPropSet ) const; /** Returns the service name of the control component to be created. */ - virtual ::rtl::OUString DoGetServiceName() const; + virtual OUString DoGetServiceName() const; /** Returns the type of the macro event to be created. */ virtual XclTbxEventType DoGetEventType() const; @@ -744,7 +744,7 @@ protected: /** Sets additional properties for the current form control. */ virtual void DoProcessControl( ScfPropertySet& rPropSet ) const; /** Returns the service name of the control component to be created. */ - virtual ::rtl::OUString DoGetServiceName() const; + virtual OUString DoGetServiceName() const; /** Returns the type of the macro event to be created. */ virtual XclTbxEventType DoGetEventType() const; }; @@ -763,7 +763,7 @@ protected: /** Sets additional properties for the current form control. */ virtual void DoProcessControl( ScfPropertySet& rPropSet ) const; /** Returns the service name of the control component to be created. */ - virtual ::rtl::OUString DoGetServiceName() const; + virtual OUString DoGetServiceName() const; /** Returns the type of the macro event to be created. */ virtual XclTbxEventType DoGetEventType() const; }; @@ -809,7 +809,7 @@ protected: /** Sets additional properties for the current form control. */ virtual void DoProcessControl( ScfPropertySet& rPropSet ) const; /** Returns the service name of the control component to be created. */ - virtual ::rtl::OUString DoGetServiceName() const; + virtual OUString DoGetServiceName() const; /** Returns the type of the macro event to be created. */ virtual XclTbxEventType DoGetEventType() const; @@ -839,7 +839,7 @@ protected: /** Sets additional properties for the current form control. */ virtual void DoProcessControl( ScfPropertySet& rPropSet ) const; /** Returns the service name of the control component to be created. */ - virtual ::rtl::OUString DoGetServiceName() const; + virtual OUString DoGetServiceName() const; /** Returns the type of the macro event to be created. */ virtual XclTbxEventType DoGetEventType() const; @@ -861,7 +861,7 @@ class XclImpPictureObj : public XclImpRectObj, public XclImpControlHelper public: explicit XclImpPictureObj( const XclImpRoot& rRoot ); /** Returns the ObjectName - can use non-obvious lookup for override in the associated vba document module stream**/ - virtual rtl::OUString GetObjName() const; + virtual OUString GetObjName() const; /** Returns the graphic imported from the IMGDATA record. */ inline const Graphic& GetGraphic() const { return maGraphic; } @@ -1085,7 +1085,7 @@ private: typedef boost::shared_ptr< XclImpDffConvData > XclImpDffConvDataRef; typedef ::std::vector< XclImpDffConvDataRef > XclImpDffConvDataStack; - const ::rtl::OUString maStdFormName; /// Standard name of control forms. + const OUString maStdFormName; /// Standard name of control forms. SotStorageStreamRef mxCtlsStrm; /// The 'Ctls' stream for OCX form controls. ScfProgressBarRef mxProgress; /// The progress bar used in ProcessObj(). XclImpDffConvDataStack maDataStack; /// Stack for registered drawing managers. @@ -1216,7 +1216,7 @@ public: void ConvertObjects(); /** Returns the default name for the passed object. */ - rtl::OUString GetDefaultObjName( const XclImpDrawObjBase& rDrawObj ) const; + OUString GetDefaultObjName( const XclImpDrawObjBase& rDrawObj ) const; /** Returns the used area in the sheet with the passed index. */ ScRange GetUsedArea( SCTAB nScTab ) const; /** Sets the container to receive overridden shape/ctrl names from diff --git a/sc/source/filter/inc/xihelper.hxx b/sc/source/filter/inc/xihelper.hxx index 8057fff9925f..52f7d255a26e 100644 --- a/sc/source/filter/inc/xihelper.hxx +++ b/sc/source/filter/inc/xihelper.hxx @@ -267,10 +267,10 @@ public: const String& rEncodedUrl ); static void DecodeUrl( - ::rtl::OUString& rUrl, + OUString& rUrl, bool& rbSameWb, const XclImpRoot& rRoot, - const ::rtl::OUString& rEncodedUrl ); + const OUString& rEncodedUrl ); /** Decodes the passed URL to OLE or DDE link components. @descr For DDE links: Decodes to application name and topic. diff --git a/sc/source/filter/inc/xilink.hxx b/sc/source/filter/inc/xilink.hxx index 013cd3a31fb9..09b009869600 100644 --- a/sc/source/filter/inc/xilink.hxx +++ b/sc/source/filter/inc/xilink.hxx @@ -135,8 +135,8 @@ public: * reference, since OLE link doesn't work cross-platform, and is not very * reliable even on Windows. */ - bool CreateOleData(ScDocument& rDoc, const ::rtl::OUString& rUrl, - sal_uInt16& rFileId, ::rtl::OUString& rTabName, ScRange& rRange) const; + bool CreateOleData(ScDocument& rDoc, const OUString& rUrl, + sal_uInt16& rFileId, OUString& rTabName, ScRange& rRange) const; bool HasFormulaTokens() const; diff --git a/sc/source/filter/inc/xipivot.hxx b/sc/source/filter/inc/xipivot.hxx index 504d6485193f..b670e38b82ea 100644 --- a/sc/source/filter/inc/xipivot.hxx +++ b/sc/source/filter/inc/xipivot.hxx @@ -77,7 +77,7 @@ public: // general field/item access ---------------------------------------------- /** Returns the name of the field, uses the passed visible name if supported. */ - const rtl::OUString& GetFieldName( const ScfStringVec& rVisNames ) const; + const OUString& GetFieldName( const ScfStringVec& rVisNames ) const; /** Returns the base field if this is a grouping field. */ const XclImpPCField* GetGroupBaseField() const; @@ -158,7 +158,7 @@ public: /** Returns the data source range read from the DCONREF record. */ inline const ScRange& GetSourceRange() const { return maSrcRange; } - const ::rtl::OUString& GetSourceRangeName() const { return maSrcRangeName; } + const OUString& GetSourceRangeName() const { return maSrcRangeName; } /** Returns the number of pivot cache fields. */ sal_uInt16 GetFieldCount() const; @@ -193,7 +193,7 @@ private: ScRange maSrcRange; /// Source range in the spreadsheet. String maUrl; /// URL of the source data. String maTabName; /// Sheet name of the source data. - ::rtl::OUString maSrcRangeName; /// Name of the source data range. + OUString maSrcRangeName; /// Name of the source data range. sal_uInt16 mnStrmId; /// Pivot cache stream identifier. sal_uInt16 mnSrcType; /// Source data type. bool mbSelfRef; /// true = Source data from own document. @@ -215,7 +215,7 @@ public: explicit XclImpPTItem( const XclImpPCField* pCacheField ); /** Returns the internal name of the item or 0, if no name could be found. */ - const rtl::OUString* GetItemName() const; + const OUString* GetItemName() const; /** Reads an SXVI record containing data of this item. */ void ReadSxvi( XclImpStream& rStrm ); @@ -242,14 +242,14 @@ public: /** Returns the corresponding pivot cache field of this field. */ const XclImpPCField* GetCacheField() const; /** Returns the name of this field that is used to create the Calc dimensions. */ - rtl::OUString GetFieldName() const; + OUString GetFieldName() const; /** Returns the internally set visible name of this field. */ - rtl::OUString GetVisFieldName() const; + OUString GetVisFieldName() const; /** Returns the specified item. */ const XclImpPTItem* GetItem( sal_uInt16 nItemIdx ) const; /** Returns the internal name of the specified item. */ - const rtl::OUString* GetItemName( sal_uInt16 nItemIdx ) const; + const OUString* GetItemName( sal_uInt16 nItemIdx ) const; /** Returns the flags of the axes this field is part of. */ inline sal_uInt16 GetAxes() const { return maFieldInfo.mnAxes; } @@ -326,7 +326,7 @@ public: const String& GetFieldName( sal_uInt16 nFieldIdx ) const; const XclImpPTField* GetDataField( sal_uInt16 nDataFieldIdx ) const; - rtl::OUString GetDataFieldName( sal_uInt16 nDataFieldIdx ) const; + OUString GetDataFieldName( sal_uInt16 nDataFieldIdx ) const; // records ---------------------------------------------------------------- diff --git a/sc/source/filter/inc/xistream.hxx b/sc/source/filter/inc/xistream.hxx index 0a0585bf7eed..0a2199bd06fa 100644 --- a/sc/source/filter/inc/xistream.hxx +++ b/sc/source/filter/inc/xistream.hxx @@ -57,7 +57,7 @@ public: XclImpDecrypterRef Clone() const; /** Implementation of the ::comphelper::IDocPasswordVerifier interface */ - virtual ::comphelper::DocPasswordVerifierResult verifyPassword( const ::rtl::OUString& rPassword, ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >& o_rEncryptionData ); + virtual ::comphelper::DocPasswordVerifierResult verifyPassword( const OUString& rPassword, ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >& o_rEncryptionData ); virtual ::comphelper::DocPasswordVerifierResult verifyEncryptionData( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >& rEncryptionData ); /** Updates the decrypter on start of a new record or after seeking stream. */ @@ -76,7 +76,7 @@ private: /** Derived classes implement password verification and initialization of the decoder. */ virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue > - OnVerifyPassword( const ::rtl::OUString& rPassword ) = 0; + OnVerifyPassword( const OUString& rPassword ) = 0; virtual bool OnVerifyEncryptionData( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >& rEncryptionData ) = 0; /** Implementation of updating the decrypter. */ @@ -106,7 +106,7 @@ private: virtual XclImpBiff5Decrypter* OnClone() const; /** Implements password verification and initialization of the decoder. */ virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue > - OnVerifyPassword( const ::rtl::OUString& rPassword ); + OnVerifyPassword( const OUString& rPassword ); virtual bool OnVerifyEncryptionData( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >& rEncryptionData ); /** Implementation of updating the decrypter. */ virtual void OnUpdate( sal_Size nOldStrmPos, sal_Size nNewStrmPos, sal_uInt16 nRecSize ); @@ -137,7 +137,7 @@ private: virtual XclImpBiff8Decrypter* OnClone() const; /** Implements password verification and initialization of the decoder. */ virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue > - OnVerifyPassword( const ::rtl::OUString& rPassword ); + OnVerifyPassword( const OUString& rPassword ); virtual bool OnVerifyEncryptionData( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >& rEncryptionData ); /** Implementation of updating the decrypter. */ virtual void OnUpdate( sal_Size nOldStrmPos, sal_Size nNewStrmPos, sal_uInt16 nRecSize ); diff --git a/sc/source/filter/inc/xlchart.hxx b/sc/source/filter/inc/xlchart.hxx index 6afb2ed8df45..0df3408de43f 100644 --- a/sc/source/filter/inc/xlchart.hxx +++ b/sc/source/filter/inc/xlchart.hxx @@ -885,7 +885,7 @@ struct XclChObjectLink struct XclChFrLabelProps { - rtl::OUString maSeparator; /// Separator between label values. + OUString maSeparator; /// Separator between label values. sal_uInt16 mnFlags; /// Flags indicating which values to be displayed. explicit XclChFrLabelProps(); @@ -1155,7 +1155,7 @@ public: /** Returns true, if the passed marker type is filled. */ static bool HasMarkerFillColor( sal_uInt16 nMarkerType ); /** Returns the role name for a manual data source for error bars. */ - static ::rtl::OUString GetErrorBarValuesRole( sal_uInt8 nBarType ); + static OUString GetErrorBarValuesRole( sal_uInt8 nBarType ); }; // Chart formatting info provider ============================================= @@ -1311,7 +1311,7 @@ public: /** Returns the first fitting chart type info for an Excel chart type record identifier. */ const XclChTypeInfo& GetTypeInfoFromRecId( sal_uInt16 nRecId ) const; /** Returns the first fitting chart type info for the passed service name. */ - const XclChTypeInfo& GetTypeInfoFromService( const ::rtl::OUString& rServiceName ) const; + const XclChTypeInfo& GetTypeInfoFromService( const OUString& rServiceName ) const; private: typedef ::std::map< XclChTypeId, const XclChTypeInfo* > XclChTypeInfoMap; @@ -1352,18 +1352,18 @@ public: public: explicit XclChObjectTable( XServiceFactoryRef xFactory, - const ::rtl::OUString& rServiceName, const ::rtl::OUString& rObjNameBase ); + const OUString& rServiceName, const OUString& rObjNameBase ); /** Returns a named formatting object from the chart document. */ - ::com::sun::star::uno::Any GetObject( const ::rtl::OUString& rObjName ); + ::com::sun::star::uno::Any GetObject( const OUString& rObjName ); /** Insertes a named formatting object into the chart document. */ - ::rtl::OUString InsertObject( const ::com::sun::star::uno::Any& rObj ); + OUString InsertObject( const ::com::sun::star::uno::Any& rObj ); private: XServiceFactoryRef mxFactory; /// Factory to create the container. XNameContainerRef mxContainer; /// Container for the objects. - ::rtl::OUString maServiceName; /// Service name to create the container. - ::rtl::OUString maObjNameBase; /// Base of names for inserted objects. + OUString maServiceName; /// Service name to create the container. + OUString maObjNameBase; /// Base of names for inserted objects. sal_Int32 mnIndex; /// Index to create unique identifiers. }; diff --git a/sc/source/filter/inc/xlpivot.hxx b/sc/source/filter/inc/xlpivot.hxx index 1e993942071d..364fed962601 100644 --- a/sc/source/filter/inc/xlpivot.hxx +++ b/sc/source/filter/inc/xlpivot.hxx @@ -377,7 +377,7 @@ public: /** Sets the item to 'empty' type. */ void SetEmpty(); /** Sets the item to 'text' type and adds the passed text. */ - void SetText( const rtl::OUString& rText ); + void SetText( const OUString& rText ); /** Sets the item to 'double' type and adds the passed value. */ void SetDouble( double fValue ); /** Sets the item to 'date/time' type and adds the passed date. */ @@ -392,7 +392,7 @@ public: /** Returns the current item type. */ inline XclPCItemType GetType() const { return meType; } /** Returns the text representation of the item. */ - inline const rtl::OUString& ConvertToText() const { return maText; } + inline const OUString& ConvertToText() const { return maText; } /** Returns true, if the passed iterm equals this item. */ bool IsEqual( const XclPCItem& rItem ) const; @@ -400,7 +400,7 @@ public: /** Returns true, if the item type is 'empty'. */ bool IsEmpty() const; /** Returns pointer to text, if the item type is 'text', otherwise 0. */ - const rtl::OUString* GetText() const; + const OUString* GetText() const; /** Returns pointer to value, if the item type is 'double', otherwise 0. */ const double* GetDouble() const; /** Returns pointer to date, if the item type is 'date/time', otherwise 0. */ @@ -414,7 +414,7 @@ public: private: XclPCItemType meType; /// Type of the item. - rtl::OUString maText; /// Text representation of the item. + OUString maText; /// Text representation of the item. DateTime maDateTime; /// Value of a date/time item. union { @@ -433,7 +433,7 @@ inline bool operator!=( const XclPCItem& rLeft, const XclPCItem& rRight ) { retu /** Contains data for a pivot cache field (SXFIELD record). */ struct XclPCFieldInfo { - rtl::OUString maName; /// Name of the pivot cache field. + OUString maName; /// Name of the pivot cache field. sal_uInt16 mnFlags; /// Various flags. sal_uInt16 mnGroupChild; /// Field containing grouping info for this field. sal_uInt16 mnGroupBase; /// Base field if this field contains grouping info. @@ -530,7 +530,7 @@ struct XclPCInfo sal_uInt16 mnStdFields; /// Number of standard pivot cache fields. sal_uInt16 mnTotalFields; /// Number of all fields (standard, grouped, calculated). sal_uInt16 mnSrcType; /// Database type. - rtl::OUString maUserName; /// Name of user who last modified the cache. + OUString maUserName; /// Name of user who last modified the cache. explicit XclPCInfo(); }; @@ -547,7 +547,7 @@ XclExpStream& operator<<( XclExpStream& rStrm, const XclPCInfo& rInfo ); /** A name for various pivot table info structs. Includes 'use cache' state. */ struct XclPTCachedName { - rtl::OUString maName; /// The visible name, if used. + OUString maName; /// The visible name, if used. bool mbUseCache; /// true = Use name in cache instead of maName. inline explicit XclPTCachedName() : mbUseCache( true ) {} @@ -566,9 +566,9 @@ struct XclPTVisNameInfo /** Returns true, if the name is set explicitly (maVisName.mbUseCache is false). */ inline bool HasVisName() const { return !maVisName.mbUseCache; } /** Returns the name, if set explicitly (maVisName.mbUseCache is false). */ - const rtl::OUString* GetVisName() const; + const OUString* GetVisName() const; /** Sets the visible name and enables usage of cache if name is empty. */ - void SetVisName( const rtl::OUString& rName ); + void SetVisName( const OUString& rName ); }; // Field item settings ======================================================== @@ -626,7 +626,7 @@ struct XclPTFieldExtInfo sal_uInt16 mnSortField; /// Index to data field sorting bases on. sal_uInt16 mnShowField; /// Index to data field AutoShow bases on. sal_uInt16 mnNumFmt; - boost::scoped_ptr<rtl::OUString> mpFieldTotalName; + boost::scoped_ptr<OUString> mpFieldTotalName; explicit XclPTFieldExtInfo(); @@ -707,8 +707,8 @@ XclExpStream& operator<<( XclExpStream& rStrm, const XclPTDataFieldInfo& rInfo ) /** Contains data for a pivot table (SXVIEW record). */ struct XclPTInfo { - rtl::OUString maTableName; /// The name of the pivot table. - rtl::OUString maDataName; /// The visible name of the data field. + OUString maTableName; /// The name of the pivot table. + OUString maDataName; /// The visible name of the data field. XclRange maOutXclRange; /// Output range. XclAddress maDataXclPos; /// First cell containing data. sal_uInt16 mnFirstHeadRow; /// First heading row. @@ -758,7 +758,7 @@ struct XclPTViewEx9Info sal_uInt32 mbReport; /// 2 for report* fmts ? sal_uInt8 mnAutoFormat; /// AutoFormat ID sal_uInt8 mnGridLayout; /// 0 == gridlayout, 0x10 == modern - rtl::OUString maGrandTotalName; + OUString maGrandTotalName; explicit XclPTViewEx9Info(); void Init( const ScDPObject& rDPObj ); diff --git a/sc/source/filter/inc/xltools.hxx b/sc/source/filter/inc/xltools.hxx index daa35e604f23..d0cc23e76bc1 100644 --- a/sc/source/filter/inc/xltools.hxx +++ b/sc/source/filter/inc/xltools.hxx @@ -164,26 +164,26 @@ public: // font names ------------------------------------------------------------- /** Returns the matching Excel font name for a passed Calc font name. */ - static rtl::OUString GetXclFontName( const rtl::OUString& rFontName ); + static OUString GetXclFontName( const OUString& rFontName ); // built-in defined names ------------------------------------------------- /** Returns the raw English UI representation of a built-in defined name used in NAME records. @param cBuiltIn Excel index of the built-in name. */ - static rtl::OUString GetXclBuiltInDefName( sal_Unicode cBuiltIn ); + static OUString GetXclBuiltInDefName( sal_Unicode cBuiltIn ); /** Returns the Calc UI representation of a built-in defined name used in NAME records. @descr Adds a prefix to the representation returned by GetXclBuiltInDefName(). @param cBuiltIn Excel index of the built-in name. */ - static rtl::OUString GetBuiltInDefName( sal_Unicode cBuiltIn ); + static OUString GetBuiltInDefName( sal_Unicode cBuiltIn ); /** Returns the Excel built-in name with OOXML prefix @descr Adds the "_xlnm." prefix to the representation returned by GetXclBuiltInDefName() @param cBuiltIn Excel index of the built in name.*/ - static rtl::OUString GetBuiltInDefNameXml( sal_Unicode cBuiltIn ); + static OUString GetBuiltInDefNameXml( sal_Unicode cBuiltIn ); /** Returns the Excel built-in name index of the passed defined name from Calc. @descr Ignores any characters following a valid representation of a built-in name. @param pcBuiltIn (out-param) If not 0, the index of the built-in name will be returned here. @return true = passed string is a built-in name; false = user-defined name. */ - static sal_Unicode GetBuiltInDefNameIndex( const rtl::OUString& rDefName ); + static sal_Unicode GetBuiltInDefNameIndex( const OUString& rDefName ); // built-in style names --------------------------------------------------- @@ -192,12 +192,12 @@ public: @param rName Default name for unknown styles. @param nLevel The zero-based outline level for RowLevel and ColLevel styles. @return The style name or an empty string, if the parameters are not valid. */ - static rtl::OUString GetBuiltInStyleName( sal_uInt8 nStyleId, const rtl::OUString& rName, sal_uInt8 nLevel ); + static OUString GetBuiltInStyleName( sal_uInt8 nStyleId, const OUString& rName, sal_uInt8 nLevel ); /** Returns true, if the passed string is a name of an Excel built-in style. @param pnStyleId If not 0, the found style identifier will be returned here. @param pnNextChar If not 0, the index of the char after the evaluated substring will be returned here. */ - static bool IsBuiltInStyleName( const rtl::OUString& rStyleName, sal_uInt8* pnStyleId = 0, sal_Int32* pnNextChar = 0 ); + static bool IsBuiltInStyleName( const OUString& rStyleName, sal_uInt8* pnStyleId = 0, sal_Int32* pnNextChar = 0 ); /** Returns the Excel built-in style identifier of a passed style name. @param rnStyleId The style identifier is returned here. @param rnLevel The zero-based outline level for RowLevel and ColLevel styles is returned here. @@ -205,7 +205,7 @@ public: @return true = passed string is a built-in style name, false = user style. */ static bool GetBuiltInStyleId( sal_uInt8& rnStyleId, sal_uInt8& rnLevel, - const rtl::OUString& rStyleName ); + const OUString& rStyleName ); // conditional formatting style names ------------------------------------- @@ -214,10 +214,10 @@ public: @param nFormat The zero-based index of the conditional formatting. @param nCondition The zero-based index of the condition. @return A style sheet name in the form "Excel_CondFormat_<sheet>_<format>_<condition>". */ - static rtl::OUString GetCondFormatStyleName( SCTAB nScTab, sal_Int32 nFormat, sal_uInt16 nCondition ); + static OUString GetCondFormatStyleName( SCTAB nScTab, sal_Int32 nFormat, sal_uInt16 nCondition ); /** Returns true, if the passed string is a name of a conditional format style created by Excel import. @param pnNextChar If not 0, the index of the char after the evaluated substring will be returned here. */ - static bool IsCondFormatStyleName( const rtl::OUString& rStyleName ); + static bool IsCondFormatStyleName( const OUString& rStyleName ); // stream handling -------------------------------------------------------- @@ -227,20 +227,20 @@ public: // Basic macro names ------------------------------------------------------ /** Returns the full StarBasic macro URL from an Excel macro name. */ - static ::rtl::OUString GetSbMacroUrl( const rtl::OUString& rMacroName, SfxObjectShell* pDocShell = 0 ); + static OUString GetSbMacroUrl( const OUString& rMacroName, SfxObjectShell* pDocShell = 0 ); /** Returns the Excel macro name from a full StarBasic macro URL. */ - static ::rtl::OUString GetXclMacroName( const ::rtl::OUString& rSbMacroUrl ); + static OUString GetXclMacroName( const OUString& rSbMacroUrl ); // ------------------------------------------------------------------------ private: - static const ::rtl::OUString maDefNamePrefix; /// Prefix for built-in defined names. - static const ::rtl::OUString maDefNamePrefixXml; /// Prefix for built-in defined names for OOX - static const ::rtl::OUString maStyleNamePrefix1; /// Prefix for built-in cell style names. - static const ::rtl::OUString maStyleNamePrefix2; /// Prefix for built-in cell style names from OOX filter. - static const ::rtl::OUString maCFStyleNamePrefix1; /// Prefix for cond. formatting style names. - static const ::rtl::OUString maCFStyleNamePrefix2; /// Prefix for cond. formatting style names from OOX filter. - static const ::rtl::OUString maSbMacroPrefix; /// Prefix for StarBasic macros. - static const ::rtl::OUString maSbMacroSuffix; /// Suffix for StarBasic macros. + static const OUString maDefNamePrefix; /// Prefix for built-in defined names. + static const OUString maDefNamePrefixXml; /// Prefix for built-in defined names for OOX + static const OUString maStyleNamePrefix1; /// Prefix for built-in cell style names. + static const OUString maStyleNamePrefix2; /// Prefix for built-in cell style names from OOX filter. + static const OUString maCFStyleNamePrefix1; /// Prefix for cond. formatting style names. + static const OUString maCFStyleNamePrefix2; /// Prefix for cond. formatting style names from OOX filter. + static const OUString maSbMacroPrefix; /// Prefix for StarBasic macros. + static const OUString maSbMacroSuffix; /// Suffix for StarBasic macros. /** We don't want anybody to instantiate this class, since it is just a collection of static items. To enforce this, the default constructor diff --git a/sc/source/filter/lotus/lotform.cxx b/sc/source/filter/lotus/lotform.cxx index c10283c6cbd0..1f5dd65f7c2c 100644 --- a/sc/source/filter/lotus/lotform.cxx +++ b/sc/source/filter/lotus/lotform.cxx @@ -33,7 +33,7 @@ extern WKTYP eTyp; static const sal_Char* GetAddInName( const sal_uInt8 nIndex ); -static DefTokenId lcl_KnownAddIn(const rtl::OString& rTest); +static DefTokenId lcl_KnownAddIn(const OString& rTest); //extern double decipher_Number123( sal_uInt32 nValue ); @@ -51,10 +51,10 @@ void LotusToSc::DoFunc( DefTokenId eOc, sal_uInt8 nAnz, const sal_Char* pExtStri if( eOc == ocNoName ) { - rtl::OString t; + OString t; if( pExtString ) { - const rtl::OString s(RTL_CONSTASCII_STRINGPARAM("@<<@123>>")); + const OString s(RTL_CONSTASCII_STRINGPARAM("@<<@123>>")); t = pExtString; @@ -67,7 +67,7 @@ void LotusToSc::DoFunc( DefTokenId eOc, sal_uInt8 nAnz, const sal_Char* pExtStri eOc = lcl_KnownAddIn( t ); if( eOc == ocNoName ) - t = rtl::OString(RTL_CONSTASCII_STRINGPARAM("L123_")) + t; + t = OString(RTL_CONSTASCII_STRINGPARAM("L123_")) + t; } else t = "#UNKNOWN FUNC NAME#"; @@ -75,7 +75,7 @@ void LotusToSc::DoFunc( DefTokenId eOc, sal_uInt8 nAnz, const sal_Char* pExtStri if( eOc == ocNoName ) { bAddIn = sal_True; - nMerk0 = aPool.Store(eOc, rtl::OStringToOUString(t, eSrcChar)); + nMerk0 = aPool.Store(eOc, OStringToOUString(t, eSrcChar)); aPool << nMerk0; } @@ -1986,7 +1986,7 @@ const sal_Char* GetAddInName( const sal_uInt8 n ) } -static DefTokenId lcl_KnownAddIn( const rtl::OString& rTest ) +static DefTokenId lcl_KnownAddIn( const OString& rTest ) { DefTokenId eId = ocNoName; diff --git a/sc/source/filter/lotus/lotread.cxx b/sc/source/filter/lotus/lotread.cxx index 4f07cf772766..a5b5d7b8e563 100644 --- a/sc/source/filter/lotus/lotread.cxx +++ b/sc/source/filter/lotus/lotread.cxx @@ -198,9 +198,9 @@ FltError ImportLotus::Read() // duemmliche Namen eliminieren SCTAB nTabs = pD->GetTableCount(); SCTAB nCnt; - rtl::OUString aTabName; - rtl::OUString aBaseName; - rtl::OUString aRef( "temp" ); + OUString aTabName; + OUString aBaseName; + OUString aRef( "temp" ); if( nTabs != 0 ) { if( nTabs > 1 ) diff --git a/sc/source/filter/oox/addressconverter.cxx b/sc/source/filter/oox/addressconverter.cxx index cdf78c91cb40..958acb6493db 100644 --- a/sc/source/filter/oox/addressconverter.cxx +++ b/sc/source/filter/oox/addressconverter.cxx @@ -38,10 +38,6 @@ using namespace ::com::sun::star::sheet; using namespace ::com::sun::star::table; using namespace ::com::sun::star::uno; -using ::rtl::OStringBuffer; -using ::rtl::OUString; -using ::rtl::OUStringBuffer; -using ::rtl::OUStringToOString; // ============================================================================ diff --git a/sc/source/filter/oox/autofilterbuffer.cxx b/sc/source/filter/oox/autofilterbuffer.cxx index 9665e5c47141..5064440dfb0c 100644 --- a/sc/source/filter/oox/autofilterbuffer.cxx +++ b/sc/source/filter/oox/autofilterbuffer.cxx @@ -41,8 +41,6 @@ using namespace ::com::sun::star::sheet; using namespace ::com::sun::star::table; using namespace ::com::sun::star::uno; -using ::rtl::OUString; -using ::rtl::OUStringBuffer; // ============================================================================ @@ -181,7 +179,7 @@ void ApiFilterSettings::appendField( bool bAnd, sal_Int32 nOperator, const OUStr rFilterField.Values[0].StringValue = rValue; } -void ApiFilterSettings::appendField( bool bAnd, const std::vector<rtl::OUString>& rValues ) +void ApiFilterSettings::appendField( bool bAnd, const std::vector<OUString>& rValues ) { maFilterFields.resize( maFilterFields.size() + 1 ); TableFilterField3& rFilterField = maFilterFields.back(); diff --git a/sc/source/filter/oox/autofiltercontext.cxx b/sc/source/filter/oox/autofiltercontext.cxx index 0f4277f39f47..4f351794fed5 100644 --- a/sc/source/filter/oox/autofiltercontext.cxx +++ b/sc/source/filter/oox/autofiltercontext.cxx @@ -26,7 +26,6 @@ namespace oox { namespace xls { using ::oox::core::ContextHandlerRef; -using ::rtl::OUString; // ============================================================================ diff --git a/sc/source/filter/oox/biffcodec.cxx b/sc/source/filter/oox/biffcodec.cxx index fcd4875b9a14..51e9fce72d76 100644 --- a/sc/source/filter/oox/biffcodec.cxx +++ b/sc/source/filter/oox/biffcodec.cxx @@ -33,9 +33,6 @@ using namespace ::com::sun::star::beans; using namespace ::com::sun::star::uno; using ::oox::core::FilterBase; -using ::rtl::OString; -using ::rtl::OUString; -using ::rtl::OStringToOUString; // ============================================================================ diff --git a/sc/source/filter/oox/biffhelper.cxx b/sc/source/filter/oox/biffhelper.cxx index 0afd05353bc0..efc622394225 100644 --- a/sc/source/filter/oox/biffhelper.cxx +++ b/sc/source/filter/oox/biffhelper.cxx @@ -30,8 +30,6 @@ namespace xls { // ============================================================================ -using ::rtl::OUString; -using ::rtl::OUStringBuffer; // ============================================================================ diff --git a/sc/source/filter/oox/biffinputstream.cxx b/sc/source/filter/oox/biffinputstream.cxx index eb99508559c3..0782d8027ebd 100644 --- a/sc/source/filter/oox/biffinputstream.cxx +++ b/sc/source/filter/oox/biffinputstream.cxx @@ -27,10 +27,6 @@ namespace xls { // ============================================================================ -using ::rtl::OString; -using ::rtl::OStringToOUString; -using ::rtl::OUString; -using ::rtl::OUStringBuffer; // ============================================================================ diff --git a/sc/source/filter/oox/chartsheetfragment.cxx b/sc/source/filter/oox/chartsheetfragment.cxx index 87cc63d3615a..f1aa4f4533fb 100644 --- a/sc/source/filter/oox/chartsheetfragment.cxx +++ b/sc/source/filter/oox/chartsheetfragment.cxx @@ -33,7 +33,6 @@ namespace xls { using namespace ::oox::core; -using ::rtl::OUString; // ============================================================================ diff --git a/sc/source/filter/oox/commentsbuffer.cxx b/sc/source/filter/oox/commentsbuffer.cxx index 92c090b57f15..d70a5b9bcfe2 100644 --- a/sc/source/filter/oox/commentsbuffer.cxx +++ b/sc/source/filter/oox/commentsbuffer.cxx @@ -54,7 +54,6 @@ using namespace ::com::sun::star::table; using namespace ::com::sun::star::text; using namespace ::com::sun::star::uno; -using ::rtl::OUString; static sal_Int32 lcl_ToHorizAlign( sal_Int32 nAlign ) { diff --git a/sc/source/filter/oox/commentsfragment.cxx b/sc/source/filter/oox/commentsfragment.cxx index 7cf9600bbd67..09d65f5467dd 100644 --- a/sc/source/filter/oox/commentsfragment.cxx +++ b/sc/source/filter/oox/commentsfragment.cxx @@ -28,7 +28,6 @@ namespace xls { using namespace ::oox::core; -using ::rtl::OUString; // ============================================================================ diff --git a/sc/source/filter/oox/condformatbuffer.cxx b/sc/source/filter/oox/condformatbuffer.cxx index 15d193071bfd..01c3edc077ba 100644 --- a/sc/source/filter/oox/condformatbuffer.cxx +++ b/sc/source/filter/oox/condformatbuffer.cxx @@ -64,8 +64,6 @@ using namespace ::com::sun::star::style; using namespace ::com::sun::star::table; using namespace ::com::sun::star::uno; -using ::rtl::OUString; -using ::rtl::OUStringBuffer; // ============================================================================ @@ -136,7 +134,7 @@ void lclAppendProperty( ::std::vector< PropertyValue >& orProps, const OUString& void SetCfvoData( ColorScaleRuleModelEntry* pEntry, const AttributeList& rAttribs ) { - rtl::OUString aType = rAttribs.getString( XML_type, rtl::OUString() ); + OUString aType = rAttribs.getString( XML_type, OUString() ); double nVal = rAttribs.getDouble( XML_val, 0.0 ); pEntry->mnVal = nVal; @@ -162,7 +160,7 @@ void SetCfvoData( ColorScaleRuleModelEntry* pEntry, const AttributeList& rAttrib } else if( aType == "formula" ) { - rtl::OUString aFormula = rAttribs.getString( XML_val, rtl::OUString() ); + OUString aFormula = rAttribs.getString( XML_val, OUString() ); pEntry->maFormula = aFormula; } @@ -333,7 +331,7 @@ void IconSetRule::importCfvo( const AttributeList& rAttribs ) void IconSetRule::importAttribs( const AttributeList& rAttribs ) { - maIconSetType = rAttribs.getString( XML_iconSet, rtl::OUString("3TrafficLights1") ); + maIconSetType = rAttribs.getString( XML_iconSet, OUString("3TrafficLights1") ); mpFormatData->mbShowValue = rAttribs.getBool( XML_showValue, true ); mpFormatData->mbReverse = rAttribs.getBool( XML_reverse, false ); } @@ -350,7 +348,7 @@ void IconSetRule::SetData( ScIconSetFormat* pFormat, ScDocument* pDoc, const ScA ScIconSetMap* pIconSetMap = ScIconSetFormat::getIconSetMap(); for(size_t i = 0; pIconSetMap[i].pName; ++i) { - if(rtl::OUString::createFromAscii(pIconSetMap[i].pName) == maIconSetType) + if(OUString::createFromAscii(pIconSetMap[i].pName) == maIconSetType) { eIconSetType = pIconSetMap[i].eType; break; diff --git a/sc/source/filter/oox/condformatcontext.cxx b/sc/source/filter/oox/condformatcontext.cxx index 4337e9aca35d..f4d192c690f3 100644 --- a/sc/source/filter/oox/condformatcontext.cxx +++ b/sc/source/filter/oox/condformatcontext.cxx @@ -26,7 +26,6 @@ namespace xls { // ============================================================================ using ::oox::core::ContextHandlerRef; -using ::rtl::OUString; // ============================================================================ diff --git a/sc/source/filter/oox/connectionsbuffer.cxx b/sc/source/filter/oox/connectionsbuffer.cxx index 76f2fc6a438a..f605a5991198 100644 --- a/sc/source/filter/oox/connectionsbuffer.cxx +++ b/sc/source/filter/oox/connectionsbuffer.cxx @@ -29,8 +29,6 @@ namespace xls { using namespace ::com::sun::star::uno; -using ::rtl::OUString; -using ::rtl::OUStringBuffer; // ============================================================================ diff --git a/sc/source/filter/oox/connectionsfragment.cxx b/sc/source/filter/oox/connectionsfragment.cxx index 2a9a61fc650b..676bc408ee67 100644 --- a/sc/source/filter/oox/connectionsfragment.cxx +++ b/sc/source/filter/oox/connectionsfragment.cxx @@ -30,7 +30,6 @@ namespace xls { using namespace ::oox::core; -using ::rtl::OUString; // ============================================================================ diff --git a/sc/source/filter/oox/defnamesbuffer.cxx b/sc/source/filter/oox/defnamesbuffer.cxx index 488b7e36aba3..0cb38f963ad6 100644 --- a/sc/source/filter/oox/defnamesbuffer.cxx +++ b/sc/source/filter/oox/defnamesbuffer.cxx @@ -47,8 +47,6 @@ using namespace ::com::sun::star::sheet; using namespace ::com::sun::star::table; using namespace ::com::sun::star::uno; -using ::rtl::OUString; -using ::rtl::OUStringBuffer; // ============================================================================ diff --git a/sc/source/filter/oox/drawingbase.cxx b/sc/source/filter/oox/drawingbase.cxx index 8b3bb9b7a3e4..b112a4fd8f36 100644 --- a/sc/source/filter/oox/drawingbase.cxx +++ b/sc/source/filter/oox/drawingbase.cxx @@ -35,7 +35,6 @@ using namespace ::com::sun::star::awt; using namespace ::com::sun::star::table; using namespace ::oox::drawingml; -using ::rtl::OUString; // ============================================================================ diff --git a/sc/source/filter/oox/drawingfragment.cxx b/sc/source/filter/oox/drawingfragment.cxx index 22f4a6bbd2ea..65bff71d0e9e 100644 --- a/sc/source/filter/oox/drawingfragment.cxx +++ b/sc/source/filter/oox/drawingfragment.cxx @@ -59,9 +59,6 @@ using ::com::sun::star::awt::Size; using ::com::sun::star::awt::Point; using ::com::sun::star::awt::Rectangle; using ::com::sun::star::awt::XControlModel; -using ::rtl::OStringBuffer; -using ::rtl::OUString; -using ::rtl::OUStringToOString; // no using's for ::oox::vml, that may clash with ::oox::drawingml types // ============================================================================ @@ -103,7 +100,7 @@ Shape::Shape( const WorksheetHelper& rHelper, const AttributeList& rAttribs, con void Shape::finalizeXShape( XmlFilterBase& rFilter, const Reference< XShapes >& rxShapes ) { - rtl::OUString sURL; + OUString sURL; getShapeProperties()[ PROP_URL ] >>= sURL; getWorksheets().convertSheetNameRef( sURL ); if( !maMacroName.isEmpty() && mxShape.is() ) diff --git a/sc/source/filter/oox/drawingmanager.cxx b/sc/source/filter/oox/drawingmanager.cxx index fab5365eca24..f56665809a99 100644 --- a/sc/source/filter/oox/drawingmanager.cxx +++ b/sc/source/filter/oox/drawingmanager.cxx @@ -44,7 +44,6 @@ using namespace ::com::sun::star::lang; using namespace ::com::sun::star::uno; using namespace ::oox::drawingml; -using ::rtl::OUString; // ============================================================================ diff --git a/sc/source/filter/oox/excelchartconverter.cxx b/sc/source/filter/oox/excelchartconverter.cxx index b539abb74cb0..59870a44cdce 100644 --- a/sc/source/filter/oox/excelchartconverter.cxx +++ b/sc/source/filter/oox/excelchartconverter.cxx @@ -41,7 +41,6 @@ using namespace ::com::sun::star::table; using namespace ::com::sun::star::uno; using ::oox::drawingml::chart::DataSequenceModel; -using ::rtl::OUString; // ============================================================================ diff --git a/sc/source/filter/oox/excelfilter.cxx b/sc/source/filter/oox/excelfilter.cxx index dfddf86f1567..b54d09cedd92 100644 --- a/sc/source/filter/oox/excelfilter.cxx +++ b/sc/source/filter/oox/excelfilter.cxx @@ -39,7 +39,6 @@ using namespace ::com::sun::star::uno; using namespace ::com::sun::star::xml::sax; using namespace ::oox::core; -using ::rtl::OUString; using ::oox::drawingml::table::TableStyleListPtr; // ============================================================================ diff --git a/sc/source/filter/oox/excelhandlers.cxx b/sc/source/filter/oox/excelhandlers.cxx index efb69f77eee4..66219b5c96ce 100644 --- a/sc/source/filter/oox/excelhandlers.cxx +++ b/sc/source/filter/oox/excelhandlers.cxx @@ -29,7 +29,6 @@ namespace xls { using ::oox::core::FilterBase; using ::oox::core::FragmentHandler2; -using ::rtl::OUString; // ============================================================================ // ============================================================================ diff --git a/sc/source/filter/oox/excelvbaproject.cxx b/sc/source/filter/oox/excelvbaproject.cxx index 0d78db71f30b..65d4532cc6d5 100644 --- a/sc/source/filter/oox/excelvbaproject.cxx +++ b/sc/source/filter/oox/excelvbaproject.cxx @@ -45,8 +45,6 @@ using namespace ::com::sun::star::script; using namespace ::com::sun::star::sheet; using namespace ::com::sun::star::uno; -using ::rtl::OUString; -using ::rtl::OUStringBuffer; // ============================================================================ diff --git a/sc/source/filter/oox/externallinkbuffer.cxx b/sc/source/filter/oox/externallinkbuffer.cxx index f2bb7dc3a869..bdfb6afdb296 100644 --- a/sc/source/filter/oox/externallinkbuffer.cxx +++ b/sc/source/filter/oox/externallinkbuffer.cxx @@ -51,10 +51,6 @@ using namespace ::com::sun::star::uno; using ::oox::core::Relation; using ::oox::core::Relations; -using ::rtl::OString; -using ::rtl::OStringBuffer; -using ::rtl::OStringToOUString; -using ::rtl::OUString; // ============================================================================ diff --git a/sc/source/filter/oox/externallinkfragment.cxx b/sc/source/filter/oox/externallinkfragment.cxx index cf72857e5a1c..348b50751407 100644 --- a/sc/source/filter/oox/externallinkfragment.cxx +++ b/sc/source/filter/oox/externallinkfragment.cxx @@ -36,7 +36,6 @@ using namespace ::com::sun::star::table; using namespace ::com::sun::star::uno; using namespace ::oox::core; -using ::rtl::OUString; // ============================================================================ // ============================================================================ diff --git a/sc/source/filter/oox/extlstcontext.cxx b/sc/source/filter/oox/extlstcontext.cxx index 5e20e2f6c9ae..4cd95aae3be7 100644 --- a/sc/source/filter/oox/extlstcontext.cxx +++ b/sc/source/filter/oox/extlstcontext.cxx @@ -75,7 +75,7 @@ void ExtCfRuleContext::importDataBar( const AttributeList& rAttribs ) ScDataBarFormatData* pDataBar = static_cast<ScDataBarFormatData*>(mpTarget); pDataBar->mbGradient = rAttribs.getBool( XML_gradient, true ); - rtl::OUString aAxisPosition = rAttribs.getString( XML_axisPosition, "automatic" ); + OUString aAxisPosition = rAttribs.getString( XML_axisPosition, "automatic" ); if( aAxisPosition == "none" ) pDataBar->meAxisPosition = databar::NONE; else if( aAxisPosition == "middle" ) @@ -125,7 +125,7 @@ void ExtCfRuleContext::importCfvo( const AttributeList& rAttribs ) else pEntry = pDataBar->mpUpperLimit.get(); - rtl::OUString aColorScaleType = rAttribs.getString( XML_type, rtl::OUString() ); + OUString aColorScaleType = rAttribs.getString( XML_type, OUString() ); if(aColorScaleType == "min") pEntry->SetType(COLORSCALE_MIN); else if (aColorScaleType == "max") @@ -178,11 +178,11 @@ void ExtLstLocalContext::onStartElement( const AttributeList& ) } } -void ExtLstLocalContext::onCharacters( const rtl::OUString& rChars ) +void ExtLstLocalContext::onCharacters( const OUString& rChars ) { if (getCurrentElement() == XLS_EXT_TOKEN( id )) { - getExtLst().insert( std::pair< rtl::OUString, void*>(rChars, mpTarget) ); + getExtLst().insert( std::pair< OUString, void*>(rChars, mpTarget) ); } } @@ -199,7 +199,7 @@ ContextHandlerRef ExtGlobalContext::onCreateContext( sal_Int32 nElement, const A { if(nElement == XLS_EXT_TOKEN( cfRule )) { - rtl::OUString aId = rAttribs.getString( XML_id, rtl::OUString() ); + OUString aId = rAttribs.getString( XML_id, OUString() ); // an ext entrie does not need to have an existing corresponding entry ExtLst::const_iterator aExt = getExtLst().find( aId ); diff --git a/sc/source/filter/oox/formulabase.cxx b/sc/source/filter/oox/formulabase.cxx index 1a12a2e659cc..947b785230b6 100644 --- a/sc/source/filter/oox/formulabase.cxx +++ b/sc/source/filter/oox/formulabase.cxx @@ -49,12 +49,6 @@ using namespace ::com::sun::star::sheet; using namespace ::com::sun::star::table; using namespace ::com::sun::star::uno; -using ::rtl::OString; -using ::rtl::OStringBuffer; -using ::rtl::OStringToOUString; -using ::rtl::OUString; -using ::rtl::OUStringBuffer; -using ::rtl::OUStringToOString; // reference helpers ========================================================== diff --git a/sc/source/filter/oox/formulabuffer.cxx b/sc/source/filter/oox/formulabuffer.cxx index d2f49e6e1802..0fa6dcbd9aa2 100644 --- a/sc/source/filter/oox/formulabuffer.cxx +++ b/sc/source/filter/oox/formulabuffer.cxx @@ -168,14 +168,14 @@ void FormulaBuffer::applyArrayFormulas( const std::vector< TokenRangeAddressItem } } -void FormulaBuffer::createSharedFormulaMapEntry( const ::com::sun::star::table::CellAddress& rAddress, sal_Int32 nSharedId, const rtl::OUString& rTokens ) +void FormulaBuffer::createSharedFormulaMapEntry( const ::com::sun::star::table::CellAddress& rAddress, sal_Int32 nSharedId, const OUString& rTokens ) { std::vector<SharedFormulaEntry>& rSharedFormulas = sharedFormulas[ rAddress.Sheet ]; SharedFormulaEntry aEntry( rAddress, rTokens, nSharedId ); rSharedFormulas.push_back( aEntry ); } -void FormulaBuffer::setCellFormula( const ::com::sun::star::table::CellAddress& rAddress, const rtl::OUString& rTokenStr ) +void FormulaBuffer::setCellFormula( const ::com::sun::star::table::CellAddress& rAddress, const OUString& rTokenStr ) { cellFormulas[ rAddress.Sheet ].push_back( TokenAddressItem( rTokenStr, rAddress ) ); } @@ -185,7 +185,7 @@ void FormulaBuffer::setCellFormula( const ::com::sun::star::table::CellAddress& sharedFormulaIds[ rAddress.Sheet ].push_back( SharedFormulaDesc( rAddress, nSharedId ) ); } -void FormulaBuffer::setCellArrayFormula( const ::com::sun::star::table::CellRangeAddress& rRangeAddress, const ::com::sun::star::table::CellAddress& rTokenAddress, const rtl::OUString& rTokenStr ) +void FormulaBuffer::setCellArrayFormula( const ::com::sun::star::table::CellRangeAddress& rRangeAddress, const ::com::sun::star::table::CellAddress& rTokenAddress, const OUString& rTokenStr ) { TokenAddressItem tokenPair( rTokenStr, rTokenAddress ); @@ -197,13 +197,13 @@ void FormulaBuffer::setCellFormulaValue( const ::com::sun::star::table::CellAddr cellFormulaValues[ rAddress.Sheet ].push_back( ValueAddressPair( rAddress, fValue ) ); } -void FormulaBuffer::createSharedFormula( const ::com::sun::star::table::CellAddress& rAddress, sal_Int32 nSharedId, const rtl::OUString& rTokenStr ) +void FormulaBuffer::createSharedFormula( const ::com::sun::star::table::CellAddress& rAddress, sal_Int32 nSharedId, const OUString& rTokenStr ) { ApiTokenSequence aTokens = getFormulaParser().importFormula( rAddress, rTokenStr ); - rtl::OUString aName = rtl::OUStringBuffer().appendAscii( RTL_CONSTASCII_STRINGPARAM( "__shared_" ) ). + OUString aName = OUStringBuffer().appendAscii( RTL_CONSTASCII_STRINGPARAM( "__shared_" ) ). append( static_cast< sal_Int32 >( rAddress.Sheet + 1 ) ). append( sal_Unicode( '_' ) ).append( nSharedId ). - append( rtl::OUString("_0") ).makeStringAndClear(); + append( OUString("_0") ).makeStringAndClear(); ScRangeData* pScRangeData = createNamedRangeObject( aName, aTokens, 0 ); pScRangeData->SetType(RT_SHARED); diff --git a/sc/source/filter/oox/formulaparser.cxx b/sc/source/filter/oox/formulaparser.cxx index aa1d9c79051a..cf79c711e8ef 100644 --- a/sc/source/filter/oox/formulaparser.cxx +++ b/sc/source/filter/oox/formulaparser.cxx @@ -45,7 +45,6 @@ using namespace ::com::sun::star::sheet::ReferenceFlags; using namespace ::com::sun::star::table; using namespace ::com::sun::star::uno; -using ::rtl::OUString; // ============================================================================ @@ -548,7 +547,7 @@ private: // finalize token sequence ------------------------------------------------ virtual const FunctionInfo* resolveBadFuncName( const OUString& rTokenData ) const; - virtual ::rtl::OUString resolveDefinedName( sal_Int32 nTokenIndex ) const; + virtual OUString resolveDefinedName( sal_Int32 nTokenIndex ) const; protected: const sal_Int32 mnMaxApiCol; /// Maximum column index in own document. diff --git a/sc/source/filter/oox/numberformatsbuffer.cxx b/sc/source/filter/oox/numberformatsbuffer.cxx index 8612e0d96c80..4baa33ee8ff3 100644 --- a/sc/source/filter/oox/numberformatsbuffer.cxx +++ b/sc/source/filter/oox/numberformatsbuffer.cxx @@ -50,11 +50,6 @@ using namespace ::com::sun::star::lang; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::util; -using ::rtl::OString; -using ::rtl::OStringBuffer; -using ::rtl::OStringToOUString; -using ::rtl::OUString; -using ::rtl::OUStringBuffer; // ============================================================================ diff --git a/sc/source/filter/oox/pagesettings.cxx b/sc/source/filter/oox/pagesettings.cxx index 33573ba100b4..5cf31722b3bd 100644 --- a/sc/source/filter/oox/pagesettings.cxx +++ b/sc/source/filter/oox/pagesettings.cxx @@ -57,10 +57,6 @@ using namespace ::com::sun::star::text; using namespace ::com::sun::star::uno; using ::oox::core::Relations; -using ::rtl::OString; -using ::rtl::OStringBuffer; -using ::rtl::OUString; -using ::rtl::OUStringBuffer; // ============================================================================ diff --git a/sc/source/filter/oox/pivotcachebuffer.cxx b/sc/source/filter/oox/pivotcachebuffer.cxx index e74b2faedb2a..08160c5540d0 100644 --- a/sc/source/filter/oox/pivotcachebuffer.cxx +++ b/sc/source/filter/oox/pivotcachebuffer.cxx @@ -53,8 +53,6 @@ using namespace ::com::sun::star::uno; using namespace ::com::sun::star::util; using ::oox::core::Relations; -using ::rtl::OUString; -using ::rtl::OUStringBuffer; // ============================================================================ diff --git a/sc/source/filter/oox/pivotcachefragment.cxx b/sc/source/filter/oox/pivotcachefragment.cxx index 12d6ddfa7b6e..4ae3e1adeb3d 100644 --- a/sc/source/filter/oox/pivotcachefragment.cxx +++ b/sc/source/filter/oox/pivotcachefragment.cxx @@ -32,7 +32,6 @@ namespace xls { using namespace ::com::sun::star::uno; using namespace ::oox::core; -using ::rtl::OUString; // ============================================================================ diff --git a/sc/source/filter/oox/pivottablebuffer.cxx b/sc/source/filter/oox/pivottablebuffer.cxx index babbbccc6048..6303a057f7bd 100644 --- a/sc/source/filter/oox/pivottablebuffer.cxx +++ b/sc/source/filter/oox/pivottablebuffer.cxx @@ -60,7 +60,6 @@ using namespace ::com::sun::star::table; using namespace ::com::sun::star::uno; using namespace com::sun::star; -using ::rtl::OUString; // ============================================================================ diff --git a/sc/source/filter/oox/pivottablefragment.cxx b/sc/source/filter/oox/pivottablefragment.cxx index 57c93ac81116..efe077394338 100644 --- a/sc/source/filter/oox/pivottablefragment.cxx +++ b/sc/source/filter/oox/pivottablefragment.cxx @@ -29,7 +29,6 @@ namespace xls { using namespace ::oox::core; -using ::rtl::OUString; // ============================================================================ diff --git a/sc/source/filter/oox/querytablebuffer.cxx b/sc/source/filter/oox/querytablebuffer.cxx index 7536863879d3..d80d06d2a3fa 100644 --- a/sc/source/filter/oox/querytablebuffer.cxx +++ b/sc/source/filter/oox/querytablebuffer.cxx @@ -40,8 +40,6 @@ using namespace ::com::sun::star::sheet; using namespace ::com::sun::star::table; using namespace ::com::sun::star::uno; -using ::rtl::OUString; -using ::rtl::OUStringBuffer; // ============================================================================ diff --git a/sc/source/filter/oox/querytablefragment.cxx b/sc/source/filter/oox/querytablefragment.cxx index 73b542e2d412..8ab45e52d0fb 100644 --- a/sc/source/filter/oox/querytablefragment.cxx +++ b/sc/source/filter/oox/querytablefragment.cxx @@ -29,7 +29,6 @@ namespace xls { using namespace ::oox::core; -using ::rtl::OUString; // ============================================================================ diff --git a/sc/source/filter/oox/richstring.cxx b/sc/source/filter/oox/richstring.cxx index 1a746d6d2831..98c47f12aa2d 100644 --- a/sc/source/filter/oox/richstring.cxx +++ b/sc/source/filter/oox/richstring.cxx @@ -35,9 +35,6 @@ namespace xls { using namespace ::com::sun::star::text; using namespace ::com::sun::star::uno; -using ::rtl::OString; -using ::rtl::OUString; -using ::rtl::OUStringBuffer; // ============================================================================ @@ -476,7 +473,7 @@ void RichString::createTextPortions( const OUString& rText, FontPortionModelList } } -void RichString::createPhoneticPortions( const ::rtl::OUString& rText, PhoneticPortionModelList& rPortions, sal_Int32 nBaseLen ) +void RichString::createPhoneticPortions( const OUString& rText, PhoneticPortionModelList& rPortions, sal_Int32 nBaseLen ) { maPhonPortions.clear(); if( !rText.isEmpty()) diff --git a/sc/source/filter/oox/richstringcontext.cxx b/sc/source/filter/oox/richstringcontext.cxx index 8f3a63b70649..7d83ead8c62b 100644 --- a/sc/source/filter/oox/richstringcontext.cxx +++ b/sc/source/filter/oox/richstringcontext.cxx @@ -27,7 +27,6 @@ namespace xls { // ============================================================================ using ::oox::core::ContextHandlerRef; -using ::rtl::OUString; // ============================================================================ diff --git a/sc/source/filter/oox/scenariobuffer.cxx b/sc/source/filter/oox/scenariobuffer.cxx index 01fd51026ac6..ba0766c66da6 100644 --- a/sc/source/filter/oox/scenariobuffer.cxx +++ b/sc/source/filter/oox/scenariobuffer.cxx @@ -42,7 +42,6 @@ using namespace ::com::sun::star::sheet; using namespace ::com::sun::star::table; using namespace ::com::sun::star::uno; -using ::rtl::OUString; // ============================================================================ diff --git a/sc/source/filter/oox/sharedstringsfragment.cxx b/sc/source/filter/oox/sharedstringsfragment.cxx index 89436e417665..09f7b50610f6 100644 --- a/sc/source/filter/oox/sharedstringsfragment.cxx +++ b/sc/source/filter/oox/sharedstringsfragment.cxx @@ -29,7 +29,6 @@ namespace xls { using namespace ::oox::core; -using ::rtl::OUString; // ============================================================================ diff --git a/sc/source/filter/oox/sheetdatabuffer.cxx b/sc/source/filter/oox/sheetdatabuffer.cxx index 9877fde12887..11a057d8ae29 100644 --- a/sc/source/filter/oox/sheetdatabuffer.cxx +++ b/sc/source/filter/oox/sheetdatabuffer.cxx @@ -63,8 +63,6 @@ using namespace ::com::sun::star::text; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::util; -using ::rtl::OUString; -using ::rtl::OUStringBuffer; // ============================================================================ diff --git a/sc/source/filter/oox/sheetdatacontext.cxx b/sc/source/filter/oox/sheetdatacontext.cxx index bd5b1467d88e..5403bc402460 100644 --- a/sc/source/filter/oox/sheetdatacontext.cxx +++ b/sc/source/filter/oox/sheetdatacontext.cxx @@ -42,7 +42,6 @@ using namespace ::com::sun::star::text; using namespace ::com::sun::star::uno; using ::oox::core::ContextHandlerRef; -using ::rtl::OUString; // ============================================================================ @@ -364,7 +363,7 @@ void SheetDataContext::importFormula( const AttributeList& rAttribs ) maTableData.mbRef2Deleted = rAttribs.getBool( XML_del2, false ); } - maFormulaStr = rtl::OUString(); + maFormulaStr = OUString(); } void SheetDataContext::importRow( SequenceInputStream& rStrm ) diff --git a/sc/source/filter/oox/stylesbuffer.cxx b/sc/source/filter/oox/stylesbuffer.cxx index 3b81f2cfca23..fc3ee8051f6f 100644 --- a/sc/source/filter/oox/stylesbuffer.cxx +++ b/sc/source/filter/oox/stylesbuffer.cxx @@ -91,8 +91,6 @@ using namespace ::com::sun::star::text; using namespace ::com::sun::star::uno; using ::oox::core::FilterBase; -using ::rtl::OUString; -using ::rtl::OUStringBuffer; // ============================================================================ @@ -1031,7 +1029,7 @@ void Font::fillToItemSet( SfxItemSet& rItemSet, FontPropertyType ePropType, bool rtl_TextEncoding eTempTextEnc = (bEdit && (eFontEnc == getTextEncoding())) ? ScfTools::GetSystemTextEncoding() : eFontEnc; - SvxFontItem aFontItem( lcl_getFontFamily( maApiData.maLatinFont.mnFamily ), maApiData.maLatinFont.maName, rtl::OUString(), + SvxFontItem aFontItem( lcl_getFontFamily( maApiData.maLatinFont.mnFamily ), maApiData.maLatinFont.maName, OUString(), PITCH_DONTKNOW, eTempTextEnc, ATTR_FONT ); ScfTools::PutItem( rItemSet, aFontItem, bEdit ? EE_CHAR_FONTINFO : ATTR_FONT, bSkipPoolDefs ); } @@ -1041,7 +1039,7 @@ void Font::fillToItemSet( SfxItemSet& rItemSet, FontPropertyType ePropType, bool // taken from binary importer rtl_TextEncoding eTempTextEnc = (bEdit && (eFontEnc == getTextEncoding())) ? ScfTools::GetSystemTextEncoding() : eFontEnc; - SvxFontItem aFontItem( lcl_getFontFamily( maApiData.maAsianFont.mnFamily ), maApiData.maAsianFont.maName, rtl::OUString(), + SvxFontItem aFontItem( lcl_getFontFamily( maApiData.maAsianFont.mnFamily ), maApiData.maAsianFont.maName, OUString(), PITCH_DONTKNOW, eTempTextEnc, ATTR_FONT ); ScfTools::PutItem( rItemSet, aFontItem, bEdit ? EE_CHAR_FONTINFO_CJK : ATTR_CJK_FONT, bSkipPoolDefs ); } @@ -1051,7 +1049,7 @@ void Font::fillToItemSet( SfxItemSet& rItemSet, FontPropertyType ePropType, bool // taken from binary importer rtl_TextEncoding eTempTextEnc = (bEdit && (eFontEnc == getTextEncoding())) ? ScfTools::GetSystemTextEncoding() : eFontEnc; - SvxFontItem aFontItem( lcl_getFontFamily( maApiData.maCmplxFont.mnFamily ), maApiData.maCmplxFont.maName, rtl::OUString(), + SvxFontItem aFontItem( lcl_getFontFamily( maApiData.maCmplxFont.mnFamily ), maApiData.maCmplxFont.maName, OUString(), PITCH_DONTKNOW, eTempTextEnc, ATTR_FONT ); ScfTools::PutItem( rItemSet, aFontItem, bEdit ? EE_CHAR_FONTINFO_CTL : ATTR_CTL_FONT, bSkipPoolDefs ); } diff --git a/sc/source/filter/oox/stylesfragment.cxx b/sc/source/filter/oox/stylesfragment.cxx index f49c3fa8e319..ee21b2a07877 100644 --- a/sc/source/filter/oox/stylesfragment.cxx +++ b/sc/source/filter/oox/stylesfragment.cxx @@ -28,7 +28,6 @@ namespace xls { using namespace ::oox::core; -using ::rtl::OUString; // ============================================================================ diff --git a/sc/source/filter/oox/tablebuffer.cxx b/sc/source/filter/oox/tablebuffer.cxx index 0748e3ca3bee..672e11cb358b 100644 --- a/sc/source/filter/oox/tablebuffer.cxx +++ b/sc/source/filter/oox/tablebuffer.cxx @@ -35,7 +35,6 @@ using namespace ::com::sun::star::container; using namespace ::com::sun::star::sheet; using namespace ::com::sun::star::uno; -using ::rtl::OUString; // ============================================================================ diff --git a/sc/source/filter/oox/tablefragment.cxx b/sc/source/filter/oox/tablefragment.cxx index edef7662cb8a..334f29c13ff8 100644 --- a/sc/source/filter/oox/tablefragment.cxx +++ b/sc/source/filter/oox/tablefragment.cxx @@ -30,7 +30,6 @@ namespace xls { using namespace ::oox::core; -using ::rtl::OUString; // ============================================================================ diff --git a/sc/source/filter/oox/unitconverter.cxx b/sc/source/filter/oox/unitconverter.cxx index a40ce3b36e7e..632103b05135 100644 --- a/sc/source/filter/oox/unitconverter.cxx +++ b/sc/source/filter/oox/unitconverter.cxx @@ -40,7 +40,6 @@ using namespace ::com::sun::star::awt; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::util; -using ::rtl::OUString; // ============================================================================ diff --git a/sc/source/filter/oox/viewsettings.cxx b/sc/source/filter/oox/viewsettings.cxx index 40c50db9362d..ba92331a65a4 100644 --- a/sc/source/filter/oox/viewsettings.cxx +++ b/sc/source/filter/oox/viewsettings.cxx @@ -51,7 +51,6 @@ using namespace ::com::sun::star::table; using namespace ::com::sun::star::uno; using ::oox::core::FilterBase; -using ::rtl::OUString; // ============================================================================ diff --git a/sc/source/filter/oox/workbookfragment.cxx b/sc/source/filter/oox/workbookfragment.cxx index 41a6ce71098c..5fad0fd6af25 100644 --- a/sc/source/filter/oox/workbookfragment.cxx +++ b/sc/source/filter/oox/workbookfragment.cxx @@ -64,7 +64,6 @@ using namespace ::com::sun::star::sheet; using namespace ::oox::core; using ::oox::drawingml::ThemeFragmentHandler; -using ::rtl::OUString; // ============================================================================ diff --git a/sc/source/filter/oox/workbookhelper.cxx b/sc/source/filter/oox/workbookhelper.cxx index ca89dccb2dcf..703e7398919b 100644 --- a/sc/source/filter/oox/workbookhelper.cxx +++ b/sc/source/filter/oox/workbookhelper.cxx @@ -95,13 +95,12 @@ using ::oox::core::FilterBase; using ::oox::core::FragmentHandler; using ::oox::core::XmlFilterBase; using ::oox::drawingml::Theme; -using ::rtl::OUString; // ============================================================================ bool IgnoreCaseCompare::operator()( const OUString& rName1, const OUString& rName2 ) const { - // there is no wrapper in rtl::OUString, TODO: compare with collator + // there is no wrapper in OUString, TODO: compare with collator return ::rtl_ustr_compareIgnoreAsciiCase_WithLength( rName1.getStr(), rName1.getLength(), rName2.getStr(), rName2.getLength() ) < 0; } @@ -159,7 +158,7 @@ public: } } if ( !mpDoc ) - throw RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Workbookhelper::getScDocument(): Failed to access ScDocument from model" ) ), Reference< XInterface >() ); + throw RuntimeException( OUString( RTL_CONSTASCII_USTRINGPARAM("Workbookhelper::getScDocument(): Failed to access ScDocument from model" ) ), Reference< XInterface >() ); return *mpDoc; } @@ -393,12 +392,12 @@ ScRangeData* lcl_addNewByNameAndTokens( ScDocument& rDoc, ScRangeName* pNames, c return pNew; } -rtl::OUString findUnusedName( const ScRangeName* pRangeName, const rtl::OUString& rSuggestedName ) +OUString findUnusedName( const ScRangeName* pRangeName, const OUString& rSuggestedName ) { - rtl::OUString aNewName = rSuggestedName; + OUString aNewName = rSuggestedName; sal_Int32 nIndex = 0; while(pRangeName->findByUpperName(ScGlobal::pCharClass->uppercase(aNewName))) - aNewName = rtl::OUStringBuffer(rSuggestedName).append( '_' ).append( nIndex++ ).makeStringAndClear(); + aNewName = OUStringBuffer(rSuggestedName).append( '_' ).append( nIndex++ ).makeStringAndClear(); return aNewName; } diff --git a/sc/source/filter/oox/workbooksettings.cxx b/sc/source/filter/oox/workbooksettings.cxx index f9a61c00d19b..a46a3fa40414 100644 --- a/sc/source/filter/oox/workbooksettings.cxx +++ b/sc/source/filter/oox/workbooksettings.cxx @@ -43,7 +43,6 @@ using namespace ::com::sun::star::util; using ::comphelper::MediaDescriptor; using ::oox::core::CodecHelper; -using ::rtl::OUString; // ============================================================================ diff --git a/sc/source/filter/oox/worksheetbuffer.cxx b/sc/source/filter/oox/worksheetbuffer.cxx index 7483900c088e..1a0bcb1df172 100644 --- a/sc/source/filter/oox/worksheetbuffer.cxx +++ b/sc/source/filter/oox/worksheetbuffer.cxx @@ -43,8 +43,6 @@ using namespace ::com::sun::star::container; using namespace ::com::sun::star::sheet; using namespace ::com::sun::star::uno; -using ::rtl::OUString; -using ::rtl::OUStringBuffer; // ============================================================================ @@ -110,7 +108,7 @@ OUString WorksheetBuffer::getCalcSheetName( sal_Int32 nWorksheet ) const return pSheetInfo ? pSheetInfo->maCalcName : OUString(); } -void WorksheetBuffer::convertSheetNameRef( ::rtl::OUString& sSheetNameRef ) const +void WorksheetBuffer::convertSheetNameRef( OUString& sSheetNameRef ) const { // convert '#SheetName!A1' to '#SheetName.A1' if( !sSheetNameRef.isEmpty() && (sSheetNameRef[ 0 ] == '#') ) diff --git a/sc/source/filter/oox/worksheetfragment.cxx b/sc/source/filter/oox/worksheetfragment.cxx index 874693375219..b8ad65832889 100644 --- a/sc/source/filter/oox/worksheetfragment.cxx +++ b/sc/source/filter/oox/worksheetfragment.cxx @@ -53,8 +53,6 @@ using namespace ::com::sun::star::table; using namespace ::com::sun::star::uno; using namespace ::oox::core; -using ::rtl::OUString; -using ::rtl::OUStringBuffer; // ============================================================================ diff --git a/sc/source/filter/oox/worksheethelper.cxx b/sc/source/filter/oox/worksheethelper.cxx index dfb1653ab684..f22c27a32fec 100644 --- a/sc/source/filter/oox/worksheethelper.cxx +++ b/sc/source/filter/oox/worksheethelper.cxx @@ -87,8 +87,6 @@ using namespace ::com::sun::star::text; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::util; -using ::rtl::OUString; -using ::rtl::OUStringBuffer; // ============================================================================ @@ -1598,7 +1596,7 @@ void WorksheetHelper::finalizeDrawingImport() mrSheetGlob.finalizeDrawingImport(); } -void WorksheetHelper::setCellFormula( const ::com::sun::star::table::CellAddress& rTokenAddress, const rtl::OUString& rTokenStr ) +void WorksheetHelper::setCellFormula( const ::com::sun::star::table::CellAddress& rTokenAddress, const OUString& rTokenStr ) { getFormulaBuffer().setCellFormula( rTokenAddress, rTokenStr ); } @@ -1608,12 +1606,12 @@ void WorksheetHelper::setCellFormula( const ::com::sun::star::table::CellAddress getFormulaBuffer().setCellFormula( rTokenAddress, nSharedId ); } -void WorksheetHelper::setCellArrayFormula( const ::com::sun::star::table::CellRangeAddress& rRangeAddress, const ::com::sun::star::table::CellAddress& rTokenAddress, const rtl::OUString& rTokenStr ) +void WorksheetHelper::setCellArrayFormula( const ::com::sun::star::table::CellRangeAddress& rRangeAddress, const ::com::sun::star::table::CellAddress& rTokenAddress, const OUString& rTokenStr ) { getFormulaBuffer().setCellArrayFormula( rRangeAddress, rTokenAddress, rTokenStr ); } -void WorksheetHelper::createSharedFormulaMapEntry( const ::com::sun::star::table::CellAddress& rAddress, sal_Int32 nSharedId, const rtl::OUString& rTokens ) +void WorksheetHelper::createSharedFormulaMapEntry( const ::com::sun::star::table::CellAddress& rAddress, sal_Int32 nSharedId, const OUString& rTokens ) { getFormulaBuffer().createSharedFormulaMapEntry( rAddress, nSharedId, rTokens ); } diff --git a/sc/source/filter/oox/worksheetsettings.cxx b/sc/source/filter/oox/worksheetsettings.cxx index 933d986bca61..1980283e4820 100644 --- a/sc/source/filter/oox/worksheetsettings.cxx +++ b/sc/source/filter/oox/worksheetsettings.cxx @@ -37,7 +37,6 @@ using namespace ::com::sun::star::uno; using namespace ::com::sun::star::util; using ::oox::core::CodecHelper; -using ::rtl::OUString; // ============================================================================ diff --git a/sc/source/filter/orcus/orcusfiltersimpl.cxx b/sc/source/filter/orcus/orcusfiltersimpl.cxx index ed33cc185971..e74a5e421891 100644 --- a/sc/source/filter/orcus/orcusfiltersimpl.cxx +++ b/sc/source/filter/orcus/orcusfiltersimpl.cxx @@ -28,7 +28,7 @@ OString ScOrcusFiltersImpl::toSystemPath(const OUString& rPath) { INetURLObject aURL(rPath); - return rtl::OUStringToOString(aURL.getFSysPath(SYSTEM_PATH), RTL_TEXTENCODING_UTF8); + return OUStringToOString(aURL.getFSysPath(SYSTEM_PATH), RTL_TEXTENCODING_UTF8); } bool ScOrcusFiltersImpl::importCSV(ScDocument& rDoc, const OUString& rPath) const @@ -71,7 +71,7 @@ bool ScOrcusFiltersImpl::importGnumeric(ScDocument& rDoc, const OUString& rPath) return true; } -ScOrcusXMLContext* ScOrcusFiltersImpl::createXMLContext(ScDocument& rDoc, const rtl::OUString& rPath) const +ScOrcusXMLContext* ScOrcusFiltersImpl::createXMLContext(ScDocument& rDoc, const OUString& rPath) const { return new ScOrcusXMLContextImpl(rDoc, rPath); } diff --git a/sc/source/filter/orcus/xmlcontext.cxx b/sc/source/filter/orcus/xmlcontext.cxx index ecbf35bf9691..edfd0b6ee42f 100644 --- a/sc/source/filter/orcus/xmlcontext.cxx +++ b/sc/source/filter/orcus/xmlcontext.cxx @@ -237,7 +237,7 @@ bool ScOrcusXMLContextImpl::importXML(const ScOrcusImportXMLParam& rParam) mrDoc.GetName(rLink.maPos.Tab(), aTabName); filter.set_cell_link( rLink.maPath.getStr(), - rtl::OUStringToOString(aTabName, RTL_TEXTENCODING_UTF8).getStr(), + OUStringToOString(aTabName, RTL_TEXTENCODING_UTF8).getStr(), rLink.maPos.Row(), rLink.maPos.Col()); } } @@ -252,7 +252,7 @@ bool ScOrcusXMLContextImpl::importXML(const ScOrcusImportXMLParam& rParam) OUString aTabName; mrDoc.GetName(rLink.maPos.Tab(), aTabName); filter.start_range( - rtl::OUStringToOString(aTabName, RTL_TEXTENCODING_UTF8).getStr(), + OUStringToOString(aTabName, RTL_TEXTENCODING_UTF8).getStr(), rLink.maPos.Row(), rLink.maPos.Col()); std::for_each(rLink.maFieldPaths.begin(), rLink.maFieldPaths.end(), InsertFieldPath(filter)); diff --git a/sc/source/filter/qpro/qproform.cxx b/sc/source/filter/qpro/qproform.cxx index 082cc083d379..89c6c0328ae3 100644 --- a/sc/source/filter/qpro/qproform.cxx +++ b/sc/source/filter/qpro/qproform.cxx @@ -92,9 +92,9 @@ void QProToSc::DoFunc( DefTokenId eOc, sal_uInt16 nArgs, const sal_Char* pExtStr bAddIn = sal_True; if( pExtString ) { - rtl::OStringBuffer s(RTL_CONSTASCII_STRINGPARAM("QPRO_")); + OStringBuffer s(RTL_CONSTASCII_STRINGPARAM("QPRO_")); s.append(pExtString); - nPush = aPool.Store(eOc, rtl::OStringToOUString(s.makeStringAndClear(), maIn.GetStreamCharSet())); + nPush = aPool.Store(eOc, OStringToOUString(s.makeStringAndClear(), maIn.GetStreamCharSet())); aPool << nPush; } else diff --git a/sc/source/filter/rtf/eeimpars.cxx b/sc/source/filter/rtf/eeimpars.cxx index 23a4c3c9501a..cad6188aa7ad 100644 --- a/sc/source/filter/rtf/eeimpars.cxx +++ b/sc/source/filter/rtf/eeimpars.cxx @@ -202,7 +202,7 @@ void ScEEImport::WriteToDocument( bool bSizeColsRows, double nOutputFactor, SvNu } // HTML - rtl::OUString aValStr, aNumStr; + OUString aValStr, aNumStr; double fVal; sal_uInt32 nNumForm = 0; LanguageType eNumLang = LANGUAGE_NONE; diff --git a/sc/source/filter/rtf/rtfexp.cxx b/sc/source/filter/rtf/rtfexp.cxx index 0e19de093056..7dd2475503cf 100644 --- a/sc/source/filter/rtf/rtfexp.cxx +++ b/sc/source/filter/rtf/rtfexp.cxx @@ -110,7 +110,7 @@ void ScRTFExport::WriteTab( SCTAB nTab ) void ScRTFExport::WriteRow( SCTAB nTab, SCROW nRow ) { rStrm << OOO_STRING_SVTOOLS_RTF_TROWD << OOO_STRING_SVTOOLS_RTF_TRGAPH << "30" << OOO_STRING_SVTOOLS_RTF_TRLEFT << "-30"; - rStrm << OOO_STRING_SVTOOLS_RTF_TRRH << rtl::OString::valueOf(static_cast<sal_Int32>(pDoc->GetRowHeight(nRow, nTab))).getStr(); + rStrm << OOO_STRING_SVTOOLS_RTF_TRRH << OString::valueOf(static_cast<sal_Int32>(pDoc->GetRowHeight(nRow, nTab))).getStr(); SCCOL nCol; SCCOL nEndCol = aRange.aEnd.Col(); for ( nCol = aRange.aStart.Col(); nCol <= nEndCol; nCol++ ) @@ -141,7 +141,7 @@ void ScRTFExport::WriteRow( SCTAB nTab, SCROW nRow ) if ( pChar ) rStrm << pChar; - rStrm << OOO_STRING_SVTOOLS_RTF_CELLX << rtl::OString::valueOf(static_cast<sal_Int32>(pCellX[nCol+1])).getStr(); + rStrm << OOO_STRING_SVTOOLS_RTF_CELLX << OString::valueOf(static_cast<sal_Int32>(pCellX[nCol+1])).getStr(); if ( (nCol & 0x0F) == 0x0F ) rStrm << sNewLine; // Zeilen nicht zu lang werden lassen } diff --git a/sc/source/filter/starcalc/scfobj.cxx b/sc/source/filter/starcalc/scfobj.cxx index 8f2c0b62d226..87bac8df1336 100644 --- a/sc/source/filter/starcalc/scfobj.cxx +++ b/sc/source/filter/starcalc/scfobj.cxx @@ -51,7 +51,7 @@ void Sc10InsertObject::InsertChart( ScDocument* pDoc, SCTAB nDestTab, const Rect if ( !SvtModuleOptions().IsChart() ) return; - ::rtl::OUString aName; + OUString aName; uno::Reference < embed::XEmbeddedObject > xObj = pDoc->GetDocumentShell()-> GetEmbeddedObjectContainer().CreateEmbeddedObject( SvGlobalName( SO3_SCH_CLASSID ).GetByteSequence(), aName ); if ( xObj.is() ) diff --git a/sc/source/filter/xcl97/XclExpChangeTrack.cxx b/sc/source/filter/xcl97/XclExpChangeTrack.cxx index f23dfe21fea5..9b0767aadfbb 100644 --- a/sc/source/filter/xcl97/XclExpChangeTrack.cxx +++ b/sc/source/filter/xcl97/XclExpChangeTrack.cxx @@ -33,9 +33,6 @@ #include <oox/token/tokens.hxx> #include <rtl/strbuf.hxx> -using ::rtl::OUString; -using ::rtl::OString; -using ::rtl::OStringBuffer; using namespace oox; static OString lcl_GuidToOString( sal_uInt8 aGuid[ 16 ] ) @@ -141,9 +138,9 @@ XclExpUserBViewList::XclExpUserBViewList( const ScChangeTrack& rChangeTrack ) { sal_uInt8 aGUID[ 16 ]; sal_Bool bValidGUID = false; - const std::set<rtl::OUString>& rStrColl = rChangeTrack.GetUserCollection(); + const std::set<OUString>& rStrColl = rChangeTrack.GetUserCollection(); aViews.reserve(rStrColl.size()); - std::set<rtl::OUString>::const_iterator it = rStrColl.begin(), itEnd = rStrColl.end(); + std::set<OUString>::const_iterator it = rStrColl.begin(), itEnd = rStrColl.end(); for (; it != itEnd; ++it) { lcl_GenerateGUID( aGUID, bValidGUID ); @@ -1537,7 +1534,7 @@ ScChangeTrack* XclExpChangeTrack::CreateTempChangeTrack() // adjust table count SCTAB nOrigCount = GetDoc().GetTableCount(); - rtl::OUString sTabName; + OUString sTabName; for( sal_Int32 nIndex = 0; nIndex < nOrigCount; nIndex++ ) { pTempDoc->CreateValidTabName( sTabName ); diff --git a/sc/source/filter/xcl97/XclImpChangeTrack.cxx b/sc/source/filter/xcl97/XclImpChangeTrack.cxx index 9ce4e2ab19c3..976c1f83d451 100644 --- a/sc/source/filter/xcl97/XclImpChangeTrack.cxx +++ b/sc/source/filter/xcl97/XclImpChangeTrack.cxx @@ -158,7 +158,7 @@ sal_Bool XclImpChangeTrack::Read3DTabRefInfo( SCTAB& rFirstTab, SCTAB& rLastTab, // external ref - read doc and tab name and find sc tab num // - URL String aEncUrl( pStrm->ReadUniString() ); - ::rtl::OUString aUrl; + OUString aUrl; bool bSelf; XclImpUrlHelper::DecodeUrl( aUrl, bSelf, GetRoot(), aEncUrl ); pStrm->Ignore( 1 ); diff --git a/sc/source/filter/xcl97/xcl97esc.cxx b/sc/source/filter/xcl97/xcl97esc.cxx index 6ba28abbb1e1..6d7a15b41a45 100644 --- a/sc/source/filter/xcl97/xcl97esc.cxx +++ b/sc/source/filter/xcl97/xcl97esc.cxx @@ -51,7 +51,6 @@ #include "xechart.hxx" #include "xcl97esc.hxx" -using ::rtl::OUString; using ::com::sun::star::uno::Any; using ::com::sun::star::uno::Exception; using ::com::sun::star::uno::Reference; @@ -523,8 +522,8 @@ ShapeInteractionHelper::PopulateShapeInteractionInfo( XclExpObjectManager& rObjM try { SvMemoryStream* pMemStrm = NULL; - rtl::OUString sHyperLink; - rtl::OUString sMacro; + OUString sHyperLink; + OUString sMacro; if ( ScMacroInfo* pInfo = ScDrawLayer::GetMacroInfo( ::GetSdrObjectFromXShape( xShape ) ) ) { sHyperLink = pInfo->GetHlink(); diff --git a/sc/source/filter/xcl97/xcl97rec.cxx b/sc/source/filter/xcl97/xcl97rec.cxx index 60b169086391..dcd62b5b5ab5 100644 --- a/sc/source/filter/xcl97/xcl97rec.cxx +++ b/sc/source/filter/xcl97/xcl97rec.cxx @@ -76,8 +76,6 @@ #include <oox/export/utils.hxx> #include <oox/export/vmlexport.hxx> -using ::rtl::OString; -using ::rtl::OUString; using namespace ::com::sun::star; using ::com::sun::star::uno::Reference; using ::oox::drawingml::DrawingML; @@ -1122,7 +1120,7 @@ void ExcBundlesheet8::SaveXml( XclExpXmlStream& rStrm ) rStrm.GetCurrentStream()->singleElement( XML_sheet, XML_name, XclXmlUtils::ToOString( sUnicodeName ).getStr(), - XML_sheetId, rtl::OString::valueOf( (sal_Int32)( nTab+1 ) ).getStr(), + XML_sheetId, OString::valueOf( (sal_Int32)( nTab+1 ) ).getStr(), XML_state, nGrbit == 0x0000 ? "visible" : "hidden", FSNS( XML_r, XML_id ), XclXmlUtils::ToOString( sId ).getStr(), FSEND ); @@ -1207,7 +1205,7 @@ ExcEScenario::ExcEScenario( const XclExpRoot& rRoot, SCTAB nTab ) { String sTmpName; String sTmpComm; - rtl::OUString aTmp; + OUString aTmp; Color aDummyCol; sal_uInt16 nFlags; diff --git a/sc/source/filter/xml/XMLCalculationSettingsContext.cxx b/sc/source/filter/xml/XMLCalculationSettingsContext.cxx index 0a5c34eb57d0..c1922811ffde 100644 --- a/sc/source/filter/xml/XMLCalculationSettingsContext.cxx +++ b/sc/source/filter/xml/XMLCalculationSettingsContext.cxx @@ -36,7 +36,7 @@ using namespace xmloff::token; ScXMLCalculationSettingsContext::ScXMLCalculationSettingsContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList) : SvXMLImportContext( rImport, nPrfx, rLName ), @@ -56,11 +56,11 @@ ScXMLCalculationSettingsContext::ScXMLCalculationSettingsContext( ScXMLImport& r sal_Int16 nAttrCount = xAttrList.is() ? xAttrList->getLength() : 0; for( sal_Int16 i=0; i < nAttrCount; ++i ) { - const rtl::OUString& sAttrName(xAttrList->getNameByIndex( i )); - rtl::OUString aLocalName; + const OUString& sAttrName(xAttrList->getNameByIndex( i )); + OUString aLocalName; sal_uInt16 nPrefix = GetScImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName ); - const rtl::OUString& sValue(xAttrList->getValueByIndex( i )); + const OUString& sValue(xAttrList->getValueByIndex( i )); if (nPrefix == XML_NAMESPACE_TABLE) { @@ -104,7 +104,7 @@ ScXMLCalculationSettingsContext::~ScXMLCalculationSettingsContext() } SvXMLImportContext *ScXMLCalculationSettingsContext::CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) { @@ -131,15 +131,15 @@ void ScXMLCalculationSettingsContext::EndElement() uno::Reference <beans::XPropertySet> xPropertySet (GetScImport().GetModel(), uno::UNO_QUERY); if (xPropertySet.is()) { - xPropertySet->setPropertyValue(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_CALCASSHOWN)), uno::makeAny(bCalcAsShown) ); - xPropertySet->setPropertyValue(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_IGNORECASE)), uno::makeAny(bIgnoreCase) ); - xPropertySet->setPropertyValue(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_LOOKUPLABELS)), uno::makeAny(bLookUpLabels) ); - xPropertySet->setPropertyValue(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_MATCHWHOLE)), uno::makeAny(bMatchWholeCell) ); - xPropertySet->setPropertyValue(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_REGEXENABLED)), uno::makeAny(bUseRegularExpressions) ); - xPropertySet->setPropertyValue(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_ITERENABLED)), uno::makeAny(bIsIterationEnabled) ); - xPropertySet->setPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_ITERCOUNT)), uno::makeAny(nIterationCount) ); - xPropertySet->setPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_ITEREPSILON)), uno::makeAny(fIterationEpsilon) ); - xPropertySet->setPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_NULLDATE)), uno::makeAny(aNullDate) ); + xPropertySet->setPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_CALCASSHOWN)), uno::makeAny(bCalcAsShown) ); + xPropertySet->setPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_IGNORECASE)), uno::makeAny(bIgnoreCase) ); + xPropertySet->setPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_LOOKUPLABELS)), uno::makeAny(bLookUpLabels) ); + xPropertySet->setPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_MATCHWHOLE)), uno::makeAny(bMatchWholeCell) ); + xPropertySet->setPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_REGEXENABLED)), uno::makeAny(bUseRegularExpressions) ); + xPropertySet->setPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_ITERENABLED)), uno::makeAny(bIsIterationEnabled) ); + xPropertySet->setPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_ITERCOUNT)), uno::makeAny(nIterationCount) ); + xPropertySet->setPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_ITEREPSILON)), uno::makeAny(fIterationEpsilon) ); + xPropertySet->setPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_NULLDATE)), uno::makeAny(aNullDate) ); if (GetScImport().GetDocument()) { ScXMLImport::MutexGuard aGuard(GetScImport()); @@ -153,7 +153,7 @@ void ScXMLCalculationSettingsContext::EndElement() ScXMLNullDateContext::ScXMLNullDateContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLCalculationSettingsContext* pCalcSet) : @@ -162,11 +162,11 @@ ScXMLNullDateContext::ScXMLNullDateContext( ScXMLImport& rImport, sal_Int16 nAttrCount = xAttrList.is() ? xAttrList->getLength() : 0; for( sal_Int16 i=0; i < nAttrCount; ++i ) { - const rtl::OUString& sAttrName(xAttrList->getNameByIndex( i )); - rtl::OUString aLocalName; + const OUString& sAttrName(xAttrList->getNameByIndex( i )); + OUString aLocalName; sal_uInt16 nPrefix = GetScImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName ); - const rtl::OUString& sValue(xAttrList->getValueByIndex( i )); + const OUString& sValue(xAttrList->getValueByIndex( i )); if (nPrefix == XML_NAMESPACE_TABLE && IsXMLToken(aLocalName, XML_DATE_VALUE)) { @@ -186,7 +186,7 @@ ScXMLNullDateContext::~ScXMLNullDateContext() } SvXMLImportContext *ScXMLNullDateContext::CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& /* xAttrList */ ) { @@ -201,7 +201,7 @@ void ScXMLNullDateContext::EndElement() ScXMLIterationContext::ScXMLIterationContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLCalculationSettingsContext* pCalcSet) : @@ -210,11 +210,11 @@ ScXMLIterationContext::ScXMLIterationContext( ScXMLImport& rImport, sal_Int16 nAttrCount = xAttrList.is() ? xAttrList->getLength() : 0; for( sal_Int16 i=0; i < nAttrCount; ++i ) { - const rtl::OUString& sAttrName(xAttrList->getNameByIndex( i )); - rtl::OUString aLocalName; + const OUString& sAttrName(xAttrList->getNameByIndex( i )); + OUString aLocalName; sal_uInt16 nPrefix = GetScImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName ); - const rtl::OUString& sValue(xAttrList->getValueByIndex( i )); + const OUString& sValue(xAttrList->getValueByIndex( i )); if (nPrefix == XML_NAMESPACE_TABLE) { @@ -244,7 +244,7 @@ ScXMLIterationContext::~ScXMLIterationContext() } SvXMLImportContext *ScXMLIterationContext::CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& /* xAttrList */ ) { diff --git a/sc/source/filter/xml/XMLCalculationSettingsContext.hxx b/sc/source/filter/xml/XMLCalculationSettingsContext.hxx index 5916e538c57c..337948a1714e 100644 --- a/sc/source/filter/xml/XMLCalculationSettingsContext.hxx +++ b/sc/source/filter/xml/XMLCalculationSettingsContext.hxx @@ -42,14 +42,14 @@ class ScXMLCalculationSettingsContext : public SvXMLImportContext ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } public: ScXMLCalculationSettingsContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList); virtual ~ScXMLCalculationSettingsContext(); 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 ); @@ -66,14 +66,14 @@ class ScXMLNullDateContext : public SvXMLImportContext ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } public: ScXMLNullDateContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLCalculationSettingsContext* pCalcSet); virtual ~ScXMLNullDateContext(); 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 ); @@ -86,14 +86,14 @@ class ScXMLIterationContext : public SvXMLImportContext ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } public: ScXMLIterationContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLCalculationSettingsContext* pCalcSet); virtual ~ScXMLIterationContext(); 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 ); diff --git a/sc/source/filter/xml/XMLCellRangeSourceContext.cxx b/sc/source/filter/xml/XMLCellRangeSourceContext.cxx index cfbc37d713a5..b13efc2d5309 100644 --- a/sc/source/filter/xml/XMLCellRangeSourceContext.cxx +++ b/sc/source/filter/xml/XMLCellRangeSourceContext.cxx @@ -28,7 +28,6 @@ #include <xmloff/nmspmap.hxx> #include "xmlimprt.hxx" -using ::rtl::OUString; using namespace ::com::sun::star; @@ -59,7 +58,7 @@ ScXMLCellRangeSourceContext::ScXMLCellRangeSourceContext( for( sal_Int16 nIndex = 0; nIndex < nAttrCount; ++nIndex ) { - const rtl::OUString& sAttrName(xAttrList->getNameByIndex( nIndex )); + const OUString& sAttrName(xAttrList->getNameByIndex( nIndex )); const OUString& sValue(xAttrList->getValueByIndex( nIndex )); OUString aLocalName; sal_uInt16 nPrefix = GetScImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName ); diff --git a/sc/source/filter/xml/XMLCellRangeSourceContext.hxx b/sc/source/filter/xml/XMLCellRangeSourceContext.hxx index 61c704ebdc46..568a8dc32d2e 100644 --- a/sc/source/filter/xml/XMLCellRangeSourceContext.hxx +++ b/sc/source/filter/xml/XMLCellRangeSourceContext.hxx @@ -29,10 +29,10 @@ class ScXMLImport; struct ScMyImpCellRangeSource { - ::rtl::OUString sSourceStr; - ::rtl::OUString sFilterName; - ::rtl::OUString sFilterOptions; - ::rtl::OUString sURL; + OUString sSourceStr; + OUString sFilterName; + OUString sFilterOptions; + OUString sURL; sal_Int32 nColumns; sal_Int32 nRows; sal_Int32 nRefresh; @@ -53,7 +53,7 @@ public: ScXMLCellRangeSourceContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList, ScMyImpCellRangeSource* pCellRangeSource ); @@ -61,7 +61,7 @@ public: 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 ); virtual void EndElement(); diff --git a/sc/source/filter/xml/XMLChangeTrackingExportHelper.cxx b/sc/source/filter/xml/XMLChangeTrackingExportHelper.cxx index 08e60c4f1aa7..d4bcd4e0f2ff 100644 --- a/sc/source/filter/xml/XMLChangeTrackingExportHelper.cxx +++ b/sc/source/filter/xml/XMLChangeTrackingExportHelper.cxx @@ -59,9 +59,9 @@ ScChangeTrackingExportHelper::~ScChangeTrackingExportHelper() delete pDependings; } -rtl::OUString ScChangeTrackingExportHelper::GetChangeID(const sal_uInt32 nActionNumber) +OUString ScChangeTrackingExportHelper::GetChangeID(const sal_uInt32 nActionNumber) { - rtl::OUStringBuffer sBuffer(sChangeIDPrefix); + OUStringBuffer sBuffer(sChangeIDPrefix); ::sax::Converter::convertNumber(sBuffer, static_cast<sal_Int32>(nActionNumber)); return sBuffer.makeStringAndClear(); @@ -87,7 +87,7 @@ void ScChangeTrackingExportHelper::WriteBigRange(const ScBigRange& rBigRange, XM nEndColumn, nEndRow, nEndSheet); if ((nStartColumn == nEndColumn) && (nStartRow == nEndRow) && (nStartSheet == nEndSheet)) { - rtl::OUStringBuffer sBuffer; + OUStringBuffer sBuffer; ::sax::Converter::convertNumber(sBuffer, nStartColumn); rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_COLUMN, sBuffer.makeStringAndClear()); ::sax::Converter::convertNumber(sBuffer, nStartRow); @@ -97,7 +97,7 @@ void ScChangeTrackingExportHelper::WriteBigRange(const ScBigRange& rBigRange, XM } else { - rtl::OUStringBuffer sBuffer; + OUStringBuffer sBuffer; ::sax::Converter::convertNumber(sBuffer, nStartColumn); rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_START_COLUMN, sBuffer.makeStringAndClear()); ::sax::Converter::convertNumber(sBuffer, nStartRow); @@ -122,12 +122,12 @@ void ScChangeTrackingExportHelper::WriteChangeInfo(const ScChangeAction* pAction SvXMLElementExport aCreatorElem( rExport, XML_NAMESPACE_DC, XML_CREATOR, true, false ); - rtl::OUString sAuthor(pAction->GetUser()); + OUString sAuthor(pAction->GetUser()); rExport.Characters(sAuthor); } { - rtl::OUStringBuffer sDate; + OUStringBuffer sDate; ScXMLConverter::ConvertDateTimeToString(pAction->GetDateTimeUTC(), sDate); SvXMLElementExport aDateElem( rExport, XML_NAMESPACE_DC, XML_DATE, true, @@ -135,7 +135,7 @@ void ScChangeTrackingExportHelper::WriteChangeInfo(const ScChangeAction* pAction rExport.Characters(sDate.makeStringAndClear()); } - rtl::OUString sComment(pAction->GetComment()); + OUString sComment(pAction->GetComment()); if (!sComment.isEmpty()) { SvXMLElementExport aElemC(rExport, XML_NAMESPACE_TEXT, XML_P, true, false); @@ -152,7 +152,7 @@ void ScChangeTrackingExportHelper::WriteGenerated(const ScChangeAction* pGenerat #endif SvXMLElementExport aElemPrev(rExport, XML_NAMESPACE_TABLE, XML_CELL_CONTENT_DELETION, true, true); WriteBigRange(pGeneratedAction->GetBigRange(), XML_CELL_ADDRESS); - rtl::OUString sValue; + OUString sValue; static_cast<const ScChangeActionContent*>(pGeneratedAction)->GetNewString(sValue); WriteCell(static_cast<const ScChangeActionContent*>(pGeneratedAction)->GetNewCell(), sValue); } @@ -171,7 +171,7 @@ void ScChangeTrackingExportHelper::WriteDeleted(const ScChangeAction* pDeletedAc SvXMLElementExport aElemPrev(rExport, XML_NAMESPACE_TABLE, XML_CELL_CONTENT_DELETION, true, true); if (static_cast<const ScChangeActionContent*>(pDeletedAction)->IsTopContent() && pDeletedAction->IsDeletedIn()) { - rtl::OUString sValue; + OUString sValue; pContentAction->GetNewString(sValue); WriteCell(pContentAction->GetNewCell(), sValue); } @@ -248,7 +248,7 @@ void ScChangeTrackingExportHelper::SetValueAttributes(const double& fValue, cons if ( rExport.GetMM100UnitConverter().setNullDate(rExport.GetModel()) ) { rExport.AddAttribute(XML_NAMESPACE_OFFICE, XML_VALUE_TYPE, XML_DATE); - rtl::OUStringBuffer sBuffer; + OUStringBuffer sBuffer; rExport.GetMM100UnitConverter().convertDateTime(sBuffer, fTempValue); rExport.AddAttribute(XML_NAMESPACE_OFFICE, XML_DATE_VALUE, sBuffer.makeStringAndClear()); bSetAttributes = true; @@ -258,7 +258,7 @@ void ScChangeTrackingExportHelper::SetValueAttributes(const double& fValue, cons case NUMBERFORMAT_TIME: { rExport.AddAttribute(XML_NAMESPACE_OFFICE, XML_VALUE_TYPE, XML_TIME); - rtl::OUStringBuffer sBuffer; + OUStringBuffer sBuffer; ::sax::Converter::convertDuration(sBuffer, fTempValue); rExport.AddAttribute(XML_NAMESPACE_OFFICE, XML_TIME_VALUE, sBuffer.makeStringAndClear()); bSetAttributes = true; @@ -270,9 +270,9 @@ void ScChangeTrackingExportHelper::SetValueAttributes(const double& fValue, cons if (!bSetAttributes) { rExport.AddAttribute(XML_NAMESPACE_OFFICE, XML_VALUE_TYPE, XML_FLOAT); - rtl::OUStringBuffer sBuffer; + OUStringBuffer sBuffer; ::sax::Converter::convertDouble(sBuffer, fValue); - rtl::OUString sNumValue(sBuffer.makeStringAndClear()); + OUString sNumValue(sBuffer.makeStringAndClear()); if (!sNumValue.isEmpty()) rExport.AddAttribute(XML_NAMESPACE_OFFICE, XML_VALUE, sNumValue); } @@ -423,7 +423,7 @@ void ScChangeTrackingExportHelper::WriteContentChange(ScChangeAction* pAction) if (pPrevAction) rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_ID, GetChangeID(pPrevAction->GetActionNumber())); SvXMLElementExport aElemPrev(rExport, XML_NAMESPACE_TABLE, XML_PREVIOUS, true, true); - rtl::OUString sValue; + OUString sValue; static_cast<ScChangeActionContent*>(pAction)->GetOldString(sValue); WriteCell(static_cast<ScChangeActionContent*>(pAction)->GetOldCell(), sValue); } @@ -475,7 +475,7 @@ void ScChangeTrackingExportHelper::AddInsertionAttributes(const ScChangeAction* } nPosition = nStartPosition; nCount = nEndPosition - nStartPosition + 1; - rtl::OUStringBuffer sBuffer; + OUStringBuffer sBuffer; ::sax::Converter::convertNumber(sBuffer, nPosition); rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_POSITION, sBuffer.makeStringAndClear()); OSL_ENSURE(nCount > 0, "wrong insertion count"); @@ -537,7 +537,7 @@ void ScChangeTrackingExportHelper::AddDeletionAttributes(const ScChangeActionDel } break; } - rtl::OUStringBuffer sBuffer; + OUStringBuffer sBuffer; ::sax::Converter::convertNumber(sBuffer, nPosition); rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_POSITION, sBuffer.makeStringAndClear()); if (pDelAction->GetType() != SC_CAT_DELETE_TABS) @@ -580,7 +580,7 @@ void ScChangeTrackingExportHelper::WriteCutOffs(const ScChangeActionDel* pAction if (pCutOffIns || pLinkMove) { SvXMLElementExport aCutOffsElem (rExport, XML_NAMESPACE_TABLE, XML_CUT_OFFS, true, true); - rtl::OUStringBuffer sBuffer; + OUStringBuffer sBuffer; if (pCutOffIns) { rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_ID, GetChangeID(pCutOffIns->GetActionNumber())); diff --git a/sc/source/filter/xml/XMLChangeTrackingExportHelper.hxx b/sc/source/filter/xml/XMLChangeTrackingExportHelper.hxx index 55f3169c57ab..e65e18c9365e 100644 --- a/sc/source/filter/xml/XMLChangeTrackingExportHelper.hxx +++ b/sc/source/filter/xml/XMLChangeTrackingExportHelper.hxx @@ -46,10 +46,10 @@ class ScChangeTrackingExportHelper ScChangeTrack* pChangeTrack; ScEditEngineTextObj* pEditTextObj; ScChangeActionMap* pDependings; - rtl::OUString sChangeIDPrefix; + OUString sChangeIDPrefix; com::sun::star::uno::Reference<com::sun::star::text::XText> xText; - rtl::OUString GetChangeID(const sal_uInt32 nActionNumber); + OUString GetChangeID(const sal_uInt32 nActionNumber); void GetAcceptanceState(const ScChangeAction* pAction); void WriteBigRange(const ScBigRange& rBigRange, xmloff::token::XMLTokenEnum aName); diff --git a/sc/source/filter/xml/XMLChangeTrackingImportHelper.cxx b/sc/source/filter/xml/XMLChangeTrackingImportHelper.cxx index c38b9cf3282c..6caf7b05c81d 100644 --- a/sc/source/filter/xml/XMLChangeTrackingImportHelper.cxx +++ b/sc/source/filter/xml/XMLChangeTrackingImportHelper.cxx @@ -233,7 +233,7 @@ void ScXMLChangeTrackingImportHelper::StartChangeAction(const ScChangeActionType } } -sal_uInt32 ScXMLChangeTrackingImportHelper::GetIDFromString(const rtl::OUString& sID) +sal_uInt32 ScXMLChangeTrackingImportHelper::GetIDFromString(const OUString& sID) { sal_uInt32 nResult(0); sal_uInt32 nLength(sID.getLength()); @@ -241,7 +241,7 @@ sal_uInt32 ScXMLChangeTrackingImportHelper::GetIDFromString(const rtl::OUString& { if (sID.compareTo(sIDPrefix, nPrefixLength) == 0) { - rtl::OUString sValue(sID.copy(nPrefixLength, nLength - nPrefixLength)); + OUString sValue(sID.copy(nPrefixLength, nLength - nPrefixLength)); sal_Int32 nValue; ::sax::Converter::convertNumber(nValue, sValue); OSL_ENSURE(nValue > 0, "wrong change action ID"); @@ -436,8 +436,8 @@ void ScXMLChangeTrackingImportHelper::ConvertInfo(const ScMyActionInfo& aInfo, S if ( aInfo.aDateTime.HundredthSeconds ) pTrack->SetTime100thSeconds( true ); - const std::set<rtl::OUString>& rUsers = pTrack->GetUserCollection(); - std::set<rtl::OUString>::const_iterator it = rUsers.find(aInfo.sUser); + const std::set<OUString>& rUsers = pTrack->GetUserCollection(); + std::set<OUString>::const_iterator it = rUsers.find(aInfo.sUser); if (it != rUsers.end()) { // It's probably pointless to do this. @@ -745,7 +745,7 @@ void ScXMLChangeTrackingImportHelper::SetNewCell(ScMyContentAction* pAction) else { sal_uInt8 nMatrixFlag = aCell.mpFormula->GetMatrixFlag(); - rtl::OUString sFormula; + OUString sFormula; // With GRAM_ODFF reference detection is faster on compilation. /* FIXME: new cell should be created with a clone * of the token array instead. Any reason why this @@ -755,7 +755,7 @@ void ScXMLChangeTrackingImportHelper::SetNewCell(ScMyContentAction* pAction) // #i87826# [Collaboration] Rejected move destroys formulas // FIXME: adjust ScFormulaCell::GetFormula(), so that the right formula string // is returned and no further string handling is necessary - rtl::OUString sFormula2; + OUString sFormula2; if ( nMatrixFlag != MM_NONE ) { sFormula2 = sFormula.copy( 2, sFormula.getLength() - 3 ); diff --git a/sc/source/filter/xml/XMLChangeTrackingImportHelper.hxx b/sc/source/filter/xml/XMLChangeTrackingImportHelper.hxx index fe7b167ed439..ea565c5a96f0 100644 --- a/sc/source/filter/xml/XMLChangeTrackingImportHelper.hxx +++ b/sc/source/filter/xml/XMLChangeTrackingImportHelper.hxx @@ -29,16 +29,16 @@ class DateTime; struct ScMyActionInfo { - rtl::OUString sUser; - rtl::OUString sComment; + OUString sUser; + OUString sComment; com::sun::star::util::DateTime aDateTime; }; struct ScMyCellInfo { ScCellValue maCell; - rtl::OUString sFormulaAddress; - rtl::OUString sFormula; + OUString sFormulaAddress; + OUString sFormula; String sInputString; double fValue; sal_Int32 nMatrixCols; @@ -172,13 +172,13 @@ typedef std::list<ScMyBaseAction*> ScMyActions; class ScXMLChangeTrackingImportHelper { - std::set<rtl::OUString> aUsers; + std::set<OUString> aUsers; ScMyActions aActions; com::sun::star::uno::Sequence<sal_Int8> aProtect; ScDocument* pDoc; ScChangeTrack* pTrack; ScMyBaseAction* pCurrentAction; - rtl::OUString sIDPrefix; + OUString sIDPrefix; sal_uInt32 nPrefixLength; sal_Int16 nMultiSpanned; sal_Int16 nMultiSpannedSlaveCount; @@ -202,7 +202,7 @@ public: void SetProtection(const com::sun::star::uno::Sequence<sal_Int8>& rProtect) { aProtect = rProtect; } void StartChangeAction(const ScChangeActionType nActionType); - sal_uInt32 GetIDFromString(const rtl::OUString& sID); + sal_uInt32 GetIDFromString(const OUString& sID); void SetActionNumber(const sal_uInt32 nActionNumber) { pCurrentAction->nActionNumber = nActionNumber; } void SetActionState(const ScChangeActionState nActionState) { pCurrentAction->nActionState = nActionState; } diff --git a/sc/source/filter/xml/XMLCodeNameProvider.cxx b/sc/source/filter/xml/XMLCodeNameProvider.cxx index 790e2f6251e0..6493219cd46e 100644 --- a/sc/source/filter/xml/XMLCodeNameProvider.cxx +++ b/sc/source/filter/xml/XMLCodeNameProvider.cxx @@ -22,7 +22,6 @@ using namespace com::sun::star; -using ::rtl::OUString; sal_Bool XMLCodeNameProvider::_getCodeName( const uno::Any& aAny, String& rCodeName ) { @@ -67,7 +66,7 @@ XMLCodeNameProvider::~XMLCodeNameProvider() return !mpDoc->GetCodeName().isEmpty(); SCTAB nCount = mpDoc->GetTableCount(); - rtl::OUString sSheetName, sCodeName; + OUString sSheetName, sCodeName; for( SCTAB i = 0; i < nCount; i++ ) { if( mpDoc->GetName( i, sSheetName ) && sSheetName.equals(aName) ) @@ -96,7 +95,7 @@ uno::Any SAL_CALL XMLCodeNameProvider::getByName( const OUString& aName ) } SCTAB nCount = mpDoc->GetTableCount(); - rtl::OUString sSheetName, sCodeName; + OUString sSheetName, sCodeName; for( SCTAB i = 0; i < nCount; i++ ) { if( mpDoc->GetName( i, sSheetName ) && sSheetName.equals(aName) ) @@ -121,7 +120,7 @@ uno::Sequence< OUString > SAL_CALL XMLCodeNameProvider::getElementNames( ) if( !mpDoc->GetCodeName().isEmpty() ) aNames[nRealCount++] = msDocName; - rtl::OUString sSheetName, sCodeName; + OUString sSheetName, sCodeName; for( SCTAB i = 0; i < nCount; i++ ) { mpDoc->GetCodeName( i, sCodeName ); @@ -151,7 +150,7 @@ uno::Type SAL_CALL XMLCodeNameProvider::getElementType( ) return sal_True; SCTAB nCount = mpDoc->GetTableCount(); - rtl::OUString sSheetName, sCodeName; + OUString sSheetName, sCodeName; for( SCTAB i = 0; i < nCount; i++ ) { mpDoc->GetCodeName( i, sCodeName ); @@ -175,7 +174,7 @@ void XMLCodeNameProvider::set( const uno::Reference< container::XNameAccess>& xN } SCTAB nCount = pDoc->GetTableCount(); - rtl::OUString sSheetName; + OUString sSheetName; for( SCTAB i = 0; i < nCount; i++ ) { if( pDoc->GetName( i, sSheetName ) && diff --git a/sc/source/filter/xml/XMLCodeNameProvider.hxx b/sc/source/filter/xml/XMLCodeNameProvider.hxx index 5d925f2b7fdc..9f8eb2d508af 100644 --- a/sc/source/filter/xml/XMLCodeNameProvider.hxx +++ b/sc/source/filter/xml/XMLCodeNameProvider.hxx @@ -29,8 +29,8 @@ class String; class XMLCodeNameProvider : public ::cppu::WeakImplHelper1< ::com::sun::star::container::XNameAccess > { ScDocument* mpDoc; - ::rtl::OUString msDocName; - ::rtl::OUString msCodeNameProp; + OUString msDocName; + OUString msCodeNameProp; static sal_Bool _getCodeName( const ::com::sun::star::uno::Any& aAny, String& rCodeName ); @@ -39,15 +39,15 @@ public: XMLCodeNameProvider( ScDocument* pDoc ); virtual ~XMLCodeNameProvider(); - virtual ::sal_Bool SAL_CALL hasByName( const ::rtl::OUString& aName ) + virtual ::sal_Bool SAL_CALL hasByName( const OUString& aName ) throw (::com::sun::star::uno::RuntimeException ); - virtual ::com::sun::star::uno::Any SAL_CALL getByName( const ::rtl::OUString& aName ) + virtual ::com::sun::star::uno::Any SAL_CALL getByName( const OUString& aName ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getElementNames( ) + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getElementNames( ) throw (::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Type SAL_CALL getElementType( ) diff --git a/sc/source/filter/xml/XMLColumnRowGroupExport.hxx b/sc/source/filter/xml/XMLColumnRowGroupExport.hxx index 28f130147ca6..23c597020f8b 100644 --- a/sc/source/filter/xml/XMLColumnRowGroupExport.hxx +++ b/sc/source/filter/xml/XMLColumnRowGroupExport.hxx @@ -41,7 +41,7 @@ class ScXMLExport; class ScMyOpenCloseColumnRowGroup { ScXMLExport& rExport; - const rtl::OUString rName; + const OUString rName; ScMyColumnRowGroupVec aTableStart; ScMyFieldGroupVec aTableEnd; diff --git a/sc/source/filter/xml/XMLConsolidationContext.cxx b/sc/source/filter/xml/XMLConsolidationContext.cxx index 55d3cf852c5d..3cf06b1f063c 100644 --- a/sc/source/filter/xml/XMLConsolidationContext.cxx +++ b/sc/source/filter/xml/XMLConsolidationContext.cxx @@ -29,7 +29,6 @@ #include <xmloff/nmspmap.hxx> #include <xmloff/xmltoken.hxx> -using ::rtl::OUString; using namespace ::com::sun::star; using namespace xmloff::token; @@ -54,8 +53,8 @@ ScXMLConsolidationContext::ScXMLConsolidationContext( for( sal_Int16 nIndex = 0; nIndex < nAttrCount; ++nIndex ) { - const rtl::OUString& sAttrName (xAttrList->getNameByIndex( nIndex )); - const rtl::OUString& sValue (xAttrList->getValueByIndex( nIndex )); + const OUString& sAttrName (xAttrList->getNameByIndex( nIndex )); + const OUString& sValue (xAttrList->getValueByIndex( nIndex )); OUString aLocalName; sal_uInt16 nPrefix = GetScImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName ); diff --git a/sc/source/filter/xml/XMLConsolidationContext.hxx b/sc/source/filter/xml/XMLConsolidationContext.hxx index 7b986880cd7c..be1e376dae8e 100644 --- a/sc/source/filter/xml/XMLConsolidationContext.hxx +++ b/sc/source/filter/xml/XMLConsolidationContext.hxx @@ -32,8 +32,8 @@ class ScXMLImport; class ScXMLConsolidationContext : public SvXMLImportContext { private: - ::rtl::OUString sSourceList; - ::rtl::OUString sUseLabel; + OUString sSourceList; + OUString sUseLabel; ScAddress aTargetAddr; ScSubTotalFunc eFunction; bool bLinkToSource; @@ -47,14 +47,14 @@ public: ScXMLConsolidationContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ); virtual ~ScXMLConsolidationContext(); 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 ); virtual void EndElement(); diff --git a/sc/source/filter/xml/XMLConverter.cxx b/sc/source/filter/xml/XMLConverter.cxx index 751ab1ba7375..a705c0a55d0f 100644 --- a/sc/source/filter/xml/XMLConverter.cxx +++ b/sc/source/filter/xml/XMLConverter.cxx @@ -30,8 +30,6 @@ #include "document.hxx" #include "ftools.hxx" -using ::rtl::OUString; -using ::rtl::OUStringBuffer; using namespace ::com::sun::star; using namespace xmloff::token; @@ -336,7 +334,7 @@ void ScXMLConverter::ParseFormula(OUString& sFormula, const bool bIsFormula) //_____________________________________________________________________ -void ScXMLConverter::ConvertDateTimeToString(const DateTime& aDateTime, rtl::OUStringBuffer& sDate) +void ScXMLConverter::ConvertDateTimeToString(const DateTime& aDateTime, OUStringBuffer& sDate) { util::DateTime aAPIDateTime; ConvertCoreToAPIDateTime(aDateTime, aAPIDateTime); diff --git a/sc/source/filter/xml/XMLConverter.hxx b/sc/source/filter/xml/XMLConverter.hxx index db7a53487653..d8c9ff5b6c79 100644 --- a/sc/source/filter/xml/XMLConverter.hxx +++ b/sc/source/filter/xml/XMLConverter.hxx @@ -50,55 +50,55 @@ public: // IMPORT: GeneralFunction / ScSubTotalFunc static ::com::sun::star::sheet::GeneralFunction GetFunctionFromString( - const ::rtl::OUString& rString ); + const OUString& rString ); static ScSubTotalFunc GetSubTotalFuncFromString( - const ::rtl::OUString& rString ); + const OUString& rString ); // EXPORT: GeneralFunction / ScSubTotalFunc static void GetStringFromFunction( - ::rtl::OUString& rString, + OUString& rString, const ::com::sun::star::sheet::GeneralFunction eFunction, bool bAppendStr = false ); static void GetStringFromFunction( - ::rtl::OUString& rString, + OUString& rString, const ScSubTotalFunc eFunction, bool bAppendStr = false ); // IMPORT: DataPilotFieldOrientation static ::com::sun::star::sheet::DataPilotFieldOrientation GetOrientationFromString( - const ::rtl::OUString& rString ); + const OUString& rString ); // EXPORT: DataPilotFieldOrientation static void GetStringFromOrientation( - ::rtl::OUString& rString, + OUString& rString, const ::com::sun::star::sheet::DataPilotFieldOrientation eOrientation, bool bAppendStr = false ); // IMPORT: Detective static ScDetectiveObjType GetDetObjTypeFromString( - const ::rtl::OUString& rString ); + const OUString& rString ); static bool GetDetOpTypeFromString( ScDetOpType& rDetOpType, - const ::rtl::OUString& rString ); + const OUString& rString ); // EXPORT: Detective static void GetStringFromDetObjType( - ::rtl::OUString& rString, + OUString& rString, const ScDetectiveObjType eObjType, bool bAppendStr = false ); static void GetStringFromDetOpType( - ::rtl::OUString& rString, + OUString& rString, const ScDetOpType eOpType, bool bAppendStr = false ); // IMPORT: Formulas static void ParseFormula( - ::rtl::OUString& sFormula, + OUString& sFormula, const bool bIsFormula = sal_True); // EXPORT: Core Date Time - static void ConvertDateTimeToString(const DateTime& aDateTime, rtl::OUStringBuffer& sDate); + static void ConvertDateTimeToString(const DateTime& aDateTime, OUStringBuffer& sDate); static void ConvertCoreToAPIDateTime(const DateTime& aDateTime, com::sun::star::util::DateTime& rDateTime); static void ConvertAPIToCoreDateTime(const com::sun::star::util::DateTime& aDateTime, DateTime& rDateTime); @@ -136,8 +136,8 @@ struct ScXMLConditionParseResult meValidation; /// A data validation type if existing. ::com::sun::star::sheet::ConditionOperator meOperator; /// A comparison operator if existing. - ::rtl::OUString maOperand1; /// First operand of the token or comparison value. - ::rtl::OUString maOperand2; /// Second operand of 'between' conditions. + OUString maOperand1; /// First operand of the token or comparison value. + OUString maOperand2; /// Second operand of 'between' conditions. sal_Int32 mnEndIndex; /// Index of first character following the condition. }; @@ -151,10 +151,10 @@ public: */ static void parseCondition( ScXMLConditionParseResult& rParseResult, - const ::rtl::OUString& rAttribute, + const OUString& rAttribute, sal_Int32 nStartIndex ); - static rtl::OUString getExpression(const sal_Unicode*& rpcString, const sal_Unicode* pcEnd, sal_Unicode cEndChar ); + static OUString getExpression(const sal_Unicode*& rpcString, const sal_Unicode* pcEnd, sal_Unicode cEndChar ); private: ScXMLConditionHelper(); diff --git a/sc/source/filter/xml/XMLDDELinksContext.cxx b/sc/source/filter/xml/XMLDDELinksContext.cxx index 0ff562a58aa3..184de3b502c1 100644 --- a/sc/source/filter/xml/XMLDDELinksContext.cxx +++ b/sc/source/filter/xml/XMLDDELinksContext.cxx @@ -28,15 +28,13 @@ using namespace com::sun::star; using namespace xmloff::token; -using ::rtl::OUString; -using rtl::OUString; //------------------------------------------------------------------ ScXMLDDELinksContext::ScXMLDDELinksContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& /* xAttrList */ ) : SvXMLImportContext( rImport, nPrfx, rLName ) @@ -51,7 +49,7 @@ ScXMLDDELinksContext::~ScXMLDDELinksContext() } SvXMLImportContext *ScXMLDDELinksContext::CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) { @@ -72,7 +70,7 @@ void ScXMLDDELinksContext::EndElement() ScXMLDDELinkContext::ScXMLDDELinkContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& /* xAttrList */ ) : SvXMLImportContext( rImport, nPrfx, rLName ), @@ -94,7 +92,7 @@ ScXMLDDELinkContext::~ScXMLDDELinkContext() } SvXMLImportContext *ScXMLDDELinkContext::CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) { @@ -195,7 +193,7 @@ void ScXMLDDELinkContext::EndElement() ScXMLDDESourceContext::ScXMLDDESourceContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLDDELinkContext* pTempDDELink) : @@ -208,8 +206,8 @@ ScXMLDDESourceContext::ScXMLDDESourceContext( ScXMLImport& rImport, for( sal_Int16 nIndex = 0; nIndex < nAttrCount; ++nIndex ) { - const rtl::OUString& sAttrName (xAttrList->getNameByIndex( nIndex )); - const rtl::OUString& sValue (xAttrList->getValueByIndex( nIndex )); + const OUString& sAttrName (xAttrList->getNameByIndex( nIndex )); + const OUString& sValue (xAttrList->getValueByIndex( nIndex )); OUString aLocalName; sal_uInt16 nPrefix = GetScImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName ); @@ -239,7 +237,7 @@ ScXMLDDESourceContext::~ScXMLDDESourceContext() } SvXMLImportContext *ScXMLDDESourceContext::CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& /* xAttrList */ ) { @@ -255,7 +253,7 @@ void ScXMLDDESourceContext::EndElement() ScXMLDDETableContext::ScXMLDDETableContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& /* xAttrList */, ScXMLDDELinkContext* pTempDDELink) : @@ -270,7 +268,7 @@ ScXMLDDETableContext::~ScXMLDDETableContext() } SvXMLImportContext *ScXMLDDETableContext::CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) { @@ -296,7 +294,7 @@ void ScXMLDDETableContext::EndElement() ScXMLDDEColumnContext::ScXMLDDEColumnContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLDDELinkContext* pTempDDELink) : @@ -310,8 +308,8 @@ ScXMLDDEColumnContext::ScXMLDDEColumnContext( ScXMLImport& rImport, for( sal_Int16 nIndex = 0; nIndex < nAttrCount; ++nIndex ) { - const rtl::OUString& sAttrName (xAttrList->getNameByIndex( nIndex )); - const rtl::OUString& sValue (xAttrList->getValueByIndex( nIndex )); + const OUString& sAttrName (xAttrList->getNameByIndex( nIndex )); + const OUString& sValue (xAttrList->getValueByIndex( nIndex )); OUString aLocalName; sal_uInt16 nPrefix = GetScImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName ); @@ -329,7 +327,7 @@ ScXMLDDEColumnContext::~ScXMLDDEColumnContext() } SvXMLImportContext *ScXMLDDEColumnContext::CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& /* xAttrList */ ) { @@ -344,7 +342,7 @@ void ScXMLDDEColumnContext::EndElement() ScXMLDDERowContext::ScXMLDDERowContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLDDELinkContext* pTempDDELink) : @@ -358,8 +356,8 @@ ScXMLDDERowContext::ScXMLDDERowContext( ScXMLImport& rImport, for( sal_Int16 nIndex = 0; nIndex < nAttrCount; ++nIndex ) { - const rtl::OUString& sAttrName (xAttrList->getNameByIndex( nIndex )); - const rtl::OUString& sValue (xAttrList->getValueByIndex( nIndex )); + const OUString& sAttrName (xAttrList->getNameByIndex( nIndex )); + const OUString& sValue (xAttrList->getValueByIndex( nIndex )); OUString aLocalName; sal_uInt16 nPrefix = GetScImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName ); @@ -377,7 +375,7 @@ ScXMLDDERowContext::~ScXMLDDERowContext() } SvXMLImportContext *ScXMLDDERowContext::CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) { @@ -400,7 +398,7 @@ void ScXMLDDERowContext::EndElement() ScXMLDDECellContext::ScXMLDDECellContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLDDELinkContext* pTempDDELink) : @@ -419,8 +417,8 @@ ScXMLDDECellContext::ScXMLDDECellContext( ScXMLImport& rImport, for( sal_Int16 nIndex = 0; nIndex < nAttrCount; ++nIndex ) { - const rtl::OUString& sAttrName (xAttrList->getNameByIndex( nIndex )); - const rtl::OUString& sTempValue (xAttrList->getValueByIndex( nIndex )); + const OUString& sAttrName (xAttrList->getNameByIndex( nIndex )); + const OUString& sTempValue (xAttrList->getValueByIndex( nIndex )); OUString aLocalName; sal_uInt16 nPrefix = GetScImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName ); @@ -461,7 +459,7 @@ ScXMLDDECellContext::~ScXMLDDECellContext() } SvXMLImportContext *ScXMLDDECellContext::CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& /* xAttrList */ ) { diff --git a/sc/source/filter/xml/XMLDDELinksContext.hxx b/sc/source/filter/xml/XMLDDELinksContext.hxx index c12f349978ee..87d25aab9a9f 100644 --- a/sc/source/filter/xml/XMLDDELinksContext.hxx +++ b/sc/source/filter/xml/XMLDDELinksContext.hxx @@ -32,14 +32,14 @@ class ScXMLDDELinksContext : public SvXMLImportContext ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } public: ScXMLDDELinksContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList); virtual ~ScXMLDDELinksContext(); 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 ); @@ -48,7 +48,7 @@ public: struct ScDDELinkCell { - rtl::OUString sValue; + OUString sValue; double fValue; bool bString; bool bEmpty; @@ -60,9 +60,9 @@ class ScXMLDDELinkContext : public SvXMLImportContext { ScDDELinkCells aDDELinkTable; ScDDELinkCells aDDELinkRow; - rtl::OUString sApplication; - rtl::OUString sTopic; - rtl::OUString sItem; + OUString sApplication; + OUString sTopic; + OUString sItem; sal_Int32 nPosition; sal_Int32 nColumns; sal_Int32 nRows; @@ -72,20 +72,20 @@ class ScXMLDDELinkContext : public SvXMLImportContext ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } public: ScXMLDDELinkContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList); virtual ~ScXMLDDELinkContext(); 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 ); - void SetApplication(const rtl::OUString& sValue) { sApplication = sValue; } - void SetTopic(const rtl::OUString& sValue) { sTopic = sValue; } - void SetItem(const rtl::OUString& sValue) { sItem = sValue; } + void SetApplication(const OUString& sValue) { sApplication = sValue; } + void SetTopic(const OUString& sValue) { sTopic = sValue; } + void SetItem(const OUString& sValue) { sItem = sValue; } void SetMode(const sal_uInt8 nValue) { nMode = nValue; } void CreateDDELink(); void AddColumns(const sal_Int32 nValue) { nColumns += nValue; } @@ -104,7 +104,7 @@ class ScXMLDDESourceContext : public SvXMLImportContext ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } public: ScXMLDDESourceContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLDDELinkContext* pDDELink); @@ -112,7 +112,7 @@ public: virtual ~ScXMLDDESourceContext(); 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 ); @@ -127,7 +127,7 @@ class ScXMLDDETableContext : public SvXMLImportContext ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } public: ScXMLDDETableContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLDDELinkContext* pDDELink); @@ -135,7 +135,7 @@ public: virtual ~ScXMLDDETableContext(); 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 ); @@ -150,7 +150,7 @@ class ScXMLDDEColumnContext : public SvXMLImportContext ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } public: ScXMLDDEColumnContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLDDELinkContext* pDDELink); @@ -158,7 +158,7 @@ public: virtual ~ScXMLDDEColumnContext(); 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 ); @@ -174,7 +174,7 @@ class ScXMLDDERowContext : public SvXMLImportContext ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } public: ScXMLDDERowContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLDDELinkContext* pDDELink); @@ -182,7 +182,7 @@ public: virtual ~ScXMLDDERowContext(); 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 ); @@ -191,7 +191,7 @@ public: class ScXMLDDECellContext : public SvXMLImportContext { - rtl::OUString sValue; + OUString sValue; double fValue; sal_Int32 nCells; bool bString; @@ -204,7 +204,7 @@ class ScXMLDDECellContext : public SvXMLImportContext ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } public: ScXMLDDECellContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLDDELinkContext* pDDELink); @@ -212,7 +212,7 @@ public: virtual ~ScXMLDDECellContext(); 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 ); diff --git a/sc/source/filter/xml/XMLDetectiveContext.cxx b/sc/source/filter/xml/XMLDetectiveContext.cxx index 41f2c298bbdf..5e88e781fbb1 100644 --- a/sc/source/filter/xml/XMLDetectiveContext.cxx +++ b/sc/source/filter/xml/XMLDetectiveContext.cxx @@ -33,7 +33,6 @@ #include <algorithm> -using ::rtl::OUString; using namespace ::com::sun::star; using namespace xmloff::token; @@ -134,8 +133,8 @@ ScXMLDetectiveHighlightedContext::ScXMLDetectiveHighlightedContext( for( sal_Int16 nIndex = 0; nIndex < nAttrCount; ++nIndex ) { - const rtl::OUString& sAttrName (xAttrList->getNameByIndex( nIndex )); - const rtl::OUString& sValue (xAttrList->getValueByIndex( nIndex )); + const OUString& sAttrName (xAttrList->getNameByIndex( nIndex )); + const OUString& sValue (xAttrList->getValueByIndex( nIndex )); OUString aLocalName; sal_uInt16 nPrefix = GetScImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName ); @@ -213,8 +212,8 @@ ScXMLDetectiveOperationContext::ScXMLDetectiveOperationContext( for( sal_Int16 nIndex = 0; nIndex < nAttrCount; ++nIndex ) { - const rtl::OUString& sAttrName (xAttrList->getNameByIndex( nIndex )); - const rtl::OUString& sValue (xAttrList->getValueByIndex( nIndex )); + const OUString& sAttrName (xAttrList->getNameByIndex( nIndex )); + const OUString& sValue (xAttrList->getValueByIndex( nIndex )); OUString aLocalName; sal_uInt16 nPrefix = GetScImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName ); diff --git a/sc/source/filter/xml/XMLDetectiveContext.hxx b/sc/source/filter/xml/XMLDetectiveContext.hxx index cf941ac161c4..9925a1362429 100644 --- a/sc/source/filter/xml/XMLDetectiveContext.hxx +++ b/sc/source/filter/xml/XMLDetectiveContext.hxx @@ -89,14 +89,14 @@ public: ScXMLDetectiveContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, ScMyImpDetectiveObjVec* pNewDetectiveObjVec ); virtual ~ScXMLDetectiveContext(); 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 ); virtual void EndElement(); @@ -119,7 +119,7 @@ public: ScXMLDetectiveHighlightedContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList, ScMyImpDetectiveObjVec* pNewDetectiveObjVec ); @@ -127,7 +127,7 @@ public: 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 ); virtual void EndElement(); @@ -149,14 +149,14 @@ public: ScXMLDetectiveOperationContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ); virtual ~ScXMLDetectiveOperationContext(); 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 ); virtual void EndElement(); diff --git a/sc/source/filter/xml/XMLEmptyContext.cxx b/sc/source/filter/xml/XMLEmptyContext.cxx index ff58de3e3962..9bbd5ee97ff4 100644 --- a/sc/source/filter/xml/XMLEmptyContext.cxx +++ b/sc/source/filter/xml/XMLEmptyContext.cxx @@ -24,7 +24,7 @@ ScXMLEmptyContext::ScXMLEmptyContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName) : + const OUString& rLName) : SvXMLImportContext( rImport, nPrfx, rLName ) { } @@ -34,7 +34,7 @@ ScXMLEmptyContext::~ScXMLEmptyContext() } SvXMLImportContext *ScXMLEmptyContext::CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& /* xAttrList */ ) { diff --git a/sc/source/filter/xml/XMLEmptyContext.hxx b/sc/source/filter/xml/XMLEmptyContext.hxx index e050a4f14d44..71092a2492ba 100644 --- a/sc/source/filter/xml/XMLEmptyContext.hxx +++ b/sc/source/filter/xml/XMLEmptyContext.hxx @@ -25,7 +25,7 @@ class ScXMLImport; class ScXMLEmptyContext : public SvXMLImportContext { - rtl::OUString sPrintRanges; + OUString sPrintRanges; const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); } ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } @@ -33,12 +33,12 @@ class ScXMLEmptyContext : public SvXMLImportContext public: ScXMLEmptyContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName); + const OUString& rLName); virtual ~ScXMLEmptyContext(); 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 ); diff --git a/sc/source/filter/xml/XMLExportDDELinks.cxx b/sc/source/filter/xml/XMLExportDDELinks.cxx index 2ac6f554d765..1b1626dc95c8 100644 --- a/sc/source/filter/xml/XMLExportDDELinks.cxx +++ b/sc/source/filter/xml/XMLExportDDELinks.cxx @@ -32,7 +32,6 @@ class ScMatrix; using namespace com::sun::star; using namespace xmloff::token; -using ::rtl::OUStringBuffer; ScXMLExportDDELinks::ScXMLExportDDELinks(ScXMLExport& rTempExport) : rExport(rTempExport) @@ -123,7 +122,7 @@ void ScXMLExportDDELinks::WriteDDELinks(uno::Reference<sheet::XSpreadsheetDocume uno::Reference <beans::XPropertySet> xPropertySet (xSpreadDoc, uno::UNO_QUERY); if (xPropertySet.is()) { - uno::Reference<container::XIndexAccess> xIndex(xPropertySet->getPropertyValue(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_DDELINKS))), uno::UNO_QUERY); + uno::Reference<container::XIndexAccess> xIndex(xPropertySet->getPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_DDELINKS))), uno::UNO_QUERY); if (xIndex.is()) { sal_Int32 nCount = xIndex->getCount(); diff --git a/sc/source/filter/xml/XMLExportDataPilot.cxx b/sc/source/filter/xml/XMLExportDataPilot.cxx index a89a4827314d..7d7030af8c9f 100644 --- a/sc/source/filter/xml/XMLExportDataPilot.cxx +++ b/sc/source/filter/xml/XMLExportDataPilot.cxx @@ -54,7 +54,6 @@ using namespace com::sun::star; using namespace xmloff::token; -using ::rtl::OUString; ScXMLExportDataPilot::ScXMLExportDataPilot(ScXMLExport& rTempExport) : rExport(rTempExport), @@ -66,7 +65,7 @@ ScXMLExportDataPilot::~ScXMLExportDataPilot() { } -rtl::OUString ScXMLExportDataPilot::getDPOperatorXML( +OUString ScXMLExportDataPilot::getDPOperatorXML( const ScQueryOp aFilterOperator, const bool bUseRegularExpressions) const { switch (aFilterOperator) @@ -76,27 +75,27 @@ rtl::OUString ScXMLExportDataPilot::getDPOperatorXML( if (bUseRegularExpressions) return GetXMLToken(XML_MATCH); else - return rtl::OUString("="); + return OUString("="); } case SC_NOT_EQUAL : { if (bUseRegularExpressions) return GetXMLToken(XML_NOMATCH); else - return rtl::OUString("!="); + return OUString("!="); } case SC_BOTPERC : return GetXMLToken(XML_BOTTOM_PERCENT); case SC_BOTVAL : return GetXMLToken(XML_BOTTOM_VALUES); case SC_GREATER : - return rtl::OUString(">"); + return OUString(">"); case SC_GREATER_EQUAL : - return rtl::OUString(">="); + return OUString(">="); case SC_LESS : - return rtl::OUString("<"); + return OUString("<"); case SC_LESS_EQUAL : - return rtl::OUString("<="); + return OUString("<="); case SC_TOPPERC : return GetXMLToken(XML_TOP_PERCENT); case SC_TOPVAL : @@ -104,16 +103,16 @@ rtl::OUString ScXMLExportDataPilot::getDPOperatorXML( default: OSL_FAIL("This FilterOperator is not supported."); } - return rtl::OUString("="); + return OUString("="); } void ScXMLExportDataPilot::WriteDPCondition(const ScQueryEntry& aQueryEntry, bool bIsCaseSensitive, bool bUseRegularExpressions) { - rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_FIELD_NUMBER, rtl::OUString::valueOf(sal_Int32(aQueryEntry.nField))); + rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_FIELD_NUMBER, OUString::valueOf(sal_Int32(aQueryEntry.nField))); if (bIsCaseSensitive) rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_CASE_SENSITIVE, XML_TRUE); const ScQueryEntry::Item& rItem = aQueryEntry.GetQueryItem(); - const rtl::OUString& rQueryStr = rItem.maString; + const OUString& rQueryStr = rItem.maString; if (rItem.meType == ScQueryEntry::ByString) { rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_VALUE, rQueryStr); @@ -177,7 +176,7 @@ void ScXMLExportDataPilot::WriteDPFilter(const ScQueryParam& aQueryParam) { ScRange aConditionRange(aQueryParam.nCol1, aQueryParam.nRow1, aQueryParam.nTab, aQueryParam.nCol2, aQueryParam.nRow2, aQueryParam.nTab); - rtl::OUString sConditionRange; + OUString sConditionRange; ScRangeStringConverter::GetStringFromRange( sConditionRange, aConditionRange, pDoc, ::formula::FormulaGrammar::CONV_OOO ); rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_CONDITION_SOURCE_RANGE_ADDRESS, sConditionRange); } @@ -211,7 +210,7 @@ void ScXMLExportDataPilot::WriteDPFilter(const ScQueryParam& aQueryParam) ScQueryEntry aPrevFilterField(aQueryParam.GetEntry(0)); ScQueryConnect aConnection = aQueryParam.GetEntry(1).eConnect; bool bOpenAndElement; - rtl::OUString aName(rExport.GetNamespaceMap().GetQNameByKey(XML_NAMESPACE_TABLE, GetXMLToken(XML_FILTER_AND))); + OUString aName(rExport.GetNamespaceMap().GetQNameByKey(XML_NAMESPACE_TABLE, GetXMLToken(XML_FILTER_AND))); if (aConnection == SC_AND) { rExport.StartElement( aName, true ); @@ -270,7 +269,7 @@ void ScXMLExportDataPilot::WriteFieldReference(ScDPSaveDimension* pDim) const sheet::DataPilotFieldReference* pRef = pDim->GetReferenceValue(); if (pRef) { - rtl::OUString sValueStr; + OUString sValueStr; switch (pRef->ReferenceType) { case sheet::DataPilotFieldReferenceType::NONE : @@ -314,7 +313,7 @@ void ScXMLExportDataPilot::WriteFieldReference(ScDPSaveDimension* pDim) } else { - sValueStr = rtl::OUString(); + sValueStr = OUString(); switch(pRef->ReferenceItemType) { case sheet::DataPilotFieldReferenceItemType::PREVIOUS : @@ -342,7 +341,7 @@ void ScXMLExportDataPilot::WriteSortInfo(ScDPSaveDimension* pDim) else rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_ORDER, XML_DESCENDING); - rtl::OUString sValueStr; + OUString sValueStr; switch (pSortInfo->Mode) { case sheet::DataPilotFieldSortMode::NONE: @@ -376,7 +375,7 @@ void ScXMLExportDataPilot::WriteAutoShowInfo(ScDPSaveDimension* pDim) else rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_ENABLED, XML_FALSE); - rtl::OUString sValueStr; + OUString sValueStr; switch (pAutoInfo->ShowItemsMode) { case sheet::DataPilotFieldShowItemsMode::FROM_TOP: @@ -389,7 +388,7 @@ void ScXMLExportDataPilot::WriteAutoShowInfo(ScDPSaveDimension* pDim) if (!sValueStr.isEmpty()) rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_DISPLAY_MEMBER_MODE, sValueStr); - rtl::OUStringBuffer sBuffer; + OUStringBuffer sBuffer; ::sax::Converter::convertNumber(sBuffer, pAutoInfo->ItemCount); rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_MEMBER_COUNT, sBuffer.makeStringAndClear()); @@ -409,7 +408,7 @@ void ScXMLExportDataPilot::WriteLayoutInfo(ScDPSaveDimension* pDim) else rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_ADD_EMPTY_LINES, XML_FALSE); - rtl::OUString sValueStr; + OUString sValueStr; switch (pLayoutInfo->LayoutMode) { case sheet::DataPilotFieldLayoutMode::TABULAR_LAYOUT: @@ -444,7 +443,7 @@ void ScXMLExportDataPilot::WriteSubTotals(ScDPSaveDimension* pDim) rExport.CheckAttrList(); for (sal_Int32 nSubTotal = 0; nSubTotal < nSubTotalCount; nSubTotal++) { - rtl::OUString sFunction; + OUString sFunction; GeneralFunction nFunc = static_cast<GeneralFunction>(pDim->GetSubTotalFunc(nSubTotal)); ScXMLConverter::GetStringFromFunction( sFunction, nFunc); rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_FUNCTION, sFunction); @@ -464,7 +463,7 @@ void ScXMLExportDataPilot::WriteMembers(ScDPSaveDimension* pDim) rExport.CheckAttrList(); for (ScDPSaveDimension::MemberList::const_iterator i=rMembers.begin(); i != rMembers.end() ; ++i) { - rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_NAME, rtl::OUString((*i)->GetName())); + rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_NAME, OUString((*i)->GetName())); if (rExport.getDefaultVersion() > SvtSaveOptions::ODFVER_012) { @@ -474,7 +473,7 @@ void ScXMLExportDataPilot::WriteMembers(ScDPSaveDimension* pDim) rExport.AddAttribute(XML_NAMESPACE_TABLE_EXT, XML_DISPLAY_NAME, *pLayoutName); } - rtl::OUStringBuffer sBuffer; + OUStringBuffer sBuffer; ::sax::Converter::convertBool(sBuffer, (*i)->GetIsVisible()); rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_DISPLAY, sBuffer.makeStringAndClear()); ::sax::Converter::convertBool(sBuffer, (*i)->GetShowDetails()); @@ -490,7 +489,7 @@ void ScXMLExportDataPilot::WriteLevels(ScDPSaveDimension* pDim) // #i114202# GetShowEmpty is only valid if HasShowEmpty is true. if (pDim->HasShowEmpty()) { - rtl::OUStringBuffer sBuffer; + OUStringBuffer sBuffer; ::sax::Converter::convertBool(sBuffer, pDim->GetShowEmpty()); rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_SHOW_EMPTY, sBuffer.makeStringAndClear()); } @@ -555,7 +554,7 @@ void ScXMLExportDataPilot::WriteNumGroupInfo(const ScDPNumGroupInfo& rGroupInfo) rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_DATE_START, XML_AUTO); else { - rtl::OUStringBuffer sDate; + OUStringBuffer sDate; rExport.GetMM100UnitConverter().convertDateTime(sDate, rGroupInfo.mfStart); rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_DATE_START, sDate.makeStringAndClear()); } @@ -563,7 +562,7 @@ void ScXMLExportDataPilot::WriteNumGroupInfo(const ScDPNumGroupInfo& rGroupInfo) rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_DATE_END, XML_AUTO); else { - rtl::OUStringBuffer sDate; + OUStringBuffer sDate; rExport.GetMM100UnitConverter().convertDateTime(sDate, rGroupInfo.mfEnd); rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_DATE_END, sDate.makeStringAndClear()); } @@ -574,7 +573,7 @@ void ScXMLExportDataPilot::WriteNumGroupInfo(const ScDPNumGroupInfo& rGroupInfo) rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_START, XML_AUTO); else { - rtl::OUString sValue( ::rtl::math::doubleToUString( rGroupInfo.mfStart, + OUString sValue( ::rtl::math::doubleToUString( rGroupInfo.mfStart, rtl_math_StringFormat_Automatic, rtl_math_DecimalPlaces_Max, '.', true)); rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_START, sValue); @@ -583,13 +582,13 @@ void ScXMLExportDataPilot::WriteNumGroupInfo(const ScDPNumGroupInfo& rGroupInfo) rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_END, XML_AUTO); else { - rtl::OUString sValue( ::rtl::math::doubleToUString( rGroupInfo.mfEnd, + OUString sValue( ::rtl::math::doubleToUString( rGroupInfo.mfEnd, rtl_math_StringFormat_Automatic, rtl_math_DecimalPlaces_Max, '.', true)); rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_END, sValue); } } - rtl::OUString sValue( ::rtl::math::doubleToUString( rGroupInfo.mfStep, + OUString sValue( ::rtl::math::doubleToUString( rGroupInfo.mfStep, rtl_math_StringFormat_Automatic, rtl_math_DecimalPlaces_Max, '.', true)); rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_STEP, sValue); @@ -658,7 +657,7 @@ void ScXMLExportDataPilot::WriteGroupDimElements(ScDPSaveDimension* pDim, const sal_Int32 nElemCount = pGroup->GetElementCount(); for(sal_Int32 j = 0; j < nElemCount; ++j) { - const rtl::OUString* pElem = pGroup->GetElementByIndex(j); + const OUString* pElem = pGroup->GetElementByIndex(j); if (pElem) { rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_NAME, *pElem); @@ -686,14 +685,14 @@ void ScXMLExportDataPilot::WriteDimension(ScDPSaveDimension* pDim, const ScDPDim if (pDim->IsDataLayout()) rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_IS_DATA_LAYOUT_FIELD, XML_TRUE); - rtl::OUString sValueStr; + OUString sValueStr; ScXMLConverter::GetStringFromOrientation( sValueStr, (sheet::DataPilotFieldOrientation) pDim->GetOrientation() ); if( !sValueStr.isEmpty() ) rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_ORIENTATION, sValueStr ); if (pDim->GetUsedHierarchy() != 1) { - rtl::OUStringBuffer sBuffer; + OUStringBuffer sBuffer; ::sax::Converter::convertNumber(sBuffer, pDim->GetUsedHierarchy()); rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_USED_HIERARCHY, sBuffer.makeStringAndClear()); } @@ -749,14 +748,14 @@ void ScXMLExportDataPilot::WriteDataPilots(const uno::Reference <sheet::XSpreads continue; ScRange aOutRange((*pDPs)[i]->GetOutRange()); - rtl::OUString sTargetRangeAddress; + OUString sTargetRangeAddress; ScRangeStringConverter::GetStringFromRange( sTargetRangeAddress, aOutRange, pDoc, ::formula::FormulaGrammar::CONV_OOO ); ScDocAttrIterator aAttrItr(pDoc, aOutRange.aStart.Tab(), aOutRange.aStart.Col(), aOutRange.aStart.Row(), aOutRange.aEnd.Col(), aOutRange.aEnd.Row()); SCCOL nCol; SCROW nRow1, nRow2; - rtl::OUString sOUButtonList; + OUString sOUButtonList; const ScPatternAttr* pAttr = aAttrItr.GetNext(nCol, nRow1, nRow2); while (pAttr) { @@ -772,8 +771,8 @@ void ScXMLExportDataPilot::WriteDataPilots(const uno::Reference <sheet::XSpreads } pAttr = aAttrItr.GetNext(nCol, nRow1, nRow2); } - rtl::OUString sName((*pDPs)[i]->GetName()); - rtl::OUString sApplicationData((*pDPs)[i]->GetTag()); + OUString sName((*pDPs)[i]->GetName()); + OUString sApplicationData((*pDPs)[i]->GetTag()); bool bRowGrand = pDPSave->GetRowGrand(); bool bColumnGrand = pDPSave->GetColumnGrand(); rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_NAME, sName); @@ -883,7 +882,7 @@ void ScXMLExportDataPilot::WriteDataPilots(const uno::Reference <sheet::XSpreads rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_OBJECT_NAME, pServSource->aParName); rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_USER_NAME, pServSource->aParUser); // #i111754# leave out password attribute as long as DataPilotSource doesn't specify the content - // rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_PASSWORD, rtl::OUString(pServSource->aParPass)); + // rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_PASSWORD, OUString(pServSource->aParPass)); SvXMLElementExport aElemSD(rExport, XML_NAMESPACE_TABLE, XML_SOURCE_SERVICE, true, true); rExport.CheckAttrList(); } diff --git a/sc/source/filter/xml/XMLExportDataPilot.hxx b/sc/source/filter/xml/XMLExportDataPilot.hxx index fff2587c126b..6e2acf40b53b 100644 --- a/sc/source/filter/xml/XMLExportDataPilot.hxx +++ b/sc/source/filter/xml/XMLExportDataPilot.hxx @@ -41,7 +41,7 @@ class ScXMLExportDataPilot ScXMLExport& rExport; ScDocument* pDoc; - rtl::OUString getDPOperatorXML(const ScQueryOp aFilterOperator, const bool bUseRegularExpressions) const; + OUString getDPOperatorXML(const ScQueryOp aFilterOperator, const bool bUseRegularExpressions) const; void WriteDPCondition(const ScQueryEntry& aQueryEntry, bool bIsCaseSensitive, bool bUseRegularExpressions); void WriteDPFilter(const ScQueryParam& aQueryParam); @@ -60,7 +60,7 @@ class ScXMLExportDataPilot void WriteDimension(ScDPSaveDimension* pDim, const ScDPDimensionSaveData* pDimData); void WriteDimensions(ScDPSaveData* pDPSave); - void WriteGrandTotal(::xmloff::token::XMLTokenEnum eOrient, bool bVisible, const ::rtl::OUString* pGrandTotal); + void WriteGrandTotal(::xmloff::token::XMLTokenEnum eOrient, bool bVisible, const OUString* pGrandTotal); public: ScXMLExportDataPilot(ScXMLExport& rExport); diff --git a/sc/source/filter/xml/XMLExportDatabaseRanges.cxx b/sc/source/filter/xml/XMLExportDatabaseRanges.cxx index dade8e0d2144..f83488a8a996 100644 --- a/sc/source/filter/xml/XMLExportDatabaseRanges.cxx +++ b/sc/source/filter/xml/XMLExportDatabaseRanges.cxx @@ -54,8 +54,6 @@ using namespace com::sun::star; using namespace xmloff::token; -using ::rtl::OUString; -using ::rtl::OUStringBuffer; ScXMLExportDatabaseRanges::ScXMLExportDatabaseRanges(ScXMLExport& rTempExport) : rExport(rTempExport), @@ -75,21 +73,21 @@ ScMyEmptyDatabaseRangesContainer ScXMLExportDatabaseRanges::GetEmptyDatabaseRang uno::Reference <beans::XPropertySet> xPropertySet (rExport.GetModel(), uno::UNO_QUERY); if (xPropertySet.is()) { - uno::Reference <sheet::XDatabaseRanges> xDatabaseRanges(xPropertySet->getPropertyValue(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_DATABASERNG))), uno::UNO_QUERY); + uno::Reference <sheet::XDatabaseRanges> xDatabaseRanges(xPropertySet->getPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_DATABASERNG))), uno::UNO_QUERY); rExport.CheckAttrList(); if (xDatabaseRanges.is()) { - uno::Sequence <rtl::OUString> aRanges(xDatabaseRanges->getElementNames()); + uno::Sequence <OUString> aRanges(xDatabaseRanges->getElementNames()); sal_Int32 nDatabaseRangesCount = aRanges.getLength(); for (sal_Int32 i = 0; i < nDatabaseRangesCount; ++i) { - rtl::OUString sDatabaseRangeName(aRanges[i]); + OUString sDatabaseRangeName(aRanges[i]); uno::Reference <sheet::XDatabaseRange> xDatabaseRange(xDatabaseRanges->getByName(sDatabaseRangeName), uno::UNO_QUERY); if (xDatabaseRange.is()) { uno::Reference <beans::XPropertySet> xDatabaseRangePropertySet (xDatabaseRange, uno::UNO_QUERY); if (xDatabaseRangePropertySet.is() && - ::cppu::any2bool(xDatabaseRangePropertySet->getPropertyValue(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNONAME_STRIPDAT))))) + ::cppu::any2bool(xDatabaseRangePropertySet->getPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNONAME_STRIPDAT))))) { uno::Sequence <beans::PropertyValue> aImportProperties(xDatabaseRange->getImportDescriptor()); sal_Int32 nLength = aImportProperties.getLength(); @@ -400,13 +398,13 @@ private: return OUString("="); } case SC_GREATER: - return rtl::OUString(">"); + return OUString(">"); case SC_GREATER_EQUAL: - return rtl::OUString(">="); + return OUString(">="); case SC_LESS: - return rtl::OUString("<"); + return OUString("<"); case SC_LESS_EQUAL: - return rtl::OUString("<="); + return OUString("<="); case SC_NOT_EQUAL: if (bRegExp) return GetXMLToken(XML_NOMATCH); @@ -658,7 +656,7 @@ private: break; sal_Int32 nFieldCol = static_cast<sal_Int32>(aParam.nField[i]); - mrExport.AddAttribute(XML_NAMESPACE_TABLE, XML_GROUP_BY_FIELD_NUMBER, rtl::OUString::valueOf(nFieldCol)); + mrExport.AddAttribute(XML_NAMESPACE_TABLE, XML_GROUP_BY_FIELD_NUMBER, OUString::valueOf(nFieldCol)); SvXMLElementExport aElemSTR(mrExport, XML_NAMESPACE_TABLE, XML_SUBTOTAL_RULE, true, true); for (SCCOL j = 0, n = aParam.nSubTotals[i]; j < n; ++j) diff --git a/sc/source/filter/xml/XMLExportIterator.cxx b/sc/source/filter/xml/XMLExportIterator.cxx index 4a593fff5fe5..c5a7451388a2 100644 --- a/sc/source/filter/xml/XMLExportIterator.cxx +++ b/sc/source/filter/xml/XMLExportIterator.cxx @@ -33,7 +33,6 @@ #include <algorithm> -using ::rtl::OUString; using namespace ::com::sun::star; //============================================================================== diff --git a/sc/source/filter/xml/XMLExportIterator.hxx b/sc/source/filter/xml/XMLExportIterator.hxx index 3d13403b7835..4a18f68be675 100644 --- a/sc/source/filter/xml/XMLExportIterator.hxx +++ b/sc/source/filter/xml/XMLExportIterator.hxx @@ -154,10 +154,10 @@ public: struct ScMyAreaLink { - ::rtl::OUString sFilter; - ::rtl::OUString sFilterOptions; - ::rtl::OUString sURL; - ::rtl::OUString sSourceStr; + OUString sFilter; + OUString sFilterOptions; + OUString sURL; + OUString sSourceStr; ::com::sun::star::table::CellRangeAddress aDestRange; sal_Int32 nRefresh; @@ -297,8 +297,8 @@ struct ScMyCell com::sun::star::table::CellRangeAddress aMergeRange; com::sun::star::table::CellRangeAddress aMatrixRange; - rtl::OUString sStringValue; - rtl::OUString sAnnotationText; + OUString sStringValue; + OUString sAnnotationText; ScMyAreaLink aAreaLink; ScMyShapeList aShapeList; diff --git a/sc/source/filter/xml/XMLStylesExportHelper.cxx b/sc/source/filter/xml/XMLStylesExportHelper.cxx index c8a1e084a80f..4f7a9375b965 100644 --- a/sc/source/filter/xml/XMLStylesExportHelper.cxx +++ b/sc/source/filter/xml/XMLStylesExportHelper.cxx @@ -113,13 +113,13 @@ bool ScMyValidationsContainer::AddValidation(const uno::Any& aTempAny, uno::Reference<beans::XPropertySet> xPropertySet(aTempAny, uno::UNO_QUERY); if (xPropertySet.is()) { - rtl::OUString sErrorMessage; + OUString sErrorMessage; xPropertySet->getPropertyValue(sERRMESS) >>= sErrorMessage; - rtl::OUString sErrorTitle; + OUString sErrorTitle; xPropertySet->getPropertyValue(sERRTITLE) >>= sErrorTitle; - rtl::OUString sImputMessage; + OUString sImputMessage; xPropertySet->getPropertyValue(sINPMESS) >>= sImputMessage; - rtl::OUString sImputTitle; + OUString sImputTitle; xPropertySet->getPropertyValue(sINPTITLE) >>= sImputTitle; bool bShowErrorMessage = ::cppu::any2bool(xPropertySet->getPropertyValue(sSHOWERR)); bool bShowImputMessage = ::cppu::any2bool(xPropertySet->getPropertyValue(sSHOWINP)); @@ -162,8 +162,8 @@ bool ScMyValidationsContainer::AddValidation(const uno::Any& aTempAny, else { sal_Int32 nNameIndex(nCount + 1); - rtl::OUString sCount(rtl::OUString::valueOf(nNameIndex)); - rtl::OUString sPrefix("val"); + OUString sCount(OUString::valueOf(nNameIndex)); + OUString sPrefix("val"); aValidation.sName += sPrefix; aValidation.sName += sCount; aValidationVec.push_back(aValidation); @@ -175,39 +175,39 @@ bool ScMyValidationsContainer::AddValidation(const uno::Any& aTempAny, return bAdded; } -rtl::OUString ScMyValidationsContainer::GetCondition(ScXMLExport& rExport, const ScMyValidation& aValidation) +OUString ScMyValidationsContainer::GetCondition(ScXMLExport& rExport, const ScMyValidation& aValidation) { /* ATTENTION! Should the condition to not write sheet::ValidationType_ANY * ever be changed, adapt the conditional call of * MarkUsedExternalReferences() in * ScTableValidationObj::ScTableValidationObj() accordingly! */ - rtl::OUString sCondition; + OUString sCondition; if (aValidation.aValidationType != sheet::ValidationType_ANY) { switch (aValidation.aValidationType) { //case sheet::ValidationType_CUSTOM case sheet::ValidationType_DATE : - sCondition += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("cell-content-is-date()")); + sCondition += OUString(RTL_CONSTASCII_USTRINGPARAM("cell-content-is-date()")); break; case sheet::ValidationType_DECIMAL : - sCondition += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("cell-content-is-decimal-number()")); + sCondition += OUString(RTL_CONSTASCII_USTRINGPARAM("cell-content-is-decimal-number()")); break; case sheet::ValidationType_LIST : - sCondition += rtl::OUString("cell-content-is-in-list("); + sCondition += OUString("cell-content-is-in-list("); sCondition += aValidation.sFormula1; - sCondition += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(")")); + sCondition += OUString(RTL_CONSTASCII_USTRINGPARAM(")")); break; case sheet::ValidationType_TEXT_LEN : if (aValidation.aOperator != sheet::ConditionOperator_BETWEEN && aValidation.aOperator != sheet::ConditionOperator_NOT_BETWEEN) - sCondition += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("cell-content-text-length()")); + sCondition += OUString(RTL_CONSTASCII_USTRINGPARAM("cell-content-text-length()")); break; case sheet::ValidationType_TIME : - sCondition += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("cell-content-is-time()")); + sCondition += OUString(RTL_CONSTASCII_USTRINGPARAM("cell-content-is-time()")); break; case sheet::ValidationType_WHOLE : - sCondition += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("cell-content-is-whole-number()")); + sCondition += OUString(RTL_CONSTASCII_USTRINGPARAM("cell-content-is-whole-number()")); break; default: { @@ -221,31 +221,31 @@ rtl::OUString ScMyValidationsContainer::GetCondition(ScXMLExport& rExport, const !aValidation.sFormula2.isEmpty()))) { if (aValidation.aValidationType != sheet::ValidationType_TEXT_LEN) - sCondition += rtl::OUString(" and "); + sCondition += OUString(" and "); if (aValidation.aOperator != sheet::ConditionOperator_BETWEEN && aValidation.aOperator != sheet::ConditionOperator_NOT_BETWEEN) { if (aValidation.aValidationType != sheet::ValidationType_TEXT_LEN) - sCondition += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("cell-content()")); + sCondition += OUString(RTL_CONSTASCII_USTRINGPARAM("cell-content()")); switch (aValidation.aOperator) { case sheet::ConditionOperator_EQUAL : - sCondition += rtl::OUString("="); + sCondition += OUString("="); break; case sheet::ConditionOperator_GREATER : - sCondition += rtl::OUString(">"); + sCondition += OUString(">"); break; case sheet::ConditionOperator_GREATER_EQUAL : - sCondition += rtl::OUString(">="); + sCondition += OUString(">="); break; case sheet::ConditionOperator_LESS : - sCondition += rtl::OUString("<"); + sCondition += OUString("<"); break; case sheet::ConditionOperator_LESS_EQUAL : - sCondition += rtl::OUString("<="); + sCondition += OUString("<="); break; case sheet::ConditionOperator_NOT_EQUAL : - sCondition += rtl::OUString("!="); + sCondition += OUString("!="); break; default: { @@ -259,26 +259,26 @@ rtl::OUString ScMyValidationsContainer::GetCondition(ScXMLExport& rExport, const if (aValidation.aValidationType == sheet::ValidationType_TEXT_LEN) { if (aValidation.aOperator == sheet::ConditionOperator_BETWEEN) - sCondition += rtl::OUString("cell-content-text-length-is-between("); + sCondition += OUString("cell-content-text-length-is-between("); else - sCondition += rtl::OUString("cell-content-text-length-is-not-between("); + sCondition += OUString("cell-content-text-length-is-not-between("); } else { if (aValidation.aOperator == sheet::ConditionOperator_BETWEEN) - sCondition += rtl::OUString("cell-content-is-between("); + sCondition += OUString("cell-content-is-between("); else - sCondition += rtl::OUString("cell-content-is-not-between("); + sCondition += OUString("cell-content-is-not-between("); } sCondition += aValidation.sFormula1; - sCondition += rtl::OUString(","); + sCondition += OUString(","); sCondition += aValidation.sFormula2; - sCondition += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(")")); + sCondition += OUString(RTL_CONSTASCII_USTRINGPARAM(")")); } } else if (aValidation.aValidationType == sheet::ValidationType_TEXT_LEN) - sCondition = rtl::OUString(); + sCondition = OUString(); } if (!sCondition.isEmpty()) { @@ -290,15 +290,15 @@ rtl::OUString ScMyValidationsContainer::GetCondition(ScXMLExport& rExport, const return sCondition; } -rtl::OUString ScMyValidationsContainer::GetBaseCellAddress(ScDocument* pDoc, const table::CellAddress& aCell) +OUString ScMyValidationsContainer::GetBaseCellAddress(ScDocument* pDoc, const table::CellAddress& aCell) { - rtl::OUString sAddress; + OUString sAddress; ScRangeStringConverter::GetStringFromAddress( sAddress, aCell, pDoc, ::formula::FormulaGrammar::CONV_OOO ); return sAddress; } void ScMyValidationsContainer::WriteMessage(ScXMLExport& rExport, - const rtl::OUString& sTitle, const rtl::OUString& sOUMessage, + const OUString& sTitle, const OUString& sOUMessage, const bool bShowMessage, const bool bIsHelpMessage) { if (!sTitle.isEmpty()) @@ -315,8 +315,8 @@ void ScMyValidationsContainer::WriteMessage(ScXMLExport& rExport, if (!sOUMessage.isEmpty()) { sal_Int32 i(0); - rtl::OUStringBuffer sTemp; - rtl::OUString sText(convertLineEnd(sOUMessage, LINEEND_LF)); + OUStringBuffer sTemp; + OUString sText(convertLineEnd(sOUMessage, LINEEND_LF)); bool bPrevCharWasSpace(true); while(i < sText.getLength()) { @@ -349,7 +349,7 @@ void ScMyValidationsContainer::WriteValidations(ScXMLExport& rExport) while (aItr != aEndItr) { rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_NAME, aItr->sName); - rtl::OUString sCondition(GetCondition(rExport, *aItr)); + OUString sCondition(GetCondition(rExport, *aItr)); if (!sCondition.isEmpty()) { rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_CONDITION, sCondition); @@ -444,7 +444,7 @@ void ScMyValidationsContainer::WriteValidations(ScXMLExport& rExport) } } -const rtl::OUString& ScMyValidationsContainer::GetValidationName(const sal_Int32 nIndex) +const OUString& ScMyValidationsContainer::GetValidationName(const sal_Int32 nIndex) { OSL_ENSURE( static_cast<size_t>(nIndex) < aValidationVec.size(), "out of range" ); return aValidationVec[nIndex].sName; @@ -862,7 +862,7 @@ void ScFormatRangeStyles::AddNewTable(const sal_Int32 nTable) } } -bool ScFormatRangeStyles::AddStyleName(rtl::OUString* rpString, sal_Int32& rIndex, const bool bIsAutoStyle) +bool ScFormatRangeStyles::AddStyleName(OUString* rpString, sal_Int32& rIndex, const bool bIsAutoStyle) { if (bIsAutoStyle) { @@ -896,10 +896,10 @@ bool ScFormatRangeStyles::AddStyleName(rtl::OUString* rpString, sal_Int32& rInde } } -sal_Int32 ScFormatRangeStyles::GetIndexOfStyleName(const rtl::OUString& rString, const rtl::OUString& rPrefix, bool& bIsAutoStyle) +sal_Int32 ScFormatRangeStyles::GetIndexOfStyleName(const OUString& rString, const OUString& rPrefix, bool& bIsAutoStyle) { sal_Int32 nPrefixLength(rPrefix.getLength()); - rtl::OUString sTemp(rString.copy(nPrefixLength)); + OUString sTemp(rString.copy(nPrefixLength)); sal_Int32 nIndex(sTemp.toInt32()); if (nIndex > 0 && static_cast<size_t>(nIndex-1) < aAutoStyleNames.size() && aAutoStyleNames.at(nIndex - 1)->equals(rString)) { @@ -1101,7 +1101,7 @@ void ScFormatRangeStyles::AddRangeStyleName(const table::CellRangeAddress aCellR pFormatRanges->push_back(aFormatRange); } -rtl::OUString* ScFormatRangeStyles::GetStyleNameByIndex(const sal_Int32 nIndex, const bool bIsAutoStyle) +OUString* ScFormatRangeStyles::GetStyleNameByIndex(const sal_Int32 nIndex, const bool bIsAutoStyle) { if (bIsAutoStyle) return aAutoStyleNames[nIndex]; @@ -1135,16 +1135,16 @@ ScColumnRowStylesBase::~ScColumnRowStylesBase() } } -sal_Int32 ScColumnRowStylesBase::AddStyleName(rtl::OUString* pString) +sal_Int32 ScColumnRowStylesBase::AddStyleName(OUString* pString) { aStyleNames.push_back(pString); return aStyleNames.size() - 1; } -sal_Int32 ScColumnRowStylesBase::GetIndexOfStyleName(const rtl::OUString& rString, const rtl::OUString& rPrefix) +sal_Int32 ScColumnRowStylesBase::GetIndexOfStyleName(const OUString& rString, const OUString& rPrefix) { sal_Int32 nPrefixLength(rPrefix.getLength()); - rtl::OUString sTemp(rString.copy(nPrefixLength)); + OUString sTemp(rString.copy(nPrefixLength)); sal_Int32 nIndex(sTemp.toInt32()); if (nIndex > 0 && static_cast<size_t>(nIndex-1) < aStyleNames.size() && aStyleNames.at(nIndex - 1)->equals(rString)) return nIndex - 1; @@ -1166,7 +1166,7 @@ sal_Int32 ScColumnRowStylesBase::GetIndexOfStyleName(const rtl::OUString& rStrin } } -rtl::OUString* ScColumnRowStylesBase::GetStyleNameByIndex(const sal_Int32 nIndex) +OUString* ScColumnRowStylesBase::GetStyleNameByIndex(const sal_Int32 nIndex) { if ( nIndex < 0 || nIndex >= sal::static_int_cast<sal_Int32>( aStyleNames.size() ) ) { @@ -1230,7 +1230,7 @@ void ScColumnStyles::AddFieldStyleName(const sal_Int32 nTable, const sal_Int32 n aTables[nTable][nField] = aStyle; } -rtl::OUString* ScColumnStyles::GetStyleName(const sal_Int32 nTable, const sal_Int32 nField) +OUString* ScColumnStyles::GetStyleName(const sal_Int32 nTable, const sal_Int32 nField) { bool bTemp; return GetStyleNameByIndex(GetStyleNameIndex(nTable, nField, bTemp)); @@ -1310,7 +1310,7 @@ void ScRowStyles::AddFieldStyleName(const sal_Int32 nTable, const sal_Int32 nSta r.insert_back(nStartField, nEndField+1, nStringIndex); } -rtl::OUString* ScRowStyles::GetStyleName(const sal_Int32 nTable, const sal_Int32 nField) +OUString* ScRowStyles::GetStyleName(const sal_Int32 nTable, const sal_Int32 nField) { return GetStyleNameByIndex(GetStyleNameIndex(nTable, nField)); } diff --git a/sc/source/filter/xml/XMLStylesExportHelper.hxx b/sc/source/filter/xml/XMLStylesExportHelper.hxx index 2159c846d966..1a841a461784 100644 --- a/sc/source/filter/xml/XMLStylesExportHelper.hxx +++ b/sc/source/filter/xml/XMLStylesExportHelper.hxx @@ -37,13 +37,13 @@ class ScXMLExport; struct ScMyValidation { - rtl::OUString sName; - rtl::OUString sErrorMessage; - rtl::OUString sErrorTitle; - rtl::OUString sImputMessage; - rtl::OUString sImputTitle; - rtl::OUString sFormula1; - rtl::OUString sFormula2; + OUString sName; + OUString sErrorMessage; + OUString sErrorTitle; + OUString sImputMessage; + OUString sImputTitle; + OUString sFormula1; + OUString sFormula2; com::sun::star::table::CellAddress aBaseCell; com::sun::star::sheet::ValidationAlertStyle aAlertStyle; com::sun::star::sheet::ValidationType aValidationType; @@ -65,36 +65,36 @@ class ScMyValidationsContainer { private: ScMyValidationVec aValidationVec; - const rtl::OUString sEmptyString; - const rtl::OUString sERRALSTY; - const rtl::OUString sIGNOREBL; - const rtl::OUString sSHOWLIST; - const rtl::OUString sTYPE; - const rtl::OUString sSHOWINP; - const rtl::OUString sSHOWERR; - const rtl::OUString sINPTITLE; - const rtl::OUString sINPMESS; - const rtl::OUString sERRTITLE; - const rtl::OUString sERRMESS; - const rtl::OUString sOnError; - const rtl::OUString sEventType; - const rtl::OUString sStarBasic; - const rtl::OUString sScript; - const rtl::OUString sLibrary; - const rtl::OUString sMacroName; + const OUString sEmptyString; + const OUString sERRALSTY; + const OUString sIGNOREBL; + const OUString sSHOWLIST; + const OUString sTYPE; + const OUString sSHOWINP; + const OUString sSHOWERR; + const OUString sINPTITLE; + const OUString sINPMESS; + const OUString sERRTITLE; + const OUString sERRMESS; + const OUString sOnError; + const OUString sEventType; + const OUString sStarBasic; + const OUString sScript; + const OUString sLibrary; + const OUString sMacroName; public: ScMyValidationsContainer(); ~ScMyValidationsContainer(); bool AddValidation(const com::sun::star::uno::Any& aAny, sal_Int32& nValidationIndex); - rtl::OUString GetCondition(ScXMLExport& rExport, const ScMyValidation& aValidation); - rtl::OUString GetBaseCellAddress(ScDocument* pDoc, const com::sun::star::table::CellAddress& aCell); + OUString GetCondition(ScXMLExport& rExport, const ScMyValidation& aValidation); + OUString GetBaseCellAddress(ScDocument* pDoc, const com::sun::star::table::CellAddress& aCell); void WriteMessage(ScXMLExport& rExport, - const rtl::OUString& sTitle, const rtl::OUString& sMessage, + const OUString& sTitle, const OUString& sMessage, const bool bShowMessage, const bool bIsHelpMessage); void WriteValidations(ScXMLExport& rExport); - const rtl::OUString& GetValidationName(const sal_Int32 nIndex); + const OUString& GetValidationName(const sal_Int32 nIndex); }; //============================================================================== @@ -174,7 +174,7 @@ public: void Sort(); }; -typedef std::vector<rtl::OUString*> ScMyOUStringVec; +typedef std::vector<OUString*> ScMyOUStringVec; struct ScMyFormatRange { @@ -206,8 +206,8 @@ public: void SetRowDefaults(const ScMyDefaultStyleList* pDefaults) { pRowDefaults = pDefaults; } void SetColDefaults(const ScMyDefaultStyleList* pDefaults) { pColDefaults = pDefaults; } void AddNewTable(const sal_Int32 nTable); - bool AddStyleName(rtl::OUString* pString, sal_Int32& rIndex, const bool bIsAutoStyle = true); - sal_Int32 GetIndexOfStyleName(const rtl::OUString& rString, const rtl::OUString& rPrefix, bool& bIsAutoStyle); + bool AddStyleName(OUString* pString, sal_Int32& rIndex, const bool bIsAutoStyle = true); + sal_Int32 GetIndexOfStyleName(const OUString& rString, const OUString& rPrefix, bool& bIsAutoStyle); // does not delete ranges sal_Int32 GetStyleNameIndex(const sal_Int32 nTable, const sal_Int32 nColumn, const sal_Int32 nRow, bool& bIsAutoStyle) const; @@ -218,7 +218,7 @@ public: const sal_Int32 nTable, ScRowFormatRanges* pFormatRanges); void AddRangeStyleName(const com::sun::star::table::CellRangeAddress aCellRangeAddress, const sal_Int32 nStringIndex, const bool bIsAutoStyle, const sal_Int32 nValidationIndex, const sal_Int32 nNumberFormat); - rtl::OUString* GetStyleNameByIndex(const sal_Int32 nIndex, const bool bIsAutoStyle); + OUString* GetStyleNameByIndex(const sal_Int32 nIndex, const bool bIsAutoStyle); void Sort(); }; @@ -231,10 +231,10 @@ public: virtual ~ScColumnRowStylesBase(); virtual void AddNewTable(const sal_Int32 nTable, const sal_Int32 nFields) = 0; - sal_Int32 AddStyleName(rtl::OUString* pString); - sal_Int32 GetIndexOfStyleName(const rtl::OUString& rString, const rtl::OUString& rPrefix); - virtual rtl::OUString* GetStyleName(const sal_Int32 nTable, const sal_Int32 nField) = 0; - rtl::OUString* GetStyleNameByIndex(const sal_Int32 nIndex); + sal_Int32 AddStyleName(OUString* pString); + sal_Int32 GetIndexOfStyleName(const OUString& rString, const OUString& rPrefix); + virtual OUString* GetStyleName(const sal_Int32 nTable, const sal_Int32 nField) = 0; + OUString* GetStyleNameByIndex(const sal_Int32 nIndex); }; struct ScColumnStyle @@ -259,7 +259,7 @@ public: sal_Int32 GetStyleNameIndex(const sal_Int32 nTable, const sal_Int32 nField, bool& bIsVisible); void AddFieldStyleName(const sal_Int32 nTable, const sal_Int32 nField, const sal_Int32 nStringIndex, const bool bIsVisible); - virtual rtl::OUString* GetStyleName(const sal_Int32 nTable, const sal_Int32 nField); + virtual OUString* GetStyleName(const sal_Int32 nTable, const sal_Int32 nField); }; class ScRowStyles : public ScColumnRowStylesBase @@ -286,7 +286,7 @@ public: sal_Int32 GetStyleNameIndex(const sal_Int32 nTable, const sal_Int32 nField); void AddFieldStyleName(const sal_Int32 nTable, const sal_Int32 nField, const sal_Int32 nStringIndex); void AddFieldStyleName(const sal_Int32 nTable, const sal_Int32 nStartField, const sal_Int32 nStringIndex, const sal_Int32 nEndField); - virtual rtl::OUString* GetStyleName(const sal_Int32 nTable, const sal_Int32 nField); + virtual OUString* GetStyleName(const sal_Int32 nTable, const sal_Int32 nField); }; #endif diff --git a/sc/source/filter/xml/XMLStylesImportHelper.cxx b/sc/source/filter/xml/XMLStylesImportHelper.cxx index c725de154671..3b5d5cf76556 100644 --- a/sc/source/filter/xml/XMLStylesImportHelper.cxx +++ b/sc/source/filter/xml/XMLStylesImportHelper.cxx @@ -24,12 +24,12 @@ using namespace com::sun::star; using ::std::list; -void ScMyStyleNumberFormats::AddStyleNumberFormat(const rtl::OUString& rStyleName, const sal_Int32 nNumberFormat) +void ScMyStyleNumberFormats::AddStyleNumberFormat(const OUString& rStyleName, const sal_Int32 nNumberFormat) { aSet.insert(ScMyStyleNumberFormat(rStyleName, nNumberFormat)); } -sal_Int32 ScMyStyleNumberFormats::GetStyleNumberFormat(const rtl::OUString& rStyleName) +sal_Int32 ScMyStyleNumberFormats::GetStyleNumberFormat(const OUString& rStyleName) { ScMyStyleNumberFormat aStyleNumberFormat(rStyleName); ScMyStyleNumberFormatSet::iterator aItr(aSet.find(aStyleNumberFormat)); @@ -110,7 +110,7 @@ void ScMyStyleRanges::AddRange(const ScRange& rRange, const sal_Int16 nType) } } -void ScMyStyleRanges::AddCurrencyRange(const ScRange& rRange, const rtl::OUString* pCurrency) +void ScMyStyleRanges::AddCurrencyRange(const ScRange& rRange, const OUString* pCurrency) { if (!pCurrencyList) pCurrencyList = new ScMyCurrencyStylesSet(); @@ -161,15 +161,15 @@ void ScMyStyleRanges::InsertCol(const sal_Int32 nCol, const sal_Int32 nTab, ScDo } void ScMyStyleRanges::SetStylesToRanges(const list<ScRange>& rRanges, - const rtl::OUString* pStyleName, const sal_Int16 nCellType, - const rtl::OUString* pCurrency, ScXMLImport& rImport) + const OUString* pStyleName, const sal_Int16 nCellType, + const OUString* pCurrency, ScXMLImport& rImport) { list<ScRange>::const_iterator itr = rRanges.begin(), itrEnd = rRanges.end(); for (; itr != itrEnd; ++itr) rImport.SetStyleToRange(*itr, pStyleName, nCellType, pCurrency); } -void ScMyStyleRanges::SetStylesToRanges(const rtl::OUString* pStyleName, ScXMLImport& rImport) +void ScMyStyleRanges::SetStylesToRanges(const OUString* pStyleName, ScXMLImport& rImport) { if (mpNumberList) { @@ -268,7 +268,7 @@ void ScMyStylesImportHelper::ResetAttributes() nCellType = 0; } -ScMyStylesSet::iterator ScMyStylesImportHelper::GetIterator(const rtl::OUString* pStyleNameP) +ScMyStylesSet::iterator ScMyStylesImportHelper::GetIterator(const OUString* pStyleNameP) { ScMyStyle aStyle; if (pStyleNameP) @@ -312,7 +312,7 @@ void ScMyStylesImportHelper::AddDefaultRange(const ScRange& rRange) aRange.aStart.SetCol(nStartCol); aRange.aEnd.SetCol(i - 1); delete pPrevStyleName; - pPrevStyleName = new rtl::OUString(aPrevItr->sStyleName); + pPrevStyleName = new OUString(aPrevItr->sStyleName); AddSingleRange(aRange); nStartCol = i; aPrevItr = aColDefaultStyles[i]; @@ -323,7 +323,7 @@ void ScMyStylesImportHelper::AddDefaultRange(const ScRange& rRange) ScRange aRange(rRange); aRange.aStart.SetCol(nStartCol); delete pPrevStyleName; - pPrevStyleName = new rtl::OUString(aPrevItr->sStyleName); + pPrevStyleName = new OUString(aPrevItr->sStyleName); AddSingleRange(aRange); } else @@ -339,7 +339,7 @@ void ScMyStylesImportHelper::AddDefaultRange(const ScRange& rRange) else { delete pPrevStyleName; - pPrevStyleName = new rtl::OUString(aRowDefaultStyle->sStyleName); + pPrevStyleName = new OUString(aRowDefaultStyle->sStyleName); AddSingleRange(rRange); } } @@ -365,7 +365,7 @@ void ScMyStylesImportHelper::AddRange() ResetAttributes(); } -void ScMyStylesImportHelper::AddColumnStyle(const rtl::OUString& sStyleName, const sal_Int32 nColumn, const sal_Int32 nRepeat) +void ScMyStylesImportHelper::AddColumnStyle(const OUString& sStyleName, const sal_Int32 nColumn, const sal_Int32 nRepeat) { (void)nColumn; // avoid warning in product version OSL_ENSURE(static_cast<sal_uInt32>(nColumn) == aColDefaultStyles.size(), "some columns are absent"); @@ -376,13 +376,13 @@ void ScMyStylesImportHelper::AddColumnStyle(const rtl::OUString& sStyleName, con aColDefaultStyles.push_back(aItr); } -void ScMyStylesImportHelper::SetRowStyle(const rtl::OUString& sStyleName) +void ScMyStylesImportHelper::SetRowStyle(const OUString& sStyleName) { aRowDefaultStyle = GetIterator(&sStyleName); } -void ScMyStylesImportHelper::SetAttributes(rtl::OUString* pStyleNameP, - rtl::OUString* pCurrencyP, const sal_Int16 nCellTypeP) +void ScMyStylesImportHelper::SetAttributes(OUString* pStyleNameP, + OUString* pCurrencyP, const sal_Int16 nCellTypeP) { delete this->pStyleName; delete this->pCurrency; diff --git a/sc/source/filter/xml/XMLStylesImportHelper.hxx b/sc/source/filter/xml/XMLStylesImportHelper.hxx index 29edfcb58754..5b99fea15544 100644 --- a/sc/source/filter/xml/XMLStylesImportHelper.hxx +++ b/sc/source/filter/xml/XMLStylesImportHelper.hxx @@ -33,13 +33,13 @@ class ScXMLImport; struct ScMyStyleNumberFormat { - rtl::OUString sStyleName; + OUString sStyleName; sal_Int32 nNumberFormat; ScMyStyleNumberFormat() : nNumberFormat(-1) {} - ScMyStyleNumberFormat(const rtl::OUString& rStyleName) : + ScMyStyleNumberFormat(const OUString& rStyleName) : sStyleName(rStyleName), nNumberFormat(-1) {} - ScMyStyleNumberFormat(const rtl::OUString& rStyleName, const sal_Int32 nFormat) : + ScMyStyleNumberFormat(const OUString& rStyleName, const sal_Int32 nFormat) : sStyleName(rStyleName), nNumberFormat(nFormat) {} }; @@ -58,13 +58,13 @@ class ScMyStyleNumberFormats ScMyStyleNumberFormatSet aSet; public: - void AddStyleNumberFormat(const rtl::OUString& rStyleName, const sal_Int32 nNumberFormat); - sal_Int32 GetStyleNumberFormat(const rtl::OUString& rStyleName); + void AddStyleNumberFormat(const OUString& rStyleName, const sal_Int32 nNumberFormat); + sal_Int32 GetStyleNumberFormat(const OUString& rStyleName); }; struct ScMyCurrencyStyle { - rtl::OUString sCurrency; + OUString sCurrency; ::boost::shared_ptr<ScSimpleRangeList> mpRanges; ScMyCurrencyStyle() : @@ -95,21 +95,21 @@ class ScMyStyleRanges : public SvRefBase ScMyCurrencyStylesSet* pCurrencyList; void SetStylesToRanges(const ::std::list<ScRange>& rList, - const rtl::OUString* pStyleName, const sal_Int16 nCellType, - const rtl::OUString* pCurrency, ScXMLImport& rImport); + const OUString* pStyleName, const sal_Int16 nCellType, + const OUString* pCurrency, ScXMLImport& rImport); public: ScMyStyleRanges(); ~ScMyStyleRanges(); void AddRange(const ScRange& rRange, const sal_Int16 nType); - void AddCurrencyRange(const ScRange& rRange, const rtl::OUString* pCurrency); + void AddCurrencyRange(const ScRange& rRange, const OUString* pCurrency); void InsertCol(const sal_Int32 nCol, const sal_Int32 nTab, ScDocument* pDoc); - void SetStylesToRanges(const rtl::OUString* pStyleName, ScXMLImport& rImport); + void SetStylesToRanges(const OUString* pStyleName, ScXMLImport& rImport); }; SV_DECL_IMPL_REF( ScMyStyleRanges ); struct ScMyStyle { - rtl::OUString sStyleName; + OUString sStyleName; ScMyStyleRangesRef xRanges; ScMyStyle() : xRanges(new ScMyStyleRanges()) {} @@ -133,21 +133,21 @@ class ScMyStylesImportHelper ScMyStyles aColDefaultStyles; ScMyStylesSet::iterator aRowDefaultStyle; ScXMLImport& rImport; - rtl::OUString* pStyleName; - rtl::OUString* pPrevStyleName; - rtl::OUString* pCurrency; - rtl::OUString* pPrevCurrency; + OUString* pStyleName; + OUString* pPrevStyleName; + OUString* pCurrency; + OUString* pPrevCurrency; ScRange aPrevRange; sal_Int16 nCellType; sal_Int16 nPrevCellType; bool bPrevRangeAdded; void ResetAttributes(); - ScMyStylesSet::iterator GetIterator(const rtl::OUString* pStyleName); + ScMyStylesSet::iterator GetIterator(const OUString* pStyleName); void AddDefaultRange(const ScRange& rRange); void AddSingleRange(const ScRange& rRange); void AddRange(); - bool IsEqual(const rtl::OUString* pFirst, const rtl::OUString* pSecond) + bool IsEqual(const OUString* pFirst, const OUString* pSecond) { return ((pFirst && pSecond && pFirst->equals(*pSecond)) || (!pFirst && !pSecond) || @@ -157,10 +157,10 @@ class ScMyStylesImportHelper public: ScMyStylesImportHelper(ScXMLImport& rImport); ~ScMyStylesImportHelper(); - void AddColumnStyle(const rtl::OUString& rStyleName, const sal_Int32 nColumn, const sal_Int32 nRepeat); - void SetRowStyle(const rtl::OUString& rStyleName); - void SetAttributes(rtl::OUString* pStyleName, - rtl::OUString* pCurrency, const sal_Int16 nCellType); + void AddColumnStyle(const OUString& rStyleName, const sal_Int32 nColumn, const sal_Int32 nRepeat); + void SetRowStyle(const OUString& rStyleName); + void SetAttributes(OUString* pStyleName, + OUString* pCurrency, const sal_Int16 nCellType); void AddRange(const ScRange& rRange); void AddCell(const ScAddress& rAddress); void InsertCol(const sal_Int32 nCol, const sal_Int32 nTab, ScDocument* pDoc); // a col is inserted before nCol diff --git a/sc/source/filter/xml/XMLTableHeaderFooterContext.cxx b/sc/source/filter/xml/XMLTableHeaderFooterContext.cxx index 04b73dc26281..6d48a61585c8 100644 --- a/sc/source/filter/xml/XMLTableHeaderFooterContext.cxx +++ b/sc/source/filter/xml/XMLTableHeaderFooterContext.cxx @@ -26,7 +26,6 @@ #include "unonames.hxx" -using ::rtl::OUString; using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::xml::sax; @@ -34,7 +33,6 @@ using namespace ::com::sun::star::text; using namespace ::com::sun::star::beans; using namespace xmloff::token; -using rtl::OUString; TYPEINIT1( XMLTableHeaderFooterContext, SvXMLImportContext ); diff --git a/sc/source/filter/xml/XMLTableHeaderFooterContext.hxx b/sc/source/filter/xml/XMLTableHeaderFooterContext.hxx index 48ab4cc6e7e9..21637726bb77 100644 --- a/sc/source/filter/xml/XMLTableHeaderFooterContext.hxx +++ b/sc/source/filter/xml/XMLTableHeaderFooterContext.hxx @@ -40,12 +40,12 @@ class XMLTableHeaderFooterContext: public SvXMLImportContext ::com::sun::star::uno::Reference < ::com::sun::star::sheet::XHeaderFooterContent > xHeaderFooterContent; - const ::rtl::OUString sOn; - const ::rtl::OUString sShareContent; - const ::rtl::OUString sContent; - const ::rtl::OUString sContentLeft; - const ::rtl::OUString sEmpty; - rtl::OUString sCont; + const OUString sOn; + const OUString sShareContent; + const OUString sContent; + const OUString sContentLeft; + const OUString sEmpty; + OUString sCont; bool bDisplay; bool bLeft; @@ -57,7 +57,7 @@ public: TYPEINFO(); XMLTableHeaderFooterContext( SvXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList, const ::com::sun::star::uno::Reference < @@ -68,7 +68,7 @@ public: 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 ); virtual void EndElement(); @@ -86,7 +86,7 @@ public: TYPEINFO(); XMLHeaderFooterRegionContext( SvXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList, com::sun::star::uno::Reference< com::sun::star::text::XTextCursor >& xCursor ); @@ -95,7 +95,7 @@ public: 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 ); virtual void EndElement(); diff --git a/sc/source/filter/xml/XMLTableMasterPageExport.cxx b/sc/source/filter/xml/XMLTableMasterPageExport.cxx index b06b00d37228..528139318b7f 100644 --- a/sc/source/filter/xml/XMLTableMasterPageExport.cxx +++ b/sc/source/filter/xml/XMLTableMasterPageExport.cxx @@ -27,7 +27,6 @@ #include "unonames.hxx" #include "xmlexprt.hxx" -using ::rtl::OUString; using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::text; @@ -70,9 +69,9 @@ void XMLTableMasterPageExport::exportHeaderFooter(const com::sun::star::uno::Ref Reference < XText > xRight(xHeaderFooter->getRightText()); if (xCenter.is() && xLeft.is() && xRight.is()) { - rtl::OUString sCenter (xCenter->getString()); - rtl::OUString sLeft (xLeft->getString()); - rtl::OUString sRight (xRight->getString()); + OUString sCenter (xCenter->getString()); + OUString sLeft (xLeft->getString()); + OUString sRight (xRight->getString()); if( !bDisplay ) GetExport().AddAttribute( XML_NAMESPACE_STYLE, @@ -110,13 +109,13 @@ void XMLTableMasterPageExport::exportMasterPageContent( const Reference < XPropertySet > & rPropSet, sal_Bool bAutoStyles ) { - Reference < sheet::XHeaderFooterContent > xHeader(rPropSet->getPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SC_UNO_PAGE_RIGHTHDRCON ) ) ), uno::UNO_QUERY); + Reference < sheet::XHeaderFooterContent > xHeader(rPropSet->getPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM( SC_UNO_PAGE_RIGHTHDRCON ) ) ), uno::UNO_QUERY); - Reference < sheet::XHeaderFooterContent > xHeaderLeft(rPropSet->getPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SC_UNO_PAGE_LEFTHDRCONT ) ) ), uno::UNO_QUERY); + Reference < sheet::XHeaderFooterContent > xHeaderLeft(rPropSet->getPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM( SC_UNO_PAGE_LEFTHDRCONT ) ) ), uno::UNO_QUERY); - Reference < sheet::XHeaderFooterContent > xFooter(rPropSet->getPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SC_UNO_PAGE_RIGHTFTRCON ) ) ), uno::UNO_QUERY); + Reference < sheet::XHeaderFooterContent > xFooter(rPropSet->getPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM( SC_UNO_PAGE_RIGHTFTRCON ) ) ), uno::UNO_QUERY); - Reference < sheet::XHeaderFooterContent > xFooterLeft(rPropSet->getPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SC_UNO_PAGE_LEFTFTRCONT ) ) ), uno::UNO_QUERY); + Reference < sheet::XHeaderFooterContent > xFooterLeft(rPropSet->getPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM( SC_UNO_PAGE_LEFTFTRCONT ) ) ), uno::UNO_QUERY); if( bAutoStyles ) { @@ -147,19 +146,19 @@ void XMLTableMasterPageExport::exportMasterPageContent( } else { - sal_Bool bHeader(::cppu::any2bool(rPropSet->getPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SC_UNO_PAGE_HDRON ) ) ))); + sal_Bool bHeader(::cppu::any2bool(rPropSet->getPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM( SC_UNO_PAGE_HDRON ) ) ))); exportHeaderFooter(xHeader, XML_HEADER, bHeader ); - sal_Bool bLeftHeader(!::cppu::any2bool(rPropSet->getPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SC_UNO_PAGE_HDRSHARED ) ) )) && bHeader); + sal_Bool bLeftHeader(!::cppu::any2bool(rPropSet->getPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM( SC_UNO_PAGE_HDRSHARED ) ) )) && bHeader); exportHeaderFooter( xHeaderLeft, XML_HEADER_LEFT, bLeftHeader ); - sal_Bool bFooter(::cppu::any2bool(rPropSet->getPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SC_UNO_PAGE_FTRON ) ) ))); + sal_Bool bFooter(::cppu::any2bool(rPropSet->getPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM( SC_UNO_PAGE_FTRON ) ) ))); exportHeaderFooter( xFooter, XML_FOOTER, bFooter ); - sal_Bool bLeftFooter = (!::cppu::any2bool(rPropSet->getPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SC_UNO_PAGE_FTRSHARED ) ) )) && bFooter); + sal_Bool bLeftFooter = (!::cppu::any2bool(rPropSet->getPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM( SC_UNO_PAGE_FTRSHARED ) ) )) && bFooter); exportHeaderFooter( xFooterLeft, XML_FOOTER_LEFT, bLeftFooter ); } diff --git a/sc/source/filter/xml/XMLTableShapeImportHelper.cxx b/sc/source/filter/xml/XMLTableShapeImportHelper.cxx index 4924f47894e6..ea38a3047172 100644 --- a/sc/source/filter/xml/XMLTableShapeImportHelper.cxx +++ b/sc/source/filter/xml/XMLTableShapeImportHelper.cxx @@ -39,9 +39,7 @@ using namespace ::com::sun::star; using namespace xmloff::token; -using ::rtl::OUString; -using rtl::OUString; XMLTableShapeImportHelper::XMLTableShapeImportHelper( ScXMLImport& rImp, SvXMLImportPropertyMapper *pImpMapper ) : @@ -55,7 +53,7 @@ XMLTableShapeImportHelper::~XMLTableShapeImportHelper() { } -void XMLTableShapeImportHelper::SetLayer(uno::Reference<drawing::XShape>& rShape, sal_Int16 nLayerID, const rtl::OUString& sType) const +void XMLTableShapeImportHelper::SetLayer(uno::Reference<drawing::XShape>& rShape, sal_Int16 nLayerID, const OUString& sType) const { if ( sType == "com.sun.star.drawing.ControlShape" ) nLayerID = SC_LAYER_CONTROLS; @@ -100,14 +98,14 @@ void XMLTableShapeImportHelper::finishShape( sal_Int32 nEndY(-1); sal_Int16 nAttrCount = xAttrList.is() ? xAttrList->getLength() : 0; table::CellAddress aEndCell; - rtl::OUString* pRangeList(NULL); + OUString* pRangeList(NULL); sal_Int16 nLayerID(-1); for( sal_Int16 i=0; i < nAttrCount; ++i ) { - const rtl::OUString& rAttrName(xAttrList->getNameByIndex( i )); - const rtl::OUString& rValue(xAttrList->getValueByIndex( i )); + const OUString& rAttrName(xAttrList->getNameByIndex( i )); + const OUString& rValue(xAttrList->getValueByIndex( i )); - rtl::OUString aLocalName; + OUString aLocalName; sal_uInt16 nPrefix( static_cast<ScXMLImport&>(mrImporter).GetNamespaceMap().GetKeyByAttrName( rAttrName, &aLocalName )); @@ -140,7 +138,7 @@ void XMLTableShapeImportHelper::finishShape( else if(nPrefix == XML_NAMESPACE_DRAW) { if (IsXMLToken(aLocalName, XML_NOTIFY_ON_UPDATE_OF_RANGES)) - pRangeList = new rtl::OUString(rValue); + pRangeList = new OUString(rValue); } } SetLayer(rShape, nLayerID, rShape->getShapeType()); @@ -171,13 +169,13 @@ void XMLTableShapeImportHelper::finishShape( else // shape is annotation { // get the style names for stream copying - rtl::OUString aStyleName; - rtl::OUString aTextStyle; + OUString aStyleName; + OUString aTextStyle; sal_Int16 nAttrCount = xAttrList.is() ? xAttrList->getLength() : 0; for( sal_Int16 i=0; i < nAttrCount; ++i ) { - const rtl::OUString& rAttrName(xAttrList->getNameByIndex( i )); - rtl::OUString aLocalName; + const OUString& rAttrName(xAttrList->getNameByIndex( i )); + OUString aLocalName; sal_uInt16 nPrefix(static_cast<ScXMLImport&>(mrImporter).GetNamespaceMap().GetKeyByAttrName( rAttrName, &aLocalName )); if(nPrefix == XML_NAMESPACE_DRAW) { @@ -223,10 +221,10 @@ void XMLTableShapeImportHelper::finishShape( sal_Int16 nLayerID(-1); for( sal_Int16 i=0; i < nAttrCount; ++i ) { - const rtl::OUString& rAttrName(xAttrList->getNameByIndex( i )); - const rtl::OUString& rValue(xAttrList->getValueByIndex( i )); + const OUString& rAttrName(xAttrList->getNameByIndex( i )); + const OUString& rValue(xAttrList->getValueByIndex( i )); - rtl::OUString aLocalName; + OUString aLocalName; sal_uInt16 nPrefix(static_cast<ScXMLImport&>(mrImporter).GetNamespaceMap().GetKeyByAttrName( rAttrName, &aLocalName )); if(nPrefix == XML_NAMESPACE_TABLE) { diff --git a/sc/source/filter/xml/XMLTableShapeImportHelper.hxx b/sc/source/filter/xml/XMLTableShapeImportHelper.hxx index aa38da4b115f..900560026c63 100644 --- a/sc/source/filter/xml/XMLTableShapeImportHelper.hxx +++ b/sc/source/filter/xml/XMLTableShapeImportHelper.hxx @@ -37,7 +37,7 @@ public: XMLTableShapeImportHelper( ScXMLImport& rImp, SvXMLImportPropertyMapper *pImpMapper=0 ); ~XMLTableShapeImportHelper(); - void SetLayer(com::sun::star::uno::Reference<com::sun::star::drawing::XShape>& rShape, sal_Int16 nLayerID, const rtl::OUString& sType) const; + void SetLayer(com::sun::star::uno::Reference<com::sun::star::drawing::XShape>& rShape, sal_Int16 nLayerID, const OUString& sType) const; virtual void finishShape(com::sun::star::uno::Reference< com::sun::star::drawing::XShape >& rShape, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >& xAttrList, com::sun::star::uno::Reference< com::sun::star::drawing::XShapes >& rShapes); diff --git a/sc/source/filter/xml/XMLTableShapeResizer.cxx b/sc/source/filter/xml/XMLTableShapeResizer.cxx index 33e0203dfecd..d6ffc275d59a 100644 --- a/sc/source/filter/xml/XMLTableShapeResizer.cxx +++ b/sc/source/filter/xml/XMLTableShapeResizer.cxx @@ -37,7 +37,6 @@ using namespace ::com::sun::star; using ::std::auto_ptr; using ::std::vector; -using ::rtl::OUString; ScMyOLEFixer::ScMyOLEFixer(ScXMLImport& rTempImport) : rImport(rTempImport), @@ -56,8 +55,8 @@ sal_Bool ScMyOLEFixer::IsOLE(uno::Reference< drawing::XShape >& rShape) } void ScMyOLEFixer::CreateChartListener(ScDocument* pDoc, - const rtl::OUString& rName, - const rtl::OUString& rRangeList) + const OUString& rName, + const OUString& rRangeList) { // This is the minimum required. if (!pDoc) @@ -111,7 +110,7 @@ void ScMyOLEFixer::CreateChartListener(ScDocument* pDoc, } void ScMyOLEFixer::AddOLE(uno::Reference <drawing::XShape>& rShape, - const rtl::OUString &rRangeList) + const OUString &rRangeList) { ScMyToFixupOLE aShape; aShape.xShape.set(rShape); @@ -123,7 +122,7 @@ void ScMyOLEFixer::FixupOLEs() { if (!aShapes.empty() && rImport.GetModel().is()) { - rtl::OUString sPersistName ("PersistName"); + OUString sPersistName ("PersistName"); ScMyToFixupOLEs::iterator aItr(aShapes.begin()); ScMyToFixupOLEs::iterator aEndItr(aShapes.end()); ScDocument* pDoc(rImport.GetDocument()); @@ -141,7 +140,7 @@ void ScMyOLEFixer::FixupOLEs() uno::Reference < beans::XPropertySet > xShapeProps ( aItr->xShape, uno::UNO_QUERY ); uno::Reference < beans::XPropertySetInfo > xShapeInfo(xShapeProps->getPropertySetInfo()); - rtl::OUString sName; + OUString sName; if (pDoc && xShapeProps.is() && xShapeInfo.is() && xShapeInfo->hasPropertyByName(sPersistName) && (xShapeProps->getPropertyValue(sPersistName) >>= sName)) CreateChartListener(pDoc, sName, aItr->sRangeList); diff --git a/sc/source/filter/xml/XMLTableShapeResizer.hxx b/sc/source/filter/xml/XMLTableShapeResizer.hxx index 57b6c795f146..2f3826f09fa7 100644 --- a/sc/source/filter/xml/XMLTableShapeResizer.hxx +++ b/sc/source/filter/xml/XMLTableShapeResizer.hxx @@ -32,7 +32,7 @@ class ScDocument; struct ScMyToFixupOLE { com::sun::star::uno::Reference <com::sun::star::drawing::XShape> xShape; - rtl::OUString sRangeList; + OUString sRangeList; }; typedef std::list<ScMyToFixupOLE> ScMyToFixupOLEs; @@ -44,15 +44,15 @@ class ScMyOLEFixer ScChartListenerCollection* pCollection; void CreateChartListener(ScDocument* pDoc, - const rtl::OUString& rName, - const rtl::OUString& rRangeList); + const OUString& rName, + const OUString& rRangeList); public: ScMyOLEFixer(ScXMLImport& rImport); ~ScMyOLEFixer(); static sal_Bool IsOLE(com::sun::star::uno::Reference< com::sun::star::drawing::XShape >& rShape); void AddOLE(com::sun::star::uno::Reference <com::sun::star::drawing::XShape>& rShape, - const rtl::OUString &rRangeList); + const OUString &rRangeList); void FixupOLEs(); }; diff --git a/sc/source/filter/xml/XMLTableShapesContext.cxx b/sc/source/filter/xml/XMLTableShapesContext.cxx index 13bcfba2f734..7cc5369196f4 100644 --- a/sc/source/filter/xml/XMLTableShapesContext.cxx +++ b/sc/source/filter/xml/XMLTableShapesContext.cxx @@ -29,7 +29,7 @@ using namespace com::sun::star; ScXMLTableShapesContext::ScXMLTableShapesContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& /* xAttrList */ ) : SvXMLImportContext( rImport, nPrfx, rLName ) @@ -42,7 +42,7 @@ ScXMLTableShapesContext::~ScXMLTableShapesContext() } SvXMLImportContext *ScXMLTableShapesContext::CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) { diff --git a/sc/source/filter/xml/XMLTableShapesContext.hxx b/sc/source/filter/xml/XMLTableShapesContext.hxx index 14ca9a8d4d07..21463a194c8e 100644 --- a/sc/source/filter/xml/XMLTableShapesContext.hxx +++ b/sc/source/filter/xml/XMLTableShapesContext.hxx @@ -30,14 +30,14 @@ class ScXMLTableShapesContext : public SvXMLImportContext ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } public: ScXMLTableShapesContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList); virtual ~ScXMLTableShapesContext(); 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 ); diff --git a/sc/source/filter/xml/XMLTableSourceContext.cxx b/sc/source/filter/xml/XMLTableSourceContext.cxx index a7bc29766969..ea854786b64c 100644 --- a/sc/source/filter/xml/XMLTableSourceContext.cxx +++ b/sc/source/filter/xml/XMLTableSourceContext.cxx @@ -35,7 +35,7 @@ using namespace xmloff::token; ScXMLTableSourceContext::ScXMLTableSourceContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList) : SvXMLImportContext( rImport, nPrfx, rLName ), @@ -49,11 +49,11 @@ ScXMLTableSourceContext::ScXMLTableSourceContext( ScXMLImport& rImport, sal_Int16 nAttrCount(xAttrList.is() ? xAttrList->getLength() : 0); for( sal_Int16 i=0; i < nAttrCount; ++i ) { - const rtl::OUString& sAttrName(xAttrList->getNameByIndex( i )); - rtl::OUString aLocalName; + const OUString& sAttrName(xAttrList->getNameByIndex( i )); + OUString aLocalName; sal_uInt16 nPrefix(GetScImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName )); - const rtl::OUString& sValue(xAttrList->getValueByIndex( i )); + const OUString& sValue(xAttrList->getValueByIndex( i )); if(nPrefix == XML_NAMESPACE_XLINK) { if (IsXMLToken(aLocalName, XML_HREF)) @@ -87,7 +87,7 @@ ScXMLTableSourceContext::~ScXMLTableSourceContext() } SvXMLImportContext *ScXMLTableSourceContext::CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& /* xAttrList */ ) { diff --git a/sc/source/filter/xml/XMLTableSourceContext.hxx b/sc/source/filter/xml/XMLTableSourceContext.hxx index 20553c20de95..4f61e9869b20 100644 --- a/sc/source/filter/xml/XMLTableSourceContext.hxx +++ b/sc/source/filter/xml/XMLTableSourceContext.hxx @@ -27,10 +27,10 @@ class ScXMLImport; class ScXMLTableSourceContext : public SvXMLImportContext { - rtl::OUString sLink; - rtl::OUString sTableName; - rtl::OUString sFilterName; - rtl::OUString sFilterOptions; + OUString sLink; + OUString sTableName; + OUString sFilterName; + OUString sFilterOptions; sal_Int32 nRefresh; com::sun::star::sheet::SheetLinkMode nMode; @@ -38,14 +38,14 @@ class ScXMLTableSourceContext : public SvXMLImportContext ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } public: ScXMLTableSourceContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList); virtual ~ScXMLTableSourceContext(); 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 ); diff --git a/sc/source/filter/xml/XMLTrackedChangesContext.cxx b/sc/source/filter/xml/XMLTrackedChangesContext.cxx index b7834d6d84c1..625e66b2e876 100644 --- a/sc/source/filter/xml/XMLTrackedChangesContext.cxx +++ b/sc/source/filter/xml/XMLTrackedChangesContext.cxx @@ -38,16 +38,15 @@ using namespace com::sun::star; using namespace xmloff::token; -using rtl::OUString; //----------------------------------------------------------------------------- class ScXMLChangeInfoContext : public SvXMLImportContext { ScMyActionInfo aInfo; - ::rtl::OUStringBuffer sAuthorBuffer; - ::rtl::OUStringBuffer sDateTimeBuffer; - ::rtl::OUStringBuffer sCommentBuffer; + OUStringBuffer sAuthorBuffer; + OUStringBuffer sDateTimeBuffer; + OUStringBuffer sCommentBuffer; ScXMLChangeTrackingImportHelper* pChangeTrackingImportHelper; sal_uInt32 nParagraphCount; @@ -55,14 +54,14 @@ class ScXMLChangeInfoContext : public SvXMLImportContext ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } public: - ScXMLChangeInfoContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const ::rtl::OUString& rLName, + ScXMLChangeInfoContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLChangeTrackingImportHelper* pChangeTrackingImportHelper); virtual ~ScXMLChangeInfoContext(); 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 ); @@ -79,14 +78,14 @@ class ScXMLBigRangeContext : public SvXMLImportContext ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } public: - ScXMLBigRangeContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const ::rtl::OUString& rLName, + ScXMLBigRangeContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScBigRange& rBigRange); virtual ~ScXMLBigRangeContext(); 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 ); @@ -97,10 +96,10 @@ public: class ScXMLCellContentDeletionContext : public SvXMLImportContext { - rtl::OUString sFormulaAddress; - rtl::OUString sFormula; - rtl::OUString sFormulaNmsp; - rtl::OUString sInputString; + OUString sFormulaAddress; + OUString sFormula; + OUString sFormulaNmsp; + OUString sInputString; ScBigRange aBigRange; double fValue; ScXMLChangeTrackingImportHelper* pChangeTrackingImportHelper; @@ -118,14 +117,14 @@ class ScXMLCellContentDeletionContext : public SvXMLImportContext ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } public: - ScXMLCellContentDeletionContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const ::rtl::OUString& rLName, + ScXMLCellContentDeletionContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLChangeTrackingImportHelper* pChangeTrackingImportHelper); virtual ~ScXMLCellContentDeletionContext(); 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 ); @@ -142,14 +141,14 @@ class ScXMLDependenceContext : public SvXMLImportContext ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } public: - ScXMLDependenceContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const ::rtl::OUString& rLName, + ScXMLDependenceContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLChangeTrackingImportHelper* pChangeTrackingImportHelper); virtual ~ScXMLDependenceContext(); 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 ); @@ -166,14 +165,14 @@ class ScXMLDependingsContext : public SvXMLImportContext ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } public: - ScXMLDependingsContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const ::rtl::OUString& rLName, + ScXMLDependingsContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLChangeTrackingImportHelper* pChangeTrackingImportHelper); virtual ~ScXMLDependingsContext(); 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 ); @@ -190,14 +189,14 @@ class ScXMLChangeDeletionContext : public SvXMLImportContext ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } public: - ScXMLChangeDeletionContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const ::rtl::OUString& rLName, + ScXMLChangeDeletionContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLChangeTrackingImportHelper* pChangeTrackingImportHelper); virtual ~ScXMLChangeDeletionContext(); 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 ); @@ -214,14 +213,14 @@ class ScXMLDeletionsContext : public SvXMLImportContext ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } public: - ScXMLDeletionsContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const ::rtl::OUString& rLName, + ScXMLDeletionsContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLChangeTrackingImportHelper* pChangeTrackingImportHelper); virtual ~ScXMLDeletionsContext(); 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 ); @@ -235,8 +234,8 @@ class ScXMLChangeCellContext; class ScXMLChangeTextPContext : public SvXMLImportContext { ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList> xAttrList; - rtl::OUString sLName; - rtl::OUStringBuffer sText; + OUString sLName; + OUStringBuffer sText; ScXMLChangeCellContext* pChangeCellContext; SvXMLImportContext* pTextPContext; sal_uInt16 nPrefix; @@ -247,7 +246,7 @@ class ScXMLChangeTextPContext : public SvXMLImportContext public: ScXMLChangeTextPContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLChangeCellContext* pChangeCellContext); @@ -255,11 +254,11 @@ public: virtual ~ScXMLChangeTextPContext(); 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 ); - virtual void Characters( const ::rtl::OUString& rChars ); + virtual void Characters( const OUString& rChars ); virtual void EndElement(); }; @@ -270,8 +269,8 @@ class ScXMLChangeCellContext : public SvXMLImportContext { ScCellValue& mrOldCell; - rtl::OUString sText; - rtl::OUString& rInputString; + OUString sText; + OUString& rInputString; ScEditEngineTextObj* pEditTextObj; double& rDateTimeValue; double fValue; @@ -285,24 +284,24 @@ class ScXMLChangeCellContext : public SvXMLImportContext ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } public: - ScXMLChangeCellContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const ::rtl::OUString& rLName, + ScXMLChangeCellContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, - ScCellValue& rOldCell, rtl::OUString& sAddress, - rtl::OUString& rFormula, rtl::OUString& rFormulaNmsp, + ScCellValue& rOldCell, OUString& sAddress, + OUString& rFormula, OUString& rFormulaNmsp, formula::FormulaGrammar::Grammar& rGrammar, - rtl::OUString& rInputString, double& fValue, sal_uInt16& nType, + OUString& rInputString, double& fValue, sal_uInt16& nType, sal_uInt8& nMatrixFlag, sal_Int32& nMatrixCols, sal_Int32& nMatrixRows); virtual ~ScXMLChangeCellContext(); 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 ); void CreateTextPContext(sal_Bool bIsNewParagraph); sal_Bool IsEditCell() { return pEditTextObj != 0; } - void SetText(const rtl::OUString& sTempText) { sText = sTempText; } + void SetText(const OUString& sTempText) { sText = sTempText; } virtual void EndElement(); }; @@ -311,10 +310,10 @@ public: class ScXMLPreviousContext : public SvXMLImportContext { - rtl::OUString sFormulaAddress; - rtl::OUString sFormula; - rtl::OUString sFormulaNmsp; - rtl::OUString sInputString; + OUString sFormulaAddress; + OUString sFormula; + OUString sFormulaNmsp; + OUString sInputString; double fValue; ScXMLChangeTrackingImportHelper* pChangeTrackingImportHelper; ScCellValue maOldCell; @@ -329,14 +328,14 @@ class ScXMLPreviousContext : public SvXMLImportContext ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } public: - ScXMLPreviousContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const ::rtl::OUString& rLName, + ScXMLPreviousContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLChangeTrackingImportHelper* pChangeTrackingImportHelper); virtual ~ScXMLPreviousContext(); 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 ); @@ -354,14 +353,14 @@ class ScXMLContentChangeContext : public SvXMLImportContext ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } public: - ScXMLContentChangeContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const ::rtl::OUString& rLName, + ScXMLContentChangeContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLChangeTrackingImportHelper* pChangeTrackingImportHelper); virtual ~ScXMLContentChangeContext(); 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 ); virtual void EndElement(); @@ -377,14 +376,14 @@ class ScXMLInsertionContext : public SvXMLImportContext ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } public: - ScXMLInsertionContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const ::rtl::OUString& rLName, + ScXMLInsertionContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLChangeTrackingImportHelper* pChangeTrackingImportHelper); virtual ~ScXMLInsertionContext(); 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 ); virtual void EndElement(); @@ -400,14 +399,14 @@ class ScXMLInsertionCutOffContext : public SvXMLImportContext ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } public: - ScXMLInsertionCutOffContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const ::rtl::OUString& rLName, + ScXMLInsertionCutOffContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLChangeTrackingImportHelper* pChangeTrackingImportHelper); virtual ~ScXMLInsertionCutOffContext(); 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 ); virtual void EndElement(); @@ -423,14 +422,14 @@ class ScXMLMovementCutOffContext : public SvXMLImportContext ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } public: - ScXMLMovementCutOffContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const ::rtl::OUString& rLName, + ScXMLMovementCutOffContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLChangeTrackingImportHelper* pChangeTrackingImportHelper); virtual ~ScXMLMovementCutOffContext(); 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 ); virtual void EndElement(); @@ -446,14 +445,14 @@ class ScXMLCutOffsContext : public SvXMLImportContext ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } public: - ScXMLCutOffsContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const ::rtl::OUString& rLName, + ScXMLCutOffsContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLChangeTrackingImportHelper* pChangeTrackingImportHelper); virtual ~ScXMLCutOffsContext(); 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 ); virtual void EndElement(); @@ -469,14 +468,14 @@ class ScXMLDeletionContext : public SvXMLImportContext ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } public: - ScXMLDeletionContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const ::rtl::OUString& rLName, + ScXMLDeletionContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLChangeTrackingImportHelper* pChangeTrackingImportHelper); virtual ~ScXMLDeletionContext(); 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 ); virtual void EndElement(); @@ -494,14 +493,14 @@ class ScXMLMovementContext : public SvXMLImportContext ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } public: - ScXMLMovementContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const ::rtl::OUString& rLName, + ScXMLMovementContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLChangeTrackingImportHelper* pChangeTrackingImportHelper); virtual ~ScXMLMovementContext(); 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 ); virtual void EndElement(); @@ -517,14 +516,14 @@ class ScXMLRejectionContext : public SvXMLImportContext ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } public: - ScXMLRejectionContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const ::rtl::OUString& rLName, + ScXMLRejectionContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLChangeTrackingImportHelper* pChangeTrackingImportHelper); virtual ~ScXMLRejectionContext(); 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 ); virtual void EndElement(); @@ -534,7 +533,7 @@ public: ScXMLTrackedChangesContext::ScXMLTrackedChangesContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const uno::Reference<xml::sax::XAttributeList>& xAttrList, ScXMLChangeTrackingImportHelper* pTempChangeTrackingImportHelper ) : SvXMLImportContext( rImport, nPrfx, rLName ), @@ -546,11 +545,11 @@ ScXMLTrackedChangesContext::ScXMLTrackedChangesContext( ScXMLImport& rImport, sal_Int16 nAttrCount(xAttrList.is() ? xAttrList->getLength() : 0); for( sal_Int16 i=0; i < nAttrCount; ++i ) { - const rtl::OUString& sAttrName(xAttrList->getNameByIndex( i )); - rtl::OUString aLocalName; + const OUString& sAttrName(xAttrList->getNameByIndex( i )); + OUString aLocalName; sal_uInt16 nPrefix(GetScImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName )); - const rtl::OUString& sValue(xAttrList->getValueByIndex( i )); + const OUString& sValue(xAttrList->getValueByIndex( i )); if (nPrefix == XML_NAMESPACE_TABLE) { if (IsXMLToken(aLocalName, XML_PROTECTION_KEY)) @@ -572,7 +571,7 @@ ScXMLTrackedChangesContext::~ScXMLTrackedChangesContext() } SvXMLImportContext *ScXMLTrackedChangesContext::CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) { @@ -614,7 +613,7 @@ void ScXMLTrackedChangesContext::EndElement() ScXMLChangeInfoContext::ScXMLChangeInfoContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const uno::Reference<xml::sax::XAttributeList>& xAttrList, ScXMLChangeTrackingImportHelper* pTempChangeTrackingImportHelper ) : SvXMLImportContext( rImport, nPrfx, rLName ), @@ -625,11 +624,11 @@ ScXMLChangeInfoContext::ScXMLChangeInfoContext( ScXMLImport& rImport, sal_Int16 nAttrCount(xAttrList.is() ? xAttrList->getLength() : 0); for( sal_Int16 i=0; i < nAttrCount; ++i ) { - const rtl::OUString& sAttrName(xAttrList->getNameByIndex( i )); - rtl::OUString aLocalName; + const OUString& sAttrName(xAttrList->getNameByIndex( i )); + OUString aLocalName; sal_uInt16 nPrefix(GetScImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName )); - const rtl::OUString& sValue(xAttrList->getValueByIndex( i )); + const OUString& sValue(xAttrList->getValueByIndex( i )); if (nPrefix == XML_NAMESPACE_OFFICE) { @@ -650,7 +649,7 @@ ScXMLChangeInfoContext::~ScXMLChangeInfoContext() } SvXMLImportContext *ScXMLChangeInfoContext::CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) { @@ -690,7 +689,7 @@ void ScXMLChangeInfoContext::EndElement() ScXMLBigRangeContext::ScXMLBigRangeContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const uno::Reference<xml::sax::XAttributeList>& xAttrList, ScBigRange& rTempBigRange ) : SvXMLImportContext( rImport, nPrfx, rLName ), @@ -711,11 +710,11 @@ ScXMLBigRangeContext::ScXMLBigRangeContext( ScXMLImport& rImport, sal_Int16 nAttrCount(xAttrList.is() ? xAttrList->getLength() : 0); for( sal_Int16 i=0; i < nAttrCount; ++i ) { - const rtl::OUString& sAttrName(xAttrList->getNameByIndex( i )); - rtl::OUString aLocalName; + const OUString& sAttrName(xAttrList->getNameByIndex( i )); + OUString aLocalName; sal_uInt16 nPrefix(GetScImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName )); - const rtl::OUString& sValue(xAttrList->getValueByIndex( i )); + const OUString& sValue(xAttrList->getValueByIndex( i )); if (nPrefix == XML_NAMESPACE_TABLE) { @@ -763,7 +762,7 @@ ScXMLBigRangeContext::~ScXMLBigRangeContext() } SvXMLImportContext *ScXMLBigRangeContext::CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& /* xAttrList */ ) { @@ -776,7 +775,7 @@ void ScXMLBigRangeContext::EndElement() ScXMLCellContentDeletionContext::ScXMLCellContentDeletionContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const uno::Reference<xml::sax::XAttributeList>& xAttrList, ScXMLChangeTrackingImportHelper* pTempChangeTrackingImportHelper) : SvXMLImportContext( rImport, nPrfx, rLName ), @@ -792,11 +791,11 @@ ScXMLCellContentDeletionContext::ScXMLCellContentDeletionContext( ScXMLImport& sal_Int16 nAttrCount(xAttrList.is() ? xAttrList->getLength() : 0); for( sal_Int16 i=0; i < nAttrCount; ++i ) { - const rtl::OUString& sAttrName(xAttrList->getNameByIndex( i )); - rtl::OUString aLocalName; + const OUString& sAttrName(xAttrList->getNameByIndex( i )); + OUString aLocalName; sal_uInt16 nPrefix(GetScImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName )); - const rtl::OUString& sValue(xAttrList->getValueByIndex( i )); + const OUString& sValue(xAttrList->getValueByIndex( i )); if (nPrefix == XML_NAMESPACE_TABLE) { @@ -811,7 +810,7 @@ ScXMLCellContentDeletionContext::~ScXMLCellContentDeletionContext() } SvXMLImportContext *ScXMLCellContentDeletionContext::CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) { @@ -851,7 +850,7 @@ void ScXMLCellContentDeletionContext::EndElement() ScXMLDependenceContext::ScXMLDependenceContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const uno::Reference<xml::sax::XAttributeList>& xAttrList, ScXMLChangeTrackingImportHelper* pTempChangeTrackingImportHelper ) : SvXMLImportContext( rImport, nPrfx, rLName ), @@ -861,11 +860,11 @@ ScXMLDependenceContext::ScXMLDependenceContext( ScXMLImport& rImport, sal_Int16 nAttrCount(xAttrList.is() ? xAttrList->getLength() : 0); for( sal_Int16 i=0; i < nAttrCount; ++i ) { - const rtl::OUString& sAttrName(xAttrList->getNameByIndex( i )); - rtl::OUString aLocalName; + const OUString& sAttrName(xAttrList->getNameByIndex( i )); + OUString aLocalName; sal_uInt16 nPrefix(GetScImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName )); - const rtl::OUString& sValue(xAttrList->getValueByIndex( i )); + const OUString& sValue(xAttrList->getValueByIndex( i )); if (nPrefix == XML_NAMESPACE_TABLE) { @@ -881,7 +880,7 @@ ScXMLDependenceContext::~ScXMLDependenceContext() } SvXMLImportContext *ScXMLDependenceContext::CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& /* xAttrList */ ) { @@ -894,7 +893,7 @@ void ScXMLDependenceContext::EndElement() ScXMLDependingsContext::ScXMLDependingsContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const uno::Reference<xml::sax::XAttributeList>& /* xAttrList */, ScXMLChangeTrackingImportHelper* pTempChangeTrackingImportHelper ) : SvXMLImportContext( rImport, nPrfx, rLName ), @@ -908,7 +907,7 @@ ScXMLDependingsContext::~ScXMLDependingsContext() } SvXMLImportContext *ScXMLDependingsContext::CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) { @@ -933,7 +932,7 @@ void ScXMLDependingsContext::EndElement() ScXMLChangeDeletionContext::ScXMLChangeDeletionContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const uno::Reference<xml::sax::XAttributeList>& xAttrList, ScXMLChangeTrackingImportHelper* pTempChangeTrackingImportHelper ) : SvXMLImportContext( rImport, nPrfx, rLName ), @@ -943,11 +942,11 @@ ScXMLChangeDeletionContext::ScXMLChangeDeletionContext( ScXMLImport& rImport, sal_Int16 nAttrCount(xAttrList.is() ? xAttrList->getLength() : 0); for( sal_Int16 i=0; i < nAttrCount; ++i ) { - const rtl::OUString& sAttrName(xAttrList->getNameByIndex( i )); - rtl::OUString aLocalName; + const OUString& sAttrName(xAttrList->getNameByIndex( i )); + OUString aLocalName; sal_uInt16 nPrefix(GetScImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName )); - const rtl::OUString& sValue(xAttrList->getValueByIndex( i )); + const OUString& sValue(xAttrList->getValueByIndex( i )); if (nPrefix == XML_NAMESPACE_TABLE) { @@ -963,7 +962,7 @@ ScXMLChangeDeletionContext::~ScXMLChangeDeletionContext() } SvXMLImportContext *ScXMLChangeDeletionContext::CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& /* xAttrList */ ) { @@ -976,7 +975,7 @@ void ScXMLChangeDeletionContext::EndElement() ScXMLDeletionsContext::ScXMLDeletionsContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const uno::Reference<xml::sax::XAttributeList>& /* xAttrList */, ScXMLChangeTrackingImportHelper* pTempChangeTrackingImportHelper ) : SvXMLImportContext( rImport, nPrfx, rLName ), @@ -990,7 +989,7 @@ ScXMLDeletionsContext::~ScXMLDeletionsContext() } SvXMLImportContext *ScXMLDeletionsContext::CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) { @@ -1016,7 +1015,7 @@ void ScXMLDeletionsContext::EndElement() ScXMLChangeTextPContext::ScXMLChangeTextPContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xTempAttrList, ScXMLChangeCellContext* pTempChangeCellContext) : @@ -1038,7 +1037,7 @@ ScXMLChangeTextPContext::~ScXMLChangeTextPContext() } SvXMLImportContext *ScXMLChangeTextPContext::CreateChildContext( sal_uInt16 nTempPrefix, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xTempAttrList ) { @@ -1050,9 +1049,9 @@ SvXMLImportContext *ScXMLChangeTextPContext::CreateChildContext( sal_uInt16 nTem sal_Int16 nAttrCount(xAttrList.is() ? xAttrList->getLength() : 0); for( sal_Int16 i=0; i < nAttrCount; ++i ) { - const rtl::OUString& sAttrName(xAttrList->getNameByIndex( i )); - const rtl::OUString& sValue(xAttrList->getValueByIndex( i )); - rtl::OUString aLocalName; + const OUString& sAttrName(xAttrList->getNameByIndex( i )); + const OUString& sValue(xAttrList->getValueByIndex( i )); + OUString aLocalName; sal_uInt16 nPrfx(GetScImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName )); if ((nPrfx == XML_NAMESPACE_TEXT) && (IsXMLToken(aLocalName, XML_C))) @@ -1089,7 +1088,7 @@ SvXMLImportContext *ScXMLChangeTextPContext::CreateChildContext( sal_uInt16 nTem return pContext; } -void ScXMLChangeTextPContext::Characters( const ::rtl::OUString& rChars ) +void ScXMLChangeTextPContext::Characters( const OUString& rChars ) { if (!pTextPContext) sText.append(rChars); @@ -1105,12 +1104,12 @@ void ScXMLChangeTextPContext::EndElement() ScXMLChangeCellContext::ScXMLChangeCellContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const uno::Reference<xml::sax::XAttributeList>& xAttrList, - ScCellValue& rOldCell, rtl::OUString& rAddress, - rtl::OUString& rFormula, rtl::OUString& rFormulaNmsp, + ScCellValue& rOldCell, OUString& rAddress, + OUString& rFormula, OUString& rFormulaNmsp, formula::FormulaGrammar::Grammar& rGrammar, - rtl::OUString& rTempInputString, double& fDateTimeValue, sal_uInt16& nType, + OUString& rTempInputString, double& fDateTimeValue, sal_uInt16& nType, sal_uInt8& nMatrixFlag, sal_Int32& nMatrixCols, sal_Int32& nMatrixRows ) : SvXMLImportContext( rImport, nPrfx, rLName ), mrOldCell(rOldCell), @@ -1128,11 +1127,11 @@ ScXMLChangeCellContext::ScXMLChangeCellContext( ScXMLImport& rImport, sal_Int16 nAttrCount(xAttrList.is() ? xAttrList->getLength() : 0); for( sal_Int16 i=0; i < nAttrCount; ++i ) { - const rtl::OUString& sAttrName(xAttrList->getNameByIndex( i )); - rtl::OUString aLocalName; + const OUString& sAttrName(xAttrList->getNameByIndex( i )); + OUString aLocalName; sal_uInt16 nPrefix(GetScImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName )); - const rtl::OUString& sValue(xAttrList->getValueByIndex( i )); + const OUString& sValue(xAttrList->getValueByIndex( i )); if (nPrefix == XML_NAMESPACE_TABLE) { @@ -1209,7 +1208,7 @@ ScXMLChangeCellContext::~ScXMLChangeCellContext() } SvXMLImportContext *ScXMLChangeCellContext::CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) { @@ -1313,7 +1312,7 @@ void ScXMLChangeCellContext::EndElement() ScXMLPreviousContext::ScXMLPreviousContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const uno::Reference<xml::sax::XAttributeList>& xAttrList, ScXMLChangeTrackingImportHelper* pTempChangeTrackingImportHelper ) : SvXMLImportContext( rImport, nPrfx, rLName ), @@ -1328,11 +1327,11 @@ ScXMLPreviousContext::ScXMLPreviousContext( ScXMLImport& rImport, sal_Int16 nAttrCount(xAttrList.is() ? xAttrList->getLength() : 0); for( sal_Int16 i=0; i < nAttrCount; ++i ) { - const rtl::OUString& sAttrName(xAttrList->getNameByIndex( i )); - rtl::OUString aLocalName; + const OUString& sAttrName(xAttrList->getNameByIndex( i )); + OUString aLocalName; sal_uInt16 nPrefix(GetScImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName )); - const rtl::OUString& sValue(xAttrList->getValueByIndex( i )); + const OUString& sValue(xAttrList->getValueByIndex( i )); if (nPrefix == XML_NAMESPACE_TABLE) { @@ -1347,7 +1346,7 @@ ScXMLPreviousContext::~ScXMLPreviousContext() } SvXMLImportContext *ScXMLPreviousContext::CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) { @@ -1371,7 +1370,7 @@ void ScXMLPreviousContext::EndElement() ScXMLContentChangeContext::ScXMLContentChangeContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const uno::Reference<xml::sax::XAttributeList>& xAttrList, ScXMLChangeTrackingImportHelper* pTempChangeTrackingImportHelper ) : SvXMLImportContext( rImport, nPrfx, rLName ), @@ -1384,11 +1383,11 @@ ScXMLContentChangeContext::ScXMLContentChangeContext( ScXMLImport& rImport, sal_Int16 nAttrCount(xAttrList.is() ? xAttrList->getLength() : 0); for( sal_Int16 i=0; i < nAttrCount; ++i ) { - const rtl::OUString& sAttrName(xAttrList->getNameByIndex( i )); - rtl::OUString aLocalName; + const OUString& sAttrName(xAttrList->getNameByIndex( i )); + OUString aLocalName; sal_uInt16 nPrefix(GetScImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName )); - const rtl::OUString& sValue(xAttrList->getValueByIndex( i )); + const OUString& sValue(xAttrList->getValueByIndex( i )); if (nPrefix == XML_NAMESPACE_TABLE) { @@ -1421,7 +1420,7 @@ ScXMLContentChangeContext::~ScXMLContentChangeContext() } SvXMLImportContext *ScXMLContentChangeContext::CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) { @@ -1463,7 +1462,7 @@ void ScXMLContentChangeContext::EndElement() ScXMLInsertionContext::ScXMLInsertionContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const uno::Reference<xml::sax::XAttributeList>& xAttrList, ScXMLChangeTrackingImportHelper* pTempChangeTrackingImportHelper ) : SvXMLImportContext( rImport, nPrfx, rLName ), @@ -1480,11 +1479,11 @@ ScXMLInsertionContext::ScXMLInsertionContext( ScXMLImport& rImport, sal_Int16 nAttrCount(xAttrList.is() ? xAttrList->getLength() : 0); for( sal_Int16 i=0; i < nAttrCount; ++i ) { - const rtl::OUString& sAttrName(xAttrList->getNameByIndex( i )); - rtl::OUString aLocalName; + const OUString& sAttrName(xAttrList->getNameByIndex( i )); + OUString aLocalName; sal_uInt16 nPrefix(GetScImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName )); - const rtl::OUString& sValue(xAttrList->getValueByIndex( i )); + const OUString& sValue(xAttrList->getValueByIndex( i )); if (nPrefix == XML_NAMESPACE_TABLE) { @@ -1537,7 +1536,7 @@ ScXMLInsertionContext::~ScXMLInsertionContext() } SvXMLImportContext *ScXMLInsertionContext::CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) { @@ -1568,7 +1567,7 @@ void ScXMLInsertionContext::EndElement() ScXMLInsertionCutOffContext::ScXMLInsertionCutOffContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const uno::Reference<xml::sax::XAttributeList>& xAttrList, ScXMLChangeTrackingImportHelper* pTempChangeTrackingImportHelper ) : SvXMLImportContext( rImport, nPrfx, rLName ), @@ -1579,11 +1578,11 @@ ScXMLInsertionCutOffContext::ScXMLInsertionCutOffContext( ScXMLImport& rImport, sal_Int16 nAttrCount(xAttrList.is() ? xAttrList->getLength() : 0); for( sal_Int16 i=0; i < nAttrCount; ++i ) { - const rtl::OUString& sAttrName(xAttrList->getNameByIndex( i )); - rtl::OUString aLocalName; + const OUString& sAttrName(xAttrList->getNameByIndex( i )); + OUString aLocalName; sal_uInt16 nPrefix(GetScImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName )); - const rtl::OUString& sValue(xAttrList->getValueByIndex( i )); + const OUString& sValue(xAttrList->getValueByIndex( i )); if (nPrefix == XML_NAMESPACE_TABLE) { @@ -1605,7 +1604,7 @@ ScXMLInsertionCutOffContext::~ScXMLInsertionCutOffContext() } SvXMLImportContext *ScXMLInsertionCutOffContext::CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& /* xAttrList */ ) { @@ -1618,7 +1617,7 @@ void ScXMLInsertionCutOffContext::EndElement() ScXMLMovementCutOffContext::ScXMLMovementCutOffContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const uno::Reference<xml::sax::XAttributeList>& xAttrList, ScXMLChangeTrackingImportHelper* pTempChangeTrackingImportHelper ) : SvXMLImportContext( rImport, nPrfx, rLName ), @@ -1632,11 +1631,11 @@ ScXMLMovementCutOffContext::ScXMLMovementCutOffContext( ScXMLImport& rImport, sal_Int16 nAttrCount(xAttrList.is() ? xAttrList->getLength() : 0); for( sal_Int16 i=0; i < nAttrCount; ++i ) { - const rtl::OUString& sAttrName(xAttrList->getNameByIndex( i )); - rtl::OUString aLocalName; + const OUString& sAttrName(xAttrList->getNameByIndex( i )); + OUString aLocalName; sal_uInt16 nPrefix(GetScImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName )); - const rtl::OUString& sValue(xAttrList->getValueByIndex( i )); + const OUString& sValue(xAttrList->getValueByIndex( i )); if (nPrefix == XML_NAMESPACE_TABLE) { @@ -1669,7 +1668,7 @@ ScXMLMovementCutOffContext::~ScXMLMovementCutOffContext() } SvXMLImportContext *ScXMLMovementCutOffContext::CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& /* xAttrList */ ) { @@ -1682,7 +1681,7 @@ void ScXMLMovementCutOffContext::EndElement() ScXMLCutOffsContext::ScXMLCutOffsContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const uno::Reference<xml::sax::XAttributeList>& /* xAttrList */, ScXMLChangeTrackingImportHelper* pTempChangeTrackingImportHelper ) : SvXMLImportContext( rImport, nPrfx, rLName ), @@ -1696,7 +1695,7 @@ ScXMLCutOffsContext::~ScXMLCutOffsContext() } SvXMLImportContext *ScXMLCutOffsContext::CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) { @@ -1722,7 +1721,7 @@ void ScXMLCutOffsContext::EndElement() ScXMLDeletionContext::ScXMLDeletionContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const uno::Reference<xml::sax::XAttributeList>& xAttrList, ScXMLChangeTrackingImportHelper* pTempChangeTrackingImportHelper ) : SvXMLImportContext( rImport, nPrfx, rLName ), @@ -1739,11 +1738,11 @@ ScXMLDeletionContext::ScXMLDeletionContext( ScXMLImport& rImport, sal_Int16 nAttrCount(xAttrList.is() ? xAttrList->getLength() : 0); for( sal_Int16 i=0; i < nAttrCount; i++ ) { - const rtl::OUString& sAttrName(xAttrList->getNameByIndex( i )); - rtl::OUString aLocalName; + const OUString& sAttrName(xAttrList->getNameByIndex( i )); + OUString aLocalName; sal_uInt16 nPrefix(GetScImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName )); - const rtl::OUString& sValue(xAttrList->getValueByIndex( i )); + const OUString& sValue(xAttrList->getValueByIndex( i )); if (nPrefix == XML_NAMESPACE_TABLE) { @@ -1801,7 +1800,7 @@ ScXMLDeletionContext::~ScXMLDeletionContext() } SvXMLImportContext *ScXMLDeletionContext::CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) { @@ -1838,7 +1837,7 @@ void ScXMLDeletionContext::EndElement() ScXMLMovementContext::ScXMLMovementContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const uno::Reference<xml::sax::XAttributeList>& xAttrList, ScXMLChangeTrackingImportHelper* pTempChangeTrackingImportHelper ) : SvXMLImportContext( rImport, nPrfx, rLName ), @@ -1851,11 +1850,11 @@ ScXMLMovementContext::ScXMLMovementContext( ScXMLImport& rImport, sal_Int16 nAttrCount(xAttrList.is() ? xAttrList->getLength() : 0); for( sal_Int16 i=0; i < nAttrCount; ++i ) { - const rtl::OUString& sAttrName(xAttrList->getNameByIndex( i )); - rtl::OUString aLocalName; + const OUString& sAttrName(xAttrList->getNameByIndex( i )); + OUString aLocalName; sal_uInt16 nPrefix(GetScImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName )); - const rtl::OUString& sValue(xAttrList->getValueByIndex( i )); + const OUString& sValue(xAttrList->getValueByIndex( i )); if (nPrefix == XML_NAMESPACE_TABLE) { @@ -1888,7 +1887,7 @@ ScXMLMovementContext::~ScXMLMovementContext() } SvXMLImportContext *ScXMLMovementContext::CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) { @@ -1924,7 +1923,7 @@ void ScXMLMovementContext::EndElement() ScXMLRejectionContext::ScXMLRejectionContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const uno::Reference<xml::sax::XAttributeList>& xAttrList, ScXMLChangeTrackingImportHelper* pTempChangeTrackingImportHelper ) : SvXMLImportContext( rImport, nPrfx, rLName ), @@ -1937,11 +1936,11 @@ ScXMLRejectionContext::ScXMLRejectionContext( ScXMLImport& rImport, sal_Int16 nAttrCount(xAttrList.is() ? xAttrList->getLength() : 0); for( sal_Int16 i=0; i < nAttrCount; ++i ) { - const rtl::OUString& sAttrName(xAttrList->getNameByIndex( i )); - rtl::OUString aLocalName; + const OUString& sAttrName(xAttrList->getNameByIndex( i )); + OUString aLocalName; sal_uInt16 nPrefix(GetScImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName )); - const rtl::OUString& sValue(xAttrList->getValueByIndex( i )); + const OUString& sValue(xAttrList->getValueByIndex( i )); if (nPrefix == XML_NAMESPACE_TABLE) { @@ -1974,7 +1973,7 @@ ScXMLRejectionContext::~ScXMLRejectionContext() } SvXMLImportContext *ScXMLRejectionContext::CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) { diff --git a/sc/source/filter/xml/XMLTrackedChangesContext.hxx b/sc/source/filter/xml/XMLTrackedChangesContext.hxx index 41cff44c3aa2..63d3a1b160c1 100644 --- a/sc/source/filter/xml/XMLTrackedChangesContext.hxx +++ b/sc/source/filter/xml/XMLTrackedChangesContext.hxx @@ -36,14 +36,14 @@ class ScXMLTrackedChangesContext : public SvXMLImportContext ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } public: - ScXMLTrackedChangesContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const ::rtl::OUString& rLName, + ScXMLTrackedChangesContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLChangeTrackingImportHelper* pChangeTrackingImportHelper); virtual ~ScXMLTrackedChangesContext(); 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 ); virtual void EndElement(); diff --git a/sc/source/filter/xml/sheetdata.cxx b/sc/source/filter/xml/sheetdata.cxx index 4c82a1840514..afeab260b730 100644 --- a/sc/source/filter/xml/sheetdata.cxx +++ b/sc/source/filter/xml/sheetdata.cxx @@ -29,7 +29,7 @@ ScSheetSaveData::ScSheetSaveData() : mnStartTab( -1 ), mnStartOffset( -1 ), - maPreviousNote( rtl::OUString(), rtl::OUString(), ScAddress(ScAddress::INITIALIZE_INVALID) ), + maPreviousNote( OUString(), OUString(), ScAddress(ScAddress::INITIALIZE_INVALID) ), mbInSupportedSave( false ) { } @@ -38,27 +38,27 @@ ScSheetSaveData::~ScSheetSaveData() { } -void ScSheetSaveData::AddCellStyle( const rtl::OUString& rName, const ScAddress& rCellPos ) +void ScSheetSaveData::AddCellStyle( const OUString& rName, const ScAddress& rCellPos ) { maCellStyles.push_back( ScCellStyleEntry( rName, rCellPos ) ); } -void ScSheetSaveData::AddColumnStyle( const rtl::OUString& rName, const ScAddress& rCellPos ) +void ScSheetSaveData::AddColumnStyle( const OUString& rName, const ScAddress& rCellPos ) { maColumnStyles.push_back( ScCellStyleEntry( rName, rCellPos ) ); } -void ScSheetSaveData::AddRowStyle( const rtl::OUString& rName, const ScAddress& rCellPos ) +void ScSheetSaveData::AddRowStyle( const OUString& rName, const ScAddress& rCellPos ) { maRowStyles.push_back( ScCellStyleEntry( rName, rCellPos ) ); } -void ScSheetSaveData::AddTableStyle( const rtl::OUString& rName, const ScAddress& rCellPos ) +void ScSheetSaveData::AddTableStyle( const OUString& rName, const ScAddress& rCellPos ) { maTableStyles.push_back( ScCellStyleEntry( rName, rCellPos ) ); } -void ScSheetSaveData::HandleNoteStyles( const rtl::OUString& rStyleName, const rtl::OUString& rTextName, const ScAddress& rCellPos ) +void ScSheetSaveData::HandleNoteStyles( const OUString& rStyleName, const OUString& rTextName, const ScAddress& rCellPos ) { // only consecutive duplicates (most common case) are filtered out here, // the others are found when the styles are created @@ -76,7 +76,7 @@ void ScSheetSaveData::HandleNoteStyles( const rtl::OUString& rStyleName, const r maNoteStyles.push_back( aNewEntry ); } -void ScSheetSaveData::AddNoteContentStyle( sal_uInt16 nFamily, const rtl::OUString& rName, const ScAddress& rCellPos, const ESelection& rSelection ) +void ScSheetSaveData::AddNoteContentStyle( sal_uInt16 nFamily, const OUString& rName, const ScAddress& rCellPos, const ESelection& rSelection ) { if ( nFamily == XML_STYLE_FAMILY_TEXT_PARAGRAPH ) maNoteParaStyles.push_back( ScTextStyleEntry( rName, rCellPos, rSelection ) ); @@ -84,7 +84,7 @@ void ScSheetSaveData::AddNoteContentStyle( sal_uInt16 nFamily, const rtl::OUStri maNoteTextStyles.push_back( ScTextStyleEntry( rName, rCellPos, rSelection ) ); } -void ScSheetSaveData::AddTextStyle( const rtl::OUString& rName, const ScAddress& rCellPos, const ESelection& rSelection ) +void ScSheetSaveData::AddTextStyle( const OUString& rName, const ScAddress& rCellPos, const ESelection& rSelection ) { maTextStyles.push_back( ScTextStyleEntry( rName, rCellPos, rSelection ) ); } @@ -201,7 +201,7 @@ void ScSheetSaveData::StoreLoadedNamespaces( const SvXMLNamespaceMap& rNamespace } } -static bool lcl_NameInHash( const NameSpaceHash& rNameHash, const rtl::OUString& rName ) +static bool lcl_NameInHash( const NameSpaceHash& rNameHash, const OUString& rName ) { NameSpaceHash::const_iterator aIter = rNameHash.begin(), aEnd = rNameHash.end(); while (aIter != aEnd) diff --git a/sc/source/filter/xml/xmlannoi.cxx b/sc/source/filter/xml/xmlannoi.cxx index f68694e69ec6..de6eb7003fcd 100644 --- a/sc/source/filter/xml/xmlannoi.cxx +++ b/sc/source/filter/xml/xmlannoi.cxx @@ -46,7 +46,7 @@ ScXMLAnnotationData::~ScXMLAnnotationData() ScXMLAnnotationContext::ScXMLAnnotationContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const uno::Reference<xml::sax::XAttributeList>& xAttrList, ScXMLAnnotationData& rAnnotationData, ScXMLTableRowCellContext* pTempCellContext) : @@ -69,11 +69,11 @@ ScXMLAnnotationContext::ScXMLAnnotationContext( ScXMLImport& rImport, const SvXMLTokenMap& rAttrTokenMap = GetScImport().GetTableAnnotationAttrTokenMap(); for( sal_Int16 i=0; i < nAttrCount; ++i ) { - const rtl::OUString& sAttrName(xAttrList->getNameByIndex( i )); - rtl::OUString aLocalName; + const OUString& sAttrName(xAttrList->getNameByIndex( i )); + OUString aLocalName; sal_uInt16 nPrefix = GetScImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName ); - const rtl::OUString& sValue(xAttrList->getValueByIndex( i )); + const OUString& sValue(xAttrList->getValueByIndex( i )); switch( rAttrTokenMap.Get( nPrefix, aLocalName ) ) { @@ -122,7 +122,7 @@ void ScXMLAnnotationContext::StartElement(const com::sun::star::uno::Reference< } SvXMLImportContext *ScXMLAnnotationContext::CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) { @@ -153,7 +153,7 @@ SvXMLImportContext *ScXMLAnnotationContext::CreateChildContext( sal_uInt16 nPref return pContext; } -void ScXMLAnnotationContext::Characters( const ::rtl::OUString& rChars ) +void ScXMLAnnotationContext::Characters( const OUString& rChars ) { maTextBuffer.append(rChars); } @@ -178,7 +178,7 @@ void ScXMLAnnotationContext::EndElement() } void ScXMLAnnotationContext::SetShape( const uno::Reference< drawing::XShape >& rxShape, const uno::Reference< drawing::XShapes >& rxShapes, - const rtl::OUString& rStyleName, const rtl::OUString& rTextStyle ) + const OUString& rStyleName, const OUString& rTextStyle ) { mrAnnotationData.mxShape = rxShape; mrAnnotationData.mxShapes = rxShapes; @@ -186,7 +186,7 @@ void ScXMLAnnotationContext::SetShape( const uno::Reference< drawing::XShape >& mrAnnotationData.maTextStyle = rTextStyle; } -void ScXMLAnnotationContext::AddContentStyle( sal_uInt16 nFamily, const rtl::OUString& rName, const ESelection& rSelection ) +void ScXMLAnnotationContext::AddContentStyle( sal_uInt16 nFamily, const OUString& rName, const ESelection& rSelection ) { mrAnnotationData.maContentStyles.push_back( ScXMLAnnotationStyleEntry( nFamily, rName, rSelection ) ); } diff --git a/sc/source/filter/xml/xmlannoi.hxx b/sc/source/filter/xml/xmlannoi.hxx index c52031de3ace..8aad19af1dc1 100644 --- a/sc/source/filter/xml/xmlannoi.hxx +++ b/sc/source/filter/xml/xmlannoi.hxx @@ -33,10 +33,10 @@ class ScXMLTableRowCellContext; struct ScXMLAnnotationStyleEntry { sal_uInt16 mnFamily; - rtl::OUString maName; + OUString maName; ESelection maSelection; - ScXMLAnnotationStyleEntry( sal_uInt16 nFam, const rtl::OUString& rNam, const ESelection& rSel ) : + ScXMLAnnotationStyleEntry( sal_uInt16 nFam, const OUString& rNam, const ESelection& rSel ) : mnFamily( nFam ), maName( rNam ), maSelection( rSel ) @@ -50,11 +50,11 @@ struct ScXMLAnnotationData mxShape; ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes > mxShapes; - ::rtl::OUString maAuthor; - ::rtl::OUString maCreateDate; - ::rtl::OUString maSimpleText; - ::rtl::OUString maStyleName; - ::rtl::OUString maTextStyle; + OUString maAuthor; + OUString maCreateDate; + OUString maSimpleText; + OUString maStyleName; + OUString maTextStyle; bool mbUseShapePos; bool mbShown; std::vector<ScXMLAnnotationStyleEntry> maContentStyles; @@ -68,7 +68,7 @@ class ScXMLAnnotationContext : public SvXMLImportContext public: ScXMLAnnotationContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLAnnotationData& rAnnotationData, @@ -77,29 +77,29 @@ public: virtual ~ScXMLAnnotationContext(); 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 ); virtual void StartElement(const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList); - virtual void Characters( const ::rtl::OUString& rChars ); + virtual void Characters( const OUString& rChars ); virtual void EndElement(); void SetShape( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >& rxShape, const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes >& rxShapes, - const ::rtl::OUString& rStyleName, const ::rtl::OUString& rTextStyle ); + const OUString& rStyleName, const OUString& rTextStyle ); - void AddContentStyle( sal_uInt16 nFamily, const rtl::OUString& rName, const ESelection& rSelection ); + void AddContentStyle( sal_uInt16 nFamily, const OUString& rName, const ESelection& rSelection ); private: ScXMLAnnotationData& mrAnnotationData; - rtl::OUStringBuffer maTextBuffer; - rtl::OUStringBuffer maAuthorBuffer; - rtl::OUStringBuffer maCreateDateBuffer; - rtl::OUStringBuffer maCreateDateStringBuffer; + OUStringBuffer maTextBuffer; + OUStringBuffer maAuthorBuffer; + OUStringBuffer maCreateDateBuffer; + OUStringBuffer maCreateDateStringBuffer; ScXMLTableRowCellContext* pCellContext; SvXMLImportContext* pShapeContext; diff --git a/sc/source/filter/xml/xmlbodyi.cxx b/sc/source/filter/xml/xmlbodyi.cxx index 632f847a704d..10a0a946cc38 100644 --- a/sc/source/filter/xml/xmlbodyi.cxx +++ b/sc/source/filter/xml/xmlbodyi.cxx @@ -51,7 +51,6 @@ #include <memory> -using rtl::OUString; using namespace com::sun::star; using namespace xmloff::token; @@ -60,7 +59,7 @@ using namespace xmloff::token; ScXMLBodyContext::ScXMLBodyContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const uno::Reference<xml::sax::XAttributeList>& xAttrList ) : SvXMLImportContext( rImport, nPrfx, rLName ), sPassword(), @@ -99,11 +98,11 @@ ScXMLBodyContext::ScXMLBodyContext( ScXMLImport& rImport, sal_Int16 nAttrCount = xAttrList.is() ? xAttrList->getLength() : 0; for( sal_Int16 i=0; i < nAttrCount; ++i ) { - const rtl::OUString& sAttrName(xAttrList->getNameByIndex( i )); - rtl::OUString aLocalName; + const OUString& sAttrName(xAttrList->getNameByIndex( i )); + OUString aLocalName; sal_uInt16 nPrefix = GetScImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName ); - const rtl::OUString& sValue(xAttrList->getValueByIndex( i )); + const OUString& sValue(xAttrList->getValueByIndex( i )); if (nPrefix == XML_NAMESPACE_TABLE) { @@ -124,7 +123,7 @@ ScXMLBodyContext::~ScXMLBodyContext() } SvXMLImportContext *ScXMLBodyContext::CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) { diff --git a/sc/source/filter/xml/xmlbodyi.hxx b/sc/source/filter/xml/xmlbodyi.hxx index 84e34443db18..8eec88f0390c 100644 --- a/sc/source/filter/xml/xmlbodyi.hxx +++ b/sc/source/filter/xml/xmlbodyi.hxx @@ -30,7 +30,7 @@ class ScXMLChangeTrackingImportHelper; class ScXMLBodyContext : public SvXMLImportContext { - rtl::OUString sPassword; + OUString sPassword; ScPasswordHash meHash1; ScPasswordHash meHash2; bool bProtected; @@ -41,16 +41,16 @@ class ScXMLBodyContext : public SvXMLImportContext ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } public: - ScXMLBodyContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const ::rtl::OUString& rLName, + ScXMLBodyContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, const ::com::sun::star::uno::Reference<com::sun::star::xml::sax::XAttributeList>& xAttrList ); virtual ~ScXMLBodyContext(); 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 ); virtual void EndElement(); - virtual void Characters( const ::rtl::OUString& rChars ); + virtual void Characters( const OUString& rChars ); }; #endif diff --git a/sc/source/filter/xml/xmlcelli.cxx b/sc/source/filter/xml/xmlcelli.cxx index 2ceae6bc89e7..d9b5decc1a06 100644 --- a/sc/source/filter/xml/xmlcelli.cxx +++ b/sc/source/filter/xml/xmlcelli.cxx @@ -127,7 +127,7 @@ ScXMLTableRowCellContext::Field::~Field() ScXMLTableRowCellContext::ScXMLTableRowCellContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, const bool bTempIsCovered, @@ -162,21 +162,21 @@ ScXMLTableRowCellContext::ScXMLTableRowCellContext( ScXMLImport& rImport, rXMLImport.SetRemoveLastChar(false); rXMLImport.GetTables().AddColumn(bTempIsCovered); const sal_Int16 nAttrCount = xAttrList.is() ? xAttrList->getLength() : 0; - rtl::OUString aLocalName; - rtl::OUString* pStyleName = NULL; - rtl::OUString* pCurrencySymbol = NULL; + OUString aLocalName; + OUString* pStyleName = NULL; + OUString* pCurrencySymbol = NULL; const SvXMLTokenMap& rTokenMap = rImport.GetTableRowCellAttrTokenMap(); for (sal_Int16 i = 0; i < nAttrCount; ++i) { sal_uInt16 nAttrPrefix = rImport.GetNamespaceMap().GetKeyByAttrName( xAttrList->getNameByIndex(i), &aLocalName); - const rtl::OUString& sValue = xAttrList->getValueByIndex(i); + const OUString& sValue = xAttrList->getValueByIndex(i); sal_uInt16 nToken = rTokenMap.Get(nAttrPrefix, aLocalName); switch (nToken) { case XML_TOK_TABLE_ROW_CELL_ATTR_STYLE_NAME: - pStyleName = new rtl::OUString(sValue); + pStyleName = new OUString(sValue); break; case XML_TOK_TABLE_ROW_CELL_ATTR_CONTENT_VALIDATION_NAME: OSL_ENSURE(!maContentValidationName, "here should be only one Validation Name"); @@ -269,14 +269,14 @@ ScXMLTableRowCellContext::ScXMLTableRowCellContext( ScXMLImport& rImport, if (!sValue.isEmpty()) { OSL_ENSURE(!maFormula, "here should be only one formula"); - rtl::OUString aFormula, aFormulaNmsp; + OUString aFormula, aFormulaNmsp; rXMLImport.ExtractFormulaNamespaceGrammar( aFormula, aFormulaNmsp, eGrammar, sValue ); maFormula.reset( FormulaWithNamespace(aFormula, aFormulaNmsp) ); } } break; case XML_TOK_TABLE_ROW_CELL_ATTR_CURRENCY: - pCurrencySymbol = new rtl::OUString(sValue); + pCurrencySymbol = new OUString(sValue); break; default: ; @@ -609,7 +609,7 @@ void ScXMLTableRowCellContext::PushParagraphEnd() } SvXMLImportContext *ScXMLTableRowCellContext::CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) { @@ -980,7 +980,7 @@ void ScXMLTableRowCellContext::SetFormulaCell(ScFormulaCell* pFCell) const } void ScXMLTableRowCellContext::PutTextCell( const ScAddress& rCurrentPos, - const SCCOL nCurrentCol, const ::boost::optional< rtl::OUString >& pOUText ) + const SCCOL nCurrentCol, const ::boost::optional< OUString >& pOUText ) { bool bDoIncrement = true; //matrix reference cells that contain text formula results; @@ -1116,7 +1116,7 @@ bool isEmptyOrNote( ScDocument* pDoc, const ScAddress& rCurrentPos ) } void ScXMLTableRowCellContext::AddTextAndValueCell( const ScAddress& rCellPos, - const ::boost::optional< rtl::OUString >& pOUText, ScAddress& rCurrentPos ) + const ::boost::optional< OUString >& pOUText, ScAddress& rCurrentPos ) { ScMyTables& rTables = rXMLImport.GetTables(); bool bWasEmpty = bIsEmpty; @@ -1262,7 +1262,7 @@ OUString getOutputString( ScDocument* pDoc, const ScAddress& aCellPos ) void ScXMLTableRowCellContext::AddNonFormulaCell( const ScAddress& rCellPos ) { - ::boost::optional< rtl::OUString > pOUText; + ::boost::optional< OUString > pOUText; if( nCellType == util::NumberFormat::TEXT ) { diff --git a/sc/source/filter/xml/xmlcelli.hxx b/sc/source/filter/xml/xmlcelli.hxx index e59aa6eab839..ac03836fc731 100644 --- a/sc/source/filter/xml/xmlcelli.hxx +++ b/sc/source/filter/xml/xmlcelli.hxx @@ -91,7 +91,7 @@ class ScXMLTableRowCellContext : public ScXMLImportContext bool mbCheckWithCompilerForError; bool mbEditEngineHasText; - sal_Int16 GetCellType(const rtl::OUString& sOUValue) const; + sal_Int16 GetCellType(const OUString& sOUValue) const; void DoMerge(const ScAddress& rScCellPos, const SCCOL nCols, const SCROW nRows); @@ -106,10 +106,10 @@ class ScXMLTableRowCellContext : public ScXMLImportContext void SetFormulaCell ( ScFormulaCell* pFCell ) const; void PutTextCell ( const ScAddress& rScCurrentPos, const SCCOL nCurrentCol, - const ::boost::optional< rtl::OUString >& pOUText ); + const ::boost::optional< OUString >& pOUText ); void PutValueCell ( const ScAddress& rScCurrentPos ); void AddTextAndValueCell ( const ScAddress& rScCellPos, - const ::boost::optional< rtl::OUString >& pOUText, ScAddress& rScCurrentPos ); + const ::boost::optional< OUString >& pOUText, ScAddress& rScCurrentPos ); void AddNonFormulaCell ( const ScAddress& rScCellPos ); void PutFormulaCell ( const ScAddress& rScCurrentPos ); void AddFormulaCell ( const ScAddress& rScCellPos ); @@ -123,7 +123,7 @@ class ScXMLTableRowCellContext : public ScXMLImportContext public: ScXMLTableRowCellContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, const bool bIsCovered, const sal_Int32 nRepeatedRows ); @@ -131,7 +131,7 @@ public: virtual ~ScXMLTableRowCellContext(); 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 ); diff --git a/sc/source/filter/xml/xmlcoli.cxx b/sc/source/filter/xml/xmlcoli.cxx index e53ca9a66205..4102a685c7de 100644 --- a/sc/source/filter/xml/xmlcoli.cxx +++ b/sc/source/filter/xml/xmlcoli.cxx @@ -44,7 +44,7 @@ using namespace xmloff::token; ScXMLTableColContext::ScXMLTableColContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) : SvXMLImportContext( rImport, nPrfx, rLName ), @@ -56,11 +56,11 @@ ScXMLTableColContext::ScXMLTableColContext( ScXMLImport& rImport, for( sal_Int16 i=0; i < nAttrCount; ++i ) { - const rtl::OUString& sAttrName(xAttrList->getNameByIndex( i )); - rtl::OUString aLocalName; + const OUString& sAttrName(xAttrList->getNameByIndex( i )); + OUString aLocalName; sal_uInt16 nPrefix = GetScImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName ); - const rtl::OUString& sValue(xAttrList->getValueByIndex( i )); + const OUString& sValue(xAttrList->getValueByIndex( i )); switch( rAttrTokenMap.Get( nPrefix, aLocalName ) ) { @@ -94,7 +94,7 @@ ScXMLTableColContext::~ScXMLTableColContext() } SvXMLImportContext *ScXMLTableColContext::CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& /* xAttrList */ ) { @@ -145,7 +145,7 @@ void ScXMLTableColContext::EndElement() } } } - rtl::OUString sVisible(RTL_CONSTASCII_USTRINGPARAM(SC_UNONAME_CELLVIS)); + OUString sVisible(RTL_CONSTASCII_USTRINGPARAM(SC_UNONAME_CELLVIS)); bool bValue(true); if (!IsXMLToken(sVisibility, XML_VISIBLE)) bValue = false; @@ -157,14 +157,14 @@ void ScXMLTableColContext::EndElement() // #i57915# ScXMLImport::SetStyleToRange can't handle empty style names. // The default for a column if there is no attribute is the style "Default" (programmatic API name). if ( sCellStyleName.isEmpty() ) - sCellStyleName = rtl::OUString( "Default" ); + sCellStyleName = OUString( "Default" ); GetScImport().GetTables().AddColStyle(nColCount, sCellStyleName); } ScXMLTableColsContext::ScXMLTableColsContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, const bool bTempHeader, const bool bTempGroup) : @@ -186,11 +186,11 @@ ScXMLTableColsContext::ScXMLTableColsContext( ScXMLImport& rImport, sal_Int16 nAttrCount = xAttrList.is() ? xAttrList->getLength() : 0; for( sal_Int16 i=0; i < nAttrCount; ++i ) { - const rtl::OUString& sAttrName(xAttrList->getNameByIndex( i )); - rtl::OUString aLocalName; + const OUString& sAttrName(xAttrList->getNameByIndex( i )); + OUString aLocalName; sal_uInt16 nPrefix = GetScImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName ); - const rtl::OUString& sValue(xAttrList->getValueByIndex( i )); + const OUString& sValue(xAttrList->getValueByIndex( i )); if (nPrefix == XML_NAMESPACE_TABLE && IsXMLToken(aLocalName, XML_DISPLAY)) { @@ -206,7 +206,7 @@ ScXMLTableColsContext::~ScXMLTableColsContext() } SvXMLImportContext *ScXMLTableColsContext::CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) { diff --git a/sc/source/filter/xml/xmlcoli.hxx b/sc/source/filter/xml/xmlcoli.hxx index 8fa6f172f1fa..6c94cbd82b69 100644 --- a/sc/source/filter/xml/xmlcoli.hxx +++ b/sc/source/filter/xml/xmlcoli.hxx @@ -27,9 +27,9 @@ class ScXMLImport; class ScXMLTableColContext : public SvXMLImportContext { sal_Int32 nColCount; - rtl::OUString sStyleName; - rtl::OUString sVisibility; - rtl::OUString sCellStyleName; + OUString sStyleName; + OUString sVisibility; + OUString sCellStyleName; const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); } ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } @@ -37,14 +37,14 @@ class ScXMLTableColContext : public SvXMLImportContext public: ScXMLTableColContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); virtual ~ScXMLTableColContext(); 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 ); @@ -67,7 +67,7 @@ class ScXMLTableColsContext : public SvXMLImportContext public: ScXMLTableColsContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, const bool bHeader, const bool bGroup); @@ -75,7 +75,7 @@ public: virtual ~ScXMLTableColsContext(); 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 ); diff --git a/sc/source/filter/xml/xmlcondformat.cxx b/sc/source/filter/xml/xmlcondformat.cxx index ef0468ab2474..cc00ba778c9b 100644 --- a/sc/source/filter/xml/xmlcondformat.cxx +++ b/sc/source/filter/xml/xmlcondformat.cxx @@ -40,7 +40,7 @@ ScXMLConditionalFormatsContext::ScXMLConditionalFormatsContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName): + const OUString& rLName): SvXMLImportContext( rImport, nPrfx, rLName ) { GetScImport().SetNewCondFormatData(); @@ -48,7 +48,7 @@ ScXMLConditionalFormatsContext::ScXMLConditionalFormatsContext( ScXMLImport& rIm } SvXMLImportContext* ScXMLConditionalFormatsContext::CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) { @@ -77,20 +77,20 @@ void ScXMLConditionalFormatsContext::EndElement() } ScXMLConditionalFormatContext::ScXMLConditionalFormatContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList): + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList): SvXMLImportContext( rImport, nPrfx, rLName ) { - rtl::OUString sRange; + OUString sRange; sal_Int16 nAttrCount(xAttrList.is() ? xAttrList->getLength() : 0); const SvXMLTokenMap& rAttrTokenMap = GetScImport().GetCondFormatAttrMap(); for( sal_Int16 i=0; i < nAttrCount; ++i ) { - const rtl::OUString& sAttrName(xAttrList->getNameByIndex( i )); - rtl::OUString aLocalName; + const OUString& sAttrName(xAttrList->getNameByIndex( i )); + OUString aLocalName; sal_uInt16 nPrefix(GetScImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName )); - const rtl::OUString& sValue(xAttrList->getValueByIndex( i )); + const OUString& sValue(xAttrList->getValueByIndex( i )); switch( rAttrTokenMap.Get( nPrefix, aLocalName ) ) { @@ -110,7 +110,7 @@ ScXMLConditionalFormatContext::ScXMLConditionalFormatContext( ScXMLImport& rImpo } SvXMLImportContext* ScXMLConditionalFormatContext::CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) { @@ -153,7 +153,7 @@ void ScXMLConditionalFormatContext::EndElement() } ScXMLColorScaleFormatContext::ScXMLColorScaleFormatContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, ScConditionalFormat* pFormat): + const OUString& rLName, ScConditionalFormat* pFormat): SvXMLImportContext( rImport, nPrfx, rLName ), pColorScaleFormat(NULL) { @@ -162,7 +162,7 @@ ScXMLColorScaleFormatContext::ScXMLColorScaleFormatContext( ScXMLImport& rImport } SvXMLImportContext* ScXMLColorScaleFormatContext::CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) { @@ -182,28 +182,28 @@ SvXMLImportContext* ScXMLColorScaleFormatContext::CreateChildContext( sal_uInt16 } ScXMLDataBarFormatContext::ScXMLDataBarFormatContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScConditionalFormat* pFormat): SvXMLImportContext( rImport, nPrfx, rLName ), mpDataBarFormat(NULL), mpFormatData(NULL) { - rtl::OUString sPositiveColor; - rtl::OUString sNegativeColor; - rtl::OUString sGradient; - rtl::OUString sAxisPosition; - rtl::OUString sShowValue; - rtl::OUString sAxisColor; + OUString sPositiveColor; + OUString sNegativeColor; + OUString sGradient; + OUString sAxisPosition; + OUString sShowValue; + OUString sAxisColor; sal_Int16 nAttrCount(xAttrList.is() ? xAttrList->getLength() : 0); const SvXMLTokenMap& rAttrTokenMap = GetScImport().GetDataBarAttrMap(); for( sal_Int16 i=0; i < nAttrCount; ++i ) { - const rtl::OUString& sAttrName(xAttrList->getNameByIndex( i )); - rtl::OUString aLocalName; + const OUString& sAttrName(xAttrList->getNameByIndex( i )); + OUString aLocalName; sal_uInt16 nPrefix(GetScImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName )); - const rtl::OUString& sValue(xAttrList->getValueByIndex( i )); + const OUString& sValue(xAttrList->getValueByIndex( i )); switch( rAttrTokenMap.Get( nPrefix, aLocalName ) ) { @@ -283,7 +283,7 @@ ScXMLDataBarFormatContext::ScXMLDataBarFormatContext( ScXMLImport& rImport, sal_ } SvXMLImportContext* ScXMLDataBarFormatContext::CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) { @@ -315,22 +315,22 @@ SvXMLImportContext* ScXMLDataBarFormatContext::CreateChildContext( sal_uInt16 nP } ScXMLIconSetFormatContext::ScXMLIconSetFormatContext(ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScConditionalFormat* pFormat): SvXMLImportContext( rImport, nPrfx, rLName ) { - rtl::OUString aIconSetType, sShowValue; + OUString aIconSetType, sShowValue; sal_Int16 nAttrCount(xAttrList.is() ? xAttrList->getLength() : 0); const SvXMLTokenMap& rAttrTokenMap = GetScImport().GetIconSetAttrMap(); for( sal_Int16 i=0; i < nAttrCount; ++i ) { - const rtl::OUString& sAttrName(xAttrList->getNameByIndex( i )); - rtl::OUString aLocalName; + const OUString& sAttrName(xAttrList->getNameByIndex( i )); + OUString aLocalName; sal_uInt16 nPrefix(GetScImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName )); - const rtl::OUString& sValue(xAttrList->getValueByIndex( i )); + const OUString& sValue(xAttrList->getValueByIndex( i )); switch( rAttrTokenMap.Get( nPrefix, aLocalName ) ) { @@ -349,7 +349,7 @@ ScXMLIconSetFormatContext::ScXMLIconSetFormatContext(ScXMLImport& rImport, sal_u ScIconSetType eType = IconSet_3Arrows; for(; pMap->pName; ++pMap) { - rtl::OUString aName = rtl::OUString::createFromAscii(pMap->pName); + OUString aName = OUString::createFromAscii(pMap->pName); if(aName ==aIconSetType) { eType = pMap->eType; @@ -375,7 +375,7 @@ ScXMLIconSetFormatContext::ScXMLIconSetFormatContext(ScXMLImport& rImport, sal_u } SvXMLImportContext* ScXMLIconSetFormatContext::CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) { @@ -400,7 +400,7 @@ SvXMLImportContext* ScXMLIconSetFormatContext::CreateChildContext( sal_uInt16 nP namespace { -void GetConditionData(const rtl::OUString& rValue, ScConditionMode& eMode, rtl::OUString& rExpr1, rtl::OUString& rExpr2) +void GetConditionData(const OUString& rValue, ScConditionMode& eMode, OUString& rExpr1, OUString& rExpr2) { if(rValue.indexOf("unique") == 0) { @@ -561,23 +561,23 @@ void GetConditionData(const rtl::OUString& rValue, ScConditionMode& eMode, rtl:: } ScXMLCondContext::ScXMLCondContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScConditionalFormat* pFormat ): SvXMLImportContext( rImport, nPrfx, rLName ) { - rtl::OUString sExpression; - rtl::OUString sStyle; - rtl::OUString sAddress; + OUString sExpression; + OUString sStyle; + OUString sAddress; sal_Int16 nAttrCount(xAttrList.is() ? xAttrList->getLength() : 0); const SvXMLTokenMap& rAttrTokenMap = GetScImport().GetConditionAttrMap(); for( sal_Int16 i=0; i < nAttrCount; ++i ) { - const rtl::OUString& sAttrName(xAttrList->getNameByIndex( i )); - rtl::OUString aLocalName; + const OUString& sAttrName(xAttrList->getNameByIndex( i )); + OUString aLocalName; sal_uInt16 nPrefix(GetScImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName )); - const rtl::OUString& sValue(xAttrList->getValueByIndex( i )); + const OUString& sValue(xAttrList->getValueByIndex( i )); switch( rAttrTokenMap.Get( nPrefix, aLocalName ) ) { @@ -595,13 +595,13 @@ ScXMLCondContext::ScXMLCondContext( ScXMLImport& rImport, sal_uInt16 nPrfx, } } - rtl::OUString aExpr1; - rtl::OUString aExpr2; + OUString aExpr1; + OUString aExpr2; ScConditionMode eMode; GetConditionData(sExpression, eMode, aExpr1, aExpr2); ScCondFormatEntry* pFormatEntry = new ScCondFormatEntry(eMode, aExpr1, aExpr2, GetScImport().GetDocument(), ScAddress(), sStyle, - rtl::OUString(), rtl::OUString(), formula::FormulaGrammar::GRAM_ODFF, formula::FormulaGrammar::GRAM_ODFF); + OUString(), OUString(), formula::FormulaGrammar::GRAM_ODFF, formula::FormulaGrammar::GRAM_ODFF); pFormatEntry->SetSrcString(sAddress); pFormat->AddEntry(pFormatEntry); @@ -609,7 +609,7 @@ ScXMLCondContext::ScXMLCondContext( ScXMLImport& rImport, sal_uInt16 nPrfx, namespace { -void setColorEntryType(const rtl::OUString& rType, ScColorScaleEntry* pEntry, const rtl::OUString rFormula, +void setColorEntryType(const OUString& rType, ScColorScaleEntry* pEntry, const OUString rFormula, ScXMLImport& rImport) { if(rType == "minimum") @@ -635,7 +635,7 @@ void setColorEntryType(const rtl::OUString& rType, ScColorScaleEntry* pEntry, co } ScXMLColorScaleFormatEntryContext::ScXMLColorScaleFormatEntryContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScColorScaleFormat* pFormat): SvXMLImportContext( rImport, nPrfx, rLName ), mpFormatEntry( NULL ) @@ -643,19 +643,19 @@ ScXMLColorScaleFormatEntryContext::ScXMLColorScaleFormatEntryContext( ScXMLImpor double nVal = 0; Color aColor; - rtl::OUString sType; - rtl::OUString sVal; - rtl::OUString sColor; + OUString sType; + OUString sVal; + OUString sColor; sal_Int16 nAttrCount(xAttrList.is() ? xAttrList->getLength() : 0); const SvXMLTokenMap& rAttrTokenMap = GetScImport().GetColorScaleEntryAttrMap(); for( sal_Int16 i=0; i < nAttrCount; ++i ) { - const rtl::OUString& sAttrName(xAttrList->getNameByIndex( i )); - rtl::OUString aLocalName; + const OUString& sAttrName(xAttrList->getNameByIndex( i )); + OUString aLocalName; sal_uInt16 nPrefix(GetScImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName )); - const rtl::OUString& sValue(xAttrList->getValueByIndex( i )); + const OUString& sValue(xAttrList->getValueByIndex( i )); switch( rAttrTokenMap.Get( nPrefix, aLocalName ) ) { @@ -686,22 +686,22 @@ ScXMLColorScaleFormatEntryContext::ScXMLColorScaleFormatEntryContext( ScXMLImpor } ScXMLFormattingEntryContext::ScXMLFormattingEntryContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScColorScaleEntry*& pColorScaleEntry): SvXMLImportContext( rImport, nPrfx, rLName ) { - rtl::OUString sVal; - rtl::OUString sType; + OUString sVal; + OUString sType; sal_Int16 nAttrCount(xAttrList.is() ? xAttrList->getLength() : 0); const SvXMLTokenMap& rAttrTokenMap = GetScImport().GetDataBarEntryAttrMap(); for( sal_Int16 i=0; i < nAttrCount; ++i ) { - const rtl::OUString& sAttrName(xAttrList->getNameByIndex( i )); - rtl::OUString aLocalName; + const OUString& sAttrName(xAttrList->getNameByIndex( i )); + OUString aLocalName; sal_uInt16 nPrefix(GetScImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName )); - const rtl::OUString& sValue(xAttrList->getValueByIndex( i )); + const OUString& sValue(xAttrList->getValueByIndex( i )); switch( rAttrTokenMap.Get( nPrefix, aLocalName ) ) { @@ -726,7 +726,7 @@ ScXMLFormattingEntryContext::ScXMLFormattingEntryContext( ScXMLImport& rImport, namespace { -condformat::ScCondFormatDateType getDateFromString(const rtl::OUString& rString) +condformat::ScCondFormatDateType getDateFromString(const OUString& rString) { if(rString == "today") return condformat::TODAY; @@ -762,20 +762,20 @@ condformat::ScCondFormatDateType getDateFromString(const rtl::OUString& rString) } ScXMLDateContext::ScXMLDateContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScConditionalFormat* pFormat ): SvXMLImportContext( rImport, nPrfx, rLName ) { - rtl::OUString sDateType, sStyle; + OUString sDateType, sStyle; sal_Int16 nAttrCount(xAttrList.is() ? xAttrList->getLength() : 0); const SvXMLTokenMap& rAttrTokenMap = GetScImport().GetCondDateAttrMap(); for( sal_Int16 i=0; i < nAttrCount; ++i ) { - const rtl::OUString& sAttrName(xAttrList->getNameByIndex( i )); - rtl::OUString aLocalName; + const OUString& sAttrName(xAttrList->getNameByIndex( i )); + OUString aLocalName; sal_uInt16 nPrefix(GetScImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName )); - const rtl::OUString& sValue(xAttrList->getValueByIndex( i )); + const OUString& sValue(xAttrList->getValueByIndex( i )); switch( rAttrTokenMap.Get( nPrefix, aLocalName ) ) { diff --git a/sc/source/filter/xml/xmlcondformat.hxx b/sc/source/filter/xml/xmlcondformat.hxx index 1b64cd5cf896..9df40bbfeb2f 100644 --- a/sc/source/filter/xml/xmlcondformat.hxx +++ b/sc/source/filter/xml/xmlcondformat.hxx @@ -43,12 +43,12 @@ class ScXMLConditionalFormatsContext : public SvXMLImportContext ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } public: ScXMLConditionalFormatsContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName ); + const OUString& rLName ); virtual ~ScXMLConditionalFormatsContext() {} 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 ); @@ -61,14 +61,14 @@ class ScXMLConditionalFormatContext : public SvXMLImportContext ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } public: ScXMLConditionalFormatContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList); virtual ~ScXMLConditionalFormatContext() {} 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 ); @@ -87,13 +87,13 @@ private: public: ScXMLColorScaleFormatContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, ScConditionalFormat* pFormat); + const OUString& rLName, ScConditionalFormat* pFormat); virtual ~ScXMLColorScaleFormatContext() {} 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 ); private: @@ -107,7 +107,7 @@ class ScXMLDataBarFormatContext : public SvXMLImportContext ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } public: ScXMLDataBarFormatContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScConditionalFormat* pFormat); @@ -116,7 +116,7 @@ public: 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 ); private: @@ -135,7 +135,7 @@ class ScXMLIconSetFormatContext : public SvXMLImportContext public: ScXMLIconSetFormatContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScConditionalFormat* pFormat); @@ -144,7 +144,7 @@ public: 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 ); }; @@ -155,7 +155,7 @@ class ScXMLColorScaleFormatEntryContext : public SvXMLImportContext ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } public: ScXMLColorScaleFormatEntryContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScColorScaleFormat* pFormat); @@ -172,7 +172,7 @@ class ScXMLFormattingEntryContext : public SvXMLImportContext ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } public: ScXMLFormattingEntryContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScColorScaleEntry*& pData); @@ -186,7 +186,7 @@ class ScXMLCondContext : public SvXMLImportContext ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } public: ScXMLCondContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScConditionalFormat* pFormat); @@ -200,7 +200,7 @@ class ScXMLDateContext : public SvXMLImportContext ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } public: ScXMLDateContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScConditionalFormat* pFormat); diff --git a/sc/source/filter/xml/xmlconti.cxx b/sc/source/filter/xml/xmlconti.cxx index 4decd390cb3c..29b91dca5b2f 100644 --- a/sc/source/filter/xml/xmlconti.cxx +++ b/sc/source/filter/xml/xmlconti.cxx @@ -33,10 +33,10 @@ using namespace xmloff::token; ScXMLContentContext::ScXMLContentContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& /* xAttrList */, - rtl::OUStringBuffer& sTempValue) : + OUStringBuffer& sTempValue) : SvXMLImportContext( rImport, nPrfx, rLName ), sOUText(), sValue(sTempValue) @@ -48,7 +48,7 @@ ScXMLContentContext::~ScXMLContentContext() } SvXMLImportContext *ScXMLContentContext::CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) { @@ -60,9 +60,9 @@ SvXMLImportContext *ScXMLContentContext::CreateChildContext( sal_uInt16 nPrefix, sal_Int16 nAttrCount = xAttrList.is() ? xAttrList->getLength() : 0; for( sal_Int16 i=0; i < nAttrCount; ++i ) { - const rtl::OUString& sAttrName(xAttrList->getNameByIndex( i )); - const rtl::OUString& sAttrValue(xAttrList->getValueByIndex( i )); - rtl::OUString aLocalName; + const OUString& sAttrName(xAttrList->getNameByIndex( i )); + const OUString& sAttrValue(xAttrList->getValueByIndex( i )); + OUString aLocalName; sal_uInt16 nPrfx = GetScImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName ); if ((nPrfx == XML_NAMESPACE_TEXT) && IsXMLToken(aLocalName, XML_C)) @@ -81,7 +81,7 @@ SvXMLImportContext *ScXMLContentContext::CreateChildContext( sal_uInt16 nPrefix, return pContext; } -void ScXMLContentContext::Characters( const ::rtl::OUString& rChars ) +void ScXMLContentContext::Characters( const OUString& rChars ) { sOUText.append(rChars); } diff --git a/sc/source/filter/xml/xmlconti.hxx b/sc/source/filter/xml/xmlconti.hxx index 88fa4d1e3bfd..4d9355c42a31 100644 --- a/sc/source/filter/xml/xmlconti.hxx +++ b/sc/source/filter/xml/xmlconti.hxx @@ -26,8 +26,8 @@ class ScXMLImport; class ScXMLContentContext : public SvXMLImportContext { - rtl::OUStringBuffer sOUText; - rtl::OUStringBuffer& sValue; + OUStringBuffer sOUText; + OUStringBuffer& sValue; const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); } ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } @@ -35,19 +35,19 @@ class ScXMLContentContext : public SvXMLImportContext public: ScXMLContentContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, - rtl::OUStringBuffer& sValue); + OUStringBuffer& sValue); virtual ~ScXMLContentContext(); 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 ); - virtual void Characters( const ::rtl::OUString& rChars ); + virtual void Characters( const OUString& rChars ); virtual void EndElement(); }; diff --git a/sc/source/filter/xml/xmlcvali.cxx b/sc/source/filter/xml/xmlcvali.cxx index 3a0697b61e66..2d634aea8a7f 100644 --- a/sc/source/filter/xml/xmlcvali.cxx +++ b/sc/source/filter/xml/xmlcvali.cxx @@ -33,18 +33,17 @@ using namespace com::sun::star; using namespace xmloff::token; using namespace ::formula; -using ::rtl::OUString; class ScXMLContentValidationContext : public SvXMLImportContext { - rtl::OUString sName; - rtl::OUString sHelpTitle; - rtl::OUString sHelpMessage; - rtl::OUString sErrorTitle; - rtl::OUString sErrorMessage; - rtl::OUString sErrorMessageType; - rtl::OUString sBaseCellAddress; - rtl::OUString sCondition; + OUString sName; + OUString sHelpTitle; + OUString sHelpMessage; + OUString sErrorTitle; + OUString sErrorMessage; + OUString sErrorMessageType; + OUString sBaseCellAddress; + OUString sCondition; sal_Int16 nShowList; sal_Bool bAllowEmptyCell; sal_Bool bDisplayHelp; @@ -63,28 +62,28 @@ class ScXMLContentValidationContext : public SvXMLImportContext public: ScXMLContentValidationContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList); virtual ~ScXMLContentValidationContext(); 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 ); virtual void EndElement(); - void SetHelpMessage(const rtl::OUString& sTitle, const rtl::OUString& sMessage, const sal_Bool bDisplay); - void SetErrorMessage(const rtl::OUString& sTitle, const rtl::OUString& sMessage, const rtl::OUString& sMessageType, const sal_Bool bDisplay); + void SetHelpMessage(const OUString& sTitle, const OUString& sMessage, const sal_Bool bDisplay); + void SetErrorMessage(const OUString& sTitle, const OUString& sMessage, const OUString& sMessageType, const sal_Bool bDisplay); void SetErrorMacro(const sal_Bool bExecute); }; class ScXMLHelpMessageContext : public SvXMLImportContext { - rtl::OUString sTitle; - rtl::OUStringBuffer sMessage; + OUString sTitle; + OUStringBuffer sMessage; sal_Int32 nParagraphCount; sal_Bool bDisplay; @@ -96,7 +95,7 @@ class ScXMLHelpMessageContext : public SvXMLImportContext public: ScXMLHelpMessageContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLContentValidationContext* pValidationContext); @@ -104,7 +103,7 @@ public: virtual ~ScXMLHelpMessageContext(); 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 ); @@ -113,9 +112,9 @@ public: class ScXMLErrorMessageContext : public SvXMLImportContext { - rtl::OUString sTitle; - rtl::OUStringBuffer sMessage; - rtl::OUString sMessageType; + OUString sTitle; + OUStringBuffer sMessage; + OUString sMessageType; sal_Int32 nParagraphCount; sal_Bool bDisplay; @@ -127,7 +126,7 @@ class ScXMLErrorMessageContext : public SvXMLImportContext public: ScXMLErrorMessageContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLContentValidationContext* pValidationContext); @@ -135,7 +134,7 @@ public: virtual ~ScXMLErrorMessageContext(); 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 ); @@ -144,7 +143,7 @@ public: class ScXMLErrorMacroContext : public SvXMLImportContext { - rtl::OUString sName; + OUString sName; sal_Bool bExecute; ScXMLContentValidationContext* pValidationContext; @@ -155,7 +154,7 @@ class ScXMLErrorMacroContext : public SvXMLImportContext public: ScXMLErrorMacroContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLContentValidationContext* pValidationContext); @@ -163,7 +162,7 @@ public: virtual ~ScXMLErrorMacroContext(); 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 ); virtual void EndElement(); @@ -173,7 +172,7 @@ public: ScXMLContentValidationsContext::ScXMLContentValidationsContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& /* xAttrList */ ) : SvXMLImportContext( rImport, nPrfx, rLName ) @@ -186,7 +185,7 @@ ScXMLContentValidationsContext::~ScXMLContentValidationsContext() } SvXMLImportContext *ScXMLContentValidationsContext::CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) { @@ -212,7 +211,7 @@ void ScXMLContentValidationsContext::EndElement() ScXMLContentValidationContext::ScXMLContentValidationContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList) : SvXMLImportContext( rImport, nPrfx, rLName ), @@ -225,11 +224,11 @@ ScXMLContentValidationContext::ScXMLContentValidationContext( ScXMLImport& rImpo const SvXMLTokenMap& rAttrTokenMap = GetScImport().GetContentValidationAttrTokenMap(); for( sal_Int16 i=0; i < nAttrCount; ++i ) { - const rtl::OUString& sAttrName(xAttrList->getNameByIndex( i )); - rtl::OUString aLocalName; + const OUString& sAttrName(xAttrList->getNameByIndex( i )); + OUString aLocalName; sal_uInt16 nPrefix = GetScImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName ); - const rtl::OUString& sValue(xAttrList->getValueByIndex( i )); + const OUString& sValue(xAttrList->getValueByIndex( i )); switch( rAttrTokenMap.Get( nPrefix, aLocalName ) ) { @@ -271,7 +270,7 @@ ScXMLContentValidationContext::~ScXMLContentValidationContext() } SvXMLImportContext *ScXMLContentValidationContext::CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) { @@ -418,7 +417,7 @@ void ScXMLContentValidationContext::EndElement() // #i36650# event-listeners element moved up one level if (xEventContext.Is()) { - rtl::OUString sOnError("OnError"); + OUString sOnError("OnError"); XMLEventsImportContext* pEvents = (XMLEventsImportContext*)&xEventContext; uno::Sequence<beans::PropertyValue> aValues; @@ -454,15 +453,15 @@ void ScXMLContentValidationContext::EndElement() GetScImport().AddValidation(aValidation); } -void ScXMLContentValidationContext::SetHelpMessage(const rtl::OUString& sTitle, const rtl::OUString& sMessage, const sal_Bool bDisplay) +void ScXMLContentValidationContext::SetHelpMessage(const OUString& sTitle, const OUString& sMessage, const sal_Bool bDisplay) { sHelpTitle = sTitle; sHelpMessage = sMessage; bDisplayHelp = bDisplay; } -void ScXMLContentValidationContext::SetErrorMessage(const rtl::OUString& sTitle, const rtl::OUString& sMessage, - const rtl::OUString& sMessageType, const sal_Bool bDisplay) +void ScXMLContentValidationContext::SetErrorMessage(const OUString& sTitle, const OUString& sMessage, + const OUString& sMessageType, const sal_Bool bDisplay) { sErrorTitle = sTitle; sErrorMessage = sMessage; @@ -472,13 +471,13 @@ void ScXMLContentValidationContext::SetErrorMessage(const rtl::OUString& sTitle, void ScXMLContentValidationContext::SetErrorMacro(const sal_Bool bExecute) { - sErrorMessageType = rtl::OUString("macro"); + sErrorMessageType = OUString("macro"); bDisplayError = bExecute; } ScXMLHelpMessageContext::ScXMLHelpMessageContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLContentValidationContext* pTempValidationContext) : @@ -493,11 +492,11 @@ ScXMLHelpMessageContext::ScXMLHelpMessageContext( ScXMLImport& rImport, const SvXMLTokenMap& rAttrTokenMap = GetScImport().GetContentValidationHelpMessageAttrTokenMap(); for( sal_Int16 i=0; i < nAttrCount; ++i ) { - const rtl::OUString& sAttrName(xAttrList->getNameByIndex( i )); - rtl::OUString aLocalName; + const OUString& sAttrName(xAttrList->getNameByIndex( i )); + OUString aLocalName; sal_uInt16 nPrefix = GetScImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName ); - const rtl::OUString& sValue(xAttrList->getValueByIndex( i )); + const OUString& sValue(xAttrList->getValueByIndex( i )); switch( rAttrTokenMap.Get( nPrefix, aLocalName ) ) { @@ -516,7 +515,7 @@ ScXMLHelpMessageContext::~ScXMLHelpMessageContext() } SvXMLImportContext *ScXMLHelpMessageContext::CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) { @@ -548,7 +547,7 @@ void ScXMLHelpMessageContext::EndElement() ScXMLErrorMessageContext::ScXMLErrorMessageContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLContentValidationContext* pTempValidationContext) : @@ -564,11 +563,11 @@ ScXMLErrorMessageContext::ScXMLErrorMessageContext( ScXMLImport& rImport, const SvXMLTokenMap& rAttrTokenMap = GetScImport().GetContentValidationErrorMessageAttrTokenMap(); for( sal_Int16 i=0; i < nAttrCount; ++i ) { - const rtl::OUString& sAttrName(xAttrList->getNameByIndex( i )); - rtl::OUString aLocalName; + const OUString& sAttrName(xAttrList->getNameByIndex( i )); + OUString aLocalName; sal_uInt16 nPrefix = GetScImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName ); - const rtl::OUString& sValue(xAttrList->getValueByIndex( i )); + const OUString& sValue(xAttrList->getValueByIndex( i )); switch( rAttrTokenMap.Get( nPrefix, aLocalName ) ) { @@ -590,7 +589,7 @@ ScXMLErrorMessageContext::~ScXMLErrorMessageContext() } SvXMLImportContext *ScXMLErrorMessageContext::CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) { @@ -622,7 +621,7 @@ void ScXMLErrorMessageContext::EndElement() ScXMLErrorMacroContext::ScXMLErrorMacroContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLContentValidationContext* pTempValidationContext) : @@ -635,11 +634,11 @@ ScXMLErrorMacroContext::ScXMLErrorMacroContext( ScXMLImport& rImport, const SvXMLTokenMap& rAttrTokenMap = GetScImport().GetContentValidationErrorMacroAttrTokenMap(); for( sal_Int16 i=0; i < nAttrCount; ++i ) { - const rtl::OUString& sAttrName(xAttrList->getNameByIndex( i )); - rtl::OUString aLocalName; + const OUString& sAttrName(xAttrList->getNameByIndex( i )); + OUString aLocalName; sal_uInt16 nPrefix = GetScImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName ); - const rtl::OUString& sValue(xAttrList->getValueByIndex( i )); + const OUString& sValue(xAttrList->getValueByIndex( i )); switch( rAttrTokenMap.Get( nPrefix, aLocalName ) ) { @@ -658,7 +657,7 @@ ScXMLErrorMacroContext::~ScXMLErrorMacroContext() } SvXMLImportContext *ScXMLErrorMacroContext::CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& /* xAttrList */ ) { diff --git a/sc/source/filter/xml/xmlcvali.hxx b/sc/source/filter/xml/xmlcvali.hxx index a4a309b7bf2f..efc6cca4fbc8 100644 --- a/sc/source/filter/xml/xmlcvali.hxx +++ b/sc/source/filter/xml/xmlcvali.hxx @@ -36,14 +36,14 @@ class ScXMLContentValidationsContext : public SvXMLImportContext public: ScXMLContentValidationsContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList); virtual ~ScXMLContentValidationsContext(); 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 ); diff --git a/sc/source/filter/xml/xmldpimp.cxx b/sc/source/filter/xml/xmldpimp.cxx index 208cfb50d1e9..1b9260be627e 100644 --- a/sc/source/filter/xml/xmldpimp.cxx +++ b/sc/source/filter/xml/xmldpimp.cxx @@ -51,15 +51,13 @@ using namespace com::sun::star; using namespace xmloff::token; using ::com::sun::star::uno::Reference; using ::com::sun::star::xml::sax::XAttributeList; -using ::rtl::OUString; -using rtl::OUString; //------------------------------------------------------------------ ScXMLDataPilotTablesContext::ScXMLDataPilotTablesContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& /* xAttrList */ ) : SvXMLImportContext( rImport, nPrfx, rLName ) @@ -74,7 +72,7 @@ ScXMLDataPilotTablesContext::~ScXMLDataPilotTablesContext() } SvXMLImportContext *ScXMLDataPilotTablesContext::CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) { @@ -106,7 +104,7 @@ ScXMLDataPilotTableContext::GrandTotalItem::GrandTotalItem() : ScXMLDataPilotTableContext::ScXMLDataPilotTableContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList) : SvXMLImportContext( rImport, nPrfx, rLName ), @@ -133,11 +131,11 @@ ScXMLDataPilotTableContext::ScXMLDataPilotTableContext( ScXMLImport& rImport, const SvXMLTokenMap& rAttrTokenMap = GetScImport().GetDataPilotTableAttrTokenMap(); for( sal_Int16 i=0; i < nAttrCount; ++i ) { - const rtl::OUString& sAttrName(xAttrList->getNameByIndex( i )); - rtl::OUString aLocalName; + const OUString& sAttrName(xAttrList->getNameByIndex( i )); + OUString aLocalName; sal_uInt16 nPrefix = GetScImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName ); - const rtl::OUString& sValue(xAttrList->getValueByIndex( i )); + const OUString& sValue(xAttrList->getValueByIndex( i )); switch( rAttrTokenMap.Get( nPrefix, aLocalName ) ) { @@ -224,7 +222,7 @@ ScXMLDataPilotTableContext::~ScXMLDataPilotTableContext() } SvXMLImportContext *ScXMLDataPilotTableContext::CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) { @@ -582,7 +580,7 @@ void ScXMLDataPilotTableContext::SetGrandTotal( ScXMLDPSourceSQLContext::ScXMLDPSourceSQLContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLDataPilotTableContext* pTempDataPilotTable) : @@ -593,11 +591,11 @@ ScXMLDPSourceSQLContext::ScXMLDPSourceSQLContext( ScXMLImport& rImport, const SvXMLTokenMap& rAttrTokenMap = GetScImport().GetDatabaseRangeSourceSQLAttrTokenMap(); for( sal_Int16 i=0; i < nAttrCount; ++i ) { - const rtl::OUString& sAttrName(xAttrList->getNameByIndex( i )); - rtl::OUString aLocalName; + const OUString& sAttrName(xAttrList->getNameByIndex( i )); + OUString aLocalName; sal_uInt16 nPrefix = GetScImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName ); - const rtl::OUString& sValue(xAttrList->getValueByIndex( i )); + const OUString& sValue(xAttrList->getValueByIndex( i )); switch( rAttrTokenMap.Get( nPrefix, aLocalName ) ) { @@ -625,7 +623,7 @@ ScXMLDPSourceSQLContext::~ScXMLDPSourceSQLContext() } SvXMLImportContext *ScXMLDPSourceSQLContext::CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& /* xAttrList */ ) { @@ -643,7 +641,7 @@ void ScXMLDPSourceSQLContext::EndElement() ScXMLDPSourceTableContext::ScXMLDPSourceTableContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLDataPilotTableContext* pTempDataPilotTable) : @@ -654,11 +652,11 @@ ScXMLDPSourceTableContext::ScXMLDPSourceTableContext( ScXMLImport& rImport, const SvXMLTokenMap& rAttrTokenMap = GetScImport().GetDatabaseRangeSourceTableAttrTokenMap(); for( sal_Int16 i=0; i < nAttrCount; ++i ) { - const rtl::OUString& sAttrName(xAttrList->getNameByIndex( i )); - rtl::OUString aLocalName; + const OUString& sAttrName(xAttrList->getNameByIndex( i )); + OUString aLocalName; sal_uInt16 nPrefix = GetScImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName ); - const rtl::OUString& sValue(xAttrList->getValueByIndex( i )); + const OUString& sValue(xAttrList->getValueByIndex( i )); switch( rAttrTokenMap.Get( nPrefix, aLocalName ) ) { @@ -681,7 +679,7 @@ ScXMLDPSourceTableContext::~ScXMLDPSourceTableContext() } SvXMLImportContext *ScXMLDPSourceTableContext::CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& /* xAttrList */ ) { @@ -699,7 +697,7 @@ void ScXMLDPSourceTableContext::EndElement() ScXMLDPSourceQueryContext::ScXMLDPSourceQueryContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLDataPilotTableContext* pTempDataPilotTable) : @@ -710,11 +708,11 @@ ScXMLDPSourceQueryContext::ScXMLDPSourceQueryContext( ScXMLImport& rImport, const SvXMLTokenMap& rAttrTokenMap = GetScImport().GetDatabaseRangeSourceQueryAttrTokenMap(); for( sal_Int16 i=0; i < nAttrCount; ++i ) { - const rtl::OUString& sAttrName(xAttrList->getNameByIndex( i )); - rtl::OUString aLocalName; + const OUString& sAttrName(xAttrList->getNameByIndex( i )); + OUString aLocalName; sal_uInt16 nPrefix = GetScImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName ); - const rtl::OUString& sValue(xAttrList->getValueByIndex( i )); + const OUString& sValue(xAttrList->getValueByIndex( i )); switch( rAttrTokenMap.Get( nPrefix, aLocalName ) ) { @@ -737,7 +735,7 @@ ScXMLDPSourceQueryContext::~ScXMLDPSourceQueryContext() } SvXMLImportContext *ScXMLDPSourceQueryContext::CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& /* xAttrList */ ) { @@ -755,7 +753,7 @@ void ScXMLDPSourceQueryContext::EndElement() ScXMLSourceServiceContext::ScXMLSourceServiceContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLDataPilotTableContext* pTempDataPilotTable) : @@ -766,11 +764,11 @@ ScXMLSourceServiceContext::ScXMLSourceServiceContext( ScXMLImport& rImport, const SvXMLTokenMap& rAttrTokenMap = GetScImport().GetDataPilotTableSourceServiceAttrTokenMap(); for( sal_Int16 i=0; i < nAttrCount; ++i ) { - const rtl::OUString& sAttrName(xAttrList->getNameByIndex( i )); - rtl::OUString aLocalName; + const OUString& sAttrName(xAttrList->getNameByIndex( i )); + OUString aLocalName; sal_uInt16 nPrefix = GetScImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName ); - const rtl::OUString& sValue(xAttrList->getValueByIndex( i )); + const OUString& sValue(xAttrList->getValueByIndex( i )); switch( rAttrTokenMap.Get( nPrefix, aLocalName ) ) { @@ -808,7 +806,7 @@ ScXMLSourceServiceContext::~ScXMLSourceServiceContext() } SvXMLImportContext *ScXMLSourceServiceContext::CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& /* xAttrList */ ) { @@ -874,7 +872,7 @@ ScXMLDataPilotGrandTotalContext::~ScXMLDataPilotGrandTotalContext() } SvXMLImportContext* ScXMLDataPilotGrandTotalContext::CreateChildContext( - sal_uInt16 nPrefix, const ::rtl::OUString& rLocalName, const Reference<XAttributeList>& /*xAttrList*/ ) + sal_uInt16 nPrefix, const OUString& rLocalName, const Reference<XAttributeList>& /*xAttrList*/ ) { return new SvXMLImportContext( GetImport(), nPrefix, rLocalName ); } @@ -901,7 +899,7 @@ void ScXMLDataPilotGrandTotalContext::EndElement() ScXMLSourceCellRangeContext::ScXMLSourceCellRangeContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLDataPilotTableContext* pTempDataPilotTable) : @@ -912,11 +910,11 @@ ScXMLSourceCellRangeContext::ScXMLSourceCellRangeContext( ScXMLImport& rImport, const SvXMLTokenMap& rAttrTokenMap = GetScImport().GetDataPilotTableSourceCellRangeAttrTokenMap(); for( sal_Int16 i=0; i < nAttrCount; ++i ) { - const rtl::OUString& sAttrName(xAttrList->getNameByIndex( i )); - rtl::OUString aLocalName; + const OUString& sAttrName(xAttrList->getNameByIndex( i )); + OUString aLocalName; sal_uInt16 nPrefix = GetScImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName ); - const rtl::OUString& sValue(xAttrList->getValueByIndex( i )); + const OUString& sValue(xAttrList->getValueByIndex( i )); switch( rAttrTokenMap.Get( nPrefix, aLocalName ) ) { @@ -940,7 +938,7 @@ ScXMLSourceCellRangeContext::~ScXMLSourceCellRangeContext() } SvXMLImportContext *ScXMLSourceCellRangeContext::CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) { @@ -966,7 +964,7 @@ void ScXMLSourceCellRangeContext::EndElement() ScXMLDataPilotFieldContext::ScXMLDataPilotFieldContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLDataPilotTableContext* pTempDataPilotTable) : @@ -992,11 +990,11 @@ ScXMLDataPilotFieldContext::ScXMLDataPilotFieldContext( ScXMLImport& rImport, const SvXMLTokenMap& rAttrTokenMap = GetScImport().GetDataPilotFieldAttrTokenMap(); for( sal_Int16 i=0; i < nAttrCount; ++i ) { - const rtl::OUString& sAttrName(xAttrList->getNameByIndex( i )); - rtl::OUString aLocalName; + const OUString& sAttrName(xAttrList->getNameByIndex( i )); + OUString aLocalName; sal_uInt16 nPrefix = GetScImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName ); - const rtl::OUString& sValue(xAttrList->getValueByIndex( i )); + const OUString& sValue(xAttrList->getValueByIndex( i )); switch( rAttrTokenMap.Get( nPrefix, aLocalName ) ) { @@ -1053,7 +1051,7 @@ ScXMLDataPilotFieldContext::~ScXMLDataPilotFieldContext() } SvXMLImportContext *ScXMLDataPilotFieldContext::CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) { @@ -1098,7 +1096,7 @@ void ScXMLDataPilotFieldContext::SetSubTotalName(const OUString& rName) pDim->SetSubtotalName(rName); } -void ScXMLDataPilotFieldContext::AddGroup(const ::std::vector<rtl::OUString>& rMembers, const rtl::OUString& rName) +void ScXMLDataPilotFieldContext::AddGroup(const ::std::vector<OUString>& rMembers, const OUString& rName) { ScXMLDataPilotGroup aGroup; aGroup.aMembers = rMembers; @@ -1140,8 +1138,8 @@ void ScXMLDataPilotFieldContext::EndElement() while (aItr != aEndItr) { ScDPSaveGroupItem aItem(aItr->aName); - ::std::vector<rtl::OUString>::const_iterator aMembersItr(aItr->aMembers.begin()); - ::std::vector<rtl::OUString>::const_iterator aMembersEndItr(aItr->aMembers.end()); + ::std::vector<OUString>::const_iterator aMembersItr(aItr->aMembers.begin()); + ::std::vector<OUString>::const_iterator aMembersEndItr(aItr->aMembers.end()); while (aMembersItr != aMembersEndItr) { aItem.AddElement(*aMembersItr); @@ -1165,7 +1163,7 @@ void ScXMLDataPilotFieldContext::EndElement() } ScXMLDataPilotFieldReferenceContext::ScXMLDataPilotFieldReferenceContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const uno::Reference<xml::sax::XAttributeList>& xAttrList, ScXMLDataPilotFieldContext* pDataPilotField) : SvXMLImportContext( rImport, nPrfx, rLName ) @@ -1175,11 +1173,11 @@ ScXMLDataPilotFieldReferenceContext::ScXMLDataPilotFieldReferenceContext( ScXMLI sal_Int16 nAttrCount = xAttrList.is() ? xAttrList->getLength() : 0; for( sal_Int16 i=0; i < nAttrCount; i++ ) { - rtl::OUString sAttrName(xAttrList->getNameByIndex( i )); - rtl::OUString aLocalName; + OUString sAttrName(xAttrList->getNameByIndex( i )); + OUString aLocalName; sal_uInt16 nPrefix = GetScImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName ); - rtl::OUString sValue(xAttrList->getValueByIndex( i )); + OUString sValue(xAttrList->getValueByIndex( i )); if ( nPrefix == XML_NAMESPACE_TABLE ) { @@ -1232,7 +1230,7 @@ ScXMLDataPilotFieldReferenceContext::~ScXMLDataPilotFieldReferenceContext() ScXMLDataPilotLevelContext::ScXMLDataPilotLevelContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLDataPilotFieldContext* pTempDataPilotField) : @@ -1243,11 +1241,11 @@ ScXMLDataPilotLevelContext::ScXMLDataPilotLevelContext( ScXMLImport& rImport, const SvXMLTokenMap& rAttrTokenMap = GetScImport().GetDataPilotLevelAttrTokenMap(); for( sal_Int16 i=0; i < nAttrCount; ++i ) { - const rtl::OUString& sAttrName(xAttrList->getNameByIndex( i )); - rtl::OUString aLocalName; + const OUString& sAttrName(xAttrList->getNameByIndex( i )); + OUString aLocalName; sal_uInt16 nPrefix = GetScImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName ); - const rtl::OUString& sValue(xAttrList->getValueByIndex( i )); + const OUString& sValue(xAttrList->getValueByIndex( i )); switch( rAttrTokenMap.Get( nPrefix, aLocalName ) ) { @@ -1265,7 +1263,7 @@ ScXMLDataPilotLevelContext::~ScXMLDataPilotLevelContext() } SvXMLImportContext *ScXMLDataPilotLevelContext::CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) { @@ -1302,7 +1300,7 @@ void ScXMLDataPilotLevelContext::EndElement() } ScXMLDataPilotDisplayInfoContext::ScXMLDataPilotDisplayInfoContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLDataPilotFieldContext* pDataPilotField) : @@ -1313,11 +1311,11 @@ ScXMLDataPilotDisplayInfoContext::ScXMLDataPilotDisplayInfoContext( ScXMLImport& sal_Int16 nAttrCount = xAttrList.is() ? xAttrList->getLength() : 0; for( sal_Int16 i=0; i < nAttrCount; i++ ) { - rtl::OUString sAttrName(xAttrList->getNameByIndex( i )); - rtl::OUString aLocalName; + OUString sAttrName(xAttrList->getNameByIndex( i )); + OUString aLocalName; sal_uInt16 nPrefix = GetScImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName ); - rtl::OUString sValue(xAttrList->getValueByIndex( i )); + OUString sValue(xAttrList->getValueByIndex( i )); if ( nPrefix == XML_NAMESPACE_TABLE ) { @@ -1353,7 +1351,7 @@ ScXMLDataPilotDisplayInfoContext::~ScXMLDataPilotDisplayInfoContext() } ScXMLDataPilotSortInfoContext::ScXMLDataPilotSortInfoContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLDataPilotFieldContext* pDataPilotField) : @@ -1364,11 +1362,11 @@ ScXMLDataPilotSortInfoContext::ScXMLDataPilotSortInfoContext( ScXMLImport& rImpo sal_Int16 nAttrCount = xAttrList.is() ? xAttrList->getLength() : 0; for( sal_Int16 i=0; i < nAttrCount; i++ ) { - rtl::OUString sAttrName(xAttrList->getNameByIndex( i )); - rtl::OUString aLocalName; + OUString sAttrName(xAttrList->getNameByIndex( i )); + OUString aLocalName; sal_uInt16 nPrefix = GetScImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName ); - rtl::OUString sValue(xAttrList->getValueByIndex( i )); + OUString sValue(xAttrList->getValueByIndex( i )); if ( nPrefix == XML_NAMESPACE_TABLE ) { @@ -1402,7 +1400,7 @@ ScXMLDataPilotSortInfoContext::~ScXMLDataPilotSortInfoContext() } ScXMLDataPilotLayoutInfoContext::ScXMLDataPilotLayoutInfoContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLDataPilotFieldContext* pDataPilotField) : @@ -1413,11 +1411,11 @@ ScXMLDataPilotLayoutInfoContext::ScXMLDataPilotLayoutInfoContext( ScXMLImport& r sal_Int16 nAttrCount = xAttrList.is() ? xAttrList->getLength() : 0; for( sal_Int16 i=0; i < nAttrCount; i++ ) { - rtl::OUString sAttrName(xAttrList->getNameByIndex( i )); - rtl::OUString aLocalName; + OUString sAttrName(xAttrList->getNameByIndex( i )); + OUString aLocalName; sal_uInt16 nPrefix = GetScImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName ); - rtl::OUString sValue(xAttrList->getValueByIndex( i )); + OUString sValue(xAttrList->getValueByIndex( i )); if ( nPrefix == XML_NAMESPACE_TABLE ) { @@ -1447,7 +1445,7 @@ ScXMLDataPilotLayoutInfoContext::~ScXMLDataPilotLayoutInfoContext() ScXMLDataPilotSubTotalsContext::ScXMLDataPilotSubTotalsContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& /* xAttrList */, ScXMLDataPilotFieldContext* pTempDataPilotField) : @@ -1465,7 +1463,7 @@ ScXMLDataPilotSubTotalsContext::~ScXMLDataPilotSubTotalsContext() } SvXMLImportContext *ScXMLDataPilotSubTotalsContext::CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) { @@ -1519,7 +1517,7 @@ void ScXMLDataPilotSubTotalsContext::SetDisplayName(const OUString& rName) ScXMLDataPilotSubTotalContext::ScXMLDataPilotSubTotalContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLDataPilotSubTotalsContext* pTempDataPilotSubTotals) : @@ -1530,11 +1528,11 @@ ScXMLDataPilotSubTotalContext::ScXMLDataPilotSubTotalContext( ScXMLImport& rImpo const SvXMLTokenMap& rAttrTokenMap = GetScImport().GetDataPilotSubTotalAttrTokenMap(); for( sal_Int16 i=0; i < nAttrCount; ++i ) { - const rtl::OUString& sAttrName(xAttrList->getNameByIndex( i )); - rtl::OUString aLocalName; + const OUString& sAttrName(xAttrList->getNameByIndex( i )); + OUString aLocalName; sal_uInt16 nPrefix = GetScImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName ); - const rtl::OUString& sValue(xAttrList->getValueByIndex( i )); + const OUString& sValue(xAttrList->getValueByIndex( i )); switch( rAttrTokenMap.Get( nPrefix, aLocalName ) ) { @@ -1557,7 +1555,7 @@ ScXMLDataPilotSubTotalContext::~ScXMLDataPilotSubTotalContext() } SvXMLImportContext *ScXMLDataPilotSubTotalContext::CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& /* xAttrList */ ) { @@ -1575,7 +1573,7 @@ void ScXMLDataPilotSubTotalContext::EndElement() ScXMLDataPilotMembersContext::ScXMLDataPilotMembersContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& /* xAttrList */, ScXMLDataPilotFieldContext* pTempDataPilotField) : @@ -1590,7 +1588,7 @@ ScXMLDataPilotMembersContext::~ScXMLDataPilotMembersContext() } SvXMLImportContext *ScXMLDataPilotMembersContext::CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) { @@ -1616,7 +1614,7 @@ void ScXMLDataPilotMembersContext::EndElement() ScXMLDataPilotMemberContext::ScXMLDataPilotMemberContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLDataPilotFieldContext* pTempDataPilotField) : @@ -1630,11 +1628,11 @@ ScXMLDataPilotMemberContext::ScXMLDataPilotMemberContext( ScXMLImport& rImport, const SvXMLTokenMap& rAttrTokenMap = GetScImport().GetDataPilotMemberAttrTokenMap(); for( sal_Int16 i=0; i < nAttrCount; ++i ) { - const rtl::OUString& sAttrName(xAttrList->getNameByIndex( i )); - rtl::OUString aLocalName; + const OUString& sAttrName(xAttrList->getNameByIndex( i )); + OUString aLocalName; sal_uInt16 nPrefix = GetScImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName ); - const rtl::OUString& sValue(xAttrList->getValueByIndex( i )); + const OUString& sValue(xAttrList->getValueByIndex( i )); switch( rAttrTokenMap.Get( nPrefix, aLocalName ) ) { @@ -1669,7 +1667,7 @@ ScXMLDataPilotMemberContext::~ScXMLDataPilotMemberContext() } SvXMLImportContext *ScXMLDataPilotMemberContext::CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& /* xAttrList */ ) { @@ -1696,14 +1694,14 @@ void ScXMLDataPilotMemberContext::EndElement() ScXMLDataPilotGroupsContext::ScXMLDataPilotGroupsContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLDataPilotFieldContext* pTempDataPilotField) : SvXMLImportContext( rImport, nPrfx, rLName ), pDataPilotField(pTempDataPilotField) { - rtl::OUString sGroupSource; + OUString sGroupSource; double fStart(0.0); double fEnd(0.0); double fStep(0.0); @@ -1715,11 +1713,11 @@ ScXMLDataPilotGroupsContext::ScXMLDataPilotGroupsContext( ScXMLImport& rImport, sal_Int16 nAttrCount = xAttrList.is() ? xAttrList->getLength() : 0; for( sal_Int16 i=0; i < nAttrCount; i++ ) { - rtl::OUString sAttrName = xAttrList->getNameByIndex( i ); - rtl::OUString aLocalName; + OUString sAttrName = xAttrList->getNameByIndex( i ); + OUString aLocalName; sal_uInt16 nPrefix = GetScImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName ); - rtl::OUString sValue = xAttrList->getValueByIndex( i ); + OUString sValue = xAttrList->getValueByIndex( i ); (void)nPrefix; //! compare below! @@ -1797,7 +1795,7 @@ ScXMLDataPilotGroupsContext::~ScXMLDataPilotGroupsContext() } SvXMLImportContext *ScXMLDataPilotGroupsContext::CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) { @@ -1821,7 +1819,7 @@ void ScXMLDataPilotGroupsContext::EndElement() ScXMLDataPilotGroupContext::ScXMLDataPilotGroupContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLDataPilotFieldContext* pTempDataPilotField) : @@ -1831,11 +1829,11 @@ ScXMLDataPilotGroupContext::ScXMLDataPilotGroupContext( ScXMLImport& rImport, sal_Int16 nAttrCount = xAttrList.is() ? xAttrList->getLength() : 0; for( sal_Int16 i=0; i < nAttrCount; i++ ) { - rtl::OUString sAttrName = xAttrList->getNameByIndex( i ); - rtl::OUString aLocalName; + OUString sAttrName = xAttrList->getNameByIndex( i ); + OUString aLocalName; sal_uInt16 nPrefix = GetScImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName ); - rtl::OUString sValue = xAttrList->getValueByIndex( i ); + OUString sValue = xAttrList->getValueByIndex( i ); if (nPrefix == XML_NAMESPACE_TABLE) { @@ -1850,7 +1848,7 @@ ScXMLDataPilotGroupContext::~ScXMLDataPilotGroupContext() } SvXMLImportContext *ScXMLDataPilotGroupContext::CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) { @@ -1875,7 +1873,7 @@ void ScXMLDataPilotGroupContext::EndElement() ScXMLDataPilotGroupMemberContext::ScXMLDataPilotGroupMemberContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLDataPilotGroupContext* pTempDataPilotGroup) : @@ -1885,11 +1883,11 @@ ScXMLDataPilotGroupMemberContext::ScXMLDataPilotGroupMemberContext( ScXMLImport& sal_Int16 nAttrCount = xAttrList.is() ? xAttrList->getLength() : 0; for( sal_Int16 i=0; i < nAttrCount; i++ ) { - rtl::OUString sAttrName = xAttrList->getNameByIndex( i ); - rtl::OUString aLocalName; + OUString sAttrName = xAttrList->getNameByIndex( i ); + OUString aLocalName; sal_uInt16 nPrefix = GetScImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName ); - rtl::OUString sValue = xAttrList->getValueByIndex( i ); + OUString sValue = xAttrList->getValueByIndex( i ); if (nPrefix == XML_NAMESPACE_TABLE) { @@ -1904,7 +1902,7 @@ ScXMLDataPilotGroupMemberContext::~ScXMLDataPilotGroupMemberContext() } SvXMLImportContext *ScXMLDataPilotGroupMemberContext::CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& /* xAttrList */ ) { diff --git a/sc/source/filter/xml/xmldpimp.hxx b/sc/source/filter/xml/xmldpimp.hxx index 0f722dd89785..1aa851dc1a1e 100644 --- a/sc/source/filter/xml/xmldpimp.hxx +++ b/sc/source/filter/xml/xmldpimp.hxx @@ -55,14 +55,14 @@ class ScXMLDataPilotTablesContext : public SvXMLImportContext public: ScXMLDataPilotTablesContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList); virtual ~ScXMLDataPilotTablesContext(); 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 ); @@ -73,7 +73,7 @@ class ScXMLDataPilotTableContext : public SvXMLImportContext { struct GrandTotalItem { - ::rtl::OUString maDisplayName; + OUString maDisplayName; bool mbVisible; GrandTotalItem(); }; @@ -83,17 +83,17 @@ class ScXMLDataPilotTableContext : public SvXMLImportContext ScDPDimensionSaveData* pDPDimSaveData; GrandTotalItem maRowGrandTotal; GrandTotalItem maColGrandTotal; - rtl::OUString sDataPilotTableName; - rtl::OUString sApplicationData; - rtl::OUString sDatabaseName; - rtl::OUString sSourceObject; - rtl::OUString sServiceName; - rtl::OUString sServiceSourceName; - rtl::OUString sServiceSourceObject; - rtl::OUString sServiceUsername; - rtl::OUString sServicePassword; - rtl::OUString sButtons; - rtl::OUString sSourceRangeName; + OUString sDataPilotTableName; + OUString sApplicationData; + OUString sDatabaseName; + OUString sSourceObject; + OUString sServiceName; + OUString sServiceSourceName; + OUString sServiceSourceObject; + OUString sServiceUsername; + OUString sServicePassword; + OUString sButtons; + OUString sSourceRangeName; ScRange aSourceCellRangeAddress; ScRange aTargetRangeAddress; ScRange aFilterSourceRange; @@ -120,29 +120,29 @@ class ScXMLDataPilotTableContext : public SvXMLImportContext public: ScXMLDataPilotTableContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList); virtual ~ScXMLDataPilotTableContext(); 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 ); virtual void EndElement(); - void SetGrandTotal(::xmloff::token::XMLTokenEnum eOrientation, bool bVisible, const ::rtl::OUString& rDisplayName); - void SetDatabaseName(const rtl::OUString& sValue) { sDatabaseName = sValue; } - void SetSourceObject(const rtl::OUString& sValue) { sSourceObject = sValue; } + void SetGrandTotal(::xmloff::token::XMLTokenEnum eOrientation, bool bVisible, const OUString& rDisplayName); + void SetDatabaseName(const OUString& sValue) { sDatabaseName = sValue; } + void SetSourceObject(const OUString& sValue) { sSourceObject = sValue; } void SetNative(bool bValue) { bIsNative = bValue; } - void SetServiceName(const rtl::OUString& sValue) { sServiceName = sValue; } - void SetServiceSourceName(const rtl::OUString& sValue) { sServiceSourceName = sValue; } - void SetServiceSourceObject(const rtl::OUString& sValue) { sServiceSourceObject = sValue; } - void SetServiceUsername(const rtl::OUString& sValue) { sServiceUsername = sValue; } - void SetServicePassword(const rtl::OUString& sValue) { sServicePassword = sValue; } - void SetSourceRangeName(const rtl::OUString& sValue) { sSourceRangeName = sValue; bSourceCellRange = true; } + void SetServiceName(const OUString& sValue) { sServiceName = sValue; } + void SetServiceSourceName(const OUString& sValue) { sServiceSourceName = sValue; } + void SetServiceSourceObject(const OUString& sValue) { sServiceSourceObject = sValue; } + void SetServiceUsername(const OUString& sValue) { sServiceUsername = sValue; } + void SetServicePassword(const OUString& sValue) { sServicePassword = sValue; } + void SetSourceRangeName(const OUString& sValue) { sSourceRangeName = sValue; bSourceCellRange = true; } void SetSourceCellRangeAddress(const ScRange& aValue) { aSourceCellRangeAddress = aValue; bSourceCellRange = true; } void SetSourceQueryParam(const ScQueryParam& aValue) { aSourceQueryParam = aValue; } void SetFilterOutputPosition(const ScAddress& aValue) { aFilterOutputPosition = aValue; } @@ -163,7 +163,7 @@ class ScXMLDPSourceSQLContext : public SvXMLImportContext public: ScXMLDPSourceSQLContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLDataPilotTableContext* pDataPilotTable); @@ -171,7 +171,7 @@ public: virtual ~ScXMLDPSourceSQLContext(); 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 ); @@ -188,7 +188,7 @@ class ScXMLDPSourceTableContext : public SvXMLImportContext public: ScXMLDPSourceTableContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLDataPilotTableContext* pDataPilotTable); @@ -196,7 +196,7 @@ public: virtual ~ScXMLDPSourceTableContext(); 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 ); @@ -213,7 +213,7 @@ class ScXMLDPSourceQueryContext : public SvXMLImportContext public: ScXMLDPSourceQueryContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLDataPilotTableContext* pDataPilotTable); @@ -221,7 +221,7 @@ public: virtual ~ScXMLDPSourceQueryContext(); 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 ); @@ -238,7 +238,7 @@ class ScXMLSourceServiceContext : public SvXMLImportContext public: ScXMLSourceServiceContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLDataPilotTableContext* pDataPilotTable); @@ -246,7 +246,7 @@ public: virtual ~ScXMLSourceServiceContext(); 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 ); @@ -260,13 +260,13 @@ class ScXMLDataPilotGrandTotalContext : public SvXMLImportContext ScXMLImport& GetScImport(); ScXMLDataPilotTableContext* mpTableContext; - ::rtl::OUString maDisplayName; + OUString maDisplayName; Orientation meOrientation; bool mbVisible; public: ScXMLDataPilotGrandTotalContext( - ScXMLImport& rImport, sal_uInt16 nPrefix, const ::rtl::OUString& rLName, + ScXMLImport& rImport, sal_uInt16 nPrefix, const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLDataPilotTableContext* pTableContext ); @@ -274,7 +274,7 @@ public: virtual ~ScXMLDataPilotGrandTotalContext(); 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 ); @@ -291,7 +291,7 @@ class ScXMLSourceCellRangeContext : public SvXMLImportContext public: ScXMLSourceCellRangeContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLDataPilotTableContext* pDataPilotTable); @@ -299,7 +299,7 @@ public: virtual ~ScXMLSourceCellRangeContext(); 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 ); @@ -308,8 +308,8 @@ public: struct ScXMLDataPilotGroup { - ::std::vector<rtl::OUString> aMembers; - rtl::OUString aName; + ::std::vector<OUString> aMembers; + OUString aName; }; class ScXMLDataPilotFieldContext : public SvXMLImportContext @@ -318,9 +318,9 @@ class ScXMLDataPilotFieldContext : public SvXMLImportContext ScDPSaveDimension* pDim; ::std::vector<ScXMLDataPilotGroup> aGroups; - rtl::OUString sGroupSource; - rtl::OUString sSelectedPage; - rtl::OUString sName; + OUString sGroupSource; + OUString sSelectedPage; + OUString sName; double fStart; double fEnd; double fStep; @@ -341,7 +341,7 @@ class ScXMLDataPilotFieldContext : public SvXMLImportContext public: ScXMLDataPilotFieldContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLDataPilotTableContext* pDataPilotTable); @@ -349,7 +349,7 @@ public: virtual ~ScXMLDataPilotFieldContext(); 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 ); @@ -358,12 +358,12 @@ public: void SetShowEmpty(const sal_Bool bValue) { if (pDim) pDim->SetShowEmpty(bValue); } void SetSubTotals(const sal_uInt16* pFunctions, const sal_Int16 nCount) { if(pDim) pDim->SetSubTotals(nCount, pFunctions); } void AddMember(ScDPSaveMember* pMember); - void SetSubTotalName(const ::rtl::OUString& rName); + void SetSubTotalName(const OUString& rName); void SetFieldReference(const com::sun::star::sheet::DataPilotFieldReference& aRef) { if (pDim) pDim->SetReferenceValue(&aRef); } void SetAutoShowInfo(const com::sun::star::sheet::DataPilotFieldAutoShowInfo& aInfo) { if (pDim) pDim->SetAutoShowInfo(&aInfo); } void SetSortInfo(const com::sun::star::sheet::DataPilotFieldSortInfo& aInfo) { if (pDim) pDim->SetSortInfo(&aInfo); } void SetLayoutInfo(const com::sun::star::sheet::DataPilotFieldLayoutInfo& aInfo) { if (pDim) pDim->SetLayoutInfo(&aInfo); } - void SetGrouping(const rtl::OUString& rGroupSource, const double& rStart, const double& rEnd, const double& rStep, + void SetGrouping(const OUString& rGroupSource, const double& rStart, const double& rEnd, const double& rStep, sal_Int32 nPart, sal_Bool bDate, sal_Bool bAutoSt, sal_Bool bAutoE) { bIsGroupField = sal_True; @@ -376,7 +376,7 @@ public: bAutoStart = bAutoSt; bAutoEnd = bAutoE; } - void AddGroup(const ::std::vector<rtl::OUString>& rMembers, const rtl::OUString& rName); + void AddGroup(const ::std::vector<OUString>& rMembers, const OUString& rName); }; class ScXMLDataPilotFieldReferenceContext : public SvXMLImportContext @@ -389,7 +389,7 @@ class ScXMLDataPilotFieldReferenceContext : public SvXMLImportContext public: ScXMLDataPilotFieldReferenceContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLDataPilotFieldContext* pDataPilotField); @@ -407,7 +407,7 @@ class ScXMLDataPilotLevelContext : public SvXMLImportContext public: ScXMLDataPilotLevelContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLDataPilotFieldContext* pDataPilotField); @@ -415,7 +415,7 @@ public: virtual ~ScXMLDataPilotLevelContext(); 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 ); @@ -432,7 +432,7 @@ class ScXMLDataPilotDisplayInfoContext : public SvXMLImportContext public: ScXMLDataPilotDisplayInfoContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLDataPilotFieldContext* pDataPilotField); @@ -450,7 +450,7 @@ class ScXMLDataPilotSortInfoContext : public SvXMLImportContext public: ScXMLDataPilotSortInfoContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLDataPilotFieldContext* pDataPilotField); @@ -468,7 +468,7 @@ class ScXMLDataPilotLayoutInfoContext : public SvXMLImportContext public: ScXMLDataPilotLayoutInfoContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLDataPilotFieldContext* pDataPilotField); @@ -482,7 +482,7 @@ class ScXMLDataPilotSubTotalsContext : public SvXMLImportContext sal_Int16 nFunctionCount; sal_uInt16* pFunctions; - ::rtl::OUString maDisplayName; + OUString maDisplayName; const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); } ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } @@ -492,7 +492,7 @@ public: ScXMLDataPilotFieldContext* GetDataPilotField() { return pDataPilotField; } ScXMLDataPilotSubTotalsContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLDataPilotFieldContext* pDataPilotField); @@ -500,13 +500,13 @@ public: virtual ~ScXMLDataPilotSubTotalsContext(); 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 ); virtual void EndElement(); void AddFunction(sal_Int16 nFunction); - void SetDisplayName(const ::rtl::OUString& rName); + void SetDisplayName(const OUString& rName); }; class ScXMLDataPilotSubTotalContext : public SvXMLImportContext @@ -519,7 +519,7 @@ class ScXMLDataPilotSubTotalContext : public SvXMLImportContext public: ScXMLDataPilotSubTotalContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLDataPilotSubTotalsContext* pDataPilotSubTotals); @@ -527,7 +527,7 @@ public: virtual ~ScXMLDataPilotSubTotalContext(); 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 ); @@ -544,7 +544,7 @@ class ScXMLDataPilotMembersContext : public SvXMLImportContext public: ScXMLDataPilotMembersContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLDataPilotFieldContext* pDataPilotField); @@ -552,7 +552,7 @@ public: virtual ~ScXMLDataPilotMembersContext(); 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 ); @@ -563,8 +563,8 @@ class ScXMLDataPilotMemberContext : public SvXMLImportContext { ScXMLDataPilotFieldContext* pDataPilotField; - rtl::OUString sName; - rtl::OUString maDisplayName; + OUString sName; + OUString maDisplayName; sal_Bool bDisplay; sal_Bool bDisplayDetails; sal_Bool bHasName; @@ -575,7 +575,7 @@ class ScXMLDataPilotMemberContext : public SvXMLImportContext public: ScXMLDataPilotMemberContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLDataPilotFieldContext* pDataPilotField); @@ -583,7 +583,7 @@ public: virtual ~ScXMLDataPilotMemberContext(); 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 ); @@ -600,7 +600,7 @@ class ScXMLDataPilotGroupsContext : public SvXMLImportContext public: ScXMLDataPilotGroupsContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLDataPilotFieldContext* pDataPilotField); @@ -608,7 +608,7 @@ public: virtual ~ScXMLDataPilotGroupsContext(); 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 ); @@ -619,8 +619,8 @@ class ScXMLDataPilotGroupContext : public SvXMLImportContext { ScXMLDataPilotFieldContext* pDataPilotField; - rtl::OUString sName; - ::std::vector<rtl::OUString> aMembers; + OUString sName; + ::std::vector<OUString> aMembers; const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); } ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } @@ -628,7 +628,7 @@ class ScXMLDataPilotGroupContext : public SvXMLImportContext public: ScXMLDataPilotGroupContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLDataPilotFieldContext* pDataPilotField); @@ -636,20 +636,20 @@ public: virtual ~ScXMLDataPilotGroupContext(); 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 ); virtual void EndElement(); - void AddMember(const rtl::OUString& sMember) { aMembers.push_back(sMember); } + void AddMember(const OUString& sMember) { aMembers.push_back(sMember); } }; class ScXMLDataPilotGroupMemberContext : public SvXMLImportContext { ScXMLDataPilotGroupContext* pDataPilotGroup; - rtl::OUString sName; + OUString sName; const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); } ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } @@ -657,7 +657,7 @@ class ScXMLDataPilotGroupMemberContext : public SvXMLImportContext public: ScXMLDataPilotGroupMemberContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLDataPilotGroupContext* pDataPilotGroup); @@ -665,7 +665,7 @@ public: virtual ~ScXMLDataPilotGroupMemberContext(); 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 ); diff --git a/sc/source/filter/xml/xmldrani.cxx b/sc/source/filter/xml/xmldrani.cxx index 75dbf9796c30..cd34058438eb 100644 --- a/sc/source/filter/xml/xmldrani.cxx +++ b/sc/source/filter/xml/xmldrani.cxx @@ -57,13 +57,12 @@ using namespace com::sun::star; using namespace xmloff::token; -using ::rtl::OUString; //------------------------------------------------------------------ ScXMLDatabaseRangesContext::ScXMLDatabaseRangesContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& /* xAttrList */ ) : SvXMLImportContext( rImport, nPrfx, rLName ) @@ -78,7 +77,7 @@ ScXMLDatabaseRangesContext::~ScXMLDatabaseRangesContext() } SvXMLImportContext *ScXMLDatabaseRangesContext::CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) { @@ -107,7 +106,7 @@ void ScXMLDatabaseRangesContext::EndElement() ScXMLDatabaseRangeContext::ScXMLDatabaseRangeContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList) : SvXMLImportContext( rImport, nPrfx, rLName ), @@ -141,11 +140,11 @@ ScXMLDatabaseRangeContext::ScXMLDatabaseRangeContext( ScXMLImport& rImport, const SvXMLTokenMap& rAttrTokenMap = GetScImport().GetDatabaseRangeAttrTokenMap(); for( sal_Int16 i=0; i < nAttrCount; ++i ) { - const rtl::OUString& sAttrName(xAttrList->getNameByIndex( i )); - rtl::OUString aLocalName; + const OUString& sAttrName(xAttrList->getNameByIndex( i )); + OUString aLocalName; sal_uInt16 nPrefix = GetScImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName ); - const rtl::OUString& sValue(xAttrList->getValueByIndex( i )); + const OUString& sValue(xAttrList->getValueByIndex( i )); switch( rAttrTokenMap.Get( nPrefix, aLocalName ) ) { @@ -227,7 +226,7 @@ ScXMLDatabaseRangeContext::~ScXMLDatabaseRangeContext() } SvXMLImportContext *ScXMLDatabaseRangeContext::CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) { @@ -499,7 +498,7 @@ void ScXMLDatabaseRangeContext::EndElement() ScXMLSourceSQLContext::ScXMLSourceSQLContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLDatabaseRangeContext* pTempDatabaseRangeContext) : @@ -510,11 +509,11 @@ ScXMLSourceSQLContext::ScXMLSourceSQLContext( ScXMLImport& rImport, const SvXMLTokenMap& rAttrTokenMap = GetScImport().GetDatabaseRangeSourceSQLAttrTokenMap(); for( sal_Int16 i=0; i < nAttrCount; ++i ) { - const rtl::OUString& sAttrName(xAttrList->getNameByIndex( i )); - rtl::OUString aLocalName; + const OUString& sAttrName(xAttrList->getNameByIndex( i )); + OUString aLocalName; sal_uInt16 nPrefix = GetScImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName ); - const rtl::OUString& sValue(xAttrList->getValueByIndex( i )); + const OUString& sValue(xAttrList->getValueByIndex( i )); switch( rAttrTokenMap.Get( nPrefix, aLocalName ) ) { @@ -543,7 +542,7 @@ ScXMLSourceSQLContext::~ScXMLSourceSQLContext() } SvXMLImportContext *ScXMLSourceSQLContext::CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) { @@ -572,7 +571,7 @@ void ScXMLSourceSQLContext::EndElement() ScXMLSourceTableContext::ScXMLSourceTableContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLDatabaseRangeContext* pTempDatabaseRangeContext) : @@ -583,11 +582,11 @@ ScXMLSourceTableContext::ScXMLSourceTableContext( ScXMLImport& rImport, const SvXMLTokenMap& rAttrTokenMap = GetScImport().GetDatabaseRangeSourceTableAttrTokenMap(); for( sal_Int16 i=0; i < nAttrCount; ++i ) { - const rtl::OUString& sAttrName(xAttrList->getNameByIndex( i )); - rtl::OUString aLocalName; + const OUString& sAttrName(xAttrList->getNameByIndex( i )); + OUString aLocalName; sal_uInt16 nPrefix = GetScImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName ); - const rtl::OUString& sValue(xAttrList->getValueByIndex( i )); + const OUString& sValue(xAttrList->getValueByIndex( i )); switch( rAttrTokenMap.Get( nPrefix, aLocalName ) ) { @@ -611,7 +610,7 @@ ScXMLSourceTableContext::~ScXMLSourceTableContext() } SvXMLImportContext *ScXMLSourceTableContext::CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) { @@ -640,7 +639,7 @@ void ScXMLSourceTableContext::EndElement() ScXMLSourceQueryContext::ScXMLSourceQueryContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLDatabaseRangeContext* pTempDatabaseRangeContext) : @@ -651,11 +650,11 @@ ScXMLSourceQueryContext::ScXMLSourceQueryContext( ScXMLImport& rImport, const SvXMLTokenMap& rAttrTokenMap = GetScImport().GetDatabaseRangeSourceQueryAttrTokenMap(); for( sal_Int16 i=0; i < nAttrCount; ++i ) { - const rtl::OUString& sAttrName(xAttrList->getNameByIndex( i )); - rtl::OUString aLocalName; + const OUString& sAttrName(xAttrList->getNameByIndex( i )); + OUString aLocalName; sal_uInt16 nPrefix = GetScImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName ); - const rtl::OUString& sValue(xAttrList->getValueByIndex( i )); + const OUString& sValue(xAttrList->getValueByIndex( i )); switch( rAttrTokenMap.Get( nPrefix, aLocalName ) ) { @@ -679,7 +678,7 @@ ScXMLSourceQueryContext::~ScXMLSourceQueryContext() } SvXMLImportContext *ScXMLSourceQueryContext::CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) { @@ -708,22 +707,22 @@ void ScXMLSourceQueryContext::EndElement() ScXMLConResContext::ScXMLConResContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLDatabaseRangeContext* pTempDatabaseRangeContext) : SvXMLImportContext( rImport, nPrfx, rLName ), pDatabaseRangeContext( pTempDatabaseRangeContext ) { - rtl::OUString sConRes; + OUString sConRes; sal_Int16 nAttrCount = xAttrList.is() ? xAttrList->getLength() : 0; for( sal_Int16 i=0; i < nAttrCount; i++ ) { - rtl::OUString sAttrName = xAttrList->getNameByIndex( i ); - rtl::OUString aLocalName; + OUString sAttrName = xAttrList->getNameByIndex( i ); + OUString aLocalName; sal_uInt16 nPrefix = GetScImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName ); - rtl::OUString sValue = xAttrList->getValueByIndex( i ); + OUString sValue = xAttrList->getValueByIndex( i ); if (nPrefix == XML_NAMESPACE_XLINK) { @@ -740,7 +739,7 @@ ScXMLConResContext::~ScXMLConResContext() } SvXMLImportContext *ScXMLConResContext::CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& /* xAttrList */ ) { @@ -758,7 +757,7 @@ void ScXMLConResContext::EndElement() ScXMLSubTotalRulesContext::ScXMLSubTotalRulesContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLDatabaseRangeContext* pTempDatabaseRangeContext) : @@ -769,11 +768,11 @@ ScXMLSubTotalRulesContext::ScXMLSubTotalRulesContext( ScXMLImport& rImport, const SvXMLTokenMap& rAttrTokenMap = GetScImport().GetDatabaseRangeSubTotalRulesAttrTokenMap(); for( sal_Int16 i=0; i < nAttrCount; ++i ) { - const rtl::OUString& sAttrName(xAttrList->getNameByIndex( i )); - rtl::OUString aLocalName; + const OUString& sAttrName(xAttrList->getNameByIndex( i )); + OUString aLocalName; sal_uInt16 nPrefix = GetScImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName ); - const rtl::OUString& sValue(xAttrList->getValueByIndex( i )); + const OUString& sValue(xAttrList->getValueByIndex( i )); switch( rAttrTokenMap.Get( nPrefix, aLocalName ) ) { @@ -801,7 +800,7 @@ ScXMLSubTotalRulesContext::~ScXMLSubTotalRulesContext() } SvXMLImportContext *ScXMLSubTotalRulesContext::CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) { @@ -836,7 +835,7 @@ void ScXMLSubTotalRulesContext::EndElement() ScXMLSortGroupsContext::ScXMLSortGroupsContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLDatabaseRangeContext* pTempDatabaseRangeContext) : @@ -848,11 +847,11 @@ ScXMLSortGroupsContext::ScXMLSortGroupsContext( ScXMLImport& rImport, const SvXMLTokenMap& rAttrTokenMap = GetScImport().GetSubTotalRulesSortGroupsAttrTokenMap(); for( sal_Int16 i=0; i < nAttrCount; ++i ) { - const rtl::OUString& sAttrName(xAttrList->getNameByIndex( i )); - rtl::OUString aLocalName; + const OUString& sAttrName(xAttrList->getNameByIndex( i )); + OUString aLocalName; sal_uInt16 nPrefix = GetScImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName ); - const rtl::OUString& sValue(xAttrList->getValueByIndex( i )); + const OUString& sValue(xAttrList->getValueByIndex( i )); switch( rAttrTokenMap.Get( nPrefix, aLocalName ) ) { @@ -860,7 +859,7 @@ ScXMLSortGroupsContext::ScXMLSortGroupsContext( ScXMLImport& rImport, { if (sValue.getLength() > 8) { - rtl::OUString sTemp = sValue.copy(0, 8); + OUString sTemp = sValue.copy(0, 8); if (sTemp.compareToAscii(SC_USERLIST) == 0) { pDatabaseRangeContext->SetSubTotalsEnabledUserList(true); @@ -902,7 +901,7 @@ ScXMLSortGroupsContext::~ScXMLSortGroupsContext() } SvXMLImportContext *ScXMLSortGroupsContext::CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& /* xAttrList */ ) { @@ -920,7 +919,7 @@ void ScXMLSortGroupsContext::EndElement() ScXMLSubTotalRuleContext::ScXMLSubTotalRuleContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLDatabaseRangeContext* pTempDatabaseRangeContext) : @@ -931,11 +930,11 @@ ScXMLSubTotalRuleContext::ScXMLSubTotalRuleContext( ScXMLImport& rImport, const SvXMLTokenMap& rAttrTokenMap = GetScImport().GetSubTotalRulesSubTotalRuleAttrTokenMap(); for( sal_Int16 i=0; i < nAttrCount; ++i ) { - const rtl::OUString& sAttrName(xAttrList->getNameByIndex( i )); - rtl::OUString aLocalName; + const OUString& sAttrName(xAttrList->getNameByIndex( i )); + OUString aLocalName; sal_uInt16 nPrefix = GetScImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName ); - const rtl::OUString& sValue(xAttrList->getValueByIndex( i )); + const OUString& sValue(xAttrList->getValueByIndex( i )); switch( rAttrTokenMap.Get( nPrefix, aLocalName ) ) { @@ -953,7 +952,7 @@ ScXMLSubTotalRuleContext::~ScXMLSubTotalRuleContext() } SvXMLImportContext *ScXMLSubTotalRuleContext::CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) { @@ -984,7 +983,7 @@ void ScXMLSubTotalRuleContext::EndElement() ScXMLSubTotalFieldContext::ScXMLSubTotalFieldContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLSubTotalRuleContext* pTempSubTotalRuleContext) : @@ -995,11 +994,11 @@ ScXMLSubTotalFieldContext::ScXMLSubTotalFieldContext( ScXMLImport& rImport, const SvXMLTokenMap& rAttrTokenMap = GetScImport().GetSubTotalRuleSubTotalFieldAttrTokenMap(); for( sal_Int16 i=0; i < nAttrCount; ++i ) { - const rtl::OUString& sAttrName(xAttrList->getNameByIndex( i )); - rtl::OUString aLocalName; + const OUString& sAttrName(xAttrList->getNameByIndex( i )); + OUString aLocalName; sal_uInt16 nPrefix = GetScImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName ); - const rtl::OUString& sValue(xAttrList->getValueByIndex( i )); + const OUString& sValue(xAttrList->getValueByIndex( i )); switch( rAttrTokenMap.Get( nPrefix, aLocalName ) ) { @@ -1022,7 +1021,7 @@ ScXMLSubTotalFieldContext::~ScXMLSubTotalFieldContext() } SvXMLImportContext *ScXMLSubTotalFieldContext::CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& /* xAttrList */ ) { diff --git a/sc/source/filter/xml/xmldrani.hxx b/sc/source/filter/xml/xmldrani.hxx index 6633eeefc03b..7e0a6d8b2b75 100644 --- a/sc/source/filter/xml/xmldrani.hxx +++ b/sc/source/filter/xml/xmldrani.hxx @@ -46,14 +46,14 @@ class ScXMLDatabaseRangesContext : public SvXMLImportContext public: ScXMLDatabaseRangesContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList); virtual ~ScXMLDatabaseRangesContext(); 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 ); @@ -70,10 +70,10 @@ class ScXMLDatabaseRangeContext : public SvXMLImportContext { boost::scoped_ptr<ScQueryParam> mpQueryParam; ScRange maRange; - rtl::OUString sDatabaseRangeName; - rtl::OUString sConnectionResource; - rtl::OUString sDatabaseName; - rtl::OUString sSourceObject; + OUString sDatabaseRangeName; + OUString sConnectionResource; + OUString sDatabaseName; + OUString sSourceObject; com::sun::star::uno::Sequence <com::sun::star::beans::PropertyValue> aSortSequence; std::vector < ScSubTotalRule > aSubTotalRules; com::sun::star::table::CellRangeAddress aFilterConditionSourceRangeAddress; @@ -103,27 +103,27 @@ class ScXMLDatabaseRangeContext : public SvXMLImportContext const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); } ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } - ScDBData* ConvertToDBData(const ::rtl::OUString& rName); + ScDBData* ConvertToDBData(const OUString& rName); public: ScXMLDatabaseRangeContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList); virtual ~ScXMLDatabaseRangeContext(); 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 ); virtual void EndElement(); - void SetDatabaseName(const rtl::OUString sTempDatabaseName) { sDatabaseName = sTempDatabaseName; } - void SetConnectionResource(const rtl::OUString sTempConRes) { sConnectionResource = sTempConRes; } - void SetSourceObject(const rtl::OUString sTempSourceObject) { sSourceObject = sTempSourceObject; } + void SetDatabaseName(const OUString sTempDatabaseName) { sDatabaseName = sTempDatabaseName; } + void SetConnectionResource(const OUString sTempConRes) { sConnectionResource = sTempConRes; } + void SetSourceObject(const OUString sTempSourceObject) { sSourceObject = sTempSourceObject; } void SetSourceType(const com::sun::star::sheet::DataImportMode nTempSourceType) { nSourceType = nTempSourceType; } void SetNative(const bool bTempNative) { bNative = bTempNative; } void SetSubTotalsBindFormatsToContent(const bool bTemp ) { bSubTotalsBindFormatsToContent = bTemp; } @@ -142,7 +142,7 @@ public: class ScXMLSourceSQLContext : public SvXMLImportContext { ScXMLDatabaseRangeContext* pDatabaseRangeContext; - rtl::OUString sDBName; + OUString sDBName; const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); } ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } @@ -150,7 +150,7 @@ class ScXMLSourceSQLContext : public SvXMLImportContext public: ScXMLSourceSQLContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLDatabaseRangeContext* pTempDatabaseRangeContext); @@ -158,7 +158,7 @@ public: virtual ~ScXMLSourceSQLContext(); 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 ); @@ -168,7 +168,7 @@ public: class ScXMLSourceTableContext : public SvXMLImportContext { ScXMLDatabaseRangeContext* pDatabaseRangeContext; - rtl::OUString sDBName; + OUString sDBName; const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); } ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } @@ -176,7 +176,7 @@ class ScXMLSourceTableContext : public SvXMLImportContext public: ScXMLSourceTableContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLDatabaseRangeContext* pTempDatabaseRangeContext); @@ -184,7 +184,7 @@ public: virtual ~ScXMLSourceTableContext(); 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 ); @@ -194,7 +194,7 @@ public: class ScXMLSourceQueryContext : public SvXMLImportContext { ScXMLDatabaseRangeContext* pDatabaseRangeContext; - rtl::OUString sDBName; + OUString sDBName; const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); } ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } @@ -202,7 +202,7 @@ class ScXMLSourceQueryContext : public SvXMLImportContext public: ScXMLSourceQueryContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLDatabaseRangeContext* pTempDatabaseRangeContext); @@ -210,7 +210,7 @@ public: virtual ~ScXMLSourceQueryContext(); 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 ); @@ -227,7 +227,7 @@ class ScXMLConResContext : public SvXMLImportContext public: ScXMLConResContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLDatabaseRangeContext* pTempDatabaseRangeContext); @@ -235,7 +235,7 @@ public: virtual ~ScXMLConResContext(); 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 ); @@ -252,7 +252,7 @@ class ScXMLSubTotalRulesContext : public SvXMLImportContext public: ScXMLSubTotalRulesContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLDatabaseRangeContext* pTempDatabaseRangeContext); @@ -260,7 +260,7 @@ public: virtual ~ScXMLSubTotalRulesContext(); 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 ); @@ -277,7 +277,7 @@ class ScXMLSortGroupsContext : public SvXMLImportContext public: ScXMLSortGroupsContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLDatabaseRangeContext* pTempDatabaseRangeContext); @@ -285,7 +285,7 @@ public: virtual ~ScXMLSortGroupsContext(); 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 ); @@ -303,7 +303,7 @@ class ScXMLSubTotalRuleContext : public SvXMLImportContext public: ScXMLSubTotalRuleContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLDatabaseRangeContext* pTempDatabaseRangeContext); @@ -311,7 +311,7 @@ public: virtual ~ScXMLSubTotalRuleContext(); 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 ); @@ -325,8 +325,8 @@ public: class ScXMLSubTotalFieldContext : public SvXMLImportContext { ScXMLSubTotalRuleContext* pSubTotalRuleContext; - rtl::OUString sFieldNumber; - rtl::OUString sFunction; + OUString sFieldNumber; + OUString sFunction; const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); } ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } @@ -334,7 +334,7 @@ class ScXMLSubTotalFieldContext : public SvXMLImportContext public: ScXMLSubTotalFieldContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLSubTotalRuleContext* pSubTotalRuleContext); @@ -342,7 +342,7 @@ public: virtual ~ScXMLSubTotalFieldContext(); 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 ); diff --git a/sc/source/filter/xml/xmlexprt.cxx b/sc/source/filter/xml/xmlexprt.cxx index 358172ab951b..ec3a741bab32 100644 --- a/sc/source/filter/xml/xmlexprt.cxx +++ b/sc/source/filter/xml/xmlexprt.cxx @@ -152,8 +152,6 @@ using namespace formula; using namespace com::sun::star; using namespace xmloff::token; using ::std::vector; -using ::rtl::OUString; -using ::rtl::OUStringBuffer; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::UNO_QUERY; @@ -215,13 +213,13 @@ OUString lcl_GetRawString( ScDocument* pDoc, const ScAddress& rPos ) OUString SAL_CALL ScXMLOOoExport_getImplementationName() throw() { - return rtl::OUString( "com.sun.star.comp.Calc.XMLExporter" ); + return OUString( "com.sun.star.comp.Calc.XMLExporter" ); } -uno::Sequence< rtl::OUString > SAL_CALL ScXMLOOoExport_getSupportedServiceNames() throw() +uno::Sequence< OUString > SAL_CALL ScXMLOOoExport_getSupportedServiceNames() throw() { - const rtl::OUString aServiceName( ScXMLOOoExport_getImplementationName() ); - return uno::Sequence< rtl::OUString >( &aServiceName, 1 ); + const OUString aServiceName( ScXMLOOoExport_getImplementationName() ); + return uno::Sequence< OUString >( &aServiceName, 1 ); } uno::Reference< uno::XInterface > SAL_CALL ScXMLOOoExport_createInstance( @@ -232,13 +230,13 @@ uno::Reference< uno::XInterface > SAL_CALL ScXMLOOoExport_createInstance( OUString SAL_CALL ScXMLOOoExport_Meta_getImplementationName() throw() { - return rtl::OUString( "com.sun.star.comp.Calc.XMLMetaExporter" ); + return OUString( "com.sun.star.comp.Calc.XMLMetaExporter" ); } -uno::Sequence< rtl::OUString > SAL_CALL ScXMLOOoExport_Meta_getSupportedServiceNames() throw() +uno::Sequence< OUString > SAL_CALL ScXMLOOoExport_Meta_getSupportedServiceNames() throw() { - const rtl::OUString aServiceName( ScXMLOOoExport_Meta_getImplementationName() ); - return uno::Sequence< rtl::OUString > ( &aServiceName, 1 ); + const OUString aServiceName( ScXMLOOoExport_Meta_getImplementationName() ); + return uno::Sequence< OUString > ( &aServiceName, 1 ); } uno::Reference< uno::XInterface > SAL_CALL ScXMLOOoExport_Meta_createInstance( @@ -249,13 +247,13 @@ uno::Reference< uno::XInterface > SAL_CALL ScXMLOOoExport_Meta_createInstance( OUString SAL_CALL ScXMLOOoExport_Styles_getImplementationName() throw() { - return rtl::OUString( "com.sun.star.comp.Calc.XMLStylesExporter" ); + return OUString( "com.sun.star.comp.Calc.XMLStylesExporter" ); } -uno::Sequence< rtl::OUString > SAL_CALL ScXMLOOoExport_Styles_getSupportedServiceNames() throw() +uno::Sequence< OUString > SAL_CALL ScXMLOOoExport_Styles_getSupportedServiceNames() throw() { - const rtl::OUString aServiceName( ScXMLOOoExport_Styles_getImplementationName() ); - return uno::Sequence< rtl::OUString > ( &aServiceName, 1 ); + const OUString aServiceName( ScXMLOOoExport_Styles_getImplementationName() ); + return uno::Sequence< OUString > ( &aServiceName, 1 ); } uno::Reference< uno::XInterface > SAL_CALL ScXMLOOoExport_Styles_createInstance( @@ -266,13 +264,13 @@ uno::Reference< uno::XInterface > SAL_CALL ScXMLOOoExport_Styles_createInstance( OUString SAL_CALL ScXMLOOoExport_Content_getImplementationName() throw() { - return rtl::OUString( "com.sun.star.comp.Calc.XMLContentExporter" ); + return OUString( "com.sun.star.comp.Calc.XMLContentExporter" ); } -uno::Sequence< rtl::OUString > SAL_CALL ScXMLOOoExport_Content_getSupportedServiceNames() throw() +uno::Sequence< OUString > SAL_CALL ScXMLOOoExport_Content_getSupportedServiceNames() throw() { - const rtl::OUString aServiceName( ScXMLOOoExport_Content_getImplementationName() ); - return uno::Sequence< rtl::OUString > ( &aServiceName, 1 ); + const OUString aServiceName( ScXMLOOoExport_Content_getImplementationName() ); + return uno::Sequence< OUString > ( &aServiceName, 1 ); } uno::Reference< uno::XInterface > SAL_CALL ScXMLOOoExport_Content_createInstance( @@ -283,13 +281,13 @@ uno::Reference< uno::XInterface > SAL_CALL ScXMLOOoExport_Content_createInstance OUString SAL_CALL ScXMLOOoExport_Settings_getImplementationName() throw() { - return rtl::OUString( "com.sun.star.comp.Calc.XMLSettingsExporter" ); + return OUString( "com.sun.star.comp.Calc.XMLSettingsExporter" ); } -uno::Sequence< rtl::OUString > SAL_CALL ScXMLOOoExport_Settings_getSupportedServiceNames() throw() +uno::Sequence< OUString > SAL_CALL ScXMLOOoExport_Settings_getSupportedServiceNames() throw() { - const rtl::OUString aServiceName( ScXMLOOoExport_Settings_getImplementationName() ); - return uno::Sequence< rtl::OUString > ( &aServiceName, 1 ); + const OUString aServiceName( ScXMLOOoExport_Settings_getImplementationName() ); + return uno::Sequence< OUString > ( &aServiceName, 1 ); } uno::Reference< uno::XInterface > SAL_CALL ScXMLOOoExport_Settings_createInstance( @@ -302,13 +300,13 @@ uno::Reference< uno::XInterface > SAL_CALL ScXMLOOoExport_Settings_createInstanc OUString SAL_CALL ScXMLOasisExport_getImplementationName() throw() { - return rtl::OUString( "com.sun.star.comp.Calc.XMLOasisExporter" ); + return OUString( "com.sun.star.comp.Calc.XMLOasisExporter" ); } -uno::Sequence< rtl::OUString > SAL_CALL ScXMLOasisExport_getSupportedServiceNames() throw() +uno::Sequence< OUString > SAL_CALL ScXMLOasisExport_getSupportedServiceNames() throw() { - const rtl::OUString aServiceName( ScXMLOasisExport_getImplementationName() ); - const uno::Sequence< rtl::OUString > aSeq( &aServiceName, 1 ); + const OUString aServiceName( ScXMLOasisExport_getImplementationName() ); + const uno::Sequence< OUString > aSeq( &aServiceName, 1 ); return aSeq; } @@ -320,13 +318,13 @@ uno::Reference< uno::XInterface > SAL_CALL ScXMLOasisExport_createInstance( OUString SAL_CALL ScXMLOasisExport_Meta_getImplementationName() throw() { - return rtl::OUString( "com.sun.star.comp.Calc.XMLOasisMetaExporter" ); + return OUString( "com.sun.star.comp.Calc.XMLOasisMetaExporter" ); } -uno::Sequence< rtl::OUString > SAL_CALL ScXMLOasisExport_Meta_getSupportedServiceNames() throw() +uno::Sequence< OUString > SAL_CALL ScXMLOasisExport_Meta_getSupportedServiceNames() throw() { - const rtl::OUString aServiceName( ScXMLOasisExport_Meta_getImplementationName() ); - const uno::Sequence< rtl::OUString > aSeq( &aServiceName, 1 ); + const OUString aServiceName( ScXMLOasisExport_Meta_getImplementationName() ); + const uno::Sequence< OUString > aSeq( &aServiceName, 1 ); return aSeq; } @@ -338,13 +336,13 @@ uno::Reference< uno::XInterface > SAL_CALL ScXMLOasisExport_Meta_createInstance( OUString SAL_CALL ScXMLOasisExport_Styles_getImplementationName() throw() { - return rtl::OUString( "com.sun.star.comp.Calc.XMLOasisStylesExporter" ); + return OUString( "com.sun.star.comp.Calc.XMLOasisStylesExporter" ); } -uno::Sequence< rtl::OUString > SAL_CALL ScXMLOasisExport_Styles_getSupportedServiceNames() throw() +uno::Sequence< OUString > SAL_CALL ScXMLOasisExport_Styles_getSupportedServiceNames() throw() { - const rtl::OUString aServiceName( ScXMLOasisExport_Styles_getImplementationName() ); - const uno::Sequence< rtl::OUString > aSeq( &aServiceName, 1 ); + const OUString aServiceName( ScXMLOasisExport_Styles_getImplementationName() ); + const uno::Sequence< OUString > aSeq( &aServiceName, 1 ); return aSeq; } @@ -356,13 +354,13 @@ uno::Reference< uno::XInterface > SAL_CALL ScXMLOasisExport_Styles_createInstanc OUString SAL_CALL ScXMLOasisExport_Content_getImplementationName() throw() { - return rtl::OUString( "com.sun.star.comp.Calc.XMLOasisContentExporter" ); + return OUString( "com.sun.star.comp.Calc.XMLOasisContentExporter" ); } -uno::Sequence< rtl::OUString > SAL_CALL ScXMLOasisExport_Content_getSupportedServiceNames() throw() +uno::Sequence< OUString > SAL_CALL ScXMLOasisExport_Content_getSupportedServiceNames() throw() { - const rtl::OUString aServiceName( ScXMLOasisExport_Content_getImplementationName() ); - const uno::Sequence< rtl::OUString > aSeq( &aServiceName, 1 ); + const OUString aServiceName( ScXMLOasisExport_Content_getImplementationName() ); + const uno::Sequence< OUString > aSeq( &aServiceName, 1 ); return aSeq; } @@ -374,13 +372,13 @@ uno::Reference< uno::XInterface > SAL_CALL ScXMLOasisExport_Content_createInstan OUString SAL_CALL ScXMLOasisExport_Settings_getImplementationName() throw() { - return rtl::OUString( "com.sun.star.comp.Calc.XMLOasisSettingsExporter" ); + return OUString( "com.sun.star.comp.Calc.XMLOasisSettingsExporter" ); } -uno::Sequence< rtl::OUString > SAL_CALL ScXMLOasisExport_Settings_getSupportedServiceNames() throw() +uno::Sequence< OUString > SAL_CALL ScXMLOasisExport_Settings_getSupportedServiceNames() throw() { - const rtl::OUString aServiceName( ScXMLOasisExport_Settings_getImplementationName() ); - const uno::Sequence< rtl::OUString > aSeq( &aServiceName, 1 ); + const OUString aServiceName( ScXMLOasisExport_Settings_getImplementationName() ); + const uno::Sequence< OUString > aSeq( &aServiceName, 1 ); return aSeq; } @@ -411,7 +409,7 @@ void ScXMLShapeExport::onExport( const uno::Reference < drawing::XShape >& xShap if( xShapeProp.is() ) { sal_Int16 nLayerID = 0; - if( (xShapeProp->getPropertyValue(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SC_LAYERID ))) >>= nLayerID) && (nLayerID == SC_LAYER_BACK) ) + if( (xShapeProp->getPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM( SC_LAYERID ))) >>= nLayerID) && (nLayerID == SC_LAYER_BACK) ) GetExport().AddAttribute(XML_NAMESPACE_TABLE, XML_TABLE_BACKGROUND, XML_TRUE); } } @@ -422,12 +420,12 @@ sal_Int16 ScXMLExport::GetFieldUnit() { com::sun::star::uno::Reference<com::sun::star::beans::XPropertySet> xProperties( comphelper::getProcessServiceFactory()->createInstance( - rtl::OUString( "com.sun.star.sheet.GlobalSheetSettings" ) ), + OUString( "com.sun.star.sheet.GlobalSheetSettings" ) ), com::sun::star::uno::UNO_QUERY); if (xProperties.is()) { sal_Int16 nFieldUnit = 0; - if (xProperties->getPropertyValue(rtl::OUString("Metric")) >>= nFieldUnit) + if (xProperties->getPropertyValue(OUString("Metric")) >>= nFieldUnit) return nFieldUnit; } return 0; @@ -494,21 +492,21 @@ ScXMLExport::ScXMLExport( xRowStylesExportPropertySetMapper = new ScXMLRowExportPropertyMapper(xRowStylesPropertySetMapper); xTableStylesExportPropertySetMapper = new ScXMLTableExportPropertyMapper(xTableStylesPropertySetMapper); - GetAutoStylePool()->AddFamily(XML_STYLE_FAMILY_TABLE_CELL, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(XML_STYLE_FAMILY_TABLE_CELL_STYLES_NAME)), - xCellStylesExportPropertySetMapper, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(XML_STYLE_FAMILY_TABLE_CELL_STYLES_PREFIX))); - GetAutoStylePool()->AddFamily(XML_STYLE_FAMILY_TABLE_COLUMN, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(XML_STYLE_FAMILY_TABLE_COLUMN_STYLES_NAME)), - xColumnStylesExportPropertySetMapper, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(XML_STYLE_FAMILY_TABLE_COLUMN_STYLES_PREFIX))); - GetAutoStylePool()->AddFamily(XML_STYLE_FAMILY_TABLE_ROW, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(XML_STYLE_FAMILY_TABLE_ROW_STYLES_NAME)), - xRowStylesExportPropertySetMapper, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(XML_STYLE_FAMILY_TABLE_ROW_STYLES_PREFIX))); - GetAutoStylePool()->AddFamily(XML_STYLE_FAMILY_TABLE_TABLE, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(XML_STYLE_FAMILY_TABLE_TABLE_STYLES_NAME)), - xTableStylesExportPropertySetMapper, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(XML_STYLE_FAMILY_TABLE_TABLE_STYLES_PREFIX))); + GetAutoStylePool()->AddFamily(XML_STYLE_FAMILY_TABLE_CELL, OUString(RTL_CONSTASCII_USTRINGPARAM(XML_STYLE_FAMILY_TABLE_CELL_STYLES_NAME)), + xCellStylesExportPropertySetMapper, OUString(RTL_CONSTASCII_USTRINGPARAM(XML_STYLE_FAMILY_TABLE_CELL_STYLES_PREFIX))); + GetAutoStylePool()->AddFamily(XML_STYLE_FAMILY_TABLE_COLUMN, OUString(RTL_CONSTASCII_USTRINGPARAM(XML_STYLE_FAMILY_TABLE_COLUMN_STYLES_NAME)), + xColumnStylesExportPropertySetMapper, OUString(RTL_CONSTASCII_USTRINGPARAM(XML_STYLE_FAMILY_TABLE_COLUMN_STYLES_PREFIX))); + GetAutoStylePool()->AddFamily(XML_STYLE_FAMILY_TABLE_ROW, OUString(RTL_CONSTASCII_USTRINGPARAM(XML_STYLE_FAMILY_TABLE_ROW_STYLES_NAME)), + xRowStylesExportPropertySetMapper, OUString(RTL_CONSTASCII_USTRINGPARAM(XML_STYLE_FAMILY_TABLE_ROW_STYLES_PREFIX))); + GetAutoStylePool()->AddFamily(XML_STYLE_FAMILY_TABLE_TABLE, OUString(RTL_CONSTASCII_USTRINGPARAM(XML_STYLE_FAMILY_TABLE_TABLE_STYLES_NAME)), + xTableStylesExportPropertySetMapper, OUString(RTL_CONSTASCII_USTRINGPARAM(XML_STYLE_FAMILY_TABLE_TABLE_STYLES_PREFIX))); if( (getExportFlags() & (EXPORT_STYLES|EXPORT_AUTOSTYLES|EXPORT_MASTERSTYLES|EXPORT_CONTENT) ) != 0 ) { // This name is reserved for the external ref cache tables. This // should not conflict with user-defined styles since this name is // used for a table style which is not available in the UI. - sExternalRefTabStyleName = rtl::OUString("ta_extref"); + sExternalRefTabStyleName = OUString("ta_extref"); GetAutoStylePool()->RegisterName(XML_STYLE_FAMILY_TABLE_TABLE, sExternalRefTabStyleName); sAttrName = GetNamespaceMap().GetQNameByKey( XML_NAMESPACE_TABLE, GetXMLToken(XML_NAME)); @@ -803,11 +801,11 @@ void ScXMLExport::_ExportMeta() CollectSharedData(nTableCount, nShapesCount); uno::Sequence<beans::NamedValue> stats(3); - stats[0] = beans::NamedValue(::rtl::OUString("TableCount"), + stats[0] = beans::NamedValue(OUString("TableCount"), uno::makeAny(nTableCount)); - stats[1] = beans::NamedValue(::rtl::OUString("CellCount"), + stats[1] = beans::NamedValue(OUString("CellCount"), uno::makeAny(nCellCount)); - stats[2] = beans::NamedValue(::rtl::OUString("ObjectCount"), + stats[2] = beans::NamedValue(OUString("ObjectCount"), uno::makeAny(nShapesCount)); // update document statistics at the model @@ -1150,7 +1148,7 @@ void ScXMLExport::WriteRowContent() AddAttribute(XML_NAMESPACE_TABLE, XML_CONTENT_VALIDATION_NAME, pValidationsContainer->GetValidationName(nPrevValidationIndex)); if (nCols > 1) { - rtl::OUStringBuffer aBuf; + OUStringBuffer aBuf; ::sax::Converter::convertNumber(aBuf, nCols); AddAttribute(sAttrColumnsRepeated, aBuf.makeStringAndClear()); } @@ -1174,7 +1172,7 @@ void ScXMLExport::WriteRowContent() AddAttribute(XML_NAMESPACE_TABLE, XML_CONTENT_VALIDATION_NAME, pValidationsContainer->GetValidationName(nPrevValidationIndex)); if (nCols > 1) { - rtl::OUStringBuffer aBuf; + OUStringBuffer aBuf; ::sax::Converter::convertNumber(aBuf, nCols); AddAttribute(sAttrColumnsRepeated, aBuf.makeStringAndClear()); } @@ -1196,7 +1194,7 @@ void ScXMLExport::WriteRowStartTag( } if (nEqualRows > 1) { - rtl::OUStringBuffer aBuf; + OUStringBuffer aBuf; ::sax::Converter::convertNumber(aBuf, nEqualRows); AddAttribute(XML_NAMESPACE_TABLE, XML_NUMBER_ROWS_REPEATED, aBuf.makeStringAndClear()); } @@ -1448,7 +1446,7 @@ void ScXMLExport::ExportFormatRanges(const sal_Int32 nStartCol, const sal_Int32 void ScXMLExport::GetColumnRowHeader(bool& rHasColumnHeader, table::CellRangeAddress& rColumnHeaderRange, bool& rHasRowHeader, table::CellRangeAddress& rRowHeaderRange, - rtl::OUString& rPrintRanges) const + OUString& rPrintRanges) const { uno::Reference <sheet::XPrintAreas> xPrintAreas (xCurrentTable, uno::UNO_QUERY); if (xPrintAreas.is()) @@ -1506,7 +1504,7 @@ void ScXMLExport::SetBodyAttributes() if (pDoc && pDoc->IsDocProtected()) { AddAttribute(XML_NAMESPACE_TABLE, XML_STRUCTURE_PROTECTED, XML_TRUE); - rtl::OUStringBuffer aBuffer; + OUStringBuffer aBuffer; uno::Sequence<sal_Int8> aPassHash; ScPasswordHash eHashUsed = PASSHASH_UNSPECIFIED; const ScDocProtection* p = pDoc->GetDocProtection(); @@ -1628,7 +1626,7 @@ void ScXMLExport::CopySourceStream( sal_Int32 nStartOffset, sal_Int32 nEndOffset if ( getExportFlags() & EXPORT_PRETTY ) { - const rtl::OString aOutStr("\n "); + const OString aOutStr("\n "); uno::Sequence<sal_Int8> aOutSeq( (sal_Int8*)aOutStr.getStr(), aOutStr.getLength() ); xDestStream->writeBytes( aOutSeq ); } @@ -1751,15 +1749,15 @@ void ScXMLExport::_ExportStyles( sal_Bool bUsed ) sal_Int32 nShapesCount(0); CollectSharedData(nTableCount, nShapesCount); } - ScXMLStyleExport aStylesExp(*this, rtl::OUString(), GetAutoStylePool().get()); + ScXMLStyleExport aStylesExp(*this, OUString(), GetAutoStylePool().get()); if (GetModel().is()) { uno::Reference <lang::XMultiServiceFactory> xMultiServiceFactory(GetModel(), uno::UNO_QUERY); if (xMultiServiceFactory.is()) { - uno::Reference <beans::XPropertySet> xProperties(xMultiServiceFactory->createInstance(rtl::OUString("com.sun.star.sheet.Defaults")), uno::UNO_QUERY); + uno::Reference <beans::XPropertySet> xProperties(xMultiServiceFactory->createInstance(OUString("com.sun.star.sheet.Defaults")), uno::UNO_QUERY); if (xProperties.is()) - aStylesExp.exportDefaultStyle(xProperties, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(XML_STYLE_FAMILY_TABLE_CELL_STYLES_NAME)), xCellStylesExportPropertySetMapper); + aStylesExp.exportDefaultStyle(xProperties, OUString(RTL_CONSTASCII_USTRINGPARAM(XML_STYLE_FAMILY_TABLE_CELL_STYLES_NAME)), xCellStylesExportPropertySetMapper); if (pSharedData->HasShapes()) { GetShapeExport()->ExportGraphicDefaults(); @@ -1771,11 +1769,11 @@ void ScXMLExport::_ExportStyles( sal_Bool bUsed ) uno::Reference <container::XNameAccess> xStylesFamilies(xStyleFamiliesSupplier->getStyleFamilies()); if (xStylesFamilies.is()) { - uno::Reference <container::XIndexAccess> xCellStyles(xStylesFamilies->getByName(rtl::OUString("CellStyles")), uno::UNO_QUERY); + uno::Reference <container::XIndexAccess> xCellStyles(xStylesFamilies->getByName(OUString("CellStyles")), uno::UNO_QUERY); if (xCellStyles.is()) { sal_Int32 nCount(xCellStyles->getCount()); - rtl::OUString sNumberFormat(RTL_CONSTASCII_USTRINGPARAM(SC_UNONAME_NUMFMT)); + OUString sNumberFormat(RTL_CONSTASCII_USTRINGPARAM(SC_UNONAME_NUMFMT)); for (sal_Int32 i = 0; i < nCount; ++i) { uno::Reference <beans::XPropertySet> xCellProperties(xCellStyles->getByIndex(i), uno::UNO_QUERY); @@ -1792,23 +1790,23 @@ void ScXMLExport::_ExportStyles( sal_Bool bUsed ) } exportDataStyles(); - aStylesExp.exportStyleFamily(rtl::OUString("CellStyles"), - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(XML_STYLE_FAMILY_TABLE_CELL_STYLES_NAME)), xCellStylesExportPropertySetMapper, false, XML_STYLE_FAMILY_TABLE_CELL); + aStylesExp.exportStyleFamily(OUString("CellStyles"), + OUString(RTL_CONSTASCII_USTRINGPARAM(XML_STYLE_FAMILY_TABLE_CELL_STYLES_NAME)), xCellStylesExportPropertySetMapper, false, XML_STYLE_FAMILY_TABLE_CELL); SvXMLExport::_ExportStyles(bUsed); } void ScXMLExport::AddStyleFromCells(const uno::Reference<beans::XPropertySet>& xProperties, const uno::Reference<sheet::XSpreadsheet>& xTable, - sal_Int32 nTable, const rtl::OUString* pOldName) + sal_Int32 nTable, const OUString* pOldName) { //! pass xCellRanges instead uno::Reference<sheet::XSheetCellRanges> xCellRanges( xProperties, uno::UNO_QUERY ); - rtl::OUString SC_SCELLPREFIX(RTL_CONSTASCII_USTRINGPARAM(XML_STYLE_FAMILY_TABLE_CELL_STYLES_PREFIX)); - rtl::OUString SC_NUMBERFORMAT(RTL_CONSTASCII_USTRINGPARAM(SC_UNONAME_NUMFMT)); + OUString SC_SCELLPREFIX(RTL_CONSTASCII_USTRINGPARAM(XML_STYLE_FAMILY_TABLE_CELL_STYLES_PREFIX)); + OUString SC_NUMBERFORMAT(RTL_CONSTASCII_USTRINGPARAM(SC_UNONAME_NUMFMT)); - rtl::OUString sStyleName; + OUString sStyleName; sal_Int32 nNumberFormat(-1); sal_Int32 nValidationIndex(-1); std::vector< XMLPropertyState > xPropStates(xCellStylesExportPropertySetMapper->Filter( xProperties )); @@ -1877,18 +1875,18 @@ void ScXMLExport::AddStyleFromCells(const uno::Reference<beans::XPropertySet>& x { GetAutoStylePool()->RegisterName(XML_STYLE_FAMILY_TABLE_CELL, *pOldName); // add to pCellStyles, so the name is found for normal sheets - rtl::OUString* pTemp(new rtl::OUString(*pOldName)); + OUString* pTemp(new OUString(*pOldName)); if (!pCellStyles->AddStyleName(pTemp, nIndex)) delete pTemp; } } else { - rtl::OUString sName; + OUString sName; bool bIsAutoStyle(true); if (GetAutoStylePool()->Add(sName, XML_STYLE_FAMILY_TABLE_CELL, sStyleName, xPropStates)) { - rtl::OUString* pTemp(new rtl::OUString(sName)); + OUString* pTemp(new OUString(sName)); if (!pCellStyles->AddStyleName(pTemp, nIndex)) delete pTemp; } @@ -1910,7 +1908,7 @@ void ScXMLExport::AddStyleFromCells(const uno::Reference<beans::XPropertySet>& x } else { - rtl::OUString* pTemp(new rtl::OUString(EncodeStyleName(sStyleName))); + OUString* pTemp(new OUString(EncodeStyleName(sStyleName))); sal_Int32 nIndex(0); if (!pCellStyles->AddStyleName(pTemp, nIndex, false)) { @@ -1939,9 +1937,9 @@ void ScXMLExport::AddStyleFromCells(const uno::Reference<beans::XPropertySet>& x } void ScXMLExport::AddStyleFromColumn(const uno::Reference<beans::XPropertySet>& xColumnProperties, - const rtl::OUString* pOldName, sal_Int32& rIndex, bool& rIsVisible) + const OUString* pOldName, sal_Int32& rIndex, bool& rIsVisible) { - rtl::OUString SC_SCOLUMNPREFIX(RTL_CONSTASCII_USTRINGPARAM(XML_STYLE_FAMILY_TABLE_COLUMN_STYLES_PREFIX)); + OUString SC_SCOLUMNPREFIX(RTL_CONSTASCII_USTRINGPARAM(XML_STYLE_FAMILY_TABLE_COLUMN_STYLES_PREFIX)); std::vector<XMLPropertyState> xPropStates(xColumnStylesExportPropertySetMapper->Filter(xColumnProperties)); if(!xPropStates.empty()) @@ -1958,23 +1956,23 @@ void ScXMLExport::AddStyleFromColumn(const uno::Reference<beans::XPropertySet>& ++aItr; } - rtl::OUString sParent; + OUString sParent; if (pOldName) { if (GetAutoStylePool()->AddNamed(*pOldName, XML_STYLE_FAMILY_TABLE_COLUMN, sParent, xPropStates)) { GetAutoStylePool()->RegisterName(XML_STYLE_FAMILY_TABLE_COLUMN, *pOldName); // add to pColumnStyles, so the name is found for normal sheets - rtl::OUString* pTemp(new rtl::OUString(*pOldName)); + OUString* pTemp(new OUString(*pOldName)); rIndex = pColumnStyles->AddStyleName(pTemp); } } else { - rtl::OUString sName; + OUString sName; if (GetAutoStylePool()->Add(sName, XML_STYLE_FAMILY_TABLE_COLUMN, sParent, xPropStates)) { - rtl::OUString* pTemp(new rtl::OUString(sName)); + OUString* pTemp(new OUString(sName)); rIndex = pColumnStyles->AddStyleName(pTemp); } else @@ -1984,30 +1982,30 @@ void ScXMLExport::AddStyleFromColumn(const uno::Reference<beans::XPropertySet>& } void ScXMLExport::AddStyleFromRow(const uno::Reference<beans::XPropertySet>& xRowProperties, - const rtl::OUString* pOldName, sal_Int32& rIndex) + const OUString* pOldName, sal_Int32& rIndex) { - rtl::OUString SC_SROWPREFIX(RTL_CONSTASCII_USTRINGPARAM(XML_STYLE_FAMILY_TABLE_ROW_STYLES_PREFIX)); + OUString SC_SROWPREFIX(RTL_CONSTASCII_USTRINGPARAM(XML_STYLE_FAMILY_TABLE_ROW_STYLES_PREFIX)); std::vector<XMLPropertyState> xPropStates(xRowStylesExportPropertySetMapper->Filter(xRowProperties)); if(!xPropStates.empty()) { - rtl::OUString sParent; + OUString sParent; if (pOldName) { if (GetAutoStylePool()->AddNamed(*pOldName, XML_STYLE_FAMILY_TABLE_ROW, sParent, xPropStates)) { GetAutoStylePool()->RegisterName(XML_STYLE_FAMILY_TABLE_ROW, *pOldName); // add to pRowStyles, so the name is found for normal sheets - rtl::OUString* pTemp(new rtl::OUString(*pOldName)); + OUString* pTemp(new OUString(*pOldName)); rIndex = pRowStyles->AddStyleName(pTemp); } } else { - rtl::OUString sName; + OUString sName; if (GetAutoStylePool()->Add(sName, XML_STYLE_FAMILY_TABLE_ROW, sParent, xPropStates)) { - rtl::OUString* pTemp(new rtl::OUString(sName)); + OUString* pTemp(new OUString(sName)); rIndex = pRowStyles->AddStyleName(pTemp); } else @@ -2153,8 +2151,8 @@ void ScXMLExport::_ExportAutoStyles() if (xTableProperties.is()) { std::vector<XMLPropertyState> xPropStates(xTableStylesExportPropertySetMapper->Filter(xTableProperties)); - rtl::OUString sParent; - rtl::OUString sName( aTableIter->maName ); + OUString sParent; + OUString sName( aTableIter->maName ); GetAutoStylePool()->AddNamed(sName, XML_STYLE_FAMILY_TABLE_TABLE, sParent, xPropStates); GetAutoStylePool()->RegisterName(XML_STYLE_FAMILY_TABLE_TABLE, sName); } @@ -2191,8 +2189,8 @@ void ScXMLExport::_ExportAutoStyles() if ( !aNoteIter->maStyleName.isEmpty() ) { std::vector<XMLPropertyState> xPropStates(xShapeMapper->Filter(xShapeProperties)); - rtl::OUString sParent; - rtl::OUString sName( aNoteIter->maStyleName ); + OUString sParent; + OUString sName( aNoteIter->maStyleName ); GetAutoStylePool()->AddNamed(sName, XML_STYLE_FAMILY_SD_GRAPHICS_ID, sParent, xPropStates); GetAutoStylePool()->RegisterName(XML_STYLE_FAMILY_SD_GRAPHICS_ID, sName); } @@ -2200,8 +2198,8 @@ void ScXMLExport::_ExportAutoStyles() { std::vector<XMLPropertyState> xPropStates( GetTextParagraphExport()->GetParagraphPropertyMapper()->Filter(xShapeProperties)); - rtl::OUString sParent; - rtl::OUString sName( aNoteIter->maTextStyle ); + OUString sParent; + OUString sName( aNoteIter->maTextStyle ); GetAutoStylePool()->AddNamed(sName, XML_STYLE_FAMILY_TEXT_PARAGRAPH, sParent, xPropStates); GetAutoStylePool()->RegisterName(XML_STYLE_FAMILY_TEXT_PARAGRAPH, sName); } @@ -2236,8 +2234,8 @@ void ScXMLExport::_ExportAutoStyles() if ( xParaProp.is() ) { std::vector<XMLPropertyState> xPropStates(xParaPropMapper->Filter(xParaProp)); - rtl::OUString sParent; - rtl::OUString sName( aNoteParaIter->maName ); + OUString sParent; + OUString sName( aNoteParaIter->maName ); GetAutoStylePool()->AddNamed(sName, XML_STYLE_FAMILY_TEXT_PARAGRAPH, sParent, xPropStates); GetAutoStylePool()->RegisterName(XML_STYLE_FAMILY_TEXT_PARAGRAPH, sName); } @@ -2273,8 +2271,8 @@ void ScXMLExport::_ExportAutoStyles() pCursor->SetSelection( aNoteTextIter->maSelection ); std::vector<XMLPropertyState> xPropStates(xTextPropMapper->Filter(xCursorProp)); - rtl::OUString sParent; - rtl::OUString sName( aNoteTextIter->maName ); + OUString sParent; + OUString sName( aNoteTextIter->maName ); GetAutoStylePool()->AddNamed(sName, XML_STYLE_FAMILY_TEXT_TEXT, sParent, xPropStates); GetAutoStylePool()->RegisterName(XML_STYLE_FAMILY_TEXT_TEXT, sName); } @@ -2307,8 +2305,8 @@ void ScXMLExport::_ExportAutoStyles() pCursor->SetSelection( aTextIter->maSelection ); std::vector<XMLPropertyState> xPropStates(xTextPropMapper->Filter(xCursorProp)); - rtl::OUString sParent; - rtl::OUString sName( aTextIter->maName ); + OUString sParent; + OUString sName( aTextIter->maName ); GetAutoStylePool()->AddNamed(sName, XML_STYLE_FAMILY_TEXT_TEXT, sParent, xPropStates); GetAutoStylePool()->RegisterName(XML_STYLE_FAMILY_TEXT_TEXT, sName); } @@ -2345,8 +2343,8 @@ void ScXMLExport::_ExportAutoStyles() std::vector<XMLPropertyState> xPropStates(xTableStylesExportPropertySetMapper->Filter(xTableProperties)); if(!xPropStates.empty()) { - rtl::OUString sParent; - rtl::OUString sName; + OUString sParent; + OUString sName; GetAutoStylePool()->Add(sName, XML_STYLE_FAMILY_TABLE_TABLE, sParent, xPropStates); aTableStyles.push_back(sName); } @@ -2661,7 +2659,7 @@ void ScXMLExport::WriteTable(sal_Int32 nTable, const Reference<sheet::XSpreadshe return; nCurrentTable = sal::static_int_cast<sal_uInt16>( nTable ); - rtl::OUString sOUTableName(xName->getName()); + OUString sOUTableName(xName->getName()); AddAttribute(sAttrName, sOUTableName); AddAttribute(sAttrStyleName, aTableStyles[nTable]); @@ -2675,7 +2673,7 @@ void ScXMLExport::WriteTable(sal_Int32 nTable, const Reference<sheet::XSpreadshe pProtect = pDoc->GetTabProtection(nTable); if (pProtect) { - rtl::OUStringBuffer aBuffer; + OUStringBuffer aBuffer; ScPasswordHash eHashUsed = PASSHASH_UNSPECIFIED; if (pProtect->hasPasswordHash(PASSHASH_SHA1)) { @@ -2710,7 +2708,7 @@ void ScXMLExport::WriteTable(sal_Int32 nTable, const Reference<sheet::XSpreadshe } } } - rtl::OUString sPrintRanges; + OUString sPrintRanges; table::CellRangeAddress aColumnHeaderRange; bool bHasColumnHeader; GetColumnRowHeader(bHasColumnHeader, aColumnHeaderRange, bHasRowHeader, aRowHeaderRange, sPrintRanges); @@ -2727,7 +2725,7 @@ void ScXMLExport::WriteTable(sal_Int32 nTable, const Reference<sheet::XSpreadshe if (pProtect->isOptionEnabled(ScTableProtection::SELECT_UNLOCKED_CELLS)) AddAttribute(XML_NAMESPACE_TABLE, XML_SELECT_UNPROTECTED_CELLS, XML_TRUE); - rtl::OUString aElemName = GetNamespaceMap().GetQNameByKey( + OUString aElemName = GetNamespaceMap().GetQNameByKey( XML_NAMESPACE_TABLE, GetXMLToken(XML_TABLE_PROTECTION)); SvXMLElementExport aElemProtected(*this, aElemName, true, true); @@ -2862,8 +2860,8 @@ void ScXMLExport::WriteCell(ScMyCell& aCell, sal_Int32 nEqualCellCount) { sal_Int32 nColumns(aCell.aMatrixRange.EndColumn - aCell.aMatrixRange.StartColumn + 1); sal_Int32 nRows(aCell.aMatrixRange.EndRow - aCell.aMatrixRange.StartRow + 1); - rtl::OUStringBuffer sColumns; - rtl::OUStringBuffer sRows; + OUStringBuffer sColumns; + OUStringBuffer sRows; ::sax::Converter::convertNumber(sColumns, nColumns); ::sax::Converter::convertNumber(sRows, nRows); AddAttribute(XML_NAMESPACE_TABLE, XML_NUMBER_MATRIX_COLUMNS_SPANNED, sColumns.makeStringAndClear()); @@ -2892,7 +2890,7 @@ void ScXMLExport::WriteCell(ScMyCell& aCell, sal_Int32 nEqualCellCount) { if (GetCellText(aCell, aCellPos)) { - rtl::OUString sFormula(lcl_GetRawString(pDoc, aCellPos)); + OUString sFormula(lcl_GetRawString(pDoc, aCellPos)); GetNumberFormatAttributesExportHelper()->SetNumberFormatAttributes( sFormula, aCell.sStringValue, true, true); } @@ -2904,14 +2902,14 @@ void ScXMLExport::WriteCell(ScMyCell& aCell, sal_Int32 nEqualCellCount) aCellVal.assign(*pDoc, aCellPos); if (aCellVal.meType == CELLTYPE_FORMULA) { - rtl::OUStringBuffer sFormula; + OUStringBuffer sFormula; ScFormulaCell* pFormulaCell = aCellVal.mpFormula; if (!bIsMatrix || (bIsMatrix && bIsFirstMatrixCell)) { const formula::FormulaGrammar::Grammar eGrammar = pDoc->GetStorageGrammar(); sal_uInt16 nNamespacePrefix = (eGrammar == formula::FormulaGrammar::GRAM_ODFF ? XML_NAMESPACE_OF : XML_NAMESPACE_OOOC); pFormulaCell->GetFormula(sFormula, eGrammar); - rtl::OUString sOUFormula(sFormula.makeStringAndClear()); + OUString sOUFormula(sFormula.makeStringAndClear()); if (!bIsMatrix) { AddAttribute(sAttrFormula, GetNamespaceMap().GetQNameByKey( nNamespacePrefix, sOUFormula, false )); @@ -2924,7 +2922,7 @@ void ScXMLExport::WriteCell(ScMyCell& aCell, sal_Int32 nEqualCellCount) if (pFormulaCell->IsValue()) { bool bIsStandard; - rtl::OUString sCurrency; + OUString sCurrency; GetNumberFormatAttributesExportHelper()->GetCellType(aCell.nNumberFormat, sCurrency, bIsStandard); if (bIsStandard) { @@ -2957,7 +2955,7 @@ void ScXMLExport::WriteCell(ScMyCell& aCell, sal_Int32 nEqualCellCount) // added to avoid warnings } } - rtl::OUString* pCellString(&sElemCell); + OUString* pCellString(&sElemCell); if (aCell.bIsCovered) { pCellString = &sElemCoveredCell; @@ -2968,8 +2966,8 @@ void ScXMLExport::WriteCell(ScMyCell& aCell, sal_Int32 nEqualCellCount) { sal_Int32 nColumns(aCell.aMergeRange.EndColumn - aCell.aMergeRange.StartColumn + 1); sal_Int32 nRows(aCell.aMergeRange.EndRow - aCell.aMergeRange.StartRow + 1); - rtl::OUStringBuffer sColumns; - rtl::OUStringBuffer sRows; + OUStringBuffer sColumns; + OUStringBuffer sRows; ::sax::Converter::convertNumber(sColumns, nColumns); ::sax::Converter::convertNumber(sRows, nRows); AddAttribute(XML_NAMESPACE_TABLE, XML_NUMBER_COLUMNS_SPANNED, sColumns.makeStringAndClear()); @@ -3011,31 +3009,31 @@ void ScXMLExport::ExportShape(const uno::Reference < drawing::XShape >& xShape, { uno::Reference < beans::XPropertySet > xShapeProps ( xShape, uno::UNO_QUERY ); bool bIsChart( false ); - rtl::OUString sPropCLSID ("CLSID"); - rtl::OUString sPropModel ("Model"); - rtl::OUString sPersistName ("PersistName"); + OUString sPropCLSID ("CLSID"); + OUString sPropModel ("Model"); + OUString sPersistName ("PersistName"); if (xShapeProps.is()) { sal_Int32 nZOrder = 0; - if (xShapeProps->getPropertyValue(rtl::OUString("ZOrder")) >>= nZOrder) + if (xShapeProps->getPropertyValue(OUString("ZOrder")) >>= nZOrder) { - rtl::OUStringBuffer sBuffer; + OUStringBuffer sBuffer; ::sax::Converter::convertNumber(sBuffer, nZOrder); AddAttribute(XML_NAMESPACE_DRAW, XML_ZINDEX, sBuffer.makeStringAndClear()); } uno::Reference< beans::XPropertySetInfo > xPropSetInfo = xShapeProps->getPropertySetInfo(); if( xPropSetInfo->hasPropertyByName( sPropCLSID ) ) { - rtl::OUString sCLSID; + OUString sCLSID; if (xShapeProps->getPropertyValue( sPropCLSID ) >>= sCLSID) { if ( sCLSID.equalsIgnoreAsciiCase(GetChartExport()->getChartCLSID()) ) { // we have a chart - ::rtl::OUString sRanges; + OUString sRanges; if ( pDoc ) { - ::rtl::OUString aChartName; + OUString aChartName; xShapeProps->getPropertyValue( sPersistName ) >>= aChartName; ScChartListenerCollection* pCollection = pDoc->GetChartListenerCollection(); if (pCollection) @@ -3076,7 +3074,7 @@ void ScXMLExport::ExportShape(const uno::Reference < drawing::XShape >& xShape, { // we have a chart that gets its data from Calc bIsChart = true; - uno::Sequence< ::rtl::OUString > aRepresentations( + uno::Sequence< OUString > aRepresentations( xReceiver->getUsedRangeRepresentations()); SvXMLAttributeList* pAttrList = 0; if(aRepresentations.getLength()) @@ -3101,12 +3099,12 @@ void ScXMLExport::ExportShape(const uno::Reference < drawing::XShape >& xShape, if (!bIsChart) { // #i66550 HLINK_FOR_SHAPES - rtl::OUString sHlink; + OUString sHlink; try { uno::Reference< beans::XPropertySet > xProps( xShape, uno::UNO_QUERY ); if ( xProps.is() ) - xProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_HYPERLINK ) ) ) >>= sHlink; + xProps->getPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_HYPERLINK ) ) ) >>= sHlink; } catch ( const beans::UnknownPropertyException& ) { @@ -3160,10 +3158,10 @@ void ScXMLExport::WriteShapes(const ScMyCell& rMyCell) aPoint.X = 2 * aItr->xShape->getPosition().X + aItr->xShape->getSize().Width - aPoint.X; if ( !aItr->xShape->getShapeType().equals(sCaptionShape) ) { - rtl::OUString sEndAddress; + OUString sEndAddress; ScRangeStringConverter::GetStringFromAddress(sEndAddress, aItr->aEndAddress, pDoc, FormulaGrammar::CONV_OOO); AddAttribute(XML_NAMESPACE_TABLE, XML_END_CELL_ADDRESS, sEndAddress); - rtl::OUStringBuffer sBuffer; + OUStringBuffer sBuffer; GetMM100UnitConverter().convertMeasureToXML( sBuffer, aItr->nEndX); AddAttribute(XML_NAMESPACE_TABLE, XML_END_X, sBuffer.makeStringAndClear()); @@ -3237,7 +3235,7 @@ void ScXMLExport::exportAnnotationMeta( const uno::Reference < drawing::XShape > { if (pCurrentCell && pCurrentCell->xNoteShape.is() && pCurrentCell->xNoteShape.get() == xShape.get() && pCurrentCell->xAnnotation.is()) { - rtl::OUString sAuthor(pCurrentCell->xAnnotation->getAuthor()); + OUString sAuthor(pCurrentCell->xAnnotation->getAuthor()); if (!sAuthor.isEmpty()) { SvXMLElementExport aCreatorElem( *this, XML_NAMESPACE_DC, @@ -3254,7 +3252,7 @@ void ScXMLExport::exportAnnotationMeta( const uno::Reference < drawing::XShape > sal_uInt32 nfIndex = pNumForm->GetFormatIndex(NF_DATE_SYS_DDMMYYYY, LANGUAGE_SYSTEM); if (pNumForm->IsNumberFormat(aDate, nfIndex, fDate)) { - rtl::OUStringBuffer sBuf; + OUStringBuffer sBuf; GetMM100UnitConverter().convertDateTime(sBuf, fDate,true); SvXMLElementExport aDateElem( *this, XML_NAMESPACE_DC, XML_DATE, true, @@ -3266,7 +3264,7 @@ void ScXMLExport::exportAnnotationMeta( const uno::Reference < drawing::XShape > SvXMLElementExport aDateElem( *this, XML_NAMESPACE_META, XML_DATE_STRING, true, false ); - Characters(rtl::OUString(aDate)); + Characters(OUString(aDate)); } } else @@ -3274,7 +3272,7 @@ void ScXMLExport::exportAnnotationMeta( const uno::Reference < drawing::XShape > SvXMLElementExport aDateElem( *this, XML_NAMESPACE_META, XML_DATE_STRING, true, false ); - Characters(rtl::OUString(aDate)); + Characters(OUString(aDate)); } } } @@ -3507,19 +3505,19 @@ void ScXMLExport::WriteCalculationSettings(const uno::Reference <sheet::XSpreads uno::Reference<beans::XPropertySet> xPropertySet(xSpreadDoc, uno::UNO_QUERY); if (xPropertySet.is()) { - bool bCalcAsShown (::cppu::any2bool( xPropertySet->getPropertyValue(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_CALCASSHOWN))) )); - bool bIgnoreCase (::cppu::any2bool( xPropertySet->getPropertyValue(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_IGNORECASE))) )); - bool bLookUpLabels (::cppu::any2bool( xPropertySet->getPropertyValue(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_LOOKUPLABELS))) )); - bool bMatchWholeCell (::cppu::any2bool( xPropertySet->getPropertyValue(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_MATCHWHOLE))) )); - bool bUseRegularExpressions (::cppu::any2bool( xPropertySet->getPropertyValue(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_REGEXENABLED))) )); - bool bIsIterationEnabled (::cppu::any2bool( xPropertySet->getPropertyValue(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_ITERENABLED))) )); + bool bCalcAsShown (::cppu::any2bool( xPropertySet->getPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_CALCASSHOWN))) )); + bool bIgnoreCase (::cppu::any2bool( xPropertySet->getPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_IGNORECASE))) )); + bool bLookUpLabels (::cppu::any2bool( xPropertySet->getPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_LOOKUPLABELS))) )); + bool bMatchWholeCell (::cppu::any2bool( xPropertySet->getPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_MATCHWHOLE))) )); + bool bUseRegularExpressions (::cppu::any2bool( xPropertySet->getPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_REGEXENABLED))) )); + bool bIsIterationEnabled (::cppu::any2bool( xPropertySet->getPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_ITERENABLED))) )); sal_uInt16 nYear2000 (pDoc ? pDoc->GetDocOptions().GetYear2000() : 0); sal_Int32 nIterationCount(100); - xPropertySet->getPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_ITERCOUNT))) >>= nIterationCount; + xPropertySet->getPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_ITERCOUNT))) >>= nIterationCount; double fIterationEpsilon = 0; - xPropertySet->getPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_ITEREPSILON))) >>= fIterationEpsilon; + xPropertySet->getPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_ITEREPSILON))) >>= fIterationEpsilon; util::Date aNullDate; - xPropertySet->getPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_NULLDATE))) >>= aNullDate; + xPropertySet->getPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_NULLDATE))) >>= aNullDate; if (bCalcAsShown || bIgnoreCase || !bLookUpLabels || !bMatchWholeCell || !bUseRegularExpressions || bIsIterationEnabled || nIterationCount != 100 || !::rtl::math::approxEqual(fIterationEpsilon, 0.001) || aNullDate.Day != 30 || aNullDate.Month != 12 || aNullDate.Year != 1899 || nYear2000 != 1930) @@ -3536,7 +3534,7 @@ void ScXMLExport::WriteCalculationSettings(const uno::Reference <sheet::XSpreads AddAttribute(XML_NAMESPACE_TABLE, XML_USE_REGULAR_EXPRESSIONS, XML_FALSE); if (nYear2000 != 1930) { - rtl::OUStringBuffer sBuffer; + OUStringBuffer sBuffer; ::sax::Converter::convertNumber(sBuffer, nYear2000); AddAttribute(XML_NAMESPACE_TABLE, XML_NULL_YEAR, sBuffer.makeStringAndClear()); } @@ -3544,14 +3542,14 @@ void ScXMLExport::WriteCalculationSettings(const uno::Reference <sheet::XSpreads { if (aNullDate.Day != 30 || aNullDate.Month != 12 || aNullDate.Year != 1899) { - rtl::OUStringBuffer sDate; + OUStringBuffer sDate; GetMM100UnitConverter().convertDateTime(sDate, 0.0, aNullDate); AddAttribute(XML_NAMESPACE_TABLE, XML_DATE_VALUE, sDate.makeStringAndClear()); SvXMLElementExport aElemNullDate(*this, XML_NAMESPACE_TABLE, XML_NULL_DATE, true, true); } if (bIsIterationEnabled || nIterationCount != 100 || !::rtl::math::approxEqual(fIterationEpsilon, 0.001)) { - rtl::OUStringBuffer sBuffer; + OUStringBuffer sBuffer; if (bIsIterationEnabled) AddAttribute(XML_NAMESPACE_TABLE, XML_STATUS, XML_ENABLE); if (nIterationCount != 100) @@ -3581,11 +3579,11 @@ void ScXMLExport::WriteTableSource() sheet::SheetLinkMode nMode (xLinkable->getLinkMode()); if (nMode != sheet::SheetLinkMode_NONE) { - rtl::OUString sLink (xLinkable->getLinkUrl()); + OUString sLink (xLinkable->getLinkUrl()); uno::Reference <beans::XPropertySet> xProps (GetModel(), uno::UNO_QUERY); if (xProps.is()) { - uno::Reference <container::XIndexAccess> xIndex(xProps->getPropertyValue(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_SHEETLINKS))), uno::UNO_QUERY); + uno::Reference <container::XIndexAccess> xIndex(xProps->getPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_SHEETLINKS))), uno::UNO_QUERY); if (xIndex.is()) { sal_Int32 nCount(xIndex->getCount()); @@ -3598,20 +3596,20 @@ void ScXMLExport::WriteTableSource() xLinkProps.set(xIndex->getByIndex(i), uno::UNO_QUERY); if (xLinkProps.is()) { - rtl::OUString sNewLink; - if (xLinkProps->getPropertyValue(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNONAME_LINKURL))) >>= sNewLink) + OUString sNewLink; + if (xLinkProps->getPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNONAME_LINKURL))) >>= sNewLink) bFound = sLink.equals(sNewLink); } } if (bFound && xLinkProps.is()) { - rtl::OUString sFilter; - rtl::OUString sFilterOptions; - rtl::OUString sTableName (xLinkable->getLinkSheetName()); + OUString sFilter; + OUString sFilterOptions; + OUString sTableName (xLinkable->getLinkSheetName()); sal_Int32 nRefresh(0); - xLinkProps->getPropertyValue(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNONAME_FILTER))) >>= sFilter; - xLinkProps->getPropertyValue(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNONAME_FILTOPT))) >>= sFilterOptions; - xLinkProps->getPropertyValue(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNONAME_REFDELAY))) >>= nRefresh; + xLinkProps->getPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNONAME_FILTER))) >>= sFilter; + xLinkProps->getPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNONAME_FILTOPT))) >>= sFilterOptions; + xLinkProps->getPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNONAME_REFDELAY))) >>= nRefresh; if (!sLink.isEmpty()) { AddAttribute(XML_NAMESPACE_XLINK, XML_TYPE, XML_SIMPLE); @@ -3626,7 +3624,7 @@ void ScXMLExport::WriteTableSource() AddAttribute(XML_NAMESPACE_TABLE, XML_MODE, XML_COPY_RESULTS_ONLY); if( nRefresh ) { - rtl::OUStringBuffer sBuffer; + OUStringBuffer sBuffer; ::sax::Converter::convertDuration( sBuffer, (double)nRefresh / 86400 ); AddAttribute( XML_NAMESPACE_TABLE, XML_REFRESH_DELAY, sBuffer.makeStringAndClear() ); @@ -3646,13 +3644,13 @@ void ScXMLExport::WriteScenario() { if (pDoc && pDoc->IsScenario(static_cast<SCTAB>(nCurrentTable))) { - rtl::OUString sComment; + OUString sComment; Color aColor; sal_uInt16 nFlags; pDoc->GetScenarioData(static_cast<SCTAB>(nCurrentTable), sComment, aColor, nFlags); if (!(nFlags & SC_SCENARIO_SHOWFRAME)) AddAttribute(XML_NAMESPACE_TABLE, XML_DISPLAY_BORDER, XML_FALSE); - rtl::OUStringBuffer aBuffer; + OUStringBuffer aBuffer; ::sax::Converter::convertColor(aBuffer, aColor.GetColor()); AddAttribute(XML_NAMESPACE_TABLE, XML_BORDER_COLOR, aBuffer.makeStringAndClear()); if (!(nFlags & SC_SCENARIO_TWOWAY)) @@ -3667,7 +3665,7 @@ void ScXMLExport::WriteScenario() pDoc->IsActiveScenario(static_cast<SCTAB>(nCurrentTable))); AddAttribute(XML_NAMESPACE_TABLE, XML_IS_ACTIVE, aBuffer.makeStringAndClear()); const ScRangeList* pRangeList = pDoc->GetScenarioRanges(static_cast<SCTAB>(nCurrentTable)); - rtl::OUString sRangeListStr; + OUString sRangeListStr; ScRangeStringConverter::GetStringFromRangeList( sRangeListStr, pRangeList, pDoc, FormulaGrammar::CONV_OOO ); AddAttribute(XML_NAMESPACE_TABLE, XML_SCENARIO_RANGES, sRangeListStr); if (!sComment.isEmpty()) @@ -3737,23 +3735,23 @@ void ScXMLExport::WriteNamedRange(ScRangeName* pRangeName) { AddAttribute(sAttrName, it->second->GetName()); - rtl::OUString sBaseCellAddress; + OUString sBaseCellAddress; ScRangeStringConverter::GetStringFromAddress( sBaseCellAddress, it->second->GetPos(), pDoc, FormulaGrammar::CONV_OOO, ' ', false, SCA_ABS_3D); AddAttribute(XML_NAMESPACE_TABLE, XML_BASE_CELL_ADDRESS, sBaseCellAddress); String sSymbol; it->second->GetSymbol(sSymbol, pDoc->GetStorageGrammar()); - rtl::OUString sTempSymbol(sSymbol); + OUString sTempSymbol(sSymbol); ScRange aRange; if (it->second->IsReference(aRange)) { - rtl::OUString sContent(sTempSymbol.copy(1, sTempSymbol.getLength() -2 )); + OUString sContent(sTempSymbol.copy(1, sTempSymbol.getLength() -2 )); AddAttribute(XML_NAMESPACE_TABLE, XML_CELL_RANGE_ADDRESS, sContent); sal_Int32 nRangeType = it->second->GetUnoType(); - rtl::OUStringBuffer sBufferRangeType; + OUStringBuffer sBufferRangeType; if ((nRangeType & sheet::NamedRangeFlag::COLUMN_HEADER) == sheet::NamedRangeFlag::COLUMN_HEADER) sBufferRangeType.append(GetXMLToken(XML_REPEAT_COLUMN)); if ((nRangeType & sheet::NamedRangeFlag::ROW_HEADER) == sheet::NamedRangeFlag::ROW_HEADER) @@ -3774,7 +3772,7 @@ void ScXMLExport::WriteNamedRange(ScRangeName* pRangeName) sBufferRangeType.appendAscii(" "); sBufferRangeType.append(GetXMLToken(XML_PRINT_RANGE)); } - rtl::OUString sRangeType = sBufferRangeType.makeStringAndClear(); + OUString sRangeType = sBufferRangeType.makeStringAndClear(); if (!sRangeType.isEmpty()) AddAttribute(XML_NAMESPACE_TABLE, XML_RANGE_USABLE_AS, sRangeType); SvXMLElementExport aElemNR(*this, XML_NAMESPACE_TABLE, XML_NAMED_RANGE, true, true); @@ -3790,33 +3788,33 @@ void ScXMLExport::WriteNamedRange(ScRangeName* pRangeName) namespace { -rtl::OUString getCondFormatEntryType(const ScColorScaleEntry& rEntry, bool bFirst = true) +OUString getCondFormatEntryType(const ScColorScaleEntry& rEntry, bool bFirst = true) { switch(rEntry.GetType()) { case COLORSCALE_MIN: - return rtl::OUString("minimum"); + return OUString("minimum"); case COLORSCALE_MAX: - return rtl::OUString("maximum"); + return OUString("maximum"); case COLORSCALE_PERCENT: - return rtl::OUString("percent"); + return OUString("percent"); case COLORSCALE_PERCENTILE: - return rtl::OUString("percentile"); + return OUString("percentile"); case COLORSCALE_FORMULA: - return rtl::OUString("formula"); + return OUString("formula"); case COLORSCALE_VALUE: - return rtl::OUString("number"); + return OUString("number"); case COLORSCALE_AUTO: // only important for data bars if(bFirst) - return rtl::OUString("auto-minimum"); + return OUString("auto-minimum"); else - return rtl::OUString("auto-maximum"); + return OUString("auto-maximum"); } - return rtl::OUString(); + return OUString(); } -rtl::OUString getIconSetName(ScIconSetType eType) +OUString getIconSetName(ScIconSetType eType) { const char* pName = NULL; ScIconSetMap* pMap = ScIconSetFormat::getIconSetMap(); @@ -3829,42 +3827,42 @@ rtl::OUString getIconSetName(ScIconSetType eType) } } assert(pName); - return rtl::OUString::createFromAscii(pName); + return OUString::createFromAscii(pName); } -rtl::OUString getDateStringForType(condformat::ScCondFormatDateType eType) +OUString getDateStringForType(condformat::ScCondFormatDateType eType) { switch(eType) { case condformat::TODAY: - return rtl::OUString("today"); + return OUString("today"); case condformat::YESTERDAY: - return rtl::OUString("yesterday"); + return OUString("yesterday"); case condformat::TOMORROW: - return rtl::OUString("tomorrow"); + return OUString("tomorrow"); case condformat::LAST7DAYS: - return rtl::OUString("last-7-days"); + return OUString("last-7-days"); case condformat::THISWEEK: - return rtl::OUString("this-week"); + return OUString("this-week"); case condformat::LASTWEEK: - return rtl::OUString("last-week"); + return OUString("last-week"); case condformat::NEXTWEEK: - return rtl::OUString("next-week"); + return OUString("next-week"); case condformat::THISMONTH: - return rtl::OUString("this-month"); + return OUString("this-month"); case condformat::LASTMONTH: - return rtl::OUString("last-month"); + return OUString("last-month"); case condformat::NEXTMONTH: - return rtl::OUString("next-month"); + return OUString("next-month"); case condformat::THISYEAR: - return rtl::OUString("this-year"); + return OUString("this-year"); case condformat::LASTYEAR: - return rtl::OUString("last-year"); + return OUString("last-year"); case condformat::NEXTYEAR: - return rtl::OUString("next-year"); + return OUString("next-year"); } - return rtl::OUString(); + return OUString(); } } @@ -3884,7 +3882,7 @@ void ScXMLExport::ExportConditionalFormat(SCTAB nTab) for(ScConditionalFormatList::const_iterator itr = pCondFormatList->begin(); itr != pCondFormatList->end(); ++itr) { - rtl::OUString sRanges; + OUString sRanges; const ScRangeList& rRangeList = itr->GetRange(); ScRangeStringConverter::GetStringFromRangeList( sRanges, &rRangeList, pDoc, formula::FormulaGrammar::CONV_ODF ); AddAttribute(XML_NAMESPACE_CALC_EXT, XML_TARGET_RANGE_ADDRESS, sRanges); @@ -3896,7 +3894,7 @@ void ScXMLExport::ExportConditionalFormat(SCTAB nTab) if(pFormatEntry->GetType()==condformat::CONDITION) { const ScCondFormatEntry* pEntry = static_cast<const ScCondFormatEntry*>(pFormatEntry); - rtl::OUStringBuffer aCond; + OUStringBuffer aCond; ScAddress aPos = pEntry->GetSrcPos(); switch(pEntry->GetOperation()) { @@ -3925,14 +3923,14 @@ void ScXMLExport::ExportConditionalFormat(SCTAB nTab) aCond.append(pEntry->GetExpression(aPos, 0, 0, formula::FormulaGrammar::GRAM_ODFF)); break; case SC_COND_BETWEEN: - aCond.append(rtl::OUString("between(")); + aCond.append(OUString("between(")); aCond.append(pEntry->GetExpression(aPos, 0, 0, formula::FormulaGrammar::GRAM_ODFF)); aCond.append(','); aCond.append(pEntry->GetExpression(aPos, 1, 0, formula::FormulaGrammar::GRAM_ODFF)); aCond.append(')'); break; case SC_COND_NOTBETWEEN: - aCond.append(rtl::OUString("not-between(")); + aCond.append(OUString("not-between(")); aCond.append(pEntry->GetExpression(aPos, 0, 0, formula::FormulaGrammar::GRAM_ODFF)); aCond.append(','); aCond.append(pEntry->GetExpression(aPos, 1, 0, formula::FormulaGrammar::GRAM_ODFF)); @@ -4012,11 +4010,11 @@ void ScXMLExport::ExportConditionalFormat(SCTAB nTab) default: SAL_WARN("sc", "unimplemented conditional format export"); } - rtl::OUString sStyle = pEntry->GetStyle(); + OUString sStyle = pEntry->GetStyle(); AddAttribute(XML_NAMESPACE_CALC_EXT, XML_APPLY_STYLE_NAME, sStyle); AddAttribute(XML_NAMESPACE_CALC_EXT, XML_VALUE, aCond.makeStringAndClear()); - rtl::OUString sBaseAddress; + OUString sBaseAddress; ScRangeStringConverter::GetStringFromAddress( sBaseAddress, aPos, pDoc,formula::FormulaGrammar::CONV_ODF ); AddAttribute(XML_NAMESPACE_CALC_EXT, XML_BASE_CELL_ADDRESS, sBaseAddress); SvXMLElementExport aElementCondEntry(*this, XML_NAMESPACE_CALC_EXT, XML_CONDITION, true, true); @@ -4030,14 +4028,14 @@ void ScXMLExport::ExportConditionalFormat(SCTAB nTab) { if(it->GetType() == COLORSCALE_FORMULA) { - rtl::OUString sFormula = it->GetFormula(formula::FormulaGrammar::GRAM_ODFF); + OUString sFormula = it->GetFormula(formula::FormulaGrammar::GRAM_ODFF); AddAttribute(XML_NAMESPACE_CALC_EXT, XML_VALUE, sFormula); } else - AddAttribute(XML_NAMESPACE_CALC_EXT, XML_VALUE, rtl::OUString::valueOf(it->GetValue())); + AddAttribute(XML_NAMESPACE_CALC_EXT, XML_VALUE, OUString::valueOf(it->GetValue())); AddAttribute(XML_NAMESPACE_CALC_EXT, XML_TYPE, getCondFormatEntryType(*it)); - rtl::OUStringBuffer aBuffer; + OUStringBuffer aBuffer; ::sax::Converter::convertColor(aBuffer, it->GetColor().GetColor()); AddAttribute(XML_NAMESPACE_CALC_EXT, XML_COLOR, aBuffer.makeStringAndClear()); SvXMLElementExport aElementColorScaleEntry(*this, XML_NAMESPACE_CALC_EXT, XML_COLOR_SCALE_ENTRY, true, true); @@ -4055,13 +4053,13 @@ void ScXMLExport::ExportConditionalFormat(SCTAB nTab) { if(pFormatData->mpNegativeColor) { - rtl::OUStringBuffer aBuffer; + OUStringBuffer aBuffer; ::sax::Converter::convertColor(aBuffer, pFormatData->mpNegativeColor->GetColor()); AddAttribute(XML_NAMESPACE_CALC_EXT, XML_NEGATIVE_COLOR, aBuffer.makeStringAndClear()); } else { - rtl::OUStringBuffer aBuffer; + OUStringBuffer aBuffer; ::sax::Converter::convertColor(aBuffer, Color(COL_LIGHTRED).GetColor()); AddAttribute(XML_NAMESPACE_CALC_EXT, XML_NEGATIVE_COLOR, aBuffer.makeStringAndClear()); } @@ -4071,19 +4069,19 @@ void ScXMLExport::ExportConditionalFormat(SCTAB nTab) { if(pFormatData->meAxisPosition == databar::NONE) { - AddAttribute(XML_NAMESPACE_CALC_EXT, XML_AXIS_POSITION, rtl::OUString("none")); + AddAttribute(XML_NAMESPACE_CALC_EXT, XML_AXIS_POSITION, OUString("none")); } else { - AddAttribute(XML_NAMESPACE_CALC_EXT, XML_AXIS_POSITION, rtl::OUString("middle")); + AddAttribute(XML_NAMESPACE_CALC_EXT, XML_AXIS_POSITION, OUString("middle")); } } - rtl::OUStringBuffer aBuffer; + OUStringBuffer aBuffer; ::sax::Converter::convertColor(aBuffer, pFormatData->maPositiveColor.GetColor()); AddAttribute(XML_NAMESPACE_CALC_EXT, XML_POSITIVE_COLOR, aBuffer.makeStringAndClear()); - aBuffer = rtl::OUStringBuffer(); + aBuffer = OUStringBuffer(); ::sax::Converter::convertColor(aBuffer, pFormatData->maAxisColor.GetColor()); AddAttribute(XML_NAMESPACE_CALC_EXT, XML_AXIS_COLOR, aBuffer.makeStringAndClear()); SvXMLElementExport aElementDataBar(*this, XML_NAMESPACE_CALC_EXT, XML_DATA_BAR, true, true); @@ -4091,11 +4089,11 @@ void ScXMLExport::ExportConditionalFormat(SCTAB nTab) { if(pFormatData->mpLowerLimit->GetType() == COLORSCALE_FORMULA) { - rtl::OUString sFormula = pFormatData->mpLowerLimit->GetFormula(formula::FormulaGrammar::GRAM_ODFF); + OUString sFormula = pFormatData->mpLowerLimit->GetFormula(formula::FormulaGrammar::GRAM_ODFF); AddAttribute(XML_NAMESPACE_CALC_EXT, XML_VALUE, sFormula); } else - AddAttribute(XML_NAMESPACE_CALC_EXT, XML_VALUE, rtl::OUString::valueOf(pFormatData->mpLowerLimit->GetValue())); + AddAttribute(XML_NAMESPACE_CALC_EXT, XML_VALUE, OUString::valueOf(pFormatData->mpLowerLimit->GetValue())); AddAttribute(XML_NAMESPACE_CALC_EXT, XML_TYPE, getCondFormatEntryType(*pFormatData->mpLowerLimit, true)); SvXMLElementExport aElementDataBarEntryLower(*this, XML_NAMESPACE_CALC_EXT, XML_FORMATTING_ENTRY, true, true); } @@ -4103,11 +4101,11 @@ void ScXMLExport::ExportConditionalFormat(SCTAB nTab) { if(pFormatData->mpUpperLimit->GetType() == COLORSCALE_FORMULA) { - rtl::OUString sFormula = pFormatData->mpUpperLimit->GetFormula(formula::FormulaGrammar::GRAM_ODFF); + OUString sFormula = pFormatData->mpUpperLimit->GetFormula(formula::FormulaGrammar::GRAM_ODFF); AddAttribute(XML_NAMESPACE_CALC_EXT, XML_VALUE, sFormula); } else - AddAttribute(XML_NAMESPACE_CALC_EXT, XML_VALUE, rtl::OUString::valueOf(pFormatData->mpUpperLimit->GetValue())); + AddAttribute(XML_NAMESPACE_CALC_EXT, XML_VALUE, OUString::valueOf(pFormatData->mpUpperLimit->GetValue())); AddAttribute(XML_NAMESPACE_CALC_EXT, XML_TYPE, getCondFormatEntryType(*pFormatData->mpUpperLimit, false)); SvXMLElementExport aElementDataBarEntryUpper(*this, XML_NAMESPACE_CALC_EXT, XML_FORMATTING_ENTRY, true, true); } @@ -4115,7 +4113,7 @@ void ScXMLExport::ExportConditionalFormat(SCTAB nTab) else if(pFormatEntry->GetType() == condformat::ICONSET) { const ScIconSetFormat& mrIconSet = static_cast<const ScIconSetFormat&>(*pFormatEntry); - rtl::OUString aIconSetName = getIconSetName(mrIconSet.GetIconSetData()->eIconSetType); + OUString aIconSetName = getIconSetName(mrIconSet.GetIconSetData()->eIconSetType); AddAttribute( XML_NAMESPACE_CALC_EXT, XML_ICON_SET_TYPE, aIconSetName ); SvXMLElementExport aElementColorScale(*this, XML_NAMESPACE_CALC_EXT, XML_ICON_SET, true, true); if(!mrIconSet.GetIconSetData()->mbShowValue) @@ -4125,11 +4123,11 @@ void ScXMLExport::ExportConditionalFormat(SCTAB nTab) { if(it->GetType() == COLORSCALE_FORMULA) { - rtl::OUString sFormula = it->GetFormula(formula::FormulaGrammar::GRAM_ODFF); + OUString sFormula = it->GetFormula(formula::FormulaGrammar::GRAM_ODFF); AddAttribute(XML_NAMESPACE_CALC_EXT, XML_VALUE, sFormula); } else - AddAttribute(XML_NAMESPACE_CALC_EXT, XML_VALUE, rtl::OUString::valueOf(it->GetValue())); + AddAttribute(XML_NAMESPACE_CALC_EXT, XML_VALUE, OUString::valueOf(it->GetValue())); AddAttribute(XML_NAMESPACE_CALC_EXT, XML_TYPE, getCondFormatEntryType(*it)); SvXMLElementExport aElementColorScaleEntry(*this, XML_NAMESPACE_CALC_EXT, XML_FORMATTING_ENTRY, true, true); @@ -4138,7 +4136,7 @@ void ScXMLExport::ExportConditionalFormat(SCTAB nTab) else if(pFormatEntry->GetType() == condformat::DATE) { const ScCondDateFormatEntry& mrDateFormat = static_cast<const ScCondDateFormatEntry&>(*pFormatEntry); - rtl::OUString aDateType = getDateStringForType(mrDateFormat.GetDateType()); + OUString aDateType = getDateStringForType(mrDateFormat.GetDateType()); AddAttribute( XML_NAMESPACE_CALC_EXT, XML_STYLE, mrDateFormat.GetStyleName()); AddAttribute( XML_NAMESPACE_CALC_EXT, XML_DATE, aDateType); SvXMLElementExport aElementDateFormat(*this, XML_NAMESPACE_CALC_EXT, XML_DATE_IS, true, true); @@ -4420,39 +4418,39 @@ void ScXMLExport::GetChangeTrackViewSettings(uno::Sequence<beans::PropertyValue> beans::PropertyValue* pChangeProps(aChangeProps.getArray()); if (pChangeProps) { - pChangeProps[SC_SHOW_CHANGES].Name = rtl::OUString("ShowChanges"); + pChangeProps[SC_SHOW_CHANGES].Name = OUString("ShowChanges"); pChangeProps[SC_SHOW_CHANGES].Value <<= pViewSettings->ShowChanges(); - pChangeProps[SC_SHOW_ACCEPTED_CHANGES].Name = rtl::OUString("ShowAcceptedChanges"); + pChangeProps[SC_SHOW_ACCEPTED_CHANGES].Name = OUString("ShowAcceptedChanges"); pChangeProps[SC_SHOW_ACCEPTED_CHANGES].Value <<= pViewSettings->IsShowAccepted(); - pChangeProps[SC_SHOW_REJECTED_CHANGES].Name = rtl::OUString("ShowRejectedChanges"); + pChangeProps[SC_SHOW_REJECTED_CHANGES].Name = OUString("ShowRejectedChanges"); pChangeProps[SC_SHOW_REJECTED_CHANGES].Value <<= pViewSettings->IsShowRejected(); - pChangeProps[SC_SHOW_CHANGES_BY_DATETIME].Name = rtl::OUString("ShowChangesByDatetime"); + pChangeProps[SC_SHOW_CHANGES_BY_DATETIME].Name = OUString("ShowChangesByDatetime"); pChangeProps[SC_SHOW_CHANGES_BY_DATETIME].Value <<= pViewSettings->HasDate(); - pChangeProps[SC_SHOW_CHANGES_BY_DATETIME_MODE].Name = rtl::OUString("ShowChangesByDatetimeMode"); + pChangeProps[SC_SHOW_CHANGES_BY_DATETIME_MODE].Name = OUString("ShowChangesByDatetimeMode"); pChangeProps[SC_SHOW_CHANGES_BY_DATETIME_MODE].Value <<= static_cast<sal_Int16>(pViewSettings->GetTheDateMode()); util::DateTime aDateTime; ScXMLConverter::ConvertCoreToAPIDateTime(pViewSettings->GetTheFirstDateTime(), aDateTime); - pChangeProps[SC_SHOW_CHANGES_BY_DATETIME_FIRST_DATETIME].Name = rtl::OUString("ShowChangesByDatetimeFirstDatetime"); + pChangeProps[SC_SHOW_CHANGES_BY_DATETIME_FIRST_DATETIME].Name = OUString("ShowChangesByDatetimeFirstDatetime"); pChangeProps[SC_SHOW_CHANGES_BY_DATETIME_FIRST_DATETIME].Value <<= aDateTime; ScXMLConverter::ConvertCoreToAPIDateTime(pViewSettings->GetTheLastDateTime(), aDateTime); - pChangeProps[SC_SHOW_CHANGES_BY_DATETIME_SECOND_DATETIME].Name = rtl::OUString("ShowChangesByDatetimeSecondDatetime"); + pChangeProps[SC_SHOW_CHANGES_BY_DATETIME_SECOND_DATETIME].Name = OUString("ShowChangesByDatetimeSecondDatetime"); pChangeProps[SC_SHOW_CHANGES_BY_DATETIME_SECOND_DATETIME].Value <<= aDateTime; - pChangeProps[SC_SHOW_CHANGES_BY_AUTHOR].Name = rtl::OUString("ShowChangesByAuthor"); + pChangeProps[SC_SHOW_CHANGES_BY_AUTHOR].Name = OUString("ShowChangesByAuthor"); pChangeProps[SC_SHOW_CHANGES_BY_AUTHOR].Value <<= pViewSettings->HasAuthor(); - pChangeProps[SC_SHOW_CHANGES_BY_AUTHOR_NAME].Name = rtl::OUString("ShowChangesByAuthorName"); - pChangeProps[SC_SHOW_CHANGES_BY_AUTHOR_NAME].Value <<= rtl::OUString (pViewSettings->GetTheAuthorToShow()); - pChangeProps[SC_SHOW_CHANGES_BY_COMMENT].Name = rtl::OUString("ShowChangesByComment"); + pChangeProps[SC_SHOW_CHANGES_BY_AUTHOR_NAME].Name = OUString("ShowChangesByAuthorName"); + pChangeProps[SC_SHOW_CHANGES_BY_AUTHOR_NAME].Value <<= OUString (pViewSettings->GetTheAuthorToShow()); + pChangeProps[SC_SHOW_CHANGES_BY_COMMENT].Name = OUString("ShowChangesByComment"); pChangeProps[SC_SHOW_CHANGES_BY_COMMENT].Value <<= pViewSettings->HasComment(); - pChangeProps[SC_SHOW_CHANGES_BY_COMMENT_TEXT].Name = rtl::OUString("ShowChangesByCommentText"); - pChangeProps[SC_SHOW_CHANGES_BY_COMMENT_TEXT].Value <<= rtl::OUString (pViewSettings->GetTheComment()); - pChangeProps[SC_SHOW_CHANGES_BY_RANGES].Name = rtl::OUString("ShowChangesByRanges"); + pChangeProps[SC_SHOW_CHANGES_BY_COMMENT_TEXT].Name = OUString("ShowChangesByCommentText"); + pChangeProps[SC_SHOW_CHANGES_BY_COMMENT_TEXT].Value <<= OUString (pViewSettings->GetTheComment()); + pChangeProps[SC_SHOW_CHANGES_BY_RANGES].Name = OUString("ShowChangesByRanges"); pChangeProps[SC_SHOW_CHANGES_BY_RANGES].Value <<= pViewSettings->HasRange(); - rtl::OUString sRangeList; + OUString sRangeList; ScRangeStringConverter::GetStringFromRangeList(sRangeList, &(pViewSettings->GetTheRangeList()), GetDocument(), FormulaGrammar::CONV_OOO); - pChangeProps[SC_SHOW_CHANGES_BY_RANGES_LIST].Name = rtl::OUString("ShowChangesByRangesList"); + pChangeProps[SC_SHOW_CHANGES_BY_RANGES_LIST].Name = OUString("ShowChangesByRangesList"); pChangeProps[SC_SHOW_CHANGES_BY_RANGES_LIST].Value <<= sRangeList; - pProps[nChangePos].Name = rtl::OUString("TrackedChangesViewSettings"); + pProps[nChangePos].Name = OUString("TrackedChangesViewSettings"); pProps[nChangePos].Value <<= aChangeProps; } } @@ -4475,13 +4473,13 @@ void ScXMLExport::GetViewSettings(uno::Sequence<beans::PropertyValue>& rProps) { Rectangle aRect(pEmbeddedObj->GetVisArea()); sal_uInt16 i(0); - pProps[i].Name = rtl::OUString("VisibleAreaTop"); + pProps[i].Name = OUString("VisibleAreaTop"); pProps[i].Value <<= static_cast<sal_Int32>(aRect.getY()); - pProps[++i].Name = rtl::OUString("VisibleAreaLeft"); + pProps[++i].Name = OUString("VisibleAreaLeft"); pProps[i].Value <<= static_cast<sal_Int32>(aRect.getX()); - pProps[++i].Name = rtl::OUString("VisibleAreaWidth"); + pProps[++i].Name = OUString("VisibleAreaWidth"); pProps[i].Value <<= static_cast<sal_Int32>(aRect.getWidth()); - pProps[++i].Name = rtl::OUString("VisibleAreaHeight"); + pProps[++i].Name = OUString("VisibleAreaHeight"); pProps[i].Value <<= static_cast<sal_Int32>(aRect.getHeight()); } } @@ -4500,12 +4498,12 @@ void ScXMLExport::GetConfigurationSettings(uno::Sequence<beans::PropertyValue>& uno::Reference <lang::XMultiServiceFactory> xMultiServiceFactory(GetModel(), uno::UNO_QUERY); if (xMultiServiceFactory.is()) { - uno::Reference <beans::XPropertySet> xProperties(xMultiServiceFactory->createInstance(rtl::OUString("com.sun.star.comp.SpreadsheetSettings")), uno::UNO_QUERY); + uno::Reference <beans::XPropertySet> xProperties(xMultiServiceFactory->createInstance(OUString("com.sun.star.comp.SpreadsheetSettings")), uno::UNO_QUERY); if (xProperties.is()) SvXMLUnitConverter::convertPropertySet(rProps, xProperties); sal_Int32 nPropsToAdd = 0; - rtl::OUStringBuffer aTrackedChangesKey; + OUStringBuffer aTrackedChangesKey; if (GetDocument() && GetDocument()->GetChangeTrack() && GetDocument()->GetChangeTrack()->IsProtected()) { ::sax::Converter::encodeBase64(aTrackedChangesKey, @@ -4536,19 +4534,19 @@ void ScXMLExport::GetConfigurationSettings(uno::Sequence<beans::PropertyValue>& rProps.realloc(nCount + nPropsToAdd); if (aTrackedChangesKey.getLength()) { - rProps[nCount].Name = rtl::OUString("TrackedChangesProtectionKey"); + rProps[nCount].Name = OUString("TrackedChangesProtectionKey"); rProps[nCount].Value <<= aTrackedChangesKey.makeStringAndClear(); ++nCount; } if( bVBACompat ) { - rProps[nCount].Name = rtl::OUString("VBACompatibilityMode"); + rProps[nCount].Name = OUString("VBACompatibilityMode"); rProps[nCount].Value <<= bVBACompat; ++nCount; } if( xCodeNameAccess.is() ) { - rProps[nCount].Name = rtl::OUString("ScriptConfiguration"); + rProps[nCount].Name = OUString("ScriptConfiguration"); rProps[nCount].Value <<= xCodeNameAccess; ++nCount; } @@ -4734,7 +4732,7 @@ void SAL_CALL ScXMLExport::initialize( const ::com::sun::star::uno::Sequence< :: } // XServiceInfo -::rtl::OUString SAL_CALL ScXMLExport::getImplementationName( ) +OUString SAL_CALL ScXMLExport::getImplementationName( ) throw(::com::sun::star::uno::RuntimeException) { SolarMutexGuard aGuard; @@ -4781,14 +4779,14 @@ void SAL_CALL ScXMLExport::initialize( const ::com::sun::star::uno::Sequence< :: } } -sal_Bool SAL_CALL ScXMLExport::supportsService( const ::rtl::OUString& ServiceName ) +sal_Bool SAL_CALL ScXMLExport::supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException) { SolarMutexGuard aGuard; return SvXMLExport::supportsService( ServiceName ); } -::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL ScXMLExport::getSupportedServiceNames( ) +::com::sun::star::uno::Sequence< OUString > SAL_CALL ScXMLExport::getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException) { SolarMutexGuard aGuard; diff --git a/sc/source/filter/xml/xmlexprt.hxx b/sc/source/filter/xml/xmlexprt.hxx index 8e66d15cefac..6cd196c40dac 100644 --- a/sc/source/filter/xml/xmlexprt.hxx +++ b/sc/source/filter/xml/xmlexprt.hxx @@ -87,7 +87,7 @@ class ScXMLExport : public SvXMLExport ScRowStyles* pRowStyles; ScFormatRangeStyles* pCellStyles; ScRowFormatRanges* pRowFormatRanges; - std::vector<rtl::OUString> aTableStyles; + std::vector<OUString> aTableStyles; com::sun::star::table::CellRangeAddress aRowHeaderRange; ScMyOpenCloseColumnRowGroup* pGroupColumns; ScMyOpenCloseColumnRowGroup* pGroupRows; @@ -99,21 +99,21 @@ class ScXMLExport : public SvXMLExport ScMyValidationsContainer* pValidationsContainer; ScMyNotEmptyCellsIterator* pCellsItr; ScChangeTrackingExportHelper* pChangeTrackingExportHelper; - const rtl::OUString sLayerID; - const rtl::OUString sCaptionShape; - rtl::OUString sExternalRefTabStyleName; - rtl::OUString sAttrName; - rtl::OUString sAttrStyleName; - rtl::OUString sAttrColumnsRepeated; - rtl::OUString sAttrFormula; - rtl::OUString sAttrValueType; - rtl::OUString sAttrStringValue; - rtl::OUString sElemCell; - rtl::OUString sElemCoveredCell; - rtl::OUString sElemCol; - rtl::OUString sElemRow; - rtl::OUString sElemTab; - rtl::OUString sElemP; + const OUString sLayerID; + const OUString sCaptionShape; + OUString sExternalRefTabStyleName; + OUString sAttrName; + OUString sAttrStyleName; + OUString sAttrColumnsRepeated; + OUString sAttrFormula; + OUString sAttrValueType; + OUString sAttrStringValue; + OUString sElemCell; + OUString sElemCoveredCell; + OUString sElemCol; + OUString sElemRow; + OUString sElemTab; + OUString sElemP; sal_Int32 nOpenRow; sal_Int32 nProgressCount; sal_uInt16 nCurrentTable; @@ -163,7 +163,7 @@ class ScXMLExport : public SvXMLExport void CloseRow(const sal_Int32 nRow); void GetColumnRowHeader(bool& bHasColumnHeader, com::sun::star::table::CellRangeAddress& aColumnHeaderRange, bool& bHasRowHeader, com::sun::star::table::CellRangeAddress& aRowHeaderRange, - rtl::OUString& rPrintRanges) const; + OUString& rPrintRanges) const; void FillFieldGroup(ScOutlineArray* pFields, ScMyOpenCloseColumnRowGroup* pGroups); void FillColumnRowGroups(); @@ -205,13 +205,13 @@ class ScXMLExport : public SvXMLExport void AddStyleFromCells( const com::sun::star::uno::Reference< com::sun::star::beans::XPropertySet >& xProperties, const com::sun::star::uno::Reference< com::sun::star::sheet::XSpreadsheet >& xTable, - sal_Int32 nTable, const rtl::OUString* pOldName ); + sal_Int32 nTable, const OUString* pOldName ); void AddStyleFromColumn( const com::sun::star::uno::Reference< com::sun::star::beans::XPropertySet >& xColumnProperties, - const rtl::OUString* pOldName, sal_Int32& rIndex, bool& rIsVisible ); + const OUString* pOldName, sal_Int32& rIndex, bool& rIsVisible ); void AddStyleFromRow( const com::sun::star::uno::Reference< com::sun::star::beans::XPropertySet >& xRowProperties, - const rtl::OUString* pOldName, sal_Int32& rIndex ); + const OUString* pOldName, sal_Int32& rIndex ); void IncrementProgressBar(bool bEditCell, sal_Int32 nInc = 1); @@ -265,9 +265,9 @@ public: virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) throw(::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException); + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException); // XUnoTunnel virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& aIdentifier ) throw(::com::sun::star::uno::RuntimeException); diff --git a/sc/source/filter/xml/xmlexternaltabi.cxx b/sc/source/filter/xml/xmlexternaltabi.cxx index 4be59e1fa94d..d4ef04ef5c0e 100644 --- a/sc/source/filter/xml/xmlexternaltabi.cxx +++ b/sc/source/filter/xml/xmlexternaltabi.cxx @@ -36,7 +36,6 @@ using namespace ::com::sun::star; -using ::rtl::OUString; using ::com::sun::star::uno::Reference; using ::com::sun::star::xml::sax::XAttributeList; @@ -54,10 +53,10 @@ ScXMLExternalRefTabSourceContext::ScXMLExternalRefTabSourceContext( sal_Int16 nAttrCount = xAttrList.is() ? xAttrList->getLength() : 0; for (sal_Int16 i = 0; i < nAttrCount; ++i) { - const rtl::OUString& sAttrName = xAttrList->getNameByIndex(i); - rtl::OUString aLocalName; + const OUString& sAttrName = xAttrList->getNameByIndex(i); + OUString aLocalName; sal_uInt16 nAttrPrefix = mrScImport.GetNamespaceMap().GetKeyByAttrName(sAttrName, &aLocalName); - const rtl::OUString& sValue = xAttrList->getValueByIndex(i); + const OUString& sValue = xAttrList->getValueByIndex(i); if (nAttrPrefix == XML_NAMESPACE_XLINK) { if (IsXMLToken(aLocalName, XML_HREF)) @@ -182,10 +181,10 @@ ScXMLExternalRefRowContext::ScXMLExternalRefRowContext( const SvXMLTokenMap& rAttrTokenMap = mrScImport.GetTableRowAttrTokenMap(); for( sal_Int16 i=0; i < nAttrCount; ++i ) { - const rtl::OUString& sAttrName = xAttrList->getNameByIndex(i); - rtl::OUString aLocalName; + const OUString& sAttrName = xAttrList->getNameByIndex(i); + OUString aLocalName; sal_uInt16 nAttrPrefix = mrScImport.GetNamespaceMap().GetKeyByAttrName(sAttrName, &aLocalName); - const rtl::OUString& sValue = xAttrList->getValueByIndex(i); + const OUString& sValue = xAttrList->getValueByIndex(i); switch (rAttrTokenMap.Get(nAttrPrefix, aLocalName)) { @@ -268,7 +267,7 @@ ScXMLExternalRefCellContext::ScXMLExternalRefCellContext( sal_uInt16 nAttrPrefix = rImport.GetNamespaceMap().GetKeyByAttrName( xAttrList->getNameByIndex(i), &aLocalName); - const rtl::OUString& sValue = xAttrList->getValueByIndex(i); + const OUString& sValue = xAttrList->getValueByIndex(i); sal_uInt16 nToken = rTokenMap.Get(nAttrPrefix, aLocalName); switch (nToken) diff --git a/sc/source/filter/xml/xmlexternaltabi.hxx b/sc/source/filter/xml/xmlexternaltabi.hxx index 3d29610cd500..4edf3f89dbf5 100644 --- a/sc/source/filter/xml/xmlexternaltabi.hxx +++ b/sc/source/filter/xml/xmlexternaltabi.hxx @@ -30,7 +30,7 @@ class ScXMLExternalRefTabSourceContext : public SvXMLImportContext { public: ScXMLExternalRefTabSourceContext( ScXMLImport& rImport, sal_uInt16 nPrefix, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLExternalTabData& rRefInfo ); @@ -38,7 +38,7 @@ public: virtual ~ScXMLExternalRefTabSourceContext(); 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 ); @@ -47,10 +47,10 @@ private: ScXMLImport& mrScImport; ScXMLExternalTabData& mrExternalRefInfo; - ::rtl::OUString maRelativeUrl; - ::rtl::OUString maTableName; - ::rtl::OUString maFilterName; - ::rtl::OUString maFilterOptions; + OUString maRelativeUrl; + OUString maTableName; + OUString maFilterName; + OUString maFilterOptions; }; // ============================================================================ @@ -59,7 +59,7 @@ class ScXMLExternalRefRowsContext : public SvXMLImportContext { public: ScXMLExternalRefRowsContext( ScXMLImport& rImport, sal_uInt16 nPrefix, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLExternalTabData& rRefInfo ); @@ -67,7 +67,7 @@ public: virtual ~ScXMLExternalRefRowsContext(); 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 ); @@ -83,7 +83,7 @@ class ScXMLExternalRefRowContext : public SvXMLImportContext { public: ScXMLExternalRefRowContext( ScXMLImport& rImport, sal_uInt16 nPrefix, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLExternalTabData& rRefInfo ); @@ -91,7 +91,7 @@ public: virtual ~ScXMLExternalRefRowContext(); 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 ); @@ -108,7 +108,7 @@ class ScXMLExternalRefCellContext : public SvXMLImportContext { public: ScXMLExternalRefCellContext( ScXMLImport& rImport, sal_uInt16 nPrefix, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLExternalTabData& rRefInfo ); @@ -116,18 +116,18 @@ public: virtual ~ScXMLExternalRefCellContext(); 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 ); virtual void EndElement(); - void SetCellString(const ::rtl::OUString& rStr); + void SetCellString(const OUString& rStr); private: ScXMLImport& mrScImport; ScXMLExternalTabData& mrExternalRefInfo; - ::rtl::OUString maCellString; + OUString maCellString; double mfCellValue; sal_Int32 mnRepeatCount; sal_Int32 mnNumberFormat; @@ -142,7 +142,7 @@ class ScXMLExternalRefCellTextContext : public SvXMLImportContext { public: ScXMLExternalRefCellTextContext( ScXMLImport& rImport, sal_uInt16 nPrefix, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLExternalRefCellContext& rParent ); @@ -150,18 +150,18 @@ public: virtual ~ScXMLExternalRefCellTextContext(); 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 ); - virtual void Characters(const ::rtl::OUString& rChar); + virtual void Characters(const OUString& rChar); virtual void EndElement(); private: ScXMLExternalRefCellContext& mrParent; - ::rtl::OUStringBuffer maCellStrBuf; + OUStringBuffer maCellStrBuf; }; #endif diff --git a/sc/source/filter/xml/xmlfilti.cxx b/sc/source/filter/xml/xmlfilti.cxx index 760822ea28fc..75c0af36a379 100644 --- a/sc/source/filter/xml/xmlfilti.cxx +++ b/sc/source/filter/xml/xmlfilti.cxx @@ -39,7 +39,7 @@ ScXMLFilterContext::ConnStackItem::ConnStackItem(bool bOr) : mbOr(bOr), mnCondCo ScXMLFilterContext::ScXMLFilterContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const rtl::OUString& rLName, + const OUString& rLName, const Reference<XAttributeList>& xAttrList, ScQueryParam& rParam, ScXMLDatabaseRangeContext* pTempDatabaseRangeContext) : @@ -56,11 +56,11 @@ ScXMLFilterContext::ScXMLFilterContext( ScXMLImport& rImport, const SvXMLTokenMap& rAttrTokenMap = GetScImport().GetFilterAttrTokenMap(); for( sal_Int16 i=0; i < nAttrCount; ++i ) { - const rtl::OUString& sAttrName(xAttrList->getNameByIndex( i )); - rtl::OUString aLocalName; + const OUString& sAttrName(xAttrList->getNameByIndex( i )); + OUString aLocalName; sal_uInt16 nPrefix = GetScImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName ); - const rtl::OUString& sValue(xAttrList->getValueByIndex( i )); + const OUString& sValue(xAttrList->getValueByIndex( i )); switch( rAttrTokenMap.Get( nPrefix, aLocalName ) ) { @@ -101,7 +101,7 @@ ScXMLFilterContext::~ScXMLFilterContext() } SvXMLImportContext *ScXMLFilterContext::CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) { @@ -189,7 +189,7 @@ bool ScXMLFilterContext::GetConnection() ScXMLAndContext::ScXMLAndContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const rtl::OUString& rLName, + const OUString& rLName, const Reference<XAttributeList>& /* xAttrList */, ScQueryParam& rParam, ScXMLFilterContext* pTempFilterContext) : @@ -205,7 +205,7 @@ ScXMLAndContext::~ScXMLAndContext() } SvXMLImportContext *ScXMLAndContext::CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) { @@ -240,7 +240,7 @@ void ScXMLAndContext::EndElement() ScXMLOrContext::ScXMLOrContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const rtl::OUString& rLName, + const OUString& rLName, const Reference< ::com::sun::star::xml::sax::XAttributeList>& /* xAttrList */, ScQueryParam& rParam, @@ -257,7 +257,7 @@ ScXMLOrContext::~ScXMLOrContext() } SvXMLImportContext *ScXMLOrContext::CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) { @@ -292,7 +292,7 @@ void ScXMLOrContext::EndElement() } ScXMLConditionContext::ScXMLConditionContext( - ScXMLImport& rImport, sal_uInt16 nPrfx, const rtl::OUString& rLName, + ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, const Reference<XAttributeList>& xAttrList, ScQueryParam& rParam, ScXMLFilterContext* pTempFilterContext) : @@ -307,11 +307,11 @@ ScXMLConditionContext::ScXMLConditionContext( const SvXMLTokenMap& rAttrTokenMap(GetScImport().GetFilterConditionAttrTokenMap()); for( sal_Int16 i=0; i < nAttrCount; ++i ) { - const rtl::OUString& sAttrName(xAttrList->getNameByIndex( i )); - rtl::OUString aLocalName; + const OUString& sAttrName(xAttrList->getNameByIndex( i )); + OUString aLocalName; sal_uInt16 nPrefix = GetScImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName ); - const rtl::OUString& sValue(xAttrList->getValueByIndex( i )); + const OUString& sValue(xAttrList->getValueByIndex( i )); switch( rAttrTokenMap.Get( nPrefix, aLocalName ) ) { @@ -349,7 +349,7 @@ ScXMLConditionContext::~ScXMLConditionContext() } SvXMLImportContext *ScXMLConditionContext::CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLName, + const OUString& rLName, const Reference<XAttributeList>& xAttrList ) { SvXMLImportContext *pContext = NULL; @@ -372,7 +372,7 @@ SvXMLImportContext *ScXMLConditionContext::CreateChildContext( sal_uInt16 nPrefi } void ScXMLConditionContext::GetOperator( - const rtl::OUString& aOpStr, ScQueryParam& rParam, ScQueryEntry& rEntry) const + const OUString& aOpStr, ScQueryParam& rParam, ScQueryEntry& rEntry) const { rParam.bRegExp = false; if (IsXMLToken(aOpStr, XML_MATCH)) @@ -471,7 +471,7 @@ ScXMLImport& ScXMLSetItemContext::GetScImport() } ScXMLSetItemContext::ScXMLSetItemContext( - ScXMLImport& rImport, sal_uInt16 nPrfx, const rtl::OUString& rLName, + ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, const Reference<XAttributeList>& xAttrList, ScXMLConditionContext& rParent) : SvXMLImportContext(rImport, nPrfx, rLName) { @@ -479,12 +479,12 @@ ScXMLSetItemContext::ScXMLSetItemContext( const SvXMLTokenMap& rAttrTokenMap = GetScImport().GetFilterSetItemAttrTokenMap(); for (sal_Int32 i = 0; i < nAttrCount; ++i) { - const rtl::OUString& sAttrName = xAttrList->getNameByIndex(i); - rtl::OUString aLocalName; + const OUString& sAttrName = xAttrList->getNameByIndex(i); + OUString aLocalName; sal_uInt16 nPrefix = GetScImport().GetNamespaceMap().GetKeyByAttrName(sAttrName, &aLocalName); - const rtl::OUString& sValue = xAttrList->getValueByIndex(i); + const OUString& sValue = xAttrList->getValueByIndex(i); switch (rAttrTokenMap.Get(nPrefix, aLocalName)) { @@ -502,7 +502,7 @@ ScXMLSetItemContext::ScXMLSetItemContext( } SvXMLImportContext* ScXMLSetItemContext::CreateChildContext( - sal_uInt16 nPrefix, const ::rtl::OUString& rLName, + sal_uInt16 nPrefix, const OUString& rLName, const Reference<XAttributeList>& /*xAttrList*/ ) { return new SvXMLImportContext( GetImport(), nPrefix, rLName );; @@ -520,7 +520,7 @@ void ScXMLSetItemContext::EndElement() ScXMLDPFilterContext::ScXMLDPFilterContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLDataPilotTableContext* pTempDataPilotTableContext) : @@ -541,11 +541,11 @@ ScXMLDPFilterContext::ScXMLDPFilterContext( ScXMLImport& rImport, const SvXMLTokenMap& rAttrTokenMap(GetScImport().GetFilterAttrTokenMap()); for( sal_Int16 i=0; i < nAttrCount; ++i ) { - const rtl::OUString& sAttrName(xAttrList->getNameByIndex( i )); - rtl::OUString aLocalName; + const OUString& sAttrName(xAttrList->getNameByIndex( i )); + OUString aLocalName; sal_uInt16 nPrefix(GetScImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName )); - const rtl::OUString& sValue(xAttrList->getValueByIndex( i )); + const OUString& sValue(xAttrList->getValueByIndex( i )); switch( rAttrTokenMap.Get( nPrefix, aLocalName ) ) { @@ -586,7 +586,7 @@ ScXMLDPFilterContext::~ScXMLDPFilterContext() } SvXMLImportContext *ScXMLDPFilterContext::CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) { @@ -645,7 +645,7 @@ void ScXMLDPFilterContext::AddFilterField (const ScQueryEntry& aFilterField) ScXMLDPAndContext::ScXMLDPAndContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& /* xAttrList */, ScXMLDPFilterContext* pTempFilterContext) : @@ -660,7 +660,7 @@ ScXMLDPAndContext::~ScXMLDPAndContext() } SvXMLImportContext *ScXMLDPAndContext::CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) { @@ -695,7 +695,7 @@ void ScXMLDPAndContext::EndElement() ScXMLDPOrContext::ScXMLDPOrContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& /* xAttrList */, ScXMLDPFilterContext* pTempFilterContext) : @@ -710,7 +710,7 @@ ScXMLDPOrContext::~ScXMLDPOrContext() } SvXMLImportContext *ScXMLDPOrContext::CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) { @@ -746,7 +746,7 @@ void ScXMLDPOrContext::EndElement() ScXMLDPConditionContext::ScXMLDPConditionContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLDPFilterContext* pTempFilterContext) : @@ -760,11 +760,11 @@ ScXMLDPConditionContext::ScXMLDPConditionContext( ScXMLImport& rImport, const SvXMLTokenMap& rAttrTokenMap(GetScImport().GetFilterConditionAttrTokenMap()); for( sal_Int16 i=0; i < nAttrCount; ++i ) { - const rtl::OUString& sAttrName(xAttrList->getNameByIndex( i )); - rtl::OUString aLocalName; + const OUString& sAttrName(xAttrList->getNameByIndex( i )); + OUString aLocalName; sal_uInt16 nPrefix(GetScImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName )); - const rtl::OUString& sValue(xAttrList->getValueByIndex( i )); + const OUString& sValue(xAttrList->getValueByIndex( i )); switch( rAttrTokenMap.Get( nPrefix, aLocalName ) ) { @@ -802,7 +802,7 @@ ScXMLDPConditionContext::~ScXMLDPConditionContext() } SvXMLImportContext *ScXMLDPConditionContext::CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& /* xAttrList */ ) { @@ -810,7 +810,7 @@ SvXMLImportContext *ScXMLDPConditionContext::CreateChildContext( sal_uInt16 nPre } void ScXMLDPConditionContext::getOperatorXML( - const rtl::OUString sTempOperator, ScQueryOp& aFilterOperator, bool& bUseRegularExpressions) const + const OUString sTempOperator, ScQueryOp& aFilterOperator, bool& bUseRegularExpressions) const { bUseRegularExpressions = false; if (IsXMLToken(sTempOperator, XML_MATCH)) diff --git a/sc/source/filter/xml/xmlfilti.hxx b/sc/source/filter/xml/xmlfilti.hxx index 3c7528daca11..11557dbe569c 100644 --- a/sc/source/filter/xml/xmlfilti.hxx +++ b/sc/source/filter/xml/xmlfilti.hxx @@ -61,7 +61,7 @@ class ScXMLFilterContext : public SvXMLImportContext public: ScXMLFilterContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScQueryParam& rParam, @@ -70,7 +70,7 @@ public: virtual ~ScXMLFilterContext(); 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 ); @@ -92,7 +92,7 @@ class ScXMLAndContext : public SvXMLImportContext public: ScXMLAndContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScQueryParam& rParam, @@ -101,7 +101,7 @@ public: virtual ~ScXMLAndContext(); 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 ); @@ -119,7 +119,7 @@ class ScXMLOrContext : public SvXMLImportContext public: ScXMLOrContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScQueryParam& rParam, @@ -128,7 +128,7 @@ public: virtual ~ScXMLOrContext(); 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 ); @@ -141,9 +141,9 @@ class ScXMLConditionContext : public SvXMLImportContext ScXMLFilterContext* pFilterContext; ScQueryEntry::QueryItemsType maQueryItems; - rtl::OUString sDataType; - rtl::OUString sConditionValue; - rtl::OUString sOperator; + OUString sDataType; + OUString sConditionValue; + OUString sOperator; sal_Int32 nField; bool bIsCaseSensitive; @@ -153,7 +153,7 @@ class ScXMLConditionContext : public SvXMLImportContext public: ScXMLConditionContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScQueryParam& rParam, @@ -162,13 +162,13 @@ public: virtual ~ScXMLConditionContext(); 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 ); virtual void EndElement(); - void GetOperator(const rtl::OUString& aOpStr, ScQueryParam& rParam, ScQueryEntry& rEntry) const; + void GetOperator(const OUString& aOpStr, ScQueryParam& rParam, ScQueryEntry& rEntry) const; void AddSetItem(const ScQueryEntry::Item& rItem); }; @@ -178,7 +178,7 @@ class ScXMLSetItemContext : public SvXMLImportContext ScXMLImport& GetScImport(); public: ScXMLSetItemContext(ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLConditionContext& rParent); @@ -187,7 +187,7 @@ public: 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); @@ -219,7 +219,7 @@ class ScXMLDPFilterContext : public SvXMLImportContext public: ScXMLDPFilterContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLDataPilotTableContext* pTempDataPilotTableContext); @@ -227,7 +227,7 @@ public: virtual ~ScXMLDPFilterContext(); 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 ); @@ -272,7 +272,7 @@ class ScXMLDPAndContext : public SvXMLImportContext public: ScXMLDPAndContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLDPFilterContext* pTempFilterContext); @@ -280,7 +280,7 @@ public: virtual ~ScXMLDPAndContext(); 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 ); @@ -297,7 +297,7 @@ class ScXMLDPOrContext : public SvXMLImportContext public: ScXMLDPOrContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLDPFilterContext* pTempFilterContext); @@ -305,7 +305,7 @@ public: virtual ~ScXMLDPOrContext(); 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 ); @@ -316,9 +316,9 @@ class ScXMLDPConditionContext : public SvXMLImportContext { ScXMLDPFilterContext* pFilterContext; - rtl::OUString sDataType; - rtl::OUString sConditionValue; - rtl::OUString sOperator; + OUString sDataType; + OUString sConditionValue; + OUString sOperator; sal_Int32 nField; bool bIsCaseSensitive; @@ -328,7 +328,7 @@ class ScXMLDPConditionContext : public SvXMLImportContext public: ScXMLDPConditionContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLDPFilterContext* pTempFilterContext); @@ -336,12 +336,12 @@ public: virtual ~ScXMLDPConditionContext(); 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 ); void getOperatorXML( - const rtl::OUString sTempOperator, ScQueryOp& aFilterOperator, bool& bUseRegularExpressions) const; + const OUString sTempOperator, ScQueryOp& aFilterOperator, bool& bUseRegularExpressions) const; virtual void EndElement(); }; diff --git a/sc/source/filter/xml/xmlimprt.cxx b/sc/source/filter/xml/xmlimprt.cxx index 14c022daf5b0..df3472f0f88a 100644 --- a/sc/source/filter/xml/xmlimprt.cxx +++ b/sc/source/filter/xml/xmlimprt.cxx @@ -102,18 +102,16 @@ using namespace ::xmloff::token; using namespace ::formula; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::UNO_QUERY; -using ::rtl::OUString; -using ::rtl::OUStringBuffer; OUString SAL_CALL ScXMLImport_getImplementationName() throw() { - return rtl::OUString( "com.sun.star.comp.Calc.XMLOasisImporter" ); + return OUString( "com.sun.star.comp.Calc.XMLOasisImporter" ); } -uno::Sequence< rtl::OUString > SAL_CALL ScXMLImport_getSupportedServiceNames() throw() +uno::Sequence< OUString > SAL_CALL ScXMLImport_getSupportedServiceNames() throw() { - const rtl::OUString aServiceName( ScXMLImport_getImplementationName() ); - return uno::Sequence< rtl::OUString > ( &aServiceName, 1 ); + const OUString aServiceName( ScXMLImport_getImplementationName() ); + return uno::Sequence< OUString > ( &aServiceName, 1 ); } uno::Reference< uno::XInterface > SAL_CALL ScXMLImport_createInstance( @@ -126,13 +124,13 @@ uno::Reference< uno::XInterface > SAL_CALL ScXMLImport_createInstance( OUString SAL_CALL ScXMLImport_Meta_getImplementationName() throw() { - return rtl::OUString( "com.sun.star.comp.Calc.XMLOasisMetaImporter" ); + return OUString( "com.sun.star.comp.Calc.XMLOasisMetaImporter" ); } -uno::Sequence< rtl::OUString > SAL_CALL ScXMLImport_Meta_getSupportedServiceNames() throw() +uno::Sequence< OUString > SAL_CALL ScXMLImport_Meta_getSupportedServiceNames() throw() { - const rtl::OUString aServiceName( ScXMLImport_Meta_getImplementationName() ); - return uno::Sequence< rtl::OUString > ( &aServiceName, 1 ); + const OUString aServiceName( ScXMLImport_Meta_getImplementationName() ); + return uno::Sequence< OUString > ( &aServiceName, 1 ); } uno::Reference< uno::XInterface > SAL_CALL ScXMLImport_Meta_createInstance( @@ -145,13 +143,13 @@ uno::Reference< uno::XInterface > SAL_CALL ScXMLImport_Meta_createInstance( OUString SAL_CALL ScXMLImport_Styles_getImplementationName() throw() { - return rtl::OUString( "com.sun.star.comp.Calc.XMLOasisStylesImporter" ); + return OUString( "com.sun.star.comp.Calc.XMLOasisStylesImporter" ); } -uno::Sequence< rtl::OUString > SAL_CALL ScXMLImport_Styles_getSupportedServiceNames() throw() +uno::Sequence< OUString > SAL_CALL ScXMLImport_Styles_getSupportedServiceNames() throw() { - const rtl::OUString aServiceName( ScXMLImport_Styles_getImplementationName() ); - return uno::Sequence< rtl::OUString > ( &aServiceName, 1 ); + const OUString aServiceName( ScXMLImport_Styles_getImplementationName() ); + return uno::Sequence< OUString > ( &aServiceName, 1 ); } uno::Reference< uno::XInterface > SAL_CALL ScXMLImport_Styles_createInstance( @@ -164,13 +162,13 @@ uno::Reference< uno::XInterface > SAL_CALL ScXMLImport_Styles_createInstance( OUString SAL_CALL ScXMLImport_Content_getImplementationName() throw() { - return rtl::OUString( "com.sun.star.comp.Calc.XMLOasisContentImporter" ); + return OUString( "com.sun.star.comp.Calc.XMLOasisContentImporter" ); } -uno::Sequence< rtl::OUString > SAL_CALL ScXMLImport_Content_getSupportedServiceNames() throw() +uno::Sequence< OUString > SAL_CALL ScXMLImport_Content_getSupportedServiceNames() throw() { - const rtl::OUString aServiceName( ScXMLImport_Content_getImplementationName() ); - return uno::Sequence< rtl::OUString > ( &aServiceName, 1 ); + const OUString aServiceName( ScXMLImport_Content_getImplementationName() ); + return uno::Sequence< OUString > ( &aServiceName, 1 ); } uno::Reference< uno::XInterface > SAL_CALL ScXMLImport_Content_createInstance( @@ -183,13 +181,13 @@ uno::Reference< uno::XInterface > SAL_CALL ScXMLImport_Content_createInstance( OUString SAL_CALL ScXMLImport_Settings_getImplementationName() throw() { - return rtl::OUString( "com.sun.star.comp.Calc.XMLOasisSettingsImporter" ); + return OUString( "com.sun.star.comp.Calc.XMLOasisSettingsImporter" ); } -uno::Sequence< rtl::OUString > SAL_CALL ScXMLImport_Settings_getSupportedServiceNames() throw() +uno::Sequence< OUString > SAL_CALL ScXMLImport_Settings_getSupportedServiceNames() throw() { - const rtl::OUString aServiceName( ScXMLImport_Settings_getImplementationName() ); - return uno::Sequence< rtl::OUString > ( &aServiceName, 1 ); + const OUString aServiceName( ScXMLImport_Settings_getImplementationName() ); + return uno::Sequence< OUString > ( &aServiceName, 1 ); } uno::Reference< uno::XInterface > SAL_CALL ScXMLImport_Settings_createInstance( @@ -266,7 +264,7 @@ public: virtual ~ScXMLDocContext_Impl(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const rtl::OUString& rLocalName, + const OUString& rLocalName, const uno::Reference<xml::sax::XAttributeList>& xAttrList ); }; @@ -366,7 +364,7 @@ SvXMLImportContext *ScXMLBodyContext_Impl::CreateChildContext( } SvXMLImportContext *ScXMLDocContext_Impl::CreateChildContext( sal_uInt16 nPrefix, - const rtl::OUString& rLocalName, + const OUString& rLocalName, const uno::Reference<xml::sax::XAttributeList>& xAttrList ) { SvXMLImportContext *pContext(0); @@ -2173,7 +2171,7 @@ ScXMLImport::~ScXMLImport() throw() // --------------------------------------------------------------------- -SvXMLImportContext *ScXMLImport::CreateFontDeclsContext(const sal_uInt16 nPrefix, const ::rtl::OUString& rLocalName, +SvXMLImportContext *ScXMLImport::CreateFontDeclsContext(const sal_uInt16 nPrefix, const OUString& rLocalName, const uno::Reference<xml::sax::XAttributeList>& xAttrList) { XMLFontStylesContext *pFSContext = new XMLFontStylesContext( @@ -2183,7 +2181,7 @@ SvXMLImportContext *ScXMLImport::CreateFontDeclsContext(const sal_uInt16 nPrefix return pContext; } -SvXMLImportContext *ScXMLImport::CreateStylesContext(const ::rtl::OUString& rLocalName, +SvXMLImportContext *ScXMLImport::CreateStylesContext(const OUString& rLocalName, const uno::Reference<xml::sax::XAttributeList>& xAttrList, bool bIsAutoStyle ) { SvXMLImportContext* pContext = new XMLTableStylesContext( @@ -2197,7 +2195,7 @@ SvXMLImportContext *ScXMLImport::CreateStylesContext(const ::rtl::OUString& rLoc return pContext; } -SvXMLImportContext *ScXMLImport::CreateBodyContext(const ::rtl::OUString& rLocalName, +SvXMLImportContext *ScXMLImport::CreateBodyContext(const OUString& rLocalName, const uno::Reference<xml::sax::XAttributeList>& xAttrList) { return new ScXMLBodyContext(*this, XML_NAMESPACE_OFFICE, rLocalName, xAttrList); @@ -2288,7 +2286,7 @@ XMLShapeImportHelper* ScXMLImport::CreateShapeImport() return new XMLTableShapeImportHelper(*this); } -bool ScXMLImport::GetValidation(const rtl::OUString& sName, ScMyImportValidation& aValidation) +bool ScXMLImport::GetValidation(const OUString& sName, ScMyImportValidation& aValidation) { if (pValidations) { @@ -2398,7 +2396,7 @@ void ScXMLImport::SetChangeTrackingViewSettings(const com::sun::star::uno::Seque boost::scoped_ptr<ScChangeViewSettings> pViewSettings(new ScChangeViewSettings()); for (sal_Int32 i = 0; i < nCount; ++i) { - rtl::OUString sName(rChangeProps[i].Name); + OUString sName(rChangeProps[i].Name); if (sName.compareToAscii("ShowChanges") == 0) pViewSettings->SetShowChanges(::cppu::any2bool(rChangeProps[i].Value)); else if (sName.compareToAscii("ShowAcceptedChanges") == 0) @@ -2436,7 +2434,7 @@ void ScXMLImport::SetChangeTrackingViewSettings(const com::sun::star::uno::Seque pViewSettings->SetHasAuthor(::cppu::any2bool(rChangeProps[i].Value)); else if (sName.compareToAscii("ShowChangesByAuthorName") == 0) { - rtl::OUString sOUName; + OUString sOUName; if (rChangeProps[i].Value >>= sOUName) { String sAuthorName(sOUName); @@ -2447,7 +2445,7 @@ void ScXMLImport::SetChangeTrackingViewSettings(const com::sun::star::uno::Seque pViewSettings->SetHasComment(::cppu::any2bool(rChangeProps[i].Value)); else if (sName.compareToAscii("ShowChangesByCommentText") == 0) { - rtl::OUString sOUComment; + OUString sOUComment; if (rChangeProps[i].Value >>= sOUComment) { String sComment(sOUComment); @@ -2458,7 +2456,7 @@ void ScXMLImport::SetChangeTrackingViewSettings(const com::sun::star::uno::Seque pViewSettings->SetHasRange(::cppu::any2bool(rChangeProps[i].Value)); else if (sName.compareToAscii("ShowChangesByRangesList") == 0) { - rtl::OUString sRanges; + OUString sRanges; if ((rChangeProps[i].Value >>= sRanges) && !sRanges.isEmpty()) { ScRangeList aRangeList; @@ -2482,7 +2480,7 @@ void ScXMLImport::SetViewSettings(const uno::Sequence<beans::PropertyValue>& aVi sal_Int32 nWidth(0); for (sal_Int32 i = 0; i < nCount; ++i) { - rtl::OUString sName(aViewProps[i].Name); + OUString sName(aViewProps[i].Name); if (sName.compareToAscii("VisibleAreaHeight") == 0) aViewProps[i].Value >>= nHeight; else if (sName.compareToAscii("VisibleAreaLeft") == 0) @@ -2528,14 +2526,14 @@ void ScXMLImport::SetConfigurationSettings(const uno::Sequence<beans::PropertyVa if (xMultiServiceFactory.is()) { sal_Int32 nCount(aConfigProps.getLength()); - rtl::OUString sCTName("TrackedChangesProtectionKey"); - rtl::OUString sVBName("VBACompatibilityMode"); - rtl::OUString sSCName("ScriptConfiguration"); + OUString sCTName("TrackedChangesProtectionKey"); + OUString sVBName("VBACompatibilityMode"); + OUString sSCName("ScriptConfiguration"); for (sal_Int32 i = nCount - 1; i >= 0; --i) { if (aConfigProps[i].Name == sCTName) { - rtl::OUString sKey; + OUString sKey; if (aConfigProps[i].Value >>= sKey) { uno::Sequence<sal_Int8> aPass; @@ -2546,7 +2544,7 @@ void ScXMLImport::SetConfigurationSettings(const uno::Sequence<beans::PropertyVa pDoc->GetChangeTrack()->SetProtection(aPass); else { - std::set<rtl::OUString> aUsers; + std::set<OUString> aUsers; ScChangeTrack* pTrack = new ScChangeTrack(pDoc, aUsers); pTrack->SetProtection(aPass); pDoc->SetChangeTrack(pTrack); @@ -2566,7 +2564,7 @@ void ScXMLImport::SetConfigurationSettings(const uno::Sequence<beans::PropertyVa } } } - uno::Reference <uno::XInterface> xInterface = xMultiServiceFactory->createInstance(rtl::OUString("com.sun.star.comp.SpreadsheetSettings")); + uno::Reference <uno::XInterface> xInterface = xMultiServiceFactory->createInstance(OUString("com.sun.star.comp.SpreadsheetSettings")); uno::Reference <beans::XPropertySet> xProperties(xInterface, uno::UNO_QUERY); if (xProperties.is()) SvXMLUnitConverter::convertPropertySet(xProperties, aConfigProps); @@ -2574,7 +2572,7 @@ void ScXMLImport::SetConfigurationSettings(const uno::Sequence<beans::PropertyVa } } -sal_Int32 ScXMLImport::SetCurrencySymbol(const sal_Int32 nKey, const rtl::OUString& rCurrency) +sal_Int32 ScXMLImport::SetCurrencySymbol(const sal_Int32 nKey, const OUString& rCurrency) { uno::Reference <util::XNumberFormatsSupplier> xNumberFormatsSupplier(GetNumberFormatsSupplier()); if (xNumberFormatsSupplier.is()) @@ -2582,7 +2580,7 @@ sal_Int32 ScXMLImport::SetCurrencySymbol(const sal_Int32 nKey, const rtl::OUStri uno::Reference <util::XNumberFormats> xLocalNumberFormats(xNumberFormatsSupplier->getNumberFormats()); if (xLocalNumberFormats.is()) { - rtl::OUString sFormatString; + OUString sFormatString; try { uno::Reference <beans::XPropertySet> xProperties(xLocalNumberFormats->getByKey(nKey)); @@ -2594,7 +2592,7 @@ sal_Int32 ScXMLImport::SetCurrencySymbol(const sal_Int32 nKey, const rtl::OUStri { ScXMLImport::MutexGuard aGuard(*this); LocaleDataWrapper aLocaleData( comphelper::getComponentContext(GetDocument()->GetServiceManager()), LanguageTag( aLocale) ); - rtl::OUStringBuffer aBuffer(15); + OUStringBuffer aBuffer(15); aBuffer.appendAscii("#"); aBuffer.append( aLocaleData.getNumThousandSep() ); aBuffer.appendAscii("##0"); @@ -2613,11 +2611,11 @@ sal_Int32 ScXMLImport::SetCurrencySymbol(const sal_Int32 nKey, const rtl::OUStri } catch ( const util::MalformedNumberFormatException& rException ) { - rtl::OUString sErrorMessage("Fehler im Formatstring "); + OUString sErrorMessage("Fehler im Formatstring "); sErrorMessage += sFormatString; - sErrorMessage += rtl::OUString(" an Position "); - sErrorMessage += rtl::OUString::valueOf(rException.CheckPos); - uno::Sequence<rtl::OUString> aSeq(1); + sErrorMessage += OUString(" an Position "); + sErrorMessage += OUString::valueOf(rException.CheckPos); + uno::Sequence<OUString> aSeq(1); aSeq[0] = sErrorMessage; uno::Reference<xml::sax::XLocator> xLocator; SetError(XMLERROR_API | XMLERROR_FLAG_ERROR, aSeq, rException.Message, xLocator); @@ -2627,7 +2625,7 @@ sal_Int32 ScXMLImport::SetCurrencySymbol(const sal_Int32 nKey, const rtl::OUStri return nKey; } -bool ScXMLImport::IsCurrencySymbol(const sal_Int32 nNumberFormat, const rtl::OUString& sCurrentCurrency, const rtl::OUString& sBankSymbol) +bool ScXMLImport::IsCurrencySymbol(const sal_Int32 nNumberFormat, const OUString& sCurrentCurrency, const OUString& sBankSymbol) { uno::Reference <util::XNumberFormatsSupplier> xNumberFormatsSupplier(GetNumberFormatsSupplier()); if (xNumberFormatsSupplier.is()) @@ -2640,8 +2638,8 @@ bool ScXMLImport::IsCurrencySymbol(const sal_Int32 nNumberFormat, const rtl::OUS uno::Reference <beans::XPropertySet> xNumberPropertySet(xLocalNumberFormats->getByKey(nNumberFormat)); if (xNumberPropertySet.is()) { - rtl::OUString sTemp; - if ( xNumberPropertySet->getPropertyValue(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_CURRENCYSYMBOL))) >>= sTemp) + OUString sTemp; + if ( xNumberPropertySet->getPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM(SC_CURRENCYSYMBOL))) >>= sTemp) { if (sCurrentCurrency.equals(sTemp)) return true; @@ -2673,7 +2671,7 @@ bool ScXMLImport::IsCurrencySymbol(const sal_Int32 nNumberFormat, const rtl::OUS void ScXMLImport::SetType(uno::Reference <beans::XPropertySet>& rProperties, sal_Int32& rNumberFormat, const sal_Int16 nCellType, - const rtl::OUString& rCurrency) + const OUString& rCurrency) { if ((nCellType != util::NumberFormat::TEXT) && (nCellType != util::NumberFormat::UNDEFINED)) { @@ -2683,7 +2681,7 @@ void ScXMLImport::SetType(uno::Reference <beans::XPropertySet>& rProperties, bool bIsStandard; // sCurrentCurrency may be the ISO code abbreviation if the currency // symbol matches such, or if no match found the symbol itself! - rtl::OUString sCurrentCurrency; + OUString sCurrentCurrency; sal_Int32 nCurrentCellType( GetNumberFormatAttributesExportHelper()->GetCellType( rNumberFormat, sCurrentCurrency, bIsStandard) & ~util::NumberFormat::DEFINED); @@ -2746,7 +2744,7 @@ void ScXMLImport::AddStyleRange(const table::CellRangeAddress& rCellRange) { uno::Reference <lang::XMultiServiceFactory> xMultiServiceFactory(GetModel(), uno::UNO_QUERY); if (xMultiServiceFactory.is()) - xSheetCellRanges.set(uno::Reference <sheet::XSheetCellRangeContainer>(xMultiServiceFactory->createInstance(rtl::OUString("com.sun.star.sheet.SheetCellRanges")), uno::UNO_QUERY)); + xSheetCellRanges.set(uno::Reference <sheet::XSheetCellRangeContainer>(xMultiServiceFactory->createInstance(OUString("com.sun.star.sheet.SheetCellRanges")), uno::UNO_QUERY)); OSL_ENSURE(xSheetCellRanges.is(), "didn't get SheetCellRanges"); } @@ -2802,14 +2800,14 @@ void ScXMLImport::SetStyleToRanges() if (xMultiServiceFactory.is()) xSheetCellRanges.set(uno::Reference <sheet::XSheetCellRangeContainer>( xMultiServiceFactory->createInstance( - rtl::OUString("com.sun.star.sheet.SheetCellRanges")), + OUString("com.sun.star.sheet.SheetCellRanges")), uno::UNO_QUERY)); } OSL_ENSURE(xSheetCellRanges.is(), "didn't get SheetCellRanges"); } -void ScXMLImport::SetStyleToRange(const ScRange& rRange, const rtl::OUString* pStyleName, - const sal_Int16 nCellType, const rtl::OUString* pCurrency) +void ScXMLImport::SetStyleToRange(const ScRange& rRange, const OUString* pStyleName, + const sal_Int16 nCellType, const OUString* pCurrency) { if (sPrevStyleName.isEmpty()) { @@ -2899,7 +2897,7 @@ throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::R } // XServiceInfo -::rtl::OUString SAL_CALL ScXMLImport::getImplementationName( ) +OUString SAL_CALL ScXMLImport::getImplementationName( ) throw(::com::sun::star::uno::RuntimeException) { switch( getImportFlags() ) @@ -2954,7 +2952,7 @@ throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeE xImportInfo.is() ? xImportInfo->getPropertySetInfo() : 0); if (xPropertySetInfo.is()) { - ::rtl::OUString const sOrganizerMode( + OUString const sOrganizerMode( RTL_CONSTASCII_USTRINGPARAM("OrganizerMode")); if (xPropertySetInfo->hasPropertyByName(sOrganizerMode)) { @@ -2969,16 +2967,16 @@ throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeE UnlockSolarMutex(); } -sal_Int32 ScXMLImport::GetRangeType(const rtl::OUString sRangeType) const +sal_Int32 ScXMLImport::GetRangeType(const OUString sRangeType) const { sal_Int32 nRangeType(0); - rtl::OUStringBuffer sBuffer; + OUStringBuffer sBuffer; sal_Int16 i = 0; while (i <= sRangeType.getLength()) { if ((sRangeType[i] == ' ') || (i == sRangeType.getLength())) { - rtl::OUString sTemp = sBuffer.makeStringAndClear(); + OUString sTemp = sBuffer.makeStringAndClear(); if (sTemp.compareToAscii(SC_REPEAT_COLUMN) == 0) nRangeType |= sheet::NamedRangeFlag::COLUMN_HEADER; else if (sTemp.compareToAscii(SC_REPEAT_ROW) == 0) @@ -3003,8 +3001,8 @@ void ScXMLImport::SetLabelRanges() uno::Reference <beans::XPropertySet> xPropertySet (GetModel(), uno::UNO_QUERY); if (xPropertySet.is()) { - uno::Any aColAny = xPropertySet->getPropertyValue(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_COLLABELRNG))); - uno::Any aRowAny = xPropertySet->getPropertyValue(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_ROWLABELRNG))); + uno::Any aColAny = xPropertySet->getPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_COLLABELRNG))); + uno::Any aRowAny = xPropertySet->getPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_ROWLABELRNG))); uno::Reference< sheet::XLabelRanges > xColRanges; uno::Reference< sheet::XLabelRanges > xRowRanges; @@ -3085,7 +3083,7 @@ public: { using namespace formula; - const ::rtl::OUString& aType = r.sRangeType; + const OUString& aType = r.sRangeType; sal_uInt32 nUnoType = mrXmlImport.GetRangeType(aType); sal_uInt16 nNewType = RT_NAME; @@ -3104,7 +3102,7 @@ public: if (bSuccess) { - ::rtl::OUString aContent = r.sContent; + OUString aContent = r.sContent; if (!r.bIsExpression) ScXMLConverter::ParseFormula(aContent, false); @@ -3170,10 +3168,10 @@ throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeE sal_Int32 nCount (aSeq.getLength()); for (sal_Int32 i = 0; i < nCount; ++i) { - rtl::OUString sName(aSeq[i].Name); + OUString sName(aSeq[i].Name); if (sName.compareToAscii(SC_ACTIVETABLE) == 0) { - rtl::OUString sValue; + OUString sValue; if(aSeq[i].Value >>= sValue) { String sTabName(sValue); diff --git a/sc/source/filter/xml/xmlimprt.hxx b/sc/source/filter/xml/xmlimprt.hxx index 3b97f1807c15..52e5b614ca47 100644 --- a/sc/source/filter/xml/xmlimprt.hxx +++ b/sc/source/filter/xml/xmlimprt.hxx @@ -722,11 +722,11 @@ struct tScMyCellRange struct ScMyNamedExpression { - rtl::OUString sName; - rtl::OUString sContent; - rtl::OUString sContentNmsp; - rtl::OUString sBaseCellAddress; - rtl::OUString sRangeType; + OUString sName; + OUString sContent; + OUString sContentNmsp; + OUString sBaseCellAddress; + OUString sRangeType; formula::FormulaGrammar::Grammar eGrammar; bool bIsExpression; }; @@ -735,8 +735,8 @@ typedef ::boost::ptr_list<ScMyNamedExpression> ScMyNamedExpressions; struct ScMyLabelRange { - rtl::OUString sLabelRangeStr; - rtl::OUString sDataRangeStr; + OUString sLabelRangeStr; + OUString sDataRangeStr; bool bColumnOrientation; }; @@ -744,16 +744,16 @@ typedef std::list<const ScMyLabelRange*> ScMyLabelRanges; struct ScMyImportValidation { - rtl::OUString sName; - rtl::OUString sImputTitle; - rtl::OUString sImputMessage; - rtl::OUString sErrorTitle; - rtl::OUString sErrorMessage; - rtl::OUString sFormula1; - rtl::OUString sFormula2; - rtl::OUString sFormulaNmsp1; - rtl::OUString sFormulaNmsp2; - rtl::OUString sBaseCellAddress; // string is used directly + OUString sName; + OUString sImputTitle; + OUString sImputMessage; + OUString sErrorTitle; + OUString sErrorMessage; + OUString sFormula1; + OUString sFormula2; + OUString sFormulaNmsp1; + OUString sFormulaNmsp2; + OUString sBaseCellAddress; // string is used directly com::sun::star::sheet::ValidationAlertStyle aAlertStyle; com::sun::star::sheet::ValidationType aValidationType; com::sun::star::sheet::ConditionOperator aOperator; @@ -772,7 +772,7 @@ class ScXMLEditAttributeMap; class ScXMLImport: public SvXMLImport, boost::noncopyable { - typedef ::boost::unordered_map< ::rtl::OUString, sal_Int16, ::rtl::OUStringHash > CellTypeMap; + typedef ::boost::unordered_map< OUString, sal_Int16, OUStringHash > CellTypeMap; typedef ::boost::ptr_map<SCTAB, ScMyNamedExpressions> SheetNamedExpMap; CellTypeMap aCellTypeMap; @@ -784,11 +784,11 @@ class ScXMLImport: public SvXMLImport, boost::noncopyable ScXMLChangeTrackingImportHelper* pChangeTrackingImportHelper; ScMyViewContextList aViewContextList; ScMyStylesImportHelper* pStylesImportHelper; - rtl::OUString sNumberFormat; - rtl::OUString sLocale; - rtl::OUString sCellStyle; - rtl::OUString sStandardFormat; - rtl::OUString sType; + OUString sNumberFormat; + OUString sLocale; + OUString sCellStyle; + OUString sStandardFormat; + OUString sType; UniReference < XMLPropertyHandlerFactory > xScPropHdlFactory; UniReference < XMLPropertySetMapper > xCellStylesPropertySetMapper; @@ -890,7 +890,7 @@ class ScXMLImport: public SvXMLImport, boost::noncopyable ScMyImpDetectiveOpArray* pDetectiveOpArray; SolarMutexGuard* pSolarMutexGuard; - std::vector<rtl::OUString> aTableStyles; + std::vector<OUString> aTableStyles; XMLNumberFormatAttributesExportHelper* pNumberFormatAttributesExportHelper; ScMyStyleNumberFormats* pStyleNumberFormats; com::sun::star::uno::Reference <com::sun::star::util::XNumberFormats> xNumberFormats; @@ -898,9 +898,9 @@ class ScXMLImport: public SvXMLImport, boost::noncopyable com::sun::star::uno::Reference <com::sun::star::sheet::XSheetCellRangeContainer> xSheetCellRanges; - rtl::OUString sEmpty; - rtl::OUString sPrevStyleName; - rtl::OUString sPrevCurrency; + OUString sEmpty; + OUString sPrevStyleName; + OUString sPrevCurrency; sal_uInt32 nSolarMutexLocked; sal_Int32 nProgressCount; sal_uInt16 nStyleFamilyMask;// Mask of styles to load @@ -919,7 +919,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 ); virtual XMLShapeImportHelper* CreateShapeImport(); @@ -936,15 +936,15 @@ public: // NB: in contrast to other CreateFooContexts, this particular one handles // the root element (i.e. office:document-meta) SvXMLImportContext *CreateMetaContext( - const ::rtl::OUString& rLocalName ); - SvXMLImportContext *CreateFontDeclsContext(const sal_uInt16 nPrefix, const ::rtl::OUString& rLocalName, + const OUString& rLocalName ); + SvXMLImportContext *CreateFontDeclsContext(const sal_uInt16 nPrefix, const OUString& rLocalName, const com::sun::star::uno::Reference<com::sun::star::xml::sax::XAttributeList>& xAttrList); SvXMLImportContext *CreateScriptContext( - const ::rtl::OUString& rLocalName ); - SvXMLImportContext *CreateStylesContext(const ::rtl::OUString& rLocalName, + const OUString& rLocalName ); + SvXMLImportContext *CreateStylesContext(const OUString& rLocalName, const com::sun::star::uno::Reference<com::sun::star::xml::sax::XAttributeList>& xAttrList, bool bAutoStyles ); SvXMLImportContext *CreateBodyContext( - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference<com::sun::star::xml::sax::XAttributeList>& xAttrList ); virtual void SetStatistics( @@ -960,7 +960,7 @@ public: bool IsLatinDefaultStyle() const { return bLatinDefaultStyle; } - sal_Int16 GetCellType(const ::rtl::OUString& rStrValue) const; + sal_Int16 GetCellType(const OUString& rStrValue) const; UniReference < XMLPropertySetMapper > GetCellStylesPropertySetMapper() const { return xCellStylesPropertySetMapper; } UniReference < XMLPropertySetMapper > GetColumnStylesPropertySetMapper() const { return xColumnStylesPropertySetMapper; } @@ -1069,7 +1069,7 @@ public: if (!pValidations) pValidations = new ScMyImportValidations(); pValidations->push_back(rValidation); } - bool GetValidation(const rtl::OUString& sName, ScMyImportValidation& aValidation); + bool GetValidation(const OUString& sName, ScMyImportValidation& aValidation); inline ScMyImpDetectiveOpArray* GetDetectiveOpArray() { if (!pDetectiveOpArray) @@ -1087,15 +1087,15 @@ public: virtual void SetViewSettings(const com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue>& aViewProps); virtual void SetConfigurationSettings(const com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue>& aConfigProps); - void SetTableStyle(const rtl::OUString& rValue) { aTableStyles.push_back(rValue); } - std::vector<rtl::OUString> GetTableStyle() { return aTableStyles; } + void SetTableStyle(const OUString& rValue) { aTableStyles.push_back(rValue); } + std::vector<OUString> GetTableStyle() { return aTableStyles; } ScMyStylesImportHelper* GetStylesImportHelper() { return pStylesImportHelper; } - sal_Int32 SetCurrencySymbol(const sal_Int32 nKey, const rtl::OUString& rCurrency); - bool IsCurrencySymbol(const sal_Int32 nNumberFormat, const rtl::OUString& sCurrencySymbol, const rtl::OUString& sBankSymbol); + sal_Int32 SetCurrencySymbol(const sal_Int32 nKey, const OUString& rCurrency); + bool IsCurrencySymbol(const sal_Int32 nNumberFormat, const OUString& sCurrencySymbol, const OUString& sBankSymbol); void SetType(com::sun::star::uno::Reference <com::sun::star::beans::XPropertySet>& rProperties, sal_Int32& rNumberFormat, const sal_Int16 nCellType, - const rtl::OUString& rCurrency); + const OUString& rCurrency); void ProgressBarIncrement(bool bEditCell, sal_Int32 nInc = 1); @@ -1108,8 +1108,8 @@ private: void ExamineDefaultStyle(); public: - void SetStyleToRange(const ScRange& rRange, const rtl::OUString* pStyleName, - const sal_Int16 nCellType, const rtl::OUString* pCurrency); + void SetStyleToRange(const ScRange& rRange, const OUString* pStyleName, + const sal_Int16 nCellType, const OUString* pCurrency); bool SetNullDateOnUnitConverter(); XMLNumberFormatAttributesExportHelper* GetNumberFormatAttributesExportHelper(); ScMyStyleNumberFormats* GetStyleNumberFormats(); @@ -1120,7 +1120,7 @@ public: virtual void SAL_CALL setTargetDocument( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent >& xDoc ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException); virtual void SAL_CALL startDocument(void) throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException ); @@ -1148,7 +1148,7 @@ public: void SetRangeOverflowType(sal_uInt32 nType); - sal_Int32 GetRangeType(const rtl::OUString sRangeType) const; + sal_Int32 GetRangeType(const OUString sRangeType) const; void SetNamedRanges(); void SetSheetNamedRanges(); void SetLabelRanges(); @@ -1185,10 +1185,10 @@ public: with range operator. */ void ExtractFormulaNamespaceGrammar( - ::rtl::OUString& rFormula, - ::rtl::OUString& rFormulaNmsp, + OUString& rFormula, + OUString& rFormulaNmsp, ::formula::FormulaGrammar::Grammar& reGrammar, - const ::rtl::OUString& rAttrValue, + const OUString& rAttrValue, bool bRestrictToExternalNmsp = false ) const; bool IsFormulaErrorConstant( const OUString& rStr ) const; diff --git a/sc/source/filter/xml/xmllabri.cxx b/sc/source/filter/xml/xmllabri.cxx index 48e8e42693a4..412e96106a4b 100644 --- a/sc/source/filter/xml/xmllabri.cxx +++ b/sc/source/filter/xml/xmllabri.cxx @@ -26,7 +26,6 @@ #include "xmlimprt.hxx" using namespace ::com::sun::star; -using ::rtl::OUString; using namespace xmloff::token; @@ -87,8 +86,8 @@ ScXMLLabelRangeContext::ScXMLLabelRangeContext( for( sal_Int16 nIndex = 0; nIndex < nAttrCount; ++nIndex ) { - const rtl::OUString& sAttrName (xAttrList->getNameByIndex( nIndex )); - const rtl::OUString& sValue (xAttrList->getValueByIndex( nIndex )); + const OUString& sAttrName (xAttrList->getNameByIndex( nIndex )); + const OUString& sValue (xAttrList->getValueByIndex( nIndex )); OUString aLocalName; sal_uInt16 nPrefix (GetScImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName )); diff --git a/sc/source/filter/xml/xmllabri.hxx b/sc/source/filter/xml/xmllabri.hxx index c70581c0fb8c..70b9d9517a44 100644 --- a/sc/source/filter/xml/xmllabri.hxx +++ b/sc/source/filter/xml/xmllabri.hxx @@ -36,14 +36,14 @@ public: ScXMLLabelRangesContext( ScXMLImport& rImport, sal_uInt16 nPrefix, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); virtual ~ScXMLLabelRangesContext(); 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 ); virtual void EndElement(); @@ -55,8 +55,8 @@ public: class ScXMLLabelRangeContext : public SvXMLImportContext { private: - ::rtl::OUString sLabelRangeStr; - ::rtl::OUString sDataRangeStr; + OUString sLabelRangeStr; + OUString sDataRangeStr; bool bColumnOrientation; const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); } @@ -66,14 +66,14 @@ public: ScXMLLabelRangeContext( ScXMLImport& rImport, sal_uInt16 nPrefix, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); virtual ~ScXMLLabelRangeContext(); 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 ); virtual void EndElement(); diff --git a/sc/source/filter/xml/xmlnexpi.cxx b/sc/source/filter/xml/xmlnexpi.cxx index a32d4c42b833..4ddf05d323c8 100644 --- a/sc/source/filter/xml/xmlnexpi.cxx +++ b/sc/source/filter/xml/xmlnexpi.cxx @@ -49,7 +49,7 @@ void ScXMLNamedExpressionsContext::SheetLocalInserter::insert(ScMyNamedExpressio } ScXMLNamedExpressionsContext::ScXMLNamedExpressionsContext( - ScXMLImport& rImport, sal_uInt16 nPrfx, const ::rtl::OUString& rLName, + ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, const uno::Reference<xml::sax::XAttributeList>& /* xAttrList */, Inserter* pInserter ) : SvXMLImportContext( rImport, nPrfx, rLName ), @@ -64,7 +64,7 @@ ScXMLNamedExpressionsContext::~ScXMLNamedExpressionsContext() } SvXMLImportContext *ScXMLNamedExpressionsContext::CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) { @@ -98,7 +98,7 @@ void ScXMLNamedExpressionsContext::EndElement() ScXMLNamedRangeContext::ScXMLNamedRangeContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const uno::Reference<xml::sax::XAttributeList>& xAttrList, ScXMLNamedExpressionsContext::Inserter* pInserter ) : SvXMLImportContext( rImport, nPrfx, rLName ), @@ -117,11 +117,11 @@ ScXMLNamedRangeContext::ScXMLNamedRangeContext( const SvXMLTokenMap& rAttrTokenMap = GetScImport().GetNamedRangeAttrTokenMap(); for( sal_Int16 i=0; i < nAttrCount; ++i ) { - const rtl::OUString& sAttrName(xAttrList->getNameByIndex( i )); - rtl::OUString aLocalName; + const OUString& sAttrName(xAttrList->getNameByIndex( i )); + OUString aLocalName; sal_uInt16 nPrefix(GetScImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName )); - const rtl::OUString& sValue(xAttrList->getValueByIndex( i )); + const OUString& sValue(xAttrList->getValueByIndex( i )); switch( rAttrTokenMap.Get( nPrefix, aLocalName ) ) { @@ -156,7 +156,7 @@ ScXMLNamedRangeContext::~ScXMLNamedRangeContext() } SvXMLImportContext *ScXMLNamedRangeContext::CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& /* xAttrList */ ) { @@ -168,7 +168,7 @@ void ScXMLNamedRangeContext::EndElement() } ScXMLNamedExpressionContext::ScXMLNamedExpressionContext( - ScXMLImport& rImport, sal_uInt16 nPrfx, const ::rtl::OUString& rLName, + ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, const uno::Reference<xml::sax::XAttributeList>& xAttrList, ScXMLNamedExpressionsContext::Inserter* pInserter ) : SvXMLImportContext( rImport, nPrfx, rLName ), @@ -182,11 +182,11 @@ ScXMLNamedExpressionContext::ScXMLNamedExpressionContext( const SvXMLTokenMap& rAttrTokenMap(GetScImport().GetNamedExpressionAttrTokenMap()); for( sal_Int16 i=0; i < nAttrCount; ++i ) { - const rtl::OUString& sAttrName(xAttrList->getNameByIndex( i )); - rtl::OUString aLocalName; + const OUString& sAttrName(xAttrList->getNameByIndex( i )); + OUString aLocalName; sal_uInt16 nPrefix(GetScImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName )); - const rtl::OUString& sValue(xAttrList->getValueByIndex( i )); + const OUString& sValue(xAttrList->getValueByIndex( i )); switch( rAttrTokenMap.Get( nPrefix, aLocalName ) ) { @@ -218,7 +218,7 @@ ScXMLNamedExpressionContext::~ScXMLNamedExpressionContext() } SvXMLImportContext *ScXMLNamedExpressionContext::CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& /* xAttrList */ ) { diff --git a/sc/source/filter/xml/xmlnexpi.hxx b/sc/source/filter/xml/xmlnexpi.hxx index d6133cdc6ba9..34543d7626c2 100644 --- a/sc/source/filter/xml/xmlnexpi.hxx +++ b/sc/source/filter/xml/xmlnexpi.hxx @@ -72,7 +72,7 @@ public: }; ScXMLNamedExpressionsContext( - ScXMLImport& rImport, sal_uInt16 nPrfx, const ::rtl::OUString& rLName, + ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, Inserter* pInserter ); @@ -80,7 +80,7 @@ public: virtual ~ScXMLNamedExpressionsContext(); 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 ); @@ -98,7 +98,7 @@ class ScXMLNamedRangeContext : public SvXMLImportContext public: ScXMLNamedRangeContext( - ScXMLImport& rImport, sal_uInt16 nPrfx, const ::rtl::OUString& rLName, + ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLNamedExpressionsContext::Inserter* pInserter ); @@ -106,7 +106,7 @@ public: virtual ~ScXMLNamedRangeContext(); 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 ); @@ -124,7 +124,7 @@ class ScXMLNamedExpressionContext : public SvXMLImportContext public: ScXMLNamedExpressionContext( - ScXMLImport& rImport, sal_uInt16 nPrfx, const ::rtl::OUString& rLName, + ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLNamedExpressionsContext::Inserter* pInserter ); @@ -132,7 +132,7 @@ public: virtual ~ScXMLNamedExpressionContext(); 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 ); diff --git a/sc/source/filter/xml/xmlrowi.cxx b/sc/source/filter/xml/xmlrowi.cxx index ec4c5a5e10a1..d1c1b4fec3a2 100644 --- a/sc/source/filter/xml/xmlrowi.cxx +++ b/sc/source/filter/xml/xmlrowi.cxx @@ -49,7 +49,7 @@ using namespace xmloff::token; ScXMLTableRowContext::ScXMLTableRowContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) : SvXMLImportContext( rImport, nPrfx, rLName ), @@ -57,16 +57,16 @@ ScXMLTableRowContext::ScXMLTableRowContext( ScXMLImport& rImport, nRepeatedRows(1), bHasCell(false) { - rtl::OUString sCellStyleName; + OUString sCellStyleName; sal_Int16 nAttrCount(xAttrList.is() ? xAttrList->getLength() : 0); const SvXMLTokenMap& rAttrTokenMap(GetScImport().GetTableRowAttrTokenMap()); for( sal_Int16 i=0; i < nAttrCount; ++i ) { - const rtl::OUString& sAttrName(xAttrList->getNameByIndex( i )); - rtl::OUString aLocalName; + const OUString& sAttrName(xAttrList->getNameByIndex( i )); + OUString aLocalName; sal_uInt16 nPrefix(GetScImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName )); - const rtl::OUString& sValue(xAttrList->getValueByIndex( i )); + const OUString& sValue(xAttrList->getValueByIndex( i )); switch( rAttrTokenMap.Get( nPrefix, aLocalName ) ) { @@ -107,7 +107,7 @@ ScXMLTableRowContext::~ScXMLTableRowContext() } SvXMLImportContext *ScXMLTableRowContext::CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) { @@ -204,9 +204,9 @@ void ScXMLTableRowContext::EndElement() bFiltered = true; } if (!bVisible) - xRowProperties->setPropertyValue(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_ISVISIBLE)), uno::makeAny(bVisible)); + xRowProperties->setPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM(SC_ISVISIBLE)), uno::makeAny(bVisible)); if (bFiltered) - xRowProperties->setPropertyValue(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_ISFILTERED)), uno::makeAny(bFiltered)); + xRowProperties->setPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM(SC_ISFILTERED)), uno::makeAny(bFiltered)); } } } @@ -215,7 +215,7 @@ void ScXMLTableRowContext::EndElement() ScXMLTableRowsContext::ScXMLTableRowsContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, const bool bTempHeader, const bool bTempGroup ) : @@ -241,11 +241,11 @@ ScXMLTableRowsContext::ScXMLTableRowsContext( ScXMLImport& rImport, sal_Int16 nAttrCount = xAttrList.is() ? xAttrList->getLength() : 0; for( sal_Int16 i=0; i < nAttrCount; ++i ) { - const rtl::OUString& sAttrName(xAttrList->getNameByIndex( i )); - rtl::OUString aLocalName; + const OUString& sAttrName(xAttrList->getNameByIndex( i )); + OUString aLocalName; sal_uInt16 nPrefix(GetScImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName )); - const rtl::OUString& sValue(xAttrList->getValueByIndex( i )); + const OUString& sValue(xAttrList->getValueByIndex( i )); if ((nPrefix == XML_NAMESPACE_TABLE) && IsXMLToken(aLocalName, XML_DISPLAY)) bGroupDisplay = IsXMLToken(sValue, XML_TRUE); @@ -258,7 +258,7 @@ ScXMLTableRowsContext::~ScXMLTableRowsContext() } SvXMLImportContext *ScXMLTableRowsContext::CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) { diff --git a/sc/source/filter/xml/xmlrowi.hxx b/sc/source/filter/xml/xmlrowi.hxx index a900ff781d11..c24a103f9b6e 100644 --- a/sc/source/filter/xml/xmlrowi.hxx +++ b/sc/source/filter/xml/xmlrowi.hxx @@ -26,8 +26,8 @@ class ScXMLImport; class ScXMLTableRowContext : public SvXMLImportContext { - rtl::OUString sStyleName; - rtl::OUString sVisibility; + OUString sStyleName; + OUString sVisibility; sal_Int32 nRepeatedRows; bool bHasCell; @@ -37,14 +37,14 @@ class ScXMLTableRowContext : public SvXMLImportContext public: ScXMLTableRowContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); virtual ~ScXMLTableRowContext(); 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 ); @@ -67,7 +67,7 @@ class ScXMLTableRowsContext : public SvXMLImportContext public: ScXMLTableRowsContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, const bool bHeader, const bool bGroup); @@ -75,7 +75,7 @@ public: virtual ~ScXMLTableRowsContext(); 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 ); diff --git a/sc/source/filter/xml/xmlsceni.cxx b/sc/source/filter/xml/xmlsceni.cxx index caa4a70f4c34..19478d29b4f0 100644 --- a/sc/source/filter/xml/xmlsceni.cxx +++ b/sc/source/filter/xml/xmlsceni.cxx @@ -33,9 +33,7 @@ using namespace com::sun::star; using namespace xmloff::token; -using ::rtl::OUString; -using rtl::OUString; //------------------------------------------------------------------ @@ -58,11 +56,11 @@ ScXMLTableScenarioContext::ScXMLTableScenarioContext( const SvXMLTokenMap& rAttrTokenMap(GetScImport().GetTableScenarioAttrTokenMap()); for( sal_Int16 i = 0; i < nAttrCount; ++i ) { - const rtl::OUString& sAttrName(xAttrList->getNameByIndex( i )); + const OUString& sAttrName(xAttrList->getNameByIndex( i )); OUString aLocalName; sal_uInt16 nPrefix(GetScImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName )); - const rtl::OUString& sValue(xAttrList->getValueByIndex( i )); + const OUString& sValue(xAttrList->getValueByIndex( i )); switch( rAttrTokenMap.Get( nPrefix, aLocalName ) ) { diff --git a/sc/source/filter/xml/xmlsceni.hxx b/sc/source/filter/xml/xmlsceni.hxx index c16098ed6f27..0690f08409c3 100644 --- a/sc/source/filter/xml/xmlsceni.hxx +++ b/sc/source/filter/xml/xmlsceni.hxx @@ -29,7 +29,7 @@ class ScXMLImport; class ScXMLTableScenarioContext : public SvXMLImportContext { private: - rtl::OUString sComment; + OUString sComment; Color aBorderColor; ScRangeList aScenarioRanges; bool bDisplayBorder; @@ -45,14 +45,14 @@ private: public: ScXMLTableScenarioContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); virtual ~ScXMLTableScenarioContext(); 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 ); diff --git a/sc/source/filter/xml/xmlsorti.cxx b/sc/source/filter/xml/xmlsorti.cxx index d880d401c74f..129b87f38ad7 100644 --- a/sc/source/filter/xml/xmlsorti.cxx +++ b/sc/source/filter/xml/xmlsorti.cxx @@ -39,7 +39,7 @@ using namespace xmloff::token; ScXMLSortContext::ScXMLSortContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLDatabaseRangeContext* pTempDatabaseRangeContext) : @@ -58,11 +58,11 @@ ScXMLSortContext::ScXMLSortContext( ScXMLImport& rImport, const SvXMLTokenMap& rAttrTokenMap(GetScImport().GetSortAttrTokenMap()); for( sal_Int16 i=0; i < nAttrCount; ++i ) { - const rtl::OUString& sAttrName(xAttrList->getNameByIndex( i )); - rtl::OUString aLocalName; + const OUString& sAttrName(xAttrList->getNameByIndex( i )); + OUString aLocalName; sal_uInt16 nPrefix(GetScImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName )); - const rtl::OUString& sValue(xAttrList->getValueByIndex( i )); + const OUString& sValue(xAttrList->getValueByIndex( i )); switch( rAttrTokenMap.Get( nPrefix, aLocalName ) ) { @@ -105,7 +105,7 @@ ScXMLSortContext::~ScXMLSortContext() } SvXMLImportContext *ScXMLSortContext::CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) { @@ -139,37 +139,37 @@ void ScXMLSortContext::EndElement() if (nAlgoLength) ++i; uno::Sequence <beans::PropertyValue> aSortDescriptor(7 + i); - aSortDescriptor[0].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNONAME_BINDFMT)); + aSortDescriptor[0].Name = OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNONAME_BINDFMT)); aSortDescriptor[0].Value = ::cppu::bool2any(bBindFormatsToContent); - aSortDescriptor[1].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNONAME_COPYOUT)); + aSortDescriptor[1].Name = OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNONAME_COPYOUT)); aSortDescriptor[1].Value = ::cppu::bool2any(bCopyOutputData); - aSortDescriptor[2].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNONAME_ISCASE)); + aSortDescriptor[2].Name = OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNONAME_ISCASE)); aSortDescriptor[2].Value = ::cppu::bool2any(bIsCaseSensitive); - aSortDescriptor[3].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNONAME_ISULIST)); + aSortDescriptor[3].Name = OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNONAME_ISULIST)); aSortDescriptor[3].Value = ::cppu::bool2any(bEnabledUserList); - aSortDescriptor[4].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNONAME_OUTPOS)); + aSortDescriptor[4].Name = OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNONAME_OUTPOS)); aSortDescriptor[4].Value <<= aOutputPosition; - aSortDescriptor[5].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNONAME_UINDEX)); + aSortDescriptor[5].Name = OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNONAME_UINDEX)); aSortDescriptor[5].Value <<= nUserListIndex; - aSortDescriptor[6].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNONAME_SORTFLD)); + aSortDescriptor[6].Name = OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNONAME_SORTFLD)); aSortDescriptor[6].Value <<= aSortFields; if (nLangLength || nCountryLength) { lang::Locale aLocale; aLocale.Language = sLanguage; aLocale.Country = sCountry; - aSortDescriptor[7].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNONAME_COLLLOC)); + aSortDescriptor[7].Name = OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNONAME_COLLLOC)); aSortDescriptor[7].Value <<= aLocale; } if (nAlgoLength) { - aSortDescriptor[6 + i].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNONAME_COLLALG)); + aSortDescriptor[6 + i].Name = OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNONAME_COLLALG)); aSortDescriptor[6 + i].Value <<= sAlgorithm; } pDatabaseRangeContext->SetSortSequence(aSortDescriptor); } -void ScXMLSortContext::AddSortField(const rtl::OUString& sFieldNumber, const rtl::OUString& sDataType, const rtl::OUString& sOrder) +void ScXMLSortContext::AddSortField(const OUString& sFieldNumber, const OUString& sDataType, const OUString& sOrder) { util::SortField aSortField; aSortField.Field = sFieldNumber.toInt32(); @@ -179,7 +179,7 @@ void ScXMLSortContext::AddSortField(const rtl::OUString& sFieldNumber, const rtl aSortField.SortAscending = false; if (sDataType.getLength() > 8) { - rtl::OUString sTemp = sDataType.copy(0, 8); + OUString sTemp = sDataType.copy(0, 8); if (sTemp.compareToAscii(SC_USERLIST) == 0) { bEnabledUserList = true; @@ -205,7 +205,7 @@ void ScXMLSortContext::AddSortField(const rtl::OUString& sFieldNumber, const rtl ScXMLSortByContext::ScXMLSortByContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLSortContext* pTempSortContext) : @@ -218,11 +218,11 @@ ScXMLSortByContext::ScXMLSortByContext( ScXMLImport& rImport, const SvXMLTokenMap& rAttrTokenMap(GetScImport().GetSortSortByAttrTokenMap()); for( sal_Int16 i=0; i < nAttrCount; ++i ) { - const rtl::OUString& sAttrName(xAttrList->getNameByIndex( i )); - rtl::OUString aLocalName; + const OUString& sAttrName(xAttrList->getNameByIndex( i )); + OUString aLocalName; sal_uInt16 nPrefix(GetScImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName )); - const rtl::OUString& sValue(xAttrList->getValueByIndex( i )); + const OUString& sValue(xAttrList->getValueByIndex( i )); switch( rAttrTokenMap.Get( nPrefix, aLocalName ) ) { @@ -250,7 +250,7 @@ ScXMLSortByContext::~ScXMLSortByContext() } SvXMLImportContext *ScXMLSortByContext::CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& /* xAttrList */ ) { diff --git a/sc/source/filter/xml/xmlsorti.hxx b/sc/source/filter/xml/xmlsorti.hxx index d2de3775f655..419796893aed 100644 --- a/sc/source/filter/xml/xmlsorti.hxx +++ b/sc/source/filter/xml/xmlsorti.hxx @@ -34,9 +34,9 @@ class ScXMLSortContext : public SvXMLImportContext com::sun::star::uno::Sequence <com::sun::star::util::SortField> aSortFields; com::sun::star::table::CellAddress aOutputPosition; - rtl::OUString sCountry; - rtl::OUString sLanguage; - rtl::OUString sAlgorithm; + OUString sCountry; + OUString sLanguage; + OUString sAlgorithm; sal_Int16 nUserListIndex; bool bCopyOutputData; bool bBindFormatsToContent; @@ -49,7 +49,7 @@ class ScXMLSortContext : public SvXMLImportContext public: ScXMLSortContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLDatabaseRangeContext* pTempDatabaseRangeContext); @@ -57,22 +57,22 @@ public: virtual ~ScXMLSortContext(); 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 ); virtual void EndElement(); - void AddSortField(const rtl::OUString& sFieldNumber, const rtl::OUString& sDataType, const rtl::OUString& sOrder); + void AddSortField(const OUString& sFieldNumber, const OUString& sDataType, const OUString& sOrder); }; class ScXMLSortByContext : public SvXMLImportContext { ScXMLSortContext* pSortContext; - rtl::OUString sFieldNumber; - rtl::OUString sDataType; - rtl::OUString sOrder; + OUString sFieldNumber; + OUString sDataType; + OUString sOrder; const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); } ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } @@ -80,7 +80,7 @@ class ScXMLSortByContext : public SvXMLImportContext public: ScXMLSortByContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLSortContext* pTempSortContext); @@ -88,7 +88,7 @@ public: virtual ~ScXMLSortByContext(); 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 ); diff --git a/sc/source/filter/xml/xmlstyle.cxx b/sc/source/filter/xml/xmlstyle.cxx index 486f0b2911c0..a331b0a2926a 100644 --- a/sc/source/filter/xml/xmlstyle.cxx +++ b/sc/source/filter/xml/xmlstyle.cxx @@ -53,7 +53,6 @@ using namespace com::sun::star; using namespace ::xmloff::token; using namespace ::formula; -using ::rtl::OUString; #define MAP(name,prefix,token,type,context) { name, sizeof(name)-1, prefix, token, type, context, SvtSaveOptions::ODFVER_010 } #define MAP_EXT(name,prefix,token,type,context) { name, sizeof(name)-1, prefix, token, type, context, SvtSaveOptions::ODFVER_012_EXT_COMPAT } @@ -629,7 +628,7 @@ void ScXMLAutoStylePoolP::exportStyleAttributes( sal_Int32 nNumberFormat = 0; if (i->maValue >>= nNumberFormat) { - rtl::OUString sAttrValue(rScXMLExport.getDataStyleName(nNumberFormat)); + OUString sAttrValue(rScXMLExport.getDataStyleName(nNumberFormat)); if (!sAttrValue.isEmpty()) { GetExport().AddAttribute( @@ -656,7 +655,7 @@ void ScXMLAutoStylePoolP::exportStyleAttributes( { case CTF_SC_MASTERPAGENAME : { - rtl::OUString sName; + OUString sName; if (i->maValue >>= sName) { GetExport().AddAttribute( @@ -705,7 +704,7 @@ void ScXMLAutoStylePoolP::exportStyleContent( uno::Reference <sheet::XSheetConditionalEntry> xSheetConditionalEntry(xIndex->getByIndex(nCondition), uno::UNO_QUERY); if (xSheetConditionalEntry.is()) { - rtl::OUString sStyleName(xSheetConditionalEntry->getStyleName()); + OUString sStyleName(xSheetConditionalEntry->getStyleName()); uno::Reference <sheet::XSheetCondition> xSheetCondition(xSheetConditionalEntry, uno::UNO_QUERY); if (xSheetCondition.is()) { @@ -714,9 +713,9 @@ void ScXMLAutoStylePoolP::exportStyleContent( { if (aOperator == sheet::ConditionOperator_FORMULA) { - rtl::OUString sCondition("is-true-formula("); + OUString sCondition("is-true-formula("); sCondition += xSheetCondition->getFormula1(); - sCondition += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(")")); + sCondition += OUString(RTL_CONSTASCII_USTRINGPARAM(")")); rScXMLExport.AddAttribute(XML_NAMESPACE_STYLE, XML_CONDITION, sCondition); rScXMLExport.AddAttribute(XML_NAMESPACE_STYLE, XML_APPLY_STYLE_NAME, rScXMLExport.EncodeStyleName( sStyleName )); OUString sOUBaseAddress; @@ -728,41 +727,41 @@ void ScXMLAutoStylePoolP::exportStyleContent( } else { - rtl::OUString sCondition; + OUString sCondition; if (aOperator == sheet::ConditionOperator_BETWEEN || aOperator == sheet::ConditionOperator_NOT_BETWEEN) { if (aOperator == sheet::ConditionOperator_BETWEEN) - sCondition = rtl::OUString("cell-content-is-between("); + sCondition = OUString("cell-content-is-between("); else - sCondition = rtl::OUString("cell-content-is-not-between("); + sCondition = OUString("cell-content-is-not-between("); sCondition += xSheetCondition->getFormula1(); - sCondition += rtl::OUString(","); + sCondition += OUString(","); sCondition += xSheetCondition->getFormula2(); - sCondition += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(")")); + sCondition += OUString(RTL_CONSTASCII_USTRINGPARAM(")")); } else { - sCondition = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("cell-content()")); + sCondition = OUString(RTL_CONSTASCII_USTRINGPARAM("cell-content()")); switch (aOperator) { case sheet::ConditionOperator_LESS: - sCondition += rtl::OUString("<"); + sCondition += OUString("<"); break; case sheet::ConditionOperator_GREATER: - sCondition += rtl::OUString(">"); + sCondition += OUString(">"); break; case sheet::ConditionOperator_LESS_EQUAL: - sCondition += rtl::OUString("<="); + sCondition += OUString("<="); break; case sheet::ConditionOperator_GREATER_EQUAL: - sCondition += rtl::OUString(">="); + sCondition += OUString(">="); break; case sheet::ConditionOperator_EQUAL: - sCondition += rtl::OUString("="); + sCondition += OUString("="); break; case sheet::ConditionOperator_NOT_EQUAL: - sCondition += rtl::OUString("!="); + sCondition += OUString("!="); break; default: { @@ -812,7 +811,7 @@ void ScXMLStyleExport::exportStyleAttributes( if (xPropSet.is()) { uno::Reference< beans::XPropertySetInfo > xPropSetInfo(xPropSet->getPropertySetInfo()); - rtl::OUString sNumberFormat("NumberFormat"); + OUString sNumberFormat("NumberFormat"); if( xPropSetInfo->hasPropertyByName( sNumberFormat ) ) { uno::Reference< beans::XPropertyState > xPropState( xPropSet, uno::UNO_QUERY ); @@ -836,7 +835,7 @@ void ScXMLStyleExport::exportStyleContent( ScXMLStyleExport::ScXMLStyleExport( SvXMLExport& rExp, - const ::rtl::OUString& rPoolStyleName, + const OUString& rPoolStyleName, SvXMLAutoStylePoolP *pAutoStyleP ) : XMLStyleExport(rExp, rPoolStyleName, pAutoStyleP) { @@ -964,7 +963,7 @@ bool XmlScPropHdl_CellProtection::equals( } sal_Bool XmlScPropHdl_CellProtection::importXML( - const ::rtl::OUString& rStrImpValue, + const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& /* rUnitConverter */ ) const { @@ -993,8 +992,8 @@ sal_Bool XmlScPropHdl_CellProtection::importXML( sal_Int16 i(0); while (i < rStrImpValue.getLength() && rStrImpValue[i] != ' ') ++i; - rtl::OUString sFirst(rStrImpValue.copy(0, i)); - rtl::OUString sSecond(rStrImpValue.copy(i + 1)); + OUString sFirst(rStrImpValue.copy(0, i)); + OUString sSecond(rStrImpValue.copy(i + 1)); aCellProtection.IsFormulaHidden = false; aCellProtection.IsHidden = false; aCellProtection.IsLocked = false; @@ -1046,7 +1045,7 @@ sal_Bool XmlScPropHdl_CellProtection::importXML( } sal_Bool XmlScPropHdl_CellProtection::exportXML( - ::rtl::OUString& rStrExpValue, + OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& /* rUnitConverter */ ) const { @@ -1080,7 +1079,7 @@ sal_Bool XmlScPropHdl_CellProtection::exportXML( else if (aCellProtection.IsFormulaHidden && aCellProtection.IsLocked) { rStrExpValue = GetXMLToken(XML_PROTECTED); - rStrExpValue += rtl::OUString(" "); + rStrExpValue += OUString(" "); rStrExpValue += GetXMLToken(XML_FORMULA_HIDDEN); bRetval = sal_True; } @@ -1107,7 +1106,7 @@ bool XmlScPropHdl_PrintContent::equals( } sal_Bool XmlScPropHdl_PrintContent::importXML( - const ::rtl::OUString& rStrImpValue, + const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& /* rUnitConverter */ ) const { @@ -1137,7 +1136,7 @@ sal_Bool XmlScPropHdl_PrintContent::importXML( } sal_Bool XmlScPropHdl_PrintContent::exportXML( - ::rtl::OUString& rStrExpValue, + OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& /* rUnitConverter */ ) const { @@ -1146,7 +1145,7 @@ sal_Bool XmlScPropHdl_PrintContent::exportXML( util::CellProtection aCellProtection; if(rValue >>= aCellProtection) { - rtl::OUStringBuffer sValue; + OUStringBuffer sValue; ::sax::Converter::convertBool(sValue, !aCellProtection.IsPrintHidden); rStrExpValue = sValue.makeStringAndClear(); bRetval = sal_True; @@ -1172,7 +1171,7 @@ bool XmlScPropHdl_JustifyMethod::equals( } sal_Bool XmlScPropHdl_JustifyMethod::importXML( - const ::rtl::OUString& rStrImpValue, + const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& /* rUnitConverter */ ) const { @@ -1198,7 +1197,7 @@ sal_Bool XmlScPropHdl_JustifyMethod::importXML( } sal_Bool XmlScPropHdl_JustifyMethod::exportXML( - ::rtl::OUString& rStrExpValue, + OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& /* rUnitConverter */ ) const { @@ -1246,7 +1245,7 @@ bool XmlScPropHdl_HoriJustify::equals( } sal_Bool XmlScPropHdl_HoriJustify::importXML( - const ::rtl::OUString& rStrImpValue, + const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& /* rUnitConverter */ ) const { @@ -1288,7 +1287,7 @@ sal_Bool XmlScPropHdl_HoriJustify::importXML( } sal_Bool XmlScPropHdl_HoriJustify::exportXML( - ::rtl::OUString& rStrExpValue, + OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& /* rUnitConverter */ ) const { @@ -1350,7 +1349,7 @@ bool XmlScPropHdl_HoriJustifySource::equals( } sal_Bool XmlScPropHdl_HoriJustifySource::importXML( - const ::rtl::OUString& rStrImpValue, + const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& /* rUnitConverter */ ) const { @@ -1371,7 +1370,7 @@ sal_Bool XmlScPropHdl_HoriJustifySource::importXML( } sal_Bool XmlScPropHdl_HoriJustifySource::exportXML( - ::rtl::OUString& rStrExpValue, + OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& /* rUnitConverter */ ) const { @@ -1411,7 +1410,7 @@ bool XmlScPropHdl_HoriJustifyRepeat::equals( } sal_Bool XmlScPropHdl_HoriJustifyRepeat::importXML( - const ::rtl::OUString& rStrImpValue, + const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& /* rUnitConverter */ ) const { @@ -1432,7 +1431,7 @@ sal_Bool XmlScPropHdl_HoriJustifyRepeat::importXML( } sal_Bool XmlScPropHdl_HoriJustifyRepeat::exportXML( - ::rtl::OUString& rStrExpValue, + OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& /* rUnitConverter */ ) const { @@ -1472,7 +1471,7 @@ bool XmlScPropHdl_Orientation::equals( } sal_Bool XmlScPropHdl_Orientation::importXML( - const ::rtl::OUString& rStrImpValue, + const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& /* rUnitConverter */ ) const { @@ -1496,7 +1495,7 @@ sal_Bool XmlScPropHdl_Orientation::importXML( } sal_Bool XmlScPropHdl_Orientation::exportXML( - ::rtl::OUString& rStrExpValue, + OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& /* rUnitConverter */ ) const { @@ -1541,7 +1540,7 @@ bool XmlScPropHdl_RotateAngle::equals( } sal_Bool XmlScPropHdl_RotateAngle::importXML( - const ::rtl::OUString& rStrImpValue, + const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& /* rUnitConverter */ ) const { @@ -1559,7 +1558,7 @@ sal_Bool XmlScPropHdl_RotateAngle::importXML( } sal_Bool XmlScPropHdl_RotateAngle::exportXML( - ::rtl::OUString& rStrExpValue, + OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& /* rUnitConverter */ ) const { @@ -1568,7 +1567,7 @@ sal_Bool XmlScPropHdl_RotateAngle::exportXML( if(rValue >>= nVal) { - rtl::OUStringBuffer sValue; + OUStringBuffer sValue; ::sax::Converter::convertNumber(sValue, sal_Int32(nVal / 100)); rStrExpValue = sValue.makeStringAndClear(); bRetval = sal_True; @@ -1593,7 +1592,7 @@ bool XmlScPropHdl_RotateReference::equals( } sal_Bool XmlScPropHdl_RotateReference::importXML( - const ::rtl::OUString& rStrImpValue, + const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& /* rUnitConverter */ ) const { @@ -1629,7 +1628,7 @@ sal_Bool XmlScPropHdl_RotateReference::importXML( } sal_Bool XmlScPropHdl_RotateReference::exportXML( - ::rtl::OUString& rStrExpValue, + OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& /* rUnitConverter */ ) const { @@ -1690,7 +1689,7 @@ bool XmlScPropHdl_VertJustify::equals( } sal_Bool XmlScPropHdl_VertJustify::importXML( - const ::rtl::OUString& rStrImpValue, + const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& /* rUnitConverter */ ) const { @@ -1732,7 +1731,7 @@ sal_Bool XmlScPropHdl_VertJustify::importXML( } sal_Bool XmlScPropHdl_VertJustify::exportXML( - ::rtl::OUString& rStrExpValue, + OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& /* rUnitConverter */ ) const { @@ -1799,7 +1798,7 @@ bool XmlScPropHdl_BreakBefore::equals( } sal_Bool XmlScPropHdl_BreakBefore::importXML( - const ::rtl::OUString& rStrImpValue, + const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& /* rUnitConverter */ ) const { @@ -1823,7 +1822,7 @@ sal_Bool XmlScPropHdl_BreakBefore::importXML( } sal_Bool XmlScPropHdl_BreakBefore::exportXML( - ::rtl::OUString& rStrExpValue, + OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& /* rUnitConverter */ ) const { @@ -1855,7 +1854,7 @@ bool XmlScPropHdl_IsTextWrapped::equals( } sal_Bool XmlScPropHdl_IsTextWrapped::importXML( - const ::rtl::OUString& rStrImpValue, + const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& /* rUnitConverter */ ) const { @@ -1876,7 +1875,7 @@ sal_Bool XmlScPropHdl_IsTextWrapped::importXML( } sal_Bool XmlScPropHdl_IsTextWrapped::exportXML( - ::rtl::OUString& rStrExpValue, + OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& /* rUnitConverter */ ) const { @@ -1896,7 +1895,7 @@ sal_Bool XmlScPropHdl_IsTextWrapped::exportXML( return bRetval; } -sal_Bool XmlScPropHdl_IsEqual::importXML( const ::rtl::OUString& /* rStrImpValue */, +sal_Bool XmlScPropHdl_IsEqual::importXML( const OUString& /* rStrImpValue */, ::com::sun::star::uno::Any& /* rValue */, const SvXMLUnitConverter& /* rUnitConverter */ ) const { @@ -1904,7 +1903,7 @@ sal_Bool XmlScPropHdl_IsEqual::importXML( const ::rtl::OUString& /* rStrImpValue return false; } -sal_Bool XmlScPropHdl_IsEqual::exportXML( ::rtl::OUString& /* rStrExpValue */, +sal_Bool XmlScPropHdl_IsEqual::exportXML( OUString& /* rStrExpValue */, const ::com::sun::star::uno::Any& /* rValue */, const SvXMLUnitConverter& /* rUnitConverter */ ) const { @@ -1924,7 +1923,7 @@ bool XmlScPropHdl_Vertical::equals( } sal_Bool XmlScPropHdl_Vertical::importXML( - const ::rtl::OUString& rStrImpValue, + const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& /* rUnitConverter */ ) const { @@ -1945,7 +1944,7 @@ sal_Bool XmlScPropHdl_Vertical::importXML( } sal_Bool XmlScPropHdl_Vertical::exportXML( - ::rtl::OUString& rStrExpValue, + OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& /* rUnitConverter */ ) const { diff --git a/sc/source/filter/xml/xmlstyle.hxx b/sc/source/filter/xml/xmlstyle.hxx index feb62e55fbb8..e879ddf6e069 100644 --- a/sc/source/filter/xml/xmlstyle.hxx +++ b/sc/source/filter/xml/xmlstyle.hxx @@ -217,7 +217,7 @@ class ScXMLStyleExport : public XMLStyleExport public: ScXMLStyleExport( SvXMLExport& rExp, - const ::rtl::OUString& rPoolStyleName, + const OUString& rPoolStyleName, SvXMLAutoStylePoolP *pAutoStyleP=0 ); virtual ~ScXMLStyleExport(); }; @@ -235,8 +235,8 @@ class XmlScPropHdl_CellProtection : public XMLPropertyHandler public: virtual ~XmlScPropHdl_CellProtection(); virtual bool equals( const ::com::sun::star::uno::Any& r1, const ::com::sun::star::uno::Any& r2 ) const; - virtual sal_Bool importXML( const ::rtl::OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; - virtual sal_Bool exportXML( ::rtl::OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual sal_Bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual sal_Bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; }; class XmlScPropHdl_PrintContent : public XMLPropertyHandler @@ -244,8 +244,8 @@ class XmlScPropHdl_PrintContent : public XMLPropertyHandler public: virtual ~XmlScPropHdl_PrintContent(); virtual bool equals( const ::com::sun::star::uno::Any& r1, const ::com::sun::star::uno::Any& r2 ) const; - virtual sal_Bool importXML( const ::rtl::OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; - virtual sal_Bool exportXML( ::rtl::OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual sal_Bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual sal_Bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; }; class XmlScPropHdl_JustifyMethod : public XMLPropertyHandler @@ -253,8 +253,8 @@ class XmlScPropHdl_JustifyMethod : public XMLPropertyHandler public: virtual ~XmlScPropHdl_JustifyMethod(); virtual bool equals( const ::com::sun::star::uno::Any& r1, const ::com::sun::star::uno::Any& r2 ) const; - virtual sal_Bool importXML( const ::rtl::OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; - virtual sal_Bool exportXML( ::rtl::OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual sal_Bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual sal_Bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; }; class XmlScPropHdl_HoriJustify : public XMLPropertyHandler @@ -262,8 +262,8 @@ class XmlScPropHdl_HoriJustify : public XMLPropertyHandler public: virtual ~XmlScPropHdl_HoriJustify(); virtual bool equals( const ::com::sun::star::uno::Any& r1, const ::com::sun::star::uno::Any& r2 ) const; - virtual sal_Bool importXML( const ::rtl::OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; - virtual sal_Bool exportXML( ::rtl::OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual sal_Bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual sal_Bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; }; class XmlScPropHdl_HoriJustifySource : public XMLPropertyHandler @@ -271,8 +271,8 @@ class XmlScPropHdl_HoriJustifySource : public XMLPropertyHandler public: virtual ~XmlScPropHdl_HoriJustifySource(); virtual bool equals( const ::com::sun::star::uno::Any& r1, const ::com::sun::star::uno::Any& r2 ) const; - virtual sal_Bool importXML( const ::rtl::OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; - virtual sal_Bool exportXML( ::rtl::OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual sal_Bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual sal_Bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; }; class XmlScPropHdl_HoriJustifyRepeat : public XMLPropertyHandler @@ -280,8 +280,8 @@ class XmlScPropHdl_HoriJustifyRepeat : public XMLPropertyHandler public: virtual ~XmlScPropHdl_HoriJustifyRepeat(); virtual bool equals( const ::com::sun::star::uno::Any& r1, const ::com::sun::star::uno::Any& r2 ) const; - virtual sal_Bool importXML( const ::rtl::OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; - virtual sal_Bool exportXML( ::rtl::OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual sal_Bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual sal_Bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; }; class XmlScPropHdl_Orientation : public XMLPropertyHandler @@ -289,8 +289,8 @@ class XmlScPropHdl_Orientation : public XMLPropertyHandler public: virtual ~XmlScPropHdl_Orientation(); virtual bool equals( const ::com::sun::star::uno::Any& r1, const ::com::sun::star::uno::Any& r2 ) const; - virtual sal_Bool importXML( const ::rtl::OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; - virtual sal_Bool exportXML( ::rtl::OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual sal_Bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual sal_Bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; }; class XmlScPropHdl_RotateAngle : public XMLPropertyHandler @@ -298,8 +298,8 @@ class XmlScPropHdl_RotateAngle : public XMLPropertyHandler public: virtual ~XmlScPropHdl_RotateAngle(); virtual bool equals( const ::com::sun::star::uno::Any& r1, const ::com::sun::star::uno::Any& r2 ) const; - virtual sal_Bool importXML( const ::rtl::OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; - virtual sal_Bool exportXML( ::rtl::OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual sal_Bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual sal_Bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; }; class XmlScPropHdl_RotateReference : public XMLPropertyHandler @@ -307,8 +307,8 @@ class XmlScPropHdl_RotateReference : public XMLPropertyHandler public: virtual ~XmlScPropHdl_RotateReference(); virtual bool equals( const ::com::sun::star::uno::Any& r1, const ::com::sun::star::uno::Any& r2 ) const; - virtual sal_Bool importXML( const ::rtl::OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; - virtual sal_Bool exportXML( ::rtl::OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual sal_Bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual sal_Bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; }; class XmlScPropHdl_VertJustify : public XMLPropertyHandler @@ -316,8 +316,8 @@ class XmlScPropHdl_VertJustify : public XMLPropertyHandler public: virtual ~XmlScPropHdl_VertJustify(); virtual bool equals( const ::com::sun::star::uno::Any& r1, const ::com::sun::star::uno::Any& r2 ) const; - virtual sal_Bool importXML( const ::rtl::OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; - virtual sal_Bool exportXML( ::rtl::OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual sal_Bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual sal_Bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; }; class XmlScPropHdl_BreakBefore : public XMLPropertyHandler @@ -325,8 +325,8 @@ class XmlScPropHdl_BreakBefore : public XMLPropertyHandler public: virtual ~XmlScPropHdl_BreakBefore(); virtual bool equals( const ::com::sun::star::uno::Any& r1, const ::com::sun::star::uno::Any& r2 ) const; - virtual sal_Bool importXML( const ::rtl::OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; - virtual sal_Bool exportXML( ::rtl::OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual sal_Bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual sal_Bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; }; class XmlScPropHdl_IsTextWrapped : public XMLPropertyHandler @@ -334,8 +334,8 @@ class XmlScPropHdl_IsTextWrapped : public XMLPropertyHandler public: virtual ~XmlScPropHdl_IsTextWrapped(); virtual bool equals( const ::com::sun::star::uno::Any& r1, const ::com::sun::star::uno::Any& r2 ) const; - virtual sal_Bool importXML( const ::rtl::OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; - virtual sal_Bool exportXML( ::rtl::OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual sal_Bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual sal_Bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; }; class XmlScPropHdl_IsEqual : public XMLPropertyHandler @@ -343,8 +343,8 @@ class XmlScPropHdl_IsEqual : public XMLPropertyHandler public: virtual ~XmlScPropHdl_IsEqual() {} virtual bool equals( const ::com::sun::star::uno::Any& /* r1 */, const ::com::sun::star::uno::Any& /* r2 */ ) const { return sal_True; } - virtual sal_Bool importXML( const ::rtl::OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; - virtual sal_Bool exportXML( ::rtl::OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual sal_Bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual sal_Bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; }; class XmlScPropHdl_Vertical : public XMLPropertyHandler @@ -352,8 +352,8 @@ class XmlScPropHdl_Vertical : public XMLPropertyHandler public: virtual ~XmlScPropHdl_Vertical(); virtual bool equals( const ::com::sun::star::uno::Any& r1, const ::com::sun::star::uno::Any& r2 ) const; - virtual sal_Bool importXML( const ::rtl::OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; - virtual sal_Bool exportXML( ::rtl::OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual sal_Bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual sal_Bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; }; #endif diff --git a/sc/source/filter/xml/xmlstyli.cxx b/sc/source/filter/xml/xmlstyli.cxx index 249173dec035..7e024b7901b7 100644 --- a/sc/source/filter/xml/xmlstyli.cxx +++ b/sc/source/filter/xml/xmlstyli.cxx @@ -347,9 +347,9 @@ SvXMLImportContext* XMLTableCellPropsContext::CreateChildContext( sal_uInt16 nPr class ScXMLMapContext : public SvXMLImportContext { - rtl::OUString msApplyStyle; - rtl::OUString msCondition; - rtl::OUString msBaseCell; + OUString msApplyStyle; + OUString msCondition; + OUString msBaseCell; const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); } ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } @@ -357,7 +357,7 @@ public: ScXMLMapContext( SvXMLImport& rImport, sal_uInt16 nPrfx, - const rtl::OUString& rLName, + const OUString& rLName, const uno::Reference< xml::sax::XAttributeList > & xAttrList ); virtual ~ScXMLMapContext(); @@ -410,7 +410,7 @@ ScCondFormatEntry* ScXMLMapContext::CreateConditionEntry() } ScConditionMode eMode = ScConditionEntry::GetModeFromApi(aParseResult.meOperator); - rtl::OUString aNmsp1, aNmsp2; + OUString aNmsp1, aNmsp2; ScDocument* pDoc = GetScImport().GetDocument(); ScCondFormatEntry* pEntry = new ScCondFormatEntry(eMode, aParseResult.maOperand1, aParseResult.maOperand2, pDoc, ScAddress(), msApplyStyle, @@ -577,7 +577,7 @@ void XMLTableStyleContext::SetDefaults() uno::Reference <lang::XMultiServiceFactory> xMultiServiceFactory(GetImport().GetModel(), uno::UNO_QUERY); if (xMultiServiceFactory.is()) { - uno::Reference <beans::XPropertySet> xProperties(xMultiServiceFactory->createInstance(rtl::OUString("com.sun.star.sheet.Defaults")), uno::UNO_QUERY); + uno::Reference <beans::XPropertySet> xProperties(xMultiServiceFactory->createInstance(OUString("com.sun.star.sheet.Defaults")), uno::UNO_QUERY); if (xProperties.is()) FillPropertySet(xProperties); } @@ -709,10 +709,10 @@ XMLTableStylesContext::XMLTableStylesContext( SvXMLImport& rImport, const uno::Reference< XAttributeList > & xAttrList, const bool bTempAutoStyles ) : SvXMLStylesContext( rImport, nPrfx, rLName, xAttrList ), - sCellStyleServiceName( rtl::OUString( "com.sun.star.style.CellStyle" )), - sColumnStyleServiceName( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( XML_STYLE_FAMILY_TABLE_COLUMN_STYLES_NAME ))), - sRowStyleServiceName( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( XML_STYLE_FAMILY_TABLE_ROW_STYLES_NAME ))), - sTableStyleServiceName( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( XML_STYLE_FAMILY_TABLE_TABLE_STYLES_NAME ))), + sCellStyleServiceName( OUString( "com.sun.star.style.CellStyle" )), + sColumnStyleServiceName( OUString(RTL_CONSTASCII_USTRINGPARAM( XML_STYLE_FAMILY_TABLE_COLUMN_STYLES_NAME ))), + sRowStyleServiceName( OUString(RTL_CONSTASCII_USTRINGPARAM( XML_STYLE_FAMILY_TABLE_ROW_STYLES_NAME ))), + sTableStyleServiceName( OUString(RTL_CONSTASCII_USTRINGPARAM( XML_STYLE_FAMILY_TABLE_TABLE_STYLES_NAME ))), nNumberFormatIndex(-1), nConditionalFormatIndex(-1), nCellStyleIndex(-1), @@ -800,7 +800,7 @@ uno::Reference < XNameContainer > xStyles.set(xTableStyles); else sName = - OUString( rtl::OUString( "TableStyles" )); + OUString( OUString( "TableStyles" )); } break; case XML_STYLE_FAMILY_TABLE_CELL: @@ -809,7 +809,7 @@ uno::Reference < XNameContainer > xStyles.set(xCellStyles); else sName = - OUString( rtl::OUString( "CellStyles" )); + OUString( OUString( "CellStyles" )); } break; case XML_STYLE_FAMILY_TABLE_COLUMN: @@ -818,7 +818,7 @@ uno::Reference < XNameContainer > xStyles.set(xColumnStyles); else sName = - OUString( rtl::OUString( "ColumnStyles" )); + OUString( OUString( "ColumnStyles" )); } break; case XML_STYLE_FAMILY_TABLE_ROW: @@ -827,7 +827,7 @@ uno::Reference < XNameContainer > xStyles.set(xRowStyles); else sName = - OUString( rtl::OUString( "RowStyles" )); + OUString( OUString( "RowStyles" )); } break; } @@ -873,7 +873,7 @@ uno::Reference < XNameContainer > OUString XMLTableStylesContext::GetServiceName( sal_uInt16 nFamily ) const { - rtl::OUString sServiceName(SvXMLStylesContext::GetServiceName(nFamily)); + OUString sServiceName(SvXMLStylesContext::GetServiceName(nFamily)); if (sServiceName.isEmpty()) { switch( nFamily ) @@ -1008,7 +1008,7 @@ SvXMLImportContext *ScMasterPageContext::CreateChildContext( SvXMLImportContext *ScMasterPageContext::CreateHeaderFooterContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList, const sal_Bool bFooter, const sal_Bool bLeft, @@ -1030,7 +1030,7 @@ SvXMLImportContext *ScMasterPageContext::CreateHeaderFooterContext( bFooter, bLeft ); } -void ScMasterPageContext::ClearContent(const rtl::OUString& rContent) +void ScMasterPageContext::ClearContent(const OUString& rContent) { if (!xPropSet.is()) xPropSet.set(GetStyle(), UNO_QUERY ); @@ -1052,15 +1052,15 @@ void ScMasterPageContext::Finish( sal_Bool bOverwrite ) { XMLTextMasterPageContext::Finish(bOverwrite); if (!bContainsRightFooter) - ClearContent(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_PAGE_RIGHTFTRCON))); + ClearContent(OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_PAGE_RIGHTFTRCON))); if (!bContainsRightHeader) - ClearContent(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_PAGE_RIGHTHDRCON))); + ClearContent(OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_PAGE_RIGHTHDRCON))); } // --------------------------------------------------------------------------- ScCellTextStyleContext::ScCellTextStyleContext( SvXMLImport& rImport, sal_uInt16 nPrfx, - const rtl::OUString& rLName, const uno::Reference<xml::sax::XAttributeList> & xAttrList, + const OUString& rLName, const uno::Reference<xml::sax::XAttributeList> & xAttrList, SvXMLStylesContext& rStyles, sal_uInt16 nFamily, sal_Bool bDefaultStyle ) : XMLTextStyleContext( rImport, nPrfx, rLName, xAttrList, rStyles, nFamily, bDefaultStyle ), nLastSheet(-1) diff --git a/sc/source/filter/xml/xmlstyli.hxx b/sc/source/filter/xml/xmlstyli.hxx index 09d61bae311f..865e4d00d974 100644 --- a/sc/source/filter/xml/xmlstyli.hxx +++ b/sc/source/filter/xml/xmlstyli.hxx @@ -69,8 +69,8 @@ public: class XMLTableStyleContext : public XMLPropStyleContext { - ::rtl::OUString sDataStyleName; - rtl::OUString sPageStyle; + OUString sDataStyleName; + OUString sPageStyle; SvXMLStylesContext* pStyles; sal_Int32 nNumberFormat; SCTAB nLastSheet; @@ -84,22 +84,22 @@ class XMLTableStyleContext : public XMLPropStyleContext protected: virtual void SetAttribute( sal_uInt16 nPrefixKey, - const ::rtl::OUString& rLocalName, - const ::rtl::OUString& rValue ); + const OUString& rLocalName, + const OUString& rValue ); public: TYPEINFO(); XMLTableStyleContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList, SvXMLStylesContext& rStyles, sal_uInt16 nFamily, bool bDefaultStyle = false ); virtual ~XMLTableStyleContext(); 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 ); virtual void FillPropertySet(const ::com::sun::star::uno::Reference< @@ -131,10 +131,10 @@ class XMLTableStylesContext : public SvXMLStylesContext ::com::sun::star::container::XNameContainer > xRowStyles; ::com::sun::star::uno::Reference < ::com::sun::star::container::XNameContainer > xTableStyles; - const ::rtl::OUString sCellStyleServiceName; - const ::rtl::OUString sColumnStyleServiceName; - const ::rtl::OUString sRowStyleServiceName; - const ::rtl::OUString sTableStyleServiceName; + const OUString sCellStyleServiceName; + const OUString sColumnStyleServiceName; + const OUString sRowStyleServiceName; + const OUString sTableStyleServiceName; sal_Int32 nNumberFormatIndex; sal_Int32 nConditionalFormatIndex; sal_Int32 nCellStyleIndex; @@ -155,19 +155,19 @@ protected: virtual SvXMLStyleContext *CreateStyleStyleChildContext( sal_uInt16 nFamily, sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ); virtual SvXMLStyleContext *CreateDefaultStyleStyleChildContext( sal_uInt16 nFamily, sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ); public: XMLTableStylesContext( SvXMLImport& rImport, sal_uInt16 nPrfx , - const ::rtl::OUString& rLName , + const OUString& rLName , const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList, const bool bAutoStyles ); virtual ~XMLTableStylesContext(); @@ -179,7 +179,7 @@ public: virtual ::com::sun::star::uno::Reference < ::com::sun::star::container::XNameContainer > GetStylesContainer( sal_uInt16 nFamily ) const; - virtual ::rtl::OUString GetServiceName( sal_uInt16 nFamily ) const; + virtual OUString GetServiceName( sal_uInt16 nFamily ) const; sal_Int32 GetIndex(const sal_Int16 nContextID); }; @@ -188,12 +188,12 @@ class ScXMLMasterStylesContext : public SvXMLStylesContext { protected: virtual SvXMLStyleContext *CreateStyleChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ); virtual SvXMLStyleContext *CreateStyleStyleChildContext( sal_uInt16 nFamily, - sal_uInt16 nPrefix, const ::rtl::OUString& rLocalName, + sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ); @@ -203,7 +203,7 @@ public: TYPEINFO(); ScXMLMasterStylesContext( SvXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList); @@ -218,17 +218,17 @@ namespace com { namespace sun { namespace star { class ScMasterPageContext : public XMLTextMasterPageContext { com::sun::star::uno::Reference<com::sun::star::beans::XPropertySet> xPropSet; - const rtl::OUString sEmpty; + const OUString sEmpty; sal_Bool bContainsRightHeader; sal_Bool bContainsRightFooter; - void ClearContent(const rtl::OUString& rContent); + void ClearContent(const OUString& rContent); public: TYPEINFO(); ScMasterPageContext( SvXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList, bool bOverwrite ); @@ -236,12 +236,12 @@ public: 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 ); virtual SvXMLImportContext *CreateHeaderFooterContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList, const sal_Bool bFooter, const sal_Bool bLeft, @@ -259,7 +259,7 @@ class ScCellTextStyleContext : public XMLTextStyleContext public: ScCellTextStyleContext( SvXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList, SvXMLStylesContext& rStyles, sal_uInt16 nFamily, diff --git a/sc/source/filter/xml/xmlsubti.cxx b/sc/source/filter/xml/xmlsubti.cxx index c9f46b11e7ab..122882777cf6 100644 --- a/sc/source/filter/xml/xmlsubti.cxx +++ b/sc/source/filter/xml/xmlsubti.cxx @@ -99,7 +99,7 @@ uno::Reference<sheet::XSpreadsheet> getCurrentSheet(const uno::Reference<frame:: } -void ScMyTables::NewSheet(const rtl::OUString& sTableName, const rtl::OUString& sStyleName, +void ScMyTables::NewSheet(const OUString& sTableName, const OUString& sStyleName, const ScXMLTabProtectionData& rProtectData) { if (rImport.GetModel().is()) @@ -133,7 +133,7 @@ void ScMyTables::NewSheet(const rtl::OUString& sTableName, const rtl::OUString& } } -void ScMyTables::SetTableStyle(const rtl::OUString& sStyleName) +void ScMyTables::SetTableStyle(const OUString& sStyleName) { //these uno calls are a bit difficult to remove, XMLTableStyleContext::FillPropertySet uses //SvXMLImportPropertyMapper::FillPropertySet @@ -177,7 +177,7 @@ void ScMyTables::AddRow() maCurrentCellPos.SetCol(-1); //reset columns for new row } -void ScMyTables::SetRowStyle(const rtl::OUString& rCellStyleName) +void ScMyTables::SetRowStyle(const OUString& rCellStyleName) { rImport.GetStylesImportHelper()->SetRowStyle(rCellStyleName); } @@ -216,7 +216,7 @@ void ScMyTables::DeleteTable() } } -void ScMyTables::AddColStyle(const sal_Int32 nRepeat, const rtl::OUString& rCellStyleName) +void ScMyTables::AddColStyle(const sal_Int32 nRepeat, const OUString& rCellStyleName) { rImport.GetStylesImportHelper()->AddColumnStyle(rCellStyleName, nCurrentColCount, nRepeat); nCurrentColCount += nRepeat; @@ -261,14 +261,14 @@ bool ScMyTables::HasXShapes() } void ScMyTables::AddOLE(uno::Reference <drawing::XShape>& rShape, - const rtl::OUString &rRangeList) + const OUString &rRangeList) { aFixupOLEs.AddOLE(rShape, rRangeList); } void ScMyTables::AddMatrixRange( const SCCOL nStartColumn, const SCROW nStartRow, const SCCOL nEndColumn, const SCROW nEndRow, - const rtl::OUString& rFormula, const rtl::OUString& rFormulaNmsp, const formula::FormulaGrammar::Grammar eGrammar) + const OUString& rFormula, const OUString& rFormulaNmsp, const formula::FormulaGrammar::Grammar eGrammar) { OSL_ENSURE(nEndRow >= nStartRow, "wrong row order"); OSL_ENSURE(nEndColumn >= nStartColumn, "wrong column order"); diff --git a/sc/source/filter/xml/xmlsubti.hxx b/sc/source/filter/xml/xmlsubti.hxx index b7707715a64d..58dd0ed5225d 100644 --- a/sc/source/filter/xml/xmlsubti.hxx +++ b/sc/source/filter/xml/xmlsubti.hxx @@ -37,7 +37,7 @@ class ScXMLImport; struct ScXMLTabProtectionData { - ::rtl::OUString maPassword; + OUString maPassword; ScPasswordHash meHash1; ScPasswordHash meHash2; bool mbProtected; @@ -58,7 +58,7 @@ private: ::com::sun::star::uno::Reference< ::com::sun::star::table::XCellRange > xCurrentCellRange; ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage > xDrawPage; ::com::sun::star::uno::Reference < ::com::sun::star::drawing::XShapes > xShapes; - rtl::OUString sCurrentSheetName; + OUString sCurrentSheetName; ScAddress maCurrentCellPos; ScRangeList maMatrixRangeList; ScXMLTabProtectionData maProtectionData; @@ -69,23 +69,23 @@ private: void NewRow(); void NewColumn(bool bIsCovered); - void SetTableStyle(const rtl::OUString& sStyleName); + void SetTableStyle(const OUString& sStyleName); public: ScMyTables(ScXMLImport& rImport); ~ScMyTables(); - void NewSheet(const rtl::OUString& sTableName, const rtl::OUString& sStyleName, + void NewSheet(const OUString& sTableName, const OUString& sStyleName, const ScXMLTabProtectionData& rProtectData); void AddRow(); - void SetRowStyle(const rtl::OUString& rCellStyleName); + void SetRowStyle(const OUString& rCellStyleName); void AddColumn(bool bIsCovered); void FixupOLEs() { aFixupOLEs.FixupOLEs(); } bool IsOLE(com::sun::star::uno::Reference< com::sun::star::drawing::XShape >& rShape) const { return ScMyOLEFixer::IsOLE(rShape); } void DeleteTable(); ScAddress GetCurrentCellPos() const { return maCurrentCellPos; }; - void AddColStyle(const sal_Int32 nRepeat, const rtl::OUString& rCellStyleName); + void AddColStyle(const sal_Int32 nRepeat, const OUString& rCellStyleName); ScXMLTabProtectionData& GetCurrentProtectionData() { return maProtectionData; } - rtl::OUString GetCurrentSheetName() const { return sCurrentSheetName; } + OUString GetCurrentSheetName() const { return sCurrentSheetName; } SCTAB GetCurrentSheet() const { return (maCurrentCellPos.Tab() >= 0) ? maCurrentCellPos.Tab() : 0; } SCCOL GetCurrentColCount() const { return std::min<sal_Int32>(nCurrentColCount, MAXCOL); } SCROW GetCurrentRow() const { return (maCurrentCellPos.Row() >= 0) ? maCurrentCellPos.Row() : 0; } @@ -100,14 +100,14 @@ public: bool HasDrawPage(); bool HasXShapes(); void AddOLE(com::sun::star::uno::Reference <com::sun::star::drawing::XShape>& rShape, - const rtl::OUString &rRangeList); + const OUString &rRangeList); void AddMatrixRange( const SCCOL nStartColumn, const SCROW nStartRow, const SCCOL nEndColumn, const SCROW nEndRow, - const rtl::OUString& rFormula, - const rtl::OUString& rFormulaNmsp, + const OUString& rFormula, + const OUString& rFormulaNmsp, const formula::FormulaGrammar::Grammar ); bool IsPartOfMatrix( const ScAddress& rScAddress) const; }; diff --git a/sc/source/filter/xml/xmltabi.cxx b/sc/source/filter/xml/xmltabi.cxx index f8dd920d60fd..a7f014cef506 100644 --- a/sc/source/filter/xml/xmltabi.cxx +++ b/sc/source/filter/xml/xmltabi.cxx @@ -55,7 +55,6 @@ using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Sequence; using ::com::sun::star::uno::UNO_QUERY; using ::com::sun::star::xml::sax::XAttributeList; -using ::rtl::OUString; /** * Determine whether this table is an external reference cache from its @@ -69,7 +68,7 @@ using ::rtl::OUString; * * @return */ -static bool lcl_isExternalRefCache(const rtl::OUString& rName, rtl::OUString& rUrl, rtl::OUString& rExtTabName) +static bool lcl_isExternalRefCache(const OUString& rName, OUString& rUrl, OUString& rExtTabName) { // 'file:///path/to/file.ods'#MySheet // 'file:///path/to/file.ods'#MySheet with space @@ -85,10 +84,10 @@ static bool lcl_isExternalRefCache(const rtl::OUString& rName, rtl::OUString& rU if ( eProt == INET_PROT_NOT_VALID ) return false; - rtl::OUString aPrefix = INetURLObject::GetScheme( eProt ); + OUString aPrefix = INetURLObject::GetScheme( eProt ); sal_Int32 nPrefLen = aPrefix.getLength(); - rtl::OUStringBuffer aUrlBuf, aTabNameBuf; + OUStringBuffer aUrlBuf, aTabNameBuf; aUrlBuf.append( aPrefix ); sal_Int32 n = rName.getLength(); const sal_Unicode* p = rName.getStr(); @@ -140,7 +139,7 @@ ScXMLExternalTabData::ScXMLExternalTabData() : ScXMLTableContext::ScXMLTableContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) : SvXMLImportContext( rImport, nPrfx, rLName ), @@ -153,17 +152,17 @@ ScXMLTableContext::ScXMLTableContext( ScXMLImport& rImport, nStartOffset = GetScImport().GetByteOffset(); ScXMLTabProtectionData aProtectData; - rtl::OUString sName; - rtl::OUString sStyleName; + OUString sName; + OUString sStyleName; sal_Int16 nAttrCount(xAttrList.is() ? xAttrList->getLength() : 0); const SvXMLTokenMap& rAttrTokenMap = GetScImport().GetTableAttrTokenMap(); for( sal_Int16 i=0; i < nAttrCount; ++i ) { - const rtl::OUString& sAttrName(xAttrList->getNameByIndex( i )); - rtl::OUString aLocalName; + const OUString& sAttrName(xAttrList->getNameByIndex( i )); + OUString aLocalName; sal_uInt16 nPrefix(GetScImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName )); - const rtl::OUString& sValue(xAttrList->getValueByIndex( i )); + const OUString& sValue(xAttrList->getValueByIndex( i )); switch( rAttrTokenMap.Get( nPrefix, aLocalName ) ) { @@ -197,7 +196,7 @@ ScXMLTableContext::ScXMLTableContext( ScXMLImport& rImport, } } - rtl::OUString aExtUrl, aExtTabName; + OUString aExtUrl, aExtTabName; if (lcl_isExternalRefCache(sName, aExtUrl, aExtTabName)) { // This is an external ref cache table. @@ -224,7 +223,7 @@ ScXMLTableContext::~ScXMLTableContext() } SvXMLImportContext *ScXMLTableContext::CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) { diff --git a/sc/source/filter/xml/xmltabi.hxx b/sc/source/filter/xml/xmltabi.hxx index 7476a0805d24..1caab63fcb3a 100644 --- a/sc/source/filter/xml/xmltabi.hxx +++ b/sc/source/filter/xml/xmltabi.hxx @@ -39,7 +39,7 @@ struct ScXMLExternalTabData class ScXMLTableContext : public SvXMLImportContext { - rtl::OUString sPrintRanges; + OUString sPrintRanges; ::std::auto_ptr<ScXMLExternalTabData> pExternalRefInfo; sal_Int32 nStartOffset; bool bStartFormPage; @@ -51,14 +51,14 @@ class ScXMLTableContext : public SvXMLImportContext public: ScXMLTableContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); virtual ~ScXMLTableContext(); 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 ); @@ -73,14 +73,14 @@ class ScXMLTableProtectionContext : public SvXMLImportContext public: ScXMLTableProtectionContext( ScXMLImport& rImport, sal_uInt16 nPrefix, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); virtual ~ScXMLTableProtectionContext(); 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 ); diff --git a/sc/source/filter/xml/xmlwrap.cxx b/sc/source/filter/xml/xmlwrap.cxx index 02d88a38f128..7ba722d77061 100644 --- a/sc/source/filter/xml/xmlwrap.cxx +++ b/sc/source/filter/xml/xmlwrap.cxx @@ -76,9 +76,7 @@ #define MAP_LEN(x) x, sizeof(x) - 1 using namespace com::sun::star; -using ::rtl::OUString; -using rtl::OUString; // ----------------------------------------------------------------------- @@ -109,8 +107,8 @@ uno::Reference <task::XStatusIndicator> ScXMLImportWrapper::GetStatusIndicator() sal_uInt32 ScXMLImportWrapper::ImportFromComponent(uno::Reference<lang::XMultiServiceFactory>& xServiceFactory, uno::Reference<frame::XModel>& xModel, uno::Reference<xml::sax::XParser>& xParser, xml::sax::InputSource& aParserInput, - const rtl::OUString& sComponentName, const rtl::OUString& sDocName, - const rtl::OUString& sOldDocName, uno::Sequence<uno::Any>& aArgs, + const OUString& sComponentName, const OUString& sDocName, + const OUString& sOldDocName, uno::Sequence<uno::Any>& aArgs, sal_Bool bMustBeSuccessfull) { uno::Reference < io::XStream > xDocStream; @@ -118,7 +116,7 @@ sal_uInt32 ScXMLImportWrapper::ImportFromComponent(uno::Reference<lang::XMultiSe xStorage = pMedium->GetStorage(); sal_Bool bEncrypted = false; - rtl::OUString sStream(sDocName); + OUString sStream(sDocName); if( xStorage.is() ) { try @@ -163,7 +161,7 @@ sal_uInt32 ScXMLImportWrapper::ImportFromComponent(uno::Reference<lang::XMultiSe OSL_ENSURE( xInfoSet.is(), "missing property set" ); if( xInfoSet.is() ) { - rtl::OUString sPropName("StreamName"); + OUString sPropName("StreamName"); xInfoSet->setPropertyValue( sPropName, uno::makeAny( sStream ) ); } @@ -212,9 +210,9 @@ sal_uInt32 ScXMLImportWrapper::ImportFromComponent(uno::Reference<lang::XMultiSe { #if OSL_DEBUG_LEVEL > 0 - rtl::OStringBuffer aError(RTL_CONSTASCII_STRINGPARAM( + OStringBuffer aError(RTL_CONSTASCII_STRINGPARAM( "SAX parse exception catched while importing:\n")); - aError.append(rtl::OUStringToOString(r.Message, RTL_TEXTENCODING_ASCII_US)); + aError.append(OUStringToOString(r.Message, RTL_TEXTENCODING_ASCII_US)); OSL_FAIL(aError.getStr()); #endif @@ -249,9 +247,9 @@ sal_uInt32 ScXMLImportWrapper::ImportFromComponent(uno::Reference<lang::XMultiSe { #if OSL_DEBUG_LEVEL > 0 - rtl::OStringBuffer aError(RTL_CONSTASCII_STRINGPARAM( + OStringBuffer aError(RTL_CONSTASCII_STRINGPARAM( "SAX exception catched while importing:\n")); - aError.append(rtl::OUStringToOString(r.Message, + aError.append(OUStringToOString(r.Message, RTL_TEXTENCODING_ASCII_US)); OSL_FAIL(aError.getStr()); #endif @@ -263,9 +261,9 @@ sal_uInt32 ScXMLImportWrapper::ImportFromComponent(uno::Reference<lang::XMultiSe catch( const packages::zip::ZipIOException& r ) { #if OSL_DEBUG_LEVEL > 0 - rtl::OStringBuffer aError(RTL_CONSTASCII_STRINGPARAM( + OStringBuffer aError(RTL_CONSTASCII_STRINGPARAM( "Zip exception catched while importing:\n")); - aError.append(rtl::OUStringToOString(r.Message, + aError.append(OUStringToOString(r.Message, RTL_TEXTENCODING_ASCII_US)); OSL_FAIL( aError.getStr() ); #endif @@ -276,9 +274,9 @@ sal_uInt32 ScXMLImportWrapper::ImportFromComponent(uno::Reference<lang::XMultiSe catch( const io::IOException& r ) { #if OSL_DEBUG_LEVEL > 0 - rtl::OStringBuffer aError(RTL_CONSTASCII_STRINGPARAM( + OStringBuffer aError(RTL_CONSTASCII_STRINGPARAM( "IO exception catched while importing:\n")); - aError.append(rtl::OUStringToOString(r.Message, + aError.append(OUStringToOString(r.Message, RTL_TEXTENCODING_ASCII_US)); OSL_FAIL(aError.getStr()); #endif @@ -289,9 +287,9 @@ sal_uInt32 ScXMLImportWrapper::ImportFromComponent(uno::Reference<lang::XMultiSe catch( const uno::Exception& r ) { #if OSL_DEBUG_LEVEL > 0 - rtl::OStringBuffer aError(RTL_CONSTASCII_STRINGPARAM( + OStringBuffer aError(RTL_CONSTASCII_STRINGPARAM( "uno exception catched while importing:\n")); - aError.append(rtl::OUStringToOString(r.Message, + aError.append(OUStringToOString(r.Message, RTL_TEXTENCODING_ASCII_US)); OSL_FAIL(aError.getStr()); #endif @@ -340,7 +338,7 @@ sal_Bool ScXMLImportWrapper::Import(sal_Bool bStylesOnly, ErrCode& nError) SfxObjectShell* pObjSh = rDoc.GetDocumentShell(); if ( pObjSh ) { - rtl::OUString sEmpty; + OUString sEmpty; uno::Reference<frame::XModel> xModel(pObjSh->GetModel()); /** property map for export info set */ @@ -351,9 +349,9 @@ sal_Bool ScXMLImportWrapper::Import(sal_Bool bStylesOnly, ErrCode& nError) { MAP_LEN( "ProgressCurrent" ), 0, &::getCppuType((sal_Int32*)0), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0}, { MAP_LEN( "NumberStyles" ), 0, &::getCppuType((uno::Reference<container::XNameAccess> *)0), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0}, { MAP_LEN( "PrivateData" ), 0, &::getCppuType( (uno::Reference<uno::XInterface> *)0 ), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0 }, - { MAP_LEN( "BaseURI" ), 0, &::getCppuType( (rtl::OUString *)0 ), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0 }, - { MAP_LEN( "StreamRelPath" ), 0, &::getCppuType( (rtl::OUString *)0 ), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0 }, - { MAP_LEN( "StreamName" ), 0, &::getCppuType( (rtl::OUString *)0 ), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0 }, + { MAP_LEN( "BaseURI" ), 0, &::getCppuType( (OUString *)0 ), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0 }, + { MAP_LEN( "StreamRelPath" ), 0, &::getCppuType( (OUString *)0 ), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0 }, + { MAP_LEN( "StreamName" ), 0, &::getCppuType( (OUString *)0 ), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0 }, { MAP_LEN( "BuildId" ), 0, &::getCppuType( (OUString *)0 ), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0 }, { MAP_LEN( "VBACompatibilityMode" ), 0, &::getBooleanCppuType(), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0 }, { MAP_LEN( "ScriptConfiguration" ), 0, &::getCppuType((uno::Reference<container::XNameAccess> *)0), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0}, @@ -389,13 +387,13 @@ sal_Bool ScXMLImportWrapper::Import(sal_Bool bStylesOnly, ErrCode& nError) { sal_Int32 nProgressRange(1000000); xStatusIndicator->start(ScGlobal::GetRscString(STR_LOAD_DOC), nProgressRange); - xInfoSet->setPropertyValue(rtl::OUString("ProgressRange"), uno::makeAny(nProgressRange)); + xInfoSet->setPropertyValue(OUString("ProgressRange"), uno::makeAny(nProgressRange)); } // Set base URI OSL_ENSURE( pMedium, "There is no medium to get MediaDescriptor from!\n" ); - ::rtl::OUString aBaseURL = pMedium ? pMedium->GetBaseURL() : ::rtl::OUString(); - rtl::OUString sPropName("BaseURI"); + OUString aBaseURL = pMedium ? pMedium->GetBaseURL() : OUString(); + OUString sPropName("BaseURI"); xInfoSet->setPropertyValue( sPropName, uno::makeAny( aBaseURL ) ); // TODO/LATER: do not do it for embedded links @@ -410,18 +408,18 @@ sal_Bool ScXMLImportWrapper::Import(sal_Bool bStylesOnly, ErrCode& nError) aName = pDocHierarchItem->GetValue(); } else - aName = ::rtl::OUString( "dummyObjectName" ); + aName = OUString( "dummyObjectName" ); if( !aName.isEmpty() ) { - sPropName = rtl::OUString("StreamRelPath"); + sPropName = OUString("StreamRelPath"); xInfoSet->setPropertyValue( sPropName, uno::makeAny( aName ) ); } } if (bStylesOnly) { - ::rtl::OUString const sOrganizerMode( + OUString const sOrganizerMode( RTL_CONSTASCII_USTRINGPARAM("OrganizerMode")); xInfoSet->setPropertyValue(sOrganizerMode, uno::makeAny(sal_True)); } @@ -472,8 +470,8 @@ sal_Bool ScXMLImportWrapper::Import(sal_Bool bStylesOnly, ErrCode& nError) nMetaRetval = ImportFromComponent( xServiceFactory, xModel, xXMLParser, aParserInput, - bOasis ? rtl::OUString("com.sun.star.comp.Calc.XMLOasisMetaImporter") - : rtl::OUString("com.sun.star.comp.Calc.XMLMetaImporter"), + bOasis ? OUString("com.sun.star.comp.Calc.XMLOasisMetaImporter") + : OUString("com.sun.star.comp.Calc.XMLMetaImporter"), "meta.xml", "Meta.xml", aMetaArgs, false); RTL_LOGFILE_CONTEXT_TRACE( aLog, "meta import end" ); @@ -516,8 +514,8 @@ sal_Bool ScXMLImportWrapper::Import(sal_Bool bStylesOnly, ErrCode& nError) nSettingsRetval = ImportFromComponent( xServiceFactory, xModel, xXMLParser, aParserInput, - bOasis ? rtl::OUString("com.sun.star.comp.Calc.XMLOasisSettingsImporter") - : rtl::OUString("com.sun.star.comp.Calc.XMLSettingsImporter"), + bOasis ? OUString("com.sun.star.comp.Calc.XMLOasisSettingsImporter") + : OUString("com.sun.star.comp.Calc.XMLSettingsImporter"), "settings.xml", sEmpty, aSettingsArgs, false); RTL_LOGFILE_CONTEXT_TRACE( aLog, "settings import end" ); @@ -528,9 +526,9 @@ sal_Bool ScXMLImportWrapper::Import(sal_Bool bStylesOnly, ErrCode& nError) RTL_LOGFILE_CONTEXT_TRACE( aLog, "styles import start" ); nStylesRetval = ImportFromComponent(xServiceFactory, xModel, xXMLParser, aParserInput, - bOasis ? rtl::OUString("com.sun.star.comp.Calc.XMLOasisStylesImporter") - : rtl::OUString("com.sun.star.comp.Calc.XMLStylesImporter"), - rtl::OUString("styles.xml"), + bOasis ? OUString("com.sun.star.comp.Calc.XMLOasisStylesImporter") + : OUString("com.sun.star.comp.Calc.XMLStylesImporter"), + OUString("styles.xml"), sEmpty, aStylesArgs, sal_True); RTL_LOGFILE_CONTEXT_TRACE( aLog, "styles import end" ); @@ -549,10 +547,10 @@ sal_Bool ScXMLImportWrapper::Import(sal_Bool bStylesOnly, ErrCode& nError) RTL_LOGFILE_CONTEXT_TRACE( aLog, "content import start" ); nDocRetval = ImportFromComponent(xServiceFactory, xModel, xXMLParser, aParserInput, - bOasis ? rtl::OUString("com.sun.star.comp.Calc.XMLOasisContentImporter") - : rtl::OUString("com.sun.star.comp.Calc.XMLContentImporter"), - rtl::OUString("content.xml"), - rtl::OUString("Content.xml"), aDocArgs, + bOasis ? OUString("com.sun.star.comp.Calc.XMLOasisContentImporter") + : OUString("com.sun.star.comp.Calc.XMLContentImporter"), + OUString("content.xml"), + OUString("Content.xml"), aDocArgs, sal_True); RTL_LOGFILE_CONTEXT_TRACE( aLog, "content import end" ); @@ -661,8 +659,8 @@ static bool lcl_HasValidStream(ScDocument& rDoc) sal_Bool ScXMLImportWrapper::ExportToComponent(uno::Reference<lang::XMultiServiceFactory>& xServiceFactory, uno::Reference<frame::XModel>& xModel, uno::Reference<xml::sax::XWriter>& xWriter, - uno::Sequence<beans::PropertyValue>& aDescriptor, const rtl::OUString& sName, - const rtl::OUString& sMediaType, const rtl::OUString& sComponentName, + uno::Sequence<beans::PropertyValue>& aDescriptor, const OUString& sName, + const OUString& sMediaType, const OUString& sComponentName, uno::Sequence<uno::Any>& aArgs, ScMySharedData*& pSharedData) { sal_Bool bRet(false); @@ -682,7 +680,7 @@ sal_Bool ScXMLImportWrapper::ExportToComponent(uno::Reference<lang::XMultiServic uno::Reference < beans::XPropertySet > xSet( xStream, uno::UNO_QUERY ); if (xSet.is()) { - xSet->setPropertyValue(rtl::OUString("MediaType"), uno::makeAny(sMediaType)); + xSet->setPropertyValue(OUString("MediaType"), uno::makeAny(sMediaType)); OUString aUseCommonPassPropName("UseCommonStoragePasswordEncryption"); // advise storage impl to use common encryption @@ -699,7 +697,7 @@ sal_Bool ScXMLImportWrapper::ExportToComponent(uno::Reference<lang::XMultiServic OSL_ENSURE( xInfoSet.is(), "missing property set" ); if( xInfoSet.is() ) { - rtl::OUString sPropName("StreamName"); + OUString sPropName("StreamName"); xInfoSet->setPropertyValue( sPropName, uno::makeAny( sName ) ); } @@ -805,10 +803,10 @@ sal_Bool ScXMLImportWrapper::Export(sal_Bool bStylesOnly) { MAP_LEN( "ProgressCurrent" ), 0, &::getCppuType((sal_Int32*)0), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0}, { MAP_LEN( "WrittenNumberStyles" ), 0, &::getCppuType((uno::Sequence<sal_Int32>*)0), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0}, { MAP_LEN( "UsePrettyPrinting" ), 0, &::getCppuType((sal_Bool*)0), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0}, - { MAP_LEN( "BaseURI" ), 0, &::getCppuType( (rtl::OUString *)0 ), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0 }, - { MAP_LEN( "StreamRelPath" ), 0, &::getCppuType( (rtl::OUString *)0 ), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0 }, - { MAP_LEN( "StreamName" ), 0, &::getCppuType( (rtl::OUString *)0 ), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0 }, - { MAP_LEN( "StyleNames" ), 0, &::getCppuType( (uno::Sequence<rtl::OUString>*)0 ), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0 }, + { MAP_LEN( "BaseURI" ), 0, &::getCppuType( (OUString *)0 ), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0 }, + { MAP_LEN( "StreamRelPath" ), 0, &::getCppuType( (OUString *)0 ), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0 }, + { MAP_LEN( "StreamName" ), 0, &::getCppuType( (OUString *)0 ), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0 }, + { MAP_LEN( "StyleNames" ), 0, &::getCppuType( (uno::Sequence<OUString>*)0 ), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0 }, { MAP_LEN( "StyleFamilies" ), 0, &::getCppuType( (uno::Sequence<sal_Int32>*)0 ), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0 }, { MAP_LEN( "TargetStorage" ), 0, &embed::XStorage::static_type(), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0 }, { NULL, 0, 0, NULL, 0, 0 } @@ -834,8 +832,8 @@ sal_Bool ScXMLImportWrapper::Export(sal_Bool bStylesOnly) xInfoSet->setPropertyValue( sTargetStorage, uno::Any( xStorage ) ); OSL_ENSURE( pMedium, "There is no medium to get MediaDescriptor from!\n" ); - ::rtl::OUString aBaseURL = pMedium ? pMedium->GetBaseURL( true ) : ::rtl::OUString(); - rtl::OUString sPropName("BaseURI"); + OUString aBaseURL = pMedium ? pMedium->GetBaseURL( true ) : OUString(); + OUString sPropName("BaseURI"); xInfoSet->setPropertyValue( sPropName, uno::makeAny( aBaseURL ) ); // TODO/LATER: do not do it for embedded links @@ -852,7 +850,7 @@ sal_Bool ScXMLImportWrapper::Export(sal_Bool bStylesOnly) if( !aName.isEmpty() ) { - sPropName = rtl::OUString("StreamRelPath"); + sPropName = OUString("StreamRelPath"); xInfoSet->setPropertyValue( sPropName, uno::makeAny( aName ) ); } } @@ -871,9 +869,9 @@ sal_Bool ScXMLImportWrapper::Export(sal_Bool bStylesOnly) const uno::Reference< beans::XPropertySet > xPropSet( xStorage, uno::UNO_QUERY_THROW ); try { - ::rtl::OUString aVersion; + OUString aVersion; if (( xPropSet->getPropertyValue( - rtl::OUString("Version")) >>= aVersion ) + OUString("Version")) >>= aVersion ) && !aVersion.equals(ODFVER_010_TEXT) && !aVersion.equals(ODFVER_011_TEXT) ) { @@ -902,10 +900,10 @@ sal_Bool ScXMLImportWrapper::Export(sal_Bool bStylesOnly) RTL_LOGFILE_CONTEXT_TRACE( aLog, "meta export start" ); bMetaRet = ExportToComponent(xServiceFactory, xModel, xWriter, aDescriptor, - rtl::OUString("meta.xml"), + OUString("meta.xml"), sTextMediaType, - bOasis ? rtl::OUString("com.sun.star.comp.Calc.XMLOasisMetaExporter") - : rtl::OUString("com.sun.star.comp.Calc.XMLMetaExporter"), + bOasis ? OUString("com.sun.star.comp.Calc.XMLOasisMetaExporter") + : OUString("com.sun.star.comp.Calc.XMLMetaExporter"), aMetaArgs, pSharedData); RTL_LOGFILE_CONTEXT_TRACE( aLog, "meta export end" ); @@ -943,10 +941,10 @@ sal_Bool ScXMLImportWrapper::Export(sal_Bool bStylesOnly) RTL_LOGFILE_CONTEXT_TRACE( aLog, "styles export start" ); bStylesRet = ExportToComponent(xServiceFactory, xModel, xWriter, aDescriptor, - rtl::OUString("styles.xml"), + OUString("styles.xml"), sTextMediaType, - bOasis ? rtl::OUString("com.sun.star.comp.Calc.XMLOasisStylesExporter") - : rtl::OUString("com.sun.star.comp.Calc.XMLStylesExporter"), + bOasis ? OUString("com.sun.star.comp.Calc.XMLOasisStylesExporter") + : OUString("com.sun.star.comp.Calc.XMLStylesExporter"), aStylesArgs, pSharedData); RTL_LOGFILE_CONTEXT_TRACE( aLog, "styles export end" ); @@ -967,10 +965,10 @@ sal_Bool ScXMLImportWrapper::Export(sal_Bool bStylesOnly) RTL_LOGFILE_CONTEXT_TRACE( aLog, "content export start" ); bDocRet = ExportToComponent(xServiceFactory, xModel, xWriter, aDescriptor, - rtl::OUString("content.xml"), + OUString("content.xml"), sTextMediaType, - bOasis ? rtl::OUString("com.sun.star.comp.Calc.XMLOasisContentExporter") - : rtl::OUString("com.sun.star.comp.Calc.XMLContentExporter"), + bOasis ? OUString("com.sun.star.comp.Calc.XMLOasisContentExporter") + : OUString("com.sun.star.comp.Calc.XMLContentExporter"), aDocArgs, pSharedData); RTL_LOGFILE_CONTEXT_TRACE( aLog, "content export end" ); @@ -995,10 +993,10 @@ sal_Bool ScXMLImportWrapper::Export(sal_Bool bStylesOnly) RTL_LOGFILE_CONTEXT_TRACE( aLog, "settings export start" ); bSettingsRet = ExportToComponent(xServiceFactory, xModel, xWriter, aDescriptor, - rtl::OUString("settings.xml"), + OUString("settings.xml"), sTextMediaType, - bOasis ? rtl::OUString("com.sun.star.comp.Calc.XMLOasisSettingsExporter") - : rtl::OUString("com.sun.star.comp.Calc.XMLSettingsExporter"), + bOasis ? OUString("com.sun.star.comp.Calc.XMLOasisSettingsExporter") + : OUString("com.sun.star.comp.Calc.XMLSettingsExporter"), aSettingsArgs, pSharedData); RTL_LOGFILE_CONTEXT_TRACE( aLog, "settings export end" ); |