diff options
author | Luboš Luňák <l.lunak@suse.cz> | 2013-04-07 12:06:47 +0200 |
---|---|---|
committer | Luboš Luňák <l.lunak@suse.cz> | 2013-04-07 14:23:11 +0200 |
commit | 1946794ae09ba732022fe6a74ea45e304ab70b84 (patch) | |
tree | e32bd7ba61fa021ecc7f8c85959df8ca837d6e81 /sc/source/filter/xml/xmlcelli.cxx | |
parent | 5b08c6e7a21dda94d5b755eea0b1ed1e9c199bec (diff) |
mass removal of rtl:: prefixes for O(U)String*
Modules sal, salhelper, cppu, cppuhelper, codemaker (selectively) and odk
have kept them, in order not to break external API (the automatic using declaration
is LO-internal).
Change-Id: I588fc9e0c45b914f824f91c0376980621d730f09
Diffstat (limited to 'sc/source/filter/xml/xmlcelli.cxx')
-rw-r--r-- | sc/source/filter/xml/xmlcelli.cxx | 24 |
1 files changed, 12 insertions, 12 deletions
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 ) { |