diff options
Diffstat (limited to 'sc')
| -rw-r--r-- | sc/source/core/data/table6.cxx | 6 | ||||
| -rw-r--r-- | sc/source/ui/undo/undoblk3.cxx | 2 | ||||
| -rw-r--r-- | sc/source/ui/unoobj/srchuno.cxx | 4 | ||||
| -rw-r--r-- | sc/source/ui/vba/vbarange.cxx | 10 |
4 files changed, 11 insertions, 11 deletions
diff --git a/sc/source/core/data/table6.cxx b/sc/source/core/data/table6.cxx index a5b7192f4673..3c24c8fd7c20 100644 --- a/sc/source/core/data/table6.cxx +++ b/sc/source/core/data/table6.cxx @@ -77,7 +77,7 @@ bool ScTable::SearchCell(const SvxSearchItem& rSearchItem, SCCOL nCol, SCROW nRo CellType eCellType = aCell.meType; switch (rSearchItem.GetCellType()) { - case SVX_SEARCHIN_FORMULA: + case SvxSearchCellType::FORMULA: { if ( eCellType == CELLTYPE_FORMULA ) aCell.mpFormula->GetFormula(aString, pDocument->GetGrammar()); @@ -89,7 +89,7 @@ bool ScTable::SearchCell(const SvxSearchItem& rSearchItem, SCCOL nCol, SCROW nRo } } break; - case SVX_SEARCHIN_VALUE: + case SvxSearchCellType::VALUE: if ( eCellType == CELLTYPE_EDIT ) bMultiLine = lcl_GetTextWithBreaks(*aCell.mpEditText, pDocument, aString); else @@ -97,7 +97,7 @@ bool ScTable::SearchCell(const SvxSearchItem& rSearchItem, SCCOL nCol, SCROW nRo aCol[nCol].GetInputString( nRow, aString ); } break; - case SVX_SEARCHIN_NOTE: + case SvxSearchCellType::NOTE: break; // don't search this case here default: break; diff --git a/sc/source/ui/undo/undoblk3.cxx b/sc/source/ui/undo/undoblk3.cxx index 5b765052d421..c403ab43d0d1 100644 --- a/sc/source/ui/undo/undoblk3.cxx +++ b/sc/source/ui/undo/undoblk3.cxx @@ -1012,7 +1012,7 @@ void ScUndoReplace::Undo() SC_FOLLOW_JUMP, false, false ); pDocShell->PostPaintGridAll(); } - else if (pSearchItem->GetCellType() == SVX_SEARCHIN_NOTE) + else if (pSearchItem->GetCellType() == SvxSearchCellType::NOTE) { ScPostIt* pNote = rDoc.GetNote(aCursorPos); OSL_ENSURE( pNote, "ScUndoReplace::Undo - cell does not contain a note" ); diff --git a/sc/source/ui/unoobj/srchuno.cxx b/sc/source/ui/unoobj/srchuno.cxx index 2a8b6a59d893..072ff437d798 100644 --- a/sc/source/ui/unoobj/srchuno.cxx +++ b/sc/source/ui/unoobj/srchuno.cxx @@ -82,7 +82,7 @@ ScCellSearchObj::ScCellSearchObj() : pSearchItem->SetLEVLonger(2); // Calc-Flags pSearchItem->SetRowDirection(false); - pSearchItem->SetCellType(SVX_SEARCHIN_FORMULA); + pSearchItem->SetCellType(SvxSearchCellType::FORMULA); // Selection-Flag wird beim Aufruf gesetzt } @@ -153,7 +153,7 @@ void SAL_CALL ScCellSearchObj::setPropertyValue( else if (aString == SC_UNO_SRCHSIMADD) pSearchItem->SetLEVLonger( ScUnoHelpFunctions::GetInt16FromAny( aValue ) ); else if (aString == SC_UNO_SRCHSIMEX) pSearchItem->SetLEVOther( ScUnoHelpFunctions::GetInt16FromAny( aValue ) ); else if (aString == SC_UNO_SRCHSIMREM) pSearchItem->SetLEVShorter( ScUnoHelpFunctions::GetInt16FromAny( aValue ) ); - else if (aString == SC_UNO_SRCHTYPE) pSearchItem->SetCellType( ScUnoHelpFunctions::GetInt16FromAny( aValue ) ); + else if (aString == SC_UNO_SRCHTYPE) pSearchItem->SetCellType( static_cast<SvxSearchCellType>(ScUnoHelpFunctions::GetInt16FromAny( aValue )) ); else if (aString == SC_UNO_SRCHFILTERED) pSearchItem->SetSearchFiltered( ScUnoHelpFunctions::GetBoolFromAny(aValue) ); } diff --git a/sc/source/ui/vba/vbarange.cxx b/sc/source/ui/vba/vbarange.cxx index 7cd73f319593..d371e949bf75 100644 --- a/sc/source/ui/vba/vbarange.cxx +++ b/sc/source/ui/vba/vbarange.cxx @@ -3182,23 +3182,23 @@ ScVbaRange::Find( const uno::Any& What, const uno::Any& After, const uno::Any& L sal_Int32 nLookIn = 0; if( LookIn >>= nLookIn ) { - sal_Int16 nSearchType = 0; + SvxSearchCellType nSearchType; switch( nLookIn ) { case excel::XlFindLookIn::xlComments : - nSearchType = SVX_SEARCHIN_NOTE; // Notes + nSearchType = SvxSearchCellType::NOTE; // Notes break; case excel::XlFindLookIn::xlFormulas : - nSearchType = SVX_SEARCHIN_FORMULA; + nSearchType = SvxSearchCellType::FORMULA; break; case excel::XlFindLookIn::xlValues : - nSearchType = SVX_SEARCHIN_VALUE; + nSearchType = SvxSearchCellType::VALUE; break; default: throw uno::RuntimeException("Range::Replace, illegal value for LookIn." ); } newOptions.SetCellType( nSearchType ); - xDescriptor->setPropertyValue( "SearchType", uno::makeAny( nSearchType ) ); + xDescriptor->setPropertyValue( "SearchType", uno::makeAny( static_cast<sal_uInt16>(nSearchType) ) ); } } |