diff options
| author | Mike Kaganski <mike.kaganski@collabora.com> | 2018-11-09 15:52:14 +0300 |
|---|---|---|
| committer | Mike Kaganski <mike.kaganski@collabora.com> | 2018-11-10 09:16:53 +0100 |
| commit | e3560f4770487c8d38463fb4a9a63325abc385f9 (patch) | |
| tree | cc2ea6d5d18de966e4677ebfd846c1bf5ec5c216 /sc | |
| parent | 77e3cb338f576757fd875bc60952ac22530f6a7a (diff) | |
Replace deprecated boost::optional::reset(val) with operator =
Change-Id: I7340a561e0df0c781fd834388deb4b9f83800f9b
Reviewed-on: https://gerrit.libreoffice.org/63221
Tested-by: Jenkins
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
Diffstat (limited to 'sc')
| -rw-r--r-- | sc/source/filter/xml/xmlcelli.cxx | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/sc/source/filter/xml/xmlcelli.cxx b/sc/source/filter/xml/xmlcelli.cxx index a8b61cdfd93f..12cc4df5ae1c 100644 --- a/sc/source/filter/xml/xmlcelli.cxx +++ b/sc/source/filter/xml/xmlcelli.cxx @@ -168,7 +168,7 @@ ScXMLTableRowCellContext::ScXMLTableRowCellContext( ScXMLImport& rImport, case XML_ELEMENT( TABLE, XML_CONTENT_VALIDATION_NAME ): OSL_ENSURE(!maContentValidationName, "here should be only one Validation Name"); if (!it.isEmpty()) - maContentValidationName.reset(it.toString()); + maContentValidationName = it.toString(); break; case XML_ELEMENT( TABLE, XML_NUMBER_ROWS_SPANNED ): bIsMerged = true; @@ -240,7 +240,7 @@ ScXMLTableRowCellContext::ScXMLTableRowCellContext( ScXMLImport& rImport, if (!it.isEmpty()) { OSL_ENSURE(!maStringValue, "here should be only one string value"); - maStringValue.reset(it.toString()); + maStringValue = it.toString(); bIsEmpty = false; } } @@ -266,7 +266,7 @@ ScXMLTableRowCellContext::ScXMLTableRowCellContext( ScXMLImport& rImport, OSL_ENSURE(!maFormula, "here should be only one formula"); OUString aFormula, aFormulaNmsp; rXMLImport.ExtractFormulaNamespaceGrammar( aFormula, aFormulaNmsp, eGrammar, it.toString() ); - maFormula.reset( FormulaWithNamespace(aFormula, aFormulaNmsp) ); + maFormula = FormulaWithNamespace(aFormula, aFormulaNmsp); } } break; @@ -630,7 +630,7 @@ void ScXMLTableRowCellContext::PushParagraphEnd() } else if (mnCurParagraph == 0) { - maFirstParagraph.reset(maParagraph.makeStringAndClear()); + maFirstParagraph = maParagraph.makeStringAndClear(); mbEditEngineHasText = true; } @@ -1336,7 +1336,7 @@ void ScXMLTableRowCellContext::AddNonFormulaCell( const ScAddress& rCellPos ) if( nCellType == util::NumberFormat::TEXT ) { if( !bIsEmpty && !maStringValue && !mbEditEngineHasText && cellExists(rCellPos) && CellsAreRepeated() ) - pOUText.reset( getOutputString(rXMLImport.GetDocument(), rCellPos) ); + pOUText = getOutputString(rXMLImport.GetDocument(), rCellPos); if (!mbEditEngineHasText && !pOUText && !maStringValue) bIsEmpty = true; @@ -1525,7 +1525,7 @@ void SAL_CALL ScXMLTableRowCellContext::endFastElement(sal_Int32 /*nElement*/) HasSpecialCaseFormulaText(); if( bFormulaTextResult && (mbPossibleErrorCell || mbCheckWithCompilerForError) ) { - maStringValue.reset(GetFirstParagraph()); + maStringValue = GetFirstParagraph(); } ScAddress aCellPos = rXMLImport.GetTables().GetCurrentCellPos(); |