diff options
Diffstat (limited to 'sc/source/filter/oox')
54 files changed, 32 insertions, 124 deletions
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; // ============================================================================ |