diff options
Diffstat (limited to 'sc')
25 files changed, 99 insertions, 98 deletions
diff --git a/sc/inc/editutil.hxx b/sc/inc/editutil.hxx index 6734ff741f2c..c033415e7733 100644 --- a/sc/inc/editutil.hxx +++ b/sc/inc/editutil.hxx @@ -212,8 +212,8 @@ public: void SetExecuteURL(bool bSet) { bExecuteURL = bSet; } - virtual void FieldClicked( const SvxFieldItem& rField, sal_uInt16, sal_uInt16 ); - virtual OUString CalcFieldValue( const SvxFieldItem& rField, sal_uInt16 nPara, sal_uInt16 nPos, Color*& rTxtColor, Color*& rFldColor ); + virtual void FieldClicked( const SvxFieldItem& rField, sal_Int32, sal_uInt16 ); + virtual OUString CalcFieldValue( const SvxFieldItem& rField, sal_Int32 nPara, sal_uInt16 nPos, Color*& rTxtColor, Color*& rFldColor ); }; @@ -225,7 +225,7 @@ private: public: ScHeaderEditEngine( SfxItemPool* pEnginePool, sal_Bool bDeleteEnginePool = false ); - virtual OUString CalcFieldValue( const SvxFieldItem& rField, sal_uInt16 nPara, sal_uInt16 nPos, Color*& rTxtColor, Color*& rFldColor ); + virtual OUString CalcFieldValue( const SvxFieldItem& rField, sal_Int32 nPara, sal_uInt16 nPos, Color*& rTxtColor, Color*& rFldColor ); void SetNumType(SvxNumType eNew) { aData.eNumType = eNew; } void SetData(const ScHeaderFieldData& rNew) { aData = rNew; } diff --git a/sc/qa/unit/subsequent_filters-test.cxx b/sc/qa/unit/subsequent_filters-test.cxx index 504fc4f6e7a2..82bbbb4abb2b 100644 --- a/sc/qa/unit/subsequent_filters-test.cxx +++ b/sc/qa/unit/subsequent_filters-test.cxx @@ -1574,7 +1574,7 @@ void ScFiltersTest::testRichTextContentODS() CPPUNIT_ASSERT_EQUAL(CELLTYPE_EDIT, pDoc->GetCellType(aPos)); const EditTextObject* pEditText = pDoc->GetEditText(aPos); CPPUNIT_ASSERT_MESSAGE("Failed to retrieve edit text object.", pEditText); - CPPUNIT_ASSERT_EQUAL(static_cast<size_t>(3), pEditText->GetParagraphCount()); + CPPUNIT_ASSERT_EQUAL(static_cast<sal_Int32>(3), pEditText->GetParagraphCount()); OUString aParaText = pEditText->GetText(0); CPPUNIT_ASSERT_EQUAL(OUString("one"), aParaText); aParaText = pEditText->GetText(1); @@ -1587,7 +1587,7 @@ void ScFiltersTest::testRichTextContentODS() CPPUNIT_ASSERT_EQUAL(CELLTYPE_EDIT, pDoc->GetCellType(aPos)); pEditText = pDoc->GetEditText(aPos); CPPUNIT_ASSERT_MESSAGE("Failed to retrieve edit text object.", pEditText); - CPPUNIT_ASSERT_EQUAL(static_cast<size_t>(1), pEditText->GetParagraphCount()); + CPPUNIT_ASSERT_EQUAL(static_cast<sal_Int32>(1), pEditText->GetParagraphCount()); aParaText = pEditText->GetText(0); CPPUNIT_ASSERT_MESSAGE("Unexpected text.", aParaText.indexOf("Sheet name is ") == 0); CPPUNIT_ASSERT_MESSAGE("Sheet name field item not found.", pEditText->HasField(text::textfield::Type::TABLE)); @@ -1597,7 +1597,7 @@ void ScFiltersTest::testRichTextContentODS() CPPUNIT_ASSERT_EQUAL(CELLTYPE_EDIT, pDoc->GetCellType(aPos)); pEditText = pDoc->GetEditText(aPos); CPPUNIT_ASSERT_MESSAGE("Failed to retrieve edit text object.", pEditText); - CPPUNIT_ASSERT_EQUAL(static_cast<size_t>(1), pEditText->GetParagraphCount()); + CPPUNIT_ASSERT_EQUAL(static_cast<sal_Int32>(1), pEditText->GetParagraphCount()); aParaText = pEditText->GetText(0); CPPUNIT_ASSERT_MESSAGE("Unexpected text.", aParaText.indexOf("URL: ") == 0); CPPUNIT_ASSERT_MESSAGE("URL field item not found.", pEditText->HasField(text::textfield::Type::URL)); @@ -1607,7 +1607,7 @@ void ScFiltersTest::testRichTextContentODS() CPPUNIT_ASSERT_EQUAL(CELLTYPE_EDIT, pDoc->GetCellType(aPos)); pEditText = pDoc->GetEditText(aPos); CPPUNIT_ASSERT_MESSAGE("Failed to retrieve edit text object.", pEditText); - CPPUNIT_ASSERT_EQUAL(static_cast<size_t>(1), pEditText->GetParagraphCount()); + CPPUNIT_ASSERT_EQUAL(static_cast<sal_Int32>(1), pEditText->GetParagraphCount()); aParaText = pEditText->GetText(0); CPPUNIT_ASSERT_MESSAGE("Unexpected text.", aParaText.indexOf("Date: ") == 0); CPPUNIT_ASSERT_MESSAGE("Date field item not found.", pEditText->HasField(text::textfield::Type::DATE)); @@ -1617,7 +1617,7 @@ void ScFiltersTest::testRichTextContentODS() CPPUNIT_ASSERT_EQUAL(CELLTYPE_EDIT, pDoc->GetCellType(aPos)); pEditText = pDoc->GetEditText(aPos); CPPUNIT_ASSERT_MESSAGE("Failed to retrieve edit text object.", pEditText); - CPPUNIT_ASSERT_EQUAL(static_cast<size_t>(1), pEditText->GetParagraphCount()); + CPPUNIT_ASSERT_EQUAL(static_cast<sal_Int32>(1), pEditText->GetParagraphCount()); aParaText = pEditText->GetText(0); CPPUNIT_ASSERT_MESSAGE("Unexpected text.", aParaText.indexOf("Title: ") == 0); CPPUNIT_ASSERT_MESSAGE("DocInfo title field item not found.", pEditText->HasField(text::textfield::Type::DOCINFO_TITLE)); @@ -1627,7 +1627,7 @@ void ScFiltersTest::testRichTextContentODS() CPPUNIT_ASSERT_EQUAL(CELLTYPE_EDIT, pDoc->GetCellType(aPos)); pEditText = pDoc->GetEditText(aPos); CPPUNIT_ASSERT_MESSAGE("Failed to retrieve edit text object.", pEditText); - CPPUNIT_ASSERT_EQUAL(static_cast<size_t>(1), pEditText->GetParagraphCount()); + CPPUNIT_ASSERT_EQUAL(static_cast<sal_Int32>(1), pEditText->GetParagraphCount()); aParaText = pEditText->GetText(0); CPPUNIT_ASSERT_EQUAL(OUString("Sentence with bold and italic."), aParaText); std::vector<EECharAttrib> aAttribs; @@ -1659,7 +1659,7 @@ void ScFiltersTest::testRichTextContentODS() CPPUNIT_ASSERT_EQUAL(CELLTYPE_EDIT, pDoc->GetCellType(aPos)); pEditText = pDoc->GetEditText(aPos); CPPUNIT_ASSERT_MESSAGE("Failed to retrieve edit text object.", pEditText); - CPPUNIT_ASSERT_EQUAL(static_cast<size_t>(3), pEditText->GetParagraphCount()); + CPPUNIT_ASSERT_EQUAL(static_cast<sal_Int32>(3), pEditText->GetParagraphCount()); aParaText = pEditText->GetText(0); CPPUNIT_ASSERT_EQUAL(OUString("bold"), aParaText); aParaText = pEditText->GetText(1); diff --git a/sc/source/core/data/attrib.cxx b/sc/source/core/data/attrib.cxx index 363c609fdd83..c1aec8ed40de 100644 --- a/sc/source/core/data/attrib.cxx +++ b/sc/source/core/data/attrib.cxx @@ -753,8 +753,8 @@ static void lcl_SetSpace( String& rStr, const ESelection& rSel ) static bool lcl_ConvertFields(EditEngine& rEng, const String* pCommands) { bool bChange = false; - sal_uInt16 nParCnt = rEng.GetParagraphCount(); - for (sal_uInt16 nPar = 0; nPar<nParCnt; nPar++) + sal_Int32 nParCnt = rEng.GetParagraphCount(); + for (sal_Int32 nPar = 0; nPar<nParCnt; nPar++) { String aStr = rEng.GetText( nPar ); xub_StrLen nPos; diff --git a/sc/source/core/data/cellvalue.cxx b/sc/source/core/data/cellvalue.cxx index 17a426278679..75362ba7bfc2 100644 --- a/sc/source/core/data/cellvalue.cxx +++ b/sc/source/core/data/cellvalue.cxx @@ -41,8 +41,8 @@ OUString getString( const _T& rVal ) if (rVal.meType == CELLTYPE_EDIT) { OUStringBuffer aRet; - size_t n = rVal.mpEditText->GetParagraphCount(); - for (size_t i = 0; i < n; ++i) + sal_Int32 n = rVal.mpEditText->GetParagraphCount(); + for (sal_Int32 i = 0; i < n; ++i) { if (i > 0) aRet.append('\n'); diff --git a/sc/source/core/data/column2.cxx b/sc/source/core/data/column2.cxx index 9fcf5aac7e0f..6281360f5c1b 100644 --- a/sc/source/core/data/column2.cxx +++ b/sc/source/core/data/column2.cxx @@ -963,8 +963,8 @@ void ScColumn::RemoveEditAttribs( SCROW nStartRow, SCROW nEndRow ) pDocument->ApplyAsianEditSettings( *pEngine ); } pEngine->SetText( *pData ); - sal_uInt16 nParCount = pEngine->GetParagraphCount(); - for (sal_uInt16 nPar=0; nPar<nParCount; nPar++) + sal_Int32 nParCount = pEngine->GetParagraphCount(); + for (sal_Int32 nPar=0; nPar<nParCount; nPar++) { pEngine->QuickRemoveCharAttribs( nPar ); const SfxItemSet& rOld = pEngine->GetParaAttribs( nPar ); diff --git a/sc/source/core/data/documen8.cxx b/sc/source/core/data/documen8.cxx index f8742e0adc0f..9eefd8f00565 100644 --- a/sc/source/core/data/documen8.cxx +++ b/sc/source/core/data/documen8.cxx @@ -1640,7 +1640,7 @@ void ScDocument::TransliterateText( const ScMarkData& rMultiMark, sal_Int32 nTyp pEngine->ClearModifyFlag(); - sal_uInt16 nLastPar = pEngine->GetParagraphCount(); + sal_Int32 nLastPar = pEngine->GetParagraphCount(); if (nLastPar) --nLastPar; xub_StrLen nTxtLen = pEngine->GetTextLen(nLastPar); diff --git a/sc/source/core/data/global.cxx b/sc/source/core/data/global.cxx index 7d31f6f8d9ba..95084a94f71d 100644 --- a/sc/source/core/data/global.cxx +++ b/sc/source/core/data/global.cxx @@ -899,10 +899,10 @@ sal_Bool ScGlobal::EETextObjEqual( const EditTextObject* pObj1, if ( pObj1 && pObj2 ) { // first test for equal text content - sal_uInt16 nParCount = pObj1->GetParagraphCount(); + sal_Int32 nParCount = pObj1->GetParagraphCount(); if ( nParCount != pObj2->GetParagraphCount() ) return false; - for (sal_uInt16 nPar=0; nPar<nParCount; nPar++) + for (sal_Int32 nPar=0; nPar<nParCount; nPar++) if ( pObj1->GetText(nPar) != pObj2->GetText(nPar) ) return false; diff --git a/sc/source/core/data/postit.cxx b/sc/source/core/data/postit.cxx index cff5084ddf0a..3c03746db1d2 100644 --- a/sc/source/core/data/postit.cxx +++ b/sc/source/core/data/postit.cxx @@ -556,7 +556,7 @@ OUString ScPostIt::GetText() const if( const EditTextObject* pEditObj = GetEditTextObject() ) { OUStringBuffer aBuffer; - for( sal_uInt16 nPara = 0, nParaCount = pEditObj->GetParagraphCount(); nPara < nParaCount; ++nPara ) + for( sal_Int32 nPara = 0, nParaCount = pEditObj->GetParagraphCount(); nPara < nParaCount; ++nPara ) { if( nPara > 0 ) aBuffer.append( sal_Unicode( '\n' ) ); diff --git a/sc/source/core/tool/editutil.cxx b/sc/source/core/tool/editutil.cxx index 2659625db59b..a004d8650477 100644 --- a/sc/source/core/tool/editutil.cxx +++ b/sc/source/core/tool/editutil.cxx @@ -71,8 +71,8 @@ String ScEditUtil::ModifyDelimiters( const String& rOld ) static String lcl_GetDelimitedString( const EditEngine& rEngine, const sal_Char c ) { String aRet; - sal_uInt16 nParCount = rEngine.GetParagraphCount(); - for (sal_uInt16 nPar=0; nPar<nParCount; nPar++) + sal_Int32 nParCount = rEngine.GetParagraphCount(); + for (sal_Int32 nPar=0; nPar<nParCount; nPar++) { if (nPar > 0) aRet += c; @@ -94,8 +94,8 @@ String ScEditUtil::GetMultilineString( const EditEngine& rEngine ) OUString ScEditUtil::GetString( const EditTextObject& rEditText ) { OUStringBuffer aRet; - size_t n = rEditText.GetParagraphCount(); - for (size_t i = 0; i < n; ++i) + sal_Int32 n = rEditText.GetParagraphCount(); + for (sal_Int32 i = 0; i < n; ++i) { if (i > 0) aRet.append('\n'); @@ -109,7 +109,8 @@ EditTextObject* ScEditUtil::CreateURLObjectFromURL( ScDocument& rDoc, const OUSt SvxURLField aUrlField( rURL, rText, SVXURLFORMAT_APPDEFAULT); EditEngine& rEE = rDoc.GetEditEngine(); rEE.SetText( EMPTY_OUSTRING ); - rEE.QuickInsertField( SvxFieldItem( aUrlField, EE_FEATURE_FIELD ), ESelection( 0xFFFF, 0xFFFF ) ); + rEE.QuickInsertField( SvxFieldItem( aUrlField, EE_FEATURE_FIELD ), + ESelection( EE_PARA_MAX_COUNT, EE_TEXTPOS_MAX_COUNT ) ); return rEE.CreateTextObject(); } @@ -370,8 +371,8 @@ void ScEditEngineDefaulter::SetDefaults( const SfxItemSet& rSet, sal_Bool bRemem sal_Bool bUpdateMode = GetUpdateMode(); if ( bUpdateMode ) SetUpdateMode( false ); - sal_uInt16 nPara = GetParagraphCount(); - for ( sal_uInt16 j=0; j<nPara; j++ ) + sal_Int32 nPara = GetParagraphCount(); + for ( sal_Int32 j=0; j<nPara; j++ ) { SetParaAttribs( j, rNewSet ); } @@ -491,8 +492,8 @@ void ScEditEngineDefaulter::RepeatDefaults() { if ( pDefaults ) { - sal_uInt16 nPara = GetParagraphCount(); - for ( sal_uInt16 j=0; j<nPara; j++ ) + sal_Int32 nPara = GetParagraphCount(); + for ( sal_Int32 j=0; j<nPara; j++ ) SetParaAttribs( j, *pDefaults ); } } @@ -503,8 +504,8 @@ void ScEditEngineDefaulter::RemoveParaAttribs() sal_Bool bUpdateMode = GetUpdateMode(); if ( bUpdateMode ) SetUpdateMode( false ); - sal_uInt16 nParCount = GetParagraphCount(); - for (sal_uInt16 nPar=0; nPar<nParCount; nPar++) + sal_Int32 nParCount = GetParagraphCount(); + for (sal_Int32 nPar=0; nPar<nParCount; nPar++) { const SfxItemSet& rParaAttribs = GetParaAttribs( nPar ); sal_uInt16 nWhich; @@ -680,7 +681,7 @@ ScHeaderEditEngine::ScHeaderEditEngine( SfxItemPool* pEnginePoolP, sal_Bool bDel } OUString ScHeaderEditEngine::CalcFieldValue( const SvxFieldItem& rField, - sal_uInt16 /* nPara */, sal_uInt16 /* nPos */, + sal_Int32 /* nPara */, sal_uInt16 /* nPos */, Color*& /* rTxtColor */, Color*& /* rFldColor */ ) { const SvxFieldData* pFieldData = rField.GetField(); @@ -750,7 +751,7 @@ ScFieldEditEngine::ScFieldEditEngine( } OUString ScFieldEditEngine::CalcFieldValue( const SvxFieldItem& rField, - sal_uInt16 /* nPara */, sal_uInt16 /* nPos */, + sal_Int32 /* nPara */, sal_uInt16 /* nPos */, Color*& rTxtColor, Color*& /* rFldColor */ ) { OUString aRet; @@ -827,7 +828,7 @@ OUString ScFieldEditEngine::CalcFieldValue( const SvxFieldItem& rField, return aRet; } -void ScFieldEditEngine::FieldClicked( const SvxFieldItem& rField, sal_uInt16, sal_uInt16 ) +void ScFieldEditEngine::FieldClicked( const SvxFieldItem& rField, sal_Int32, sal_uInt16 ) { const SvxFieldData* pFld = rField.GetField(); diff --git a/sc/source/filter/excel/xehelper.cxx b/sc/source/filter/excel/xehelper.cxx index a56fdc390a50..dc05fdac8635 100644 --- a/sc/source/filter/excel/xehelper.cxx +++ b/sc/source/filter/excel/xehelper.cxx @@ -436,8 +436,8 @@ XclExpStringRef lclCreateFormattedString( sal_Int16 nLastScript = XclExpStringHelper::GetLeadingScriptType( rRoot, rEE.GetText() ); // process all paragraphs - sal_uInt16 nParaCount = rEE.GetParagraphCount(); - for( sal_uInt16 nPara = 0; nPara < nParaCount; ++nPara ) + sal_Int32 nParaCount = rEE.GetParagraphCount(); + for( sal_Int32 nPara = 0; nPara < nParaCount; ++nPara ) { ESelection aSel( nPara, 0 ); String aParaText( rEE.GetText( nPara ) ); @@ -709,8 +709,8 @@ void XclExpHFConverter::AppendPortion( const EditTextObject* pTextObj, sal_Unico pFontList = pInfoItem->GetFontList(); } - sal_uInt16 nParaCount = mrEE.GetParagraphCount(); - for( sal_uInt16 nPara = 0; nPara < nParaCount; ++nPara ) + sal_Int32 nParaCount = mrEE.GetParagraphCount(); + for( sal_Int32 nPara = 0; nPara < nParaCount; ++nPara ) { ESelection aSel( nPara, 0 ); String aParaText; diff --git a/sc/source/filter/excel/xicontent.cxx b/sc/source/filter/excel/xicontent.cxx index 0f423ef5bc13..e9430bf75e4d 100644 --- a/sc/source/filter/excel/xicontent.cxx +++ b/sc/source/filter/excel/xicontent.cxx @@ -173,7 +173,7 @@ void lclInsertUrl( const XclImpRoot& rRoot, const String& rUrl, SCCOL nScCol, SC if( pEditObj ) { rEE.SetText( *pEditObj ); - rEE.QuickInsertField( SvxFieldItem( aUrlField, EE_FEATURE_FIELD ), ESelection( 0, 0, 0xFFFF, 0 ) ); + rEE.QuickInsertField( SvxFieldItem( aUrlField, EE_FEATURE_FIELD ), ESelection( 0, 0, EE_PARA_ALL, 0 ) ); } else { @@ -183,7 +183,7 @@ void lclInsertUrl( const XclImpRoot& rRoot, const String& rUrl, SCCOL nScCol, SC { SfxItemSet aItemSet( rEE.GetEmptyItemSet() ); pPattern->FillEditItemSet( &aItemSet ); - rEE.QuickSetAttribs( aItemSet, ESelection( 0, 0, 0xFFFF, 0 ) ); + rEE.QuickSetAttribs( aItemSet, ESelection( 0, 0, EE_PARA_ALL, 0 ) ); } } diff --git a/sc/source/filter/html/htmlexp.cxx b/sc/source/filter/html/htmlexp.cxx index 424f1d9a43a4..af79ad720337 100644 --- a/sc/source/filter/html/htmlexp.cxx +++ b/sc/source/filter/html/htmlexp.cxx @@ -1195,7 +1195,7 @@ bool ScHTMLExport::WriteFieldText( const EditTextObject* pData ) // text and anchor of URL fields, Doc-Engine is a ScFieldEditEngine EditEngine& rEngine = pDoc->GetEditEngine(); rEngine.SetText( *pData ); - sal_uInt16 nParas = rEngine.GetParagraphCount(); + sal_Int32 nParas = rEngine.GetParagraphCount(); if ( nParas ) { ESelection aSel( 0, 0, nParas-1, rEngine.GetTextLen( nParas-1 ) ); @@ -1208,7 +1208,7 @@ bool ScHTMLExport::WriteFieldText( const EditTextObject* pData ) { sal_Bool bOldUpdateMode = rEngine.GetUpdateMode(); rEngine.SetUpdateMode( sal_True ); // no portions if not formatted - for ( sal_uInt16 nPar=0; nPar < nParas; nPar++ ) + for ( sal_Int32 nPar=0; nPar < nParas; nPar++ ) { if ( nPar > 0 ) TAG_ON( OOO_STRING_SVTOOLS_HTML_linebreak ); diff --git a/sc/source/filter/xml/xmlcelli.hxx b/sc/source/filter/xml/xmlcelli.hxx index 6874e5e4e9de..45017c45c38d 100644 --- a/sc/source/filter/xml/xmlcelli.hxx +++ b/sc/source/filter/xml/xmlcelli.hxx @@ -66,7 +66,7 @@ class ScXMLTableRowCellContext : public ScXMLImportContext ScEditEngineDefaulter* mpEditEngine; OUStringBuffer maParagraph; - sal_uInt16 mnCurParagraph; + sal_Int32 mnCurParagraph; ParaFormatsType maFormats; FieldsType maFields; diff --git a/sc/source/ui/app/inputhdl.cxx b/sc/source/ui/app/inputhdl.cxx index e06b4c8962d5..b3bd84a5ba26 100644 --- a/sc/source/ui/app/inputhdl.cxx +++ b/sc/source/ui/app/inputhdl.cxx @@ -813,7 +813,7 @@ void ScInputHandler::ShowTipCursor() if ( bFormulaMode && pActiveView && pFormulaDataPara && pEngine->GetParagraphCount() == 1 ) { - String aFormula = pEngine->GetText( (sal_uInt16) 0 ); + String aFormula = pEngine->GetText( 0 ); ESelection aSel = pActiveView->GetSelection(); aSel.Adjust(); if( aSel.nEndPos ) @@ -1040,7 +1040,7 @@ void ScInputHandler::UseFormulaData() // Formeln duerfen nur 1 Absatz haben if ( pActiveView && pFormulaData && pEngine->GetParagraphCount() == 1 ) { - String aTotal = pEngine->GetText( (sal_uInt16) 0 ); + String aTotal = pEngine->GetText( 0 ); ESelection aSel = pActiveView->GetSelection(); aSel.Adjust(); @@ -1247,7 +1247,7 @@ static void lcl_CompleteFunction( EditView* pView, const String& rInsert, bool& // schon eine Klammer steht (z.B. wenn der Funktionsname geaendert wurde). ESelection aWordSel = pView->GetSelection(); - String aOld = pView->GetEditEngine()->GetText((sal_uInt16)0); + String aOld = pView->GetEditEngine()->GetText(0); sal_Unicode cNext = aOld.GetChar(aWordSel.nEndPos); if ( cNext == '(' ) { @@ -1384,7 +1384,7 @@ void ScInputHandler::FormulaPreview() { String aPart = pActiveView->GetSelected(); if (!aPart.Len()) - aPart = pEngine->GetText((sal_uInt16)0); + aPart = pEngine->GetText(0); ScDocument* pDoc = pActiveViewSh->GetViewData()->GetDocShell()->GetDocument(); aValue = lcl_Calculate( aPart, pDoc, aCursorPos ); } @@ -1481,7 +1481,7 @@ bool ScInputHandler::CursorAtClosingPar() { ESelection aSel = pActiveView->GetSelection(); xub_StrLen nPos = aSel.nStartPos; - String aFormula = pEngine->GetText((sal_uInt16)0); + String aFormula = pEngine->GetText(0); if ( nPos < aFormula.Len() && aFormula.GetChar(nPos) == ')' ) return true; } @@ -1549,7 +1549,7 @@ void ScInputHandler::UseColData() // beim Tippen ESelection aSel = pActiveView->GetSelection(); aSel.Adjust(); - sal_uInt16 nParCnt = pEngine->GetParagraphCount(); + sal_Int32 nParCnt = pEngine->GetParagraphCount(); if ( aSel.nEndPara+1 == nParCnt ) { xub_StrLen nParLen = pEngine->GetTextLen( aSel.nEndPara ); @@ -1624,7 +1624,7 @@ void ScInputHandler::NextAutoEntry( bool bBack ) ESelection aSel = pActiveView->GetSelection(); aSel.Adjust(); - sal_uInt16 nParCnt = pEngine->GetParagraphCount(); + sal_Int32 nParCnt = pEngine->GetParagraphCount(); if ( aSel.nEndPara+1 == nParCnt && aSel.nStartPara == aSel.nEndPara ) { OUString aText = GetEditText(pEngine); @@ -1697,7 +1697,7 @@ void ScInputHandler::UpdateParenthesis() // Das Zeichen links vom Cursor wird angeschaut xub_StrLen nPos = aSel.nStartPos - 1; - String aFormula = pEngine->GetText((sal_uInt16)0); + String aFormula = pEngine->GetText(0); sal_Unicode c = aFormula.GetChar(nPos); if ( c == '(' || c == ')' ) { @@ -1711,8 +1711,8 @@ void ScInputHandler::UpdateParenthesis() if (bParenthesisShown) { // alte Hervorhebung wegnehmen - sal_uInt16 nCount = pEngine->GetParagraphCount(); - for (sal_uInt16 i=0; i<nCount; i++) + sal_Int32 nCount = pEngine->GetParagraphCount(); + for (sal_Int32 i=0; i<nCount; i++) pEngine->QuickRemoveCharAttribs( i, EE_CHAR_WEIGHT ); } @@ -1738,8 +1738,8 @@ void ScInputHandler::UpdateParenthesis() if ( bParenthesisShown && !bFound && pTableView ) { - sal_uInt16 nCount = pEngine->GetParagraphCount(); - for (sal_uInt16 i=0; i<nCount; i++) + sal_Int32 nCount = pEngine->GetParagraphCount(); + for (sal_Int32 i=0; i<nCount; i++) pTableView->RemoveCharAttribs( i, EE_CHAR_WEIGHT ); } @@ -1910,8 +1910,8 @@ void ScInputHandler::RemoveRangeFinder() // pRangeFindList und Farben loeschen pEngine->SetUpdateMode(false); - sal_uInt16 nCount = pEngine->GetParagraphCount(); // koennte gerade neu eingefuegt worden sein - for (sal_uInt16 i=0; i<nCount; i++) + sal_Int32 nCount = pEngine->GetParagraphCount(); // koennte gerade neu eingefuegt worden sein + for (sal_Int32 i=0; i<nCount; i++) pEngine->QuickRemoveCharAttribs( i, EE_CHAR_COLOR ); pEngine->SetUpdateMode(true); @@ -2101,7 +2101,7 @@ static void lcl_SetTopSelection( EditView* pEditView, ESelection& rSel ) OSL_ENSURE( rSel.nStartPara==0 && rSel.nEndPara==0, "SetTopSelection: Para != 0" ); EditEngine* pEngine = pEditView->GetEditEngine(); - sal_uInt16 nCount = pEngine->GetParagraphCount(); + sal_Int32 nCount = pEngine->GetParagraphCount(); if (nCount > 1) { xub_StrLen nParLen = pEngine->GetTextLen(rSel.nStartPara); @@ -2261,9 +2261,9 @@ void ScInputHandler::UpdateFormulaMode() SfxApplication* pSfxApp = SFX_APP(); if ( pEngine->GetParagraphCount() == 1 && - ( pEngine->GetText((sal_uInt16)0).GetChar(0) == '=' || - pEngine->GetText((sal_uInt16)0).GetChar(0) == '+' || - pEngine->GetText((sal_uInt16)0).GetChar(0) == '-' ) && + ( pEngine->GetText(0).GetChar(0) == '=' || + pEngine->GetText(0).GetChar(0) == '+' || + pEngine->GetText(0).GetChar(0) == '-' ) && !bProtected ) { if (!bFormulaMode) @@ -2412,7 +2412,7 @@ void ScInputHandler::SetMode( ScInputMode eNewMode ) } } - sal_uInt16 nPara = pEngine->GetParagraphCount()-1; + sal_Int32 nPara = pEngine->GetParagraphCount()-1; xub_StrLen nLen = pEngine->GetText(nPara).Len(); sal_uInt16 nCount = pEngine->GetViewCount(); @@ -2470,7 +2470,7 @@ static void lcl_SelectionToEnd( EditView* pView ) if ( pView ) { EditEngine* pEngine = pView->GetEditEngine(); - sal_uInt16 nParCnt = pEngine->GetParagraphCount(); + sal_Int32 nParCnt = pEngine->GetParagraphCount(); if ( nParCnt == 0 ) nParCnt = 1; ESelection aSel( nParCnt-1, pEngine->GetTextLen(nParCnt-1) ); // empty selection, cursor at the end @@ -2595,13 +2595,13 @@ void ScInputHandler::EnterHandler( sal_uInt8 nBlockMode ) if ( bModified && !bForget ) // was wird eingeben (Text/Objekt) ? { - sal_uInt16 nParCnt = pEngine->GetParagraphCount(); + sal_Int32 nParCnt = pEngine->GetParagraphCount(); if ( nParCnt == 0 ) nParCnt = 1; bool bUniformAttribs = true; SfxItemSet aPara1Attribs = pEngine->GetAttribs(0, 0, pEngine->GetTextLen(0)); - for (sal_uInt16 nPara = 1; nPara < nParCnt; ++nPara) + for (sal_Int32 nPara = 1; nPara < nParCnt; ++nPara) { SfxItemSet aPara2Attribs = pEngine->GetAttribs(nPara, 0, pEngine->GetTextLen(nPara)); if (!(aPara1Attribs == aPara2Attribs)) @@ -3757,7 +3757,7 @@ bool ScInputHandler::GetTextAndFields( ScEditEngineDefaulter& rDestEngine ) { // Feldbefehle enthalten? - sal_uInt16 nParCnt = pEngine->GetParagraphCount(); + sal_Int32 nParCnt = pEngine->GetParagraphCount(); SfxItemSet aSet = pEngine->GetAttribs( ESelection(0,0,nParCnt,0) ); SfxItemState eFieldState = aSet.GetItemState( EE_FEATURE_FIELD, false ); if ( eFieldState == SFX_ITEM_DONTCARE || eFieldState == SFX_ITEM_SET ) @@ -3770,14 +3770,14 @@ bool ScInputHandler::GetTextAndFields( ScEditEngineDefaulter& rDestEngine ) // Attribute loeschen - for (sal_uInt16 i=0; i<nParCnt; i++) + for (sal_Int32 i=0; i<nParCnt; i++) rDestEngine.QuickRemoveCharAttribs( i ); // Absaetze zusammenfassen while ( nParCnt > 1 ) { - xub_StrLen nLen = rDestEngine.GetTextLen( (sal_uInt16)0 ); + xub_StrLen nLen = rDestEngine.GetTextLen( 0 ); ESelection aSel( 0,nLen, 1,0 ); rDestEngine.QuickInsertText( OUString(' '), aSel ); // Umbruch durch Space ersetzen --nParCnt; diff --git a/sc/source/ui/app/inputwin.cxx b/sc/source/ui/app/inputwin.cxx index a24296c7666a..919d59e35bff 100644 --- a/sc/source/ui/app/inputwin.cxx +++ b/sc/source/ui/app/inputwin.cxx @@ -729,7 +729,7 @@ void ScInputWindow::SwitchToTextWin() EditView* pView = aTextWindow.GetEditView(); if (pView) { - sal_uInt16 nPara = pView->GetEditEngine()->GetParagraphCount() ? ( pView->GetEditEngine()->GetParagraphCount() - 1 ) : 0; + sal_Int32 nPara = pView->GetEditEngine()->GetParagraphCount() ? ( pView->GetEditEngine()->GetParagraphCount() - 1 ) : 0; xub_StrLen nLen = pView->GetEditEngine()->GetTextLen( nPara ); ESelection aSel( nPara, nLen, nPara, nLen ); pView->SetSelection( aSel ); // set cursor to end of text diff --git a/sc/source/ui/app/transobj.cxx b/sc/source/ui/app/transobj.cxx index 6bf6d931d80d..a68adf368d41 100644 --- a/sc/source/ui/app/transobj.cxx +++ b/sc/source/ui/app/transobj.cxx @@ -423,7 +423,7 @@ sal_Bool ScTransferObj::WriteObject( SotStorageStreamRef& rxOStm, void* pUserObj // write old format without support for unicode characters. // Get the data from the EditEngine's transferable instead. - sal_uInt16 nParCnt = pEngine->GetParagraphCount(); + sal_Int32 nParCnt = pEngine->GetParagraphCount(); if ( nParCnt == 0 ) nParCnt = 1; ESelection aSel( 0, 0, nParCnt-1, pEngine->GetTextLen(nParCnt-1) ); diff --git a/sc/source/ui/docshell/docfunc.cxx b/sc/source/ui/docshell/docfunc.cxx index 104b0d0dd039..815dd1563fde 100644 --- a/sc/source/ui/docshell/docfunc.cxx +++ b/sc/source/ui/docshell/docfunc.cxx @@ -986,10 +986,10 @@ void ScDocFunc::NotifyInputHandler( const ScAddress& rPos ) struct ScMyRememberItem { - sal_uInt16 nIndex; + sal_Int32 nIndex; SfxItemSet aItemSet; - ScMyRememberItem(const SfxItemSet& rItemSet, sal_uInt16 nTempIndex) : + ScMyRememberItem(const SfxItemSet& rItemSet, sal_Int32 nTempIndex) : nIndex(nTempIndex), aItemSet(rItemSet) {} }; @@ -1021,8 +1021,8 @@ bool ScDocFunc::PutData( const ScAddress& rPos, ScEditEngineDefaulter& rEngine, // not only alignment, so the object doesn't contain the cell attributes as // paragraph attributes. Before remove the attributes store they in a list to // set they back to the EditEngine. - sal_uInt16 nCount = rEngine.GetParagraphCount(); - for (sal_uInt16 i=0; i<nCount; i++) + sal_Int32 nCount = rEngine.GetParagraphCount(); + for (sal_Int32 i=0; i<nCount; i++) { const SfxItemSet& rOld = rEngine.GetParaAttribs( i ); if ( rOld.Count() ) diff --git a/sc/source/ui/drawfunc/drtxtob.cxx b/sc/source/ui/drawfunc/drtxtob.cxx index ed3b2c1295e7..9e0891e540a4 100644 --- a/sc/source/ui/drawfunc/drtxtob.cxx +++ b/sc/source/ui/drawfunc/drtxtob.cxx @@ -198,8 +198,8 @@ void ScDrawTextObjectBar::Execute( SfxRequest &rReq ) case SID_SELECTALL: { - sal_uLong nCount = pOutliner->GetParagraphCount(); - ESelection aSel( 0,0,(sal_uInt16)nCount,0 ); + sal_Int32 nCount = pOutliner->GetParagraphCount(); + ESelection aSel( 0,0,nCount,0 ); pOutView->SetSelection( aSel ); } break; @@ -604,12 +604,12 @@ static void lcl_RemoveFields( OutlinerView& rOutView ) //! GetPortions and GetAttribs should be const! EditEngine& rEditEng = (EditEngine&)pOutliner->GetEditEngine(); - sal_uLong nParCount = pOutliner->GetParagraphCount(); - for (sal_uLong nPar=0; nPar<nParCount; nPar++) + sal_Int32 nParCount = pOutliner->GetParagraphCount(); + for (sal_Int32 nPar=0; nPar<nParCount; nPar++) if ( nPar >= aSel.nStartPara && nPar <= aSel.nEndPara ) { std::vector<sal_uInt16> aPortions; - rEditEng.GetPortions( (sal_uInt16)nPar, aPortions ); + rEditEng.GetPortions( nPar, aPortions ); //! GetPortions should use xub_StrLen instead of USHORT for ( size_t nPos = aPortions.size(); nPos; ) @@ -622,7 +622,7 @@ static void lcl_RemoveFields( OutlinerView& rOutView ) ( nPar > aSel.nStartPara || nStart >= aSel.nStartPos ) && ( nPar < aSel.nEndPara || nEnd <= aSel.nEndPos ) ) { - ESelection aFieldSel( (sal_uInt16)nPar, nStart, (sal_uInt16)nPar, nEnd ); + ESelection aFieldSel( nPar, nStart, nPar, nEnd ); SfxItemSet aSet = rEditEng.GetAttribs( aFieldSel ); if ( aSet.GetItemState( EE_FEATURE_FIELD ) == SFX_ITEM_ON ) { diff --git a/sc/source/ui/pagedlg/tphfedit.cxx b/sc/source/ui/pagedlg/tphfedit.cxx index 9099e23266ea..a6fc37dcbf67 100644 --- a/sc/source/ui/pagedlg/tphfedit.cxx +++ b/sc/source/ui/pagedlg/tphfedit.cxx @@ -142,8 +142,8 @@ EditTextObject* ScEditWindow::CreateTextObject() // (GetAttribs beim Format-Dialog-Aufruf gibt immer gesetzte Items zurueck) const SfxItemSet& rEmpty = pEdEngine->GetEmptyItemSet(); - sal_uInt16 nParCnt = pEdEngine->GetParagraphCount(); - for (sal_uInt16 i=0; i<nParCnt; i++) + sal_Int32 nParCnt = pEdEngine->GetParagraphCount(); + for (sal_Int32 i=0; i<nParCnt; i++) pEdEngine->SetParaAttribs( i, rEmpty ); return pEdEngine->CreateTextObject(); diff --git a/sc/source/ui/unoobj/fielduno.cxx b/sc/source/ui/unoobj/fielduno.cxx index 40ea98353f88..24b12f3fd4c7 100644 --- a/sc/source/ui/unoobj/fielduno.cxx +++ b/sc/source/ui/unoobj/fielduno.cxx @@ -173,7 +173,7 @@ class ScUnoEditEngine : public ScEditEngineDefaulter sal_uInt16 nFieldCount; sal_Int32 mnFieldType; SvxFieldData* pFound; // lokale Kopie - sal_uInt16 nFieldPar; + sal_Int32 nFieldPar; xub_StrLen nFieldPos; sal_uInt16 nFieldIndex; @@ -182,14 +182,14 @@ public: ~ScUnoEditEngine(); //! nPos should be xub_StrLen - virtual OUString CalcFieldValue( const SvxFieldItem& rField, sal_uInt16 nPara, sal_uInt16 nPos, + virtual OUString CalcFieldValue( const SvxFieldItem& rField, sal_Int32 nPara, sal_uInt16 nPos, Color*& rTxtColor, Color*& rFldColor ); sal_uInt16 CountFields(); SvxFieldData* FindByIndex(sal_uInt16 nIndex); - SvxFieldData* FindByPos(sal_uInt16 nPar, xub_StrLen nPos, sal_Int32 nType); + SvxFieldData* FindByPos(sal_Int32 nPar, xub_StrLen nPos, sal_Int32 nType); - sal_uInt16 GetFieldPar() const { return nFieldPar; } + sal_Int32 GetFieldPar() const { return nFieldPar; } xub_StrLen GetFieldPos() const { return nFieldPos; } }; @@ -214,7 +214,7 @@ ScUnoEditEngine::~ScUnoEditEngine() } OUString ScUnoEditEngine::CalcFieldValue( const SvxFieldItem& rField, - sal_uInt16 nPara, sal_uInt16 nPos, Color*& rTxtColor, Color*& rFldColor ) + sal_Int32 nPara, sal_uInt16 nPos, Color*& rTxtColor, Color*& rFldColor ) { OUString aRet(EditEngine::CalcFieldValue( rField, nPara, nPos, rTxtColor, rFldColor )); if (eMode != SC_UNO_COLLECT_NONE) @@ -266,7 +266,7 @@ SvxFieldData* ScUnoEditEngine::FindByIndex(sal_uInt16 nIndex) return pFound; } -SvxFieldData* ScUnoEditEngine::FindByPos(sal_uInt16 nPar, xub_StrLen nPos, sal_Int32 nType) +SvxFieldData* ScUnoEditEngine::FindByPos(sal_Int32 nPar, xub_StrLen nPos, sal_Int32 nType) { eMode = SC_UNO_COLLECT_FINDPOS; nFieldPar = nPar; @@ -343,7 +343,7 @@ uno::Reference<text::XTextField> ScCellFieldsObj::GetObjectByIndex_Impl(sal_Int3 if (!pData) return uno::Reference<text::XTextField>(); - sal_uInt16 nPar = aTempEngine.GetFieldPar(); + sal_Int32 nPar = aTempEngine.GetFieldPar(); xub_StrLen nPos = aTempEngine.GetFieldPos(); ESelection aSelection( nPar, nPos, nPar, nPos+1 ); // Feld ist 1 Zeichen @@ -524,7 +524,7 @@ uno::Reference<text::XTextField> ScHeaderFieldsObj::GetObjectByIndex_Impl(sal_In uno::Reference<text::XTextRange> xTemp(xText, uno::UNO_QUERY); xTextRange = xTemp; - sal_uInt16 nPar = aTempEngine.GetFieldPar(); + sal_Int32 nPar = aTempEngine.GetFieldPar(); xub_StrLen nPos = aTempEngine.GetFieldPos(); ESelection aSelection( nPar, nPos, nPar, nPos+1 ); // Field is 1 character diff --git a/sc/source/ui/view/editsh.cxx b/sc/source/ui/view/editsh.cxx index 787f55f6cbe5..aade068f089c 100644 --- a/sc/source/ui/view/editsh.cxx +++ b/sc/source/ui/view/editsh.cxx @@ -304,7 +304,7 @@ void ScEditShell::Execute( SfxRequest& rReq ) case SID_SELECTALL: { - sal_uInt16 nPar = pEngine->GetParagraphCount(); + sal_Int32 nPar = pEngine->GetParagraphCount(); if (nPar) { xub_StrLen nLen = pEngine->GetTextLen(nPar-1); diff --git a/sc/source/ui/view/output2.cxx b/sc/source/ui/view/output2.cxx index c0b5b5239234..cba96aed7cb2 100644 --- a/sc/source/ui/view/output2.cxx +++ b/sc/source/ui/view/output2.cxx @@ -2100,8 +2100,8 @@ static void lcl_ScaleFonts( EditEngine& rEngine, long nPercent ) if ( bUpdateMode ) rEngine.SetUpdateMode( false ); - sal_uInt16 nParCount = rEngine.GetParagraphCount(); - for (sal_uInt16 nPar=0; nPar<nParCount; nPar++) + sal_Int32 nParCount = rEngine.GetParagraphCount(); + for (sal_Int32 nPar=0; nPar<nParCount; nPar++) { std::vector<sal_uInt16> aPortions; rEngine.GetPortions( nPar, aPortions ); diff --git a/sc/source/ui/view/viewdata.cxx b/sc/source/ui/view/viewdata.cxx index f5d7e9ed200d..2bfc18177151 100644 --- a/sc/source/ui/view/viewdata.cxx +++ b/sc/source/ui/view/viewdata.cxx @@ -1327,7 +1327,7 @@ void ScViewData::EditGrowY( sal_Bool bInitial ) // because this occurs in the normal progress of editing a formula. // Subsequent calls with empty text might involve changed attributes (including // font height), so they are treated like normal text. - String aText = pEngine->GetText( (sal_uInt16) 0 ); + String aText = pEngine->GetText( 0 ); if ( ( aText.Len() == 0 && bInitial ) || aText.GetChar(0) == (sal_Unicode)'=' ) nAllowedExtra = SC_GROWY_BIG_EXTRA; } diff --git a/sc/source/ui/view/viewfun4.cxx b/sc/source/ui/view/viewfun4.cxx index d2c707022698..d4ec28f5115e 100644 --- a/sc/source/ui/view/viewfun4.cxx +++ b/sc/source/ui/view/viewfun4.cxx @@ -107,7 +107,7 @@ void ScViewFunc::PasteRTF( SCCOL nStartCol, SCROW nStartRow, aEditView.InsertText( rxTransferable, String(), sal_True ); } - sal_uLong nParCnt = pEngine->GetParagraphCount(); + sal_Int32 nParCnt = pEngine->GetParagraphCount(); if (nParCnt) { SCROW nEndRow = nStartRow + static_cast<SCROW>(nParCnt) - 1; @@ -127,7 +127,7 @@ void ScViewFunc::PasteRTF( SCCOL nStartCol, SCROW nStartRow, // Temporarily turn off undo generation for this lot bool bUndoEnabled = pDoc->IsUndoEnabled(); pDoc->EnableUndo( false ); - for( sal_uInt16 n = 0; n < nParCnt; n++ ) + for( sal_Int32 n = 0; n < nParCnt; n++ ) { boost::scoped_ptr<EditTextObject> pObject(pEngine->CreateTextObject(n)); EnterData(nStartCol, nRow, nTab, *pObject, true); @@ -731,7 +731,7 @@ void ScViewFunc::InsertBookmark( const String& rDescription, const String& rURL, aEngine.SetText(aOld); } - sal_uInt16 nPara = aEngine.GetParagraphCount(); + sal_Int32 nPara = aEngine.GetParagraphCount(); if (nPara) --nPara; xub_StrLen nTxtLen = aEngine.GetTextLen(nPara); diff --git a/sc/source/ui/view/viewfunc.cxx b/sc/source/ui/view/viewfunc.cxx index 9c7ca49fb994..49f8533a482f 100644 --- a/sc/source/ui/view/viewfunc.cxx +++ b/sc/source/ui/view/viewfunc.cxx @@ -651,7 +651,7 @@ void ScViewFunc::EnterData( SCCOL nCol, SCROW nRow, SCTAB nTab, if ( !bSimple && aEngine.GetParagraphCount() == 1 ) { - String aParStr = aEngine.GetText( (sal_uInt16) 0 ); + String aParStr = aEngine.GetText( 0 ); if ( aParStr.GetChar(0) == '=' ) bSimple = sal_True; } |