diff options
Diffstat (limited to 'svx/source/sdr/properties/textproperties.cxx')
| -rw-r--r-- | svx/source/sdr/properties/textproperties.cxx | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/svx/source/sdr/properties/textproperties.cxx b/svx/source/sdr/properties/textproperties.cxx index cf5e526365bb..7aa010a7dde4 100644 --- a/svx/source/sdr/properties/textproperties.cxx +++ b/svx/source/sdr/properties/textproperties.cxx @@ -108,9 +108,9 @@ namespace sdr pOutliner->SetText(*pParaObj); } - sal_uInt32 nParaCount(pOutliner->GetParagraphCount()); + sal_Int32 nParaCount(pOutliner->GetParagraphCount()); - for(sal_uInt16 nPara = 0; nPara < nParaCount; nPara++) + for(sal_Int32 nPara = 0; nPara < nParaCount; nPara++) { SfxItemSet aSet(pOutliner->GetParaAttribs(nPara)); aSet.Put(rSet); @@ -128,7 +128,7 @@ namespace sdr mpItemSet->Put(aNewSet); } - OutlinerParaObject* pTemp = pOutliner->CreateParaObject(0, (sal_uInt16)nParaCount); + OutlinerParaObject* pTemp = pOutliner->CreateParaObject(0, nParaCount); pOutliner->Clear(); rObj.NbcSetOutlinerParaObjectForText(pTemp,pText); @@ -180,14 +180,14 @@ namespace sdr if( pParaObj ) { rOutliner.SetText(*pParaObj); - sal_uInt32 nParaCount(rOutliner.GetParagraphCount()); + sal_Int32 nParaCount(rOutliner.GetParagraphCount()); if(nParaCount) { - ESelection aSelection( 0, 0, EE_PARA_ALL, EE_PARA_ALL); + ESelection aSelection( 0, 0, EE_PARA_ALL, EE_TEXTPOS_ALL); rOutliner.RemoveAttribs(aSelection, sal_True, 0); - OutlinerParaObject* pTemp = rOutliner.CreateParaObject(0, (sal_uInt16)nParaCount); + OutlinerParaObject* pTemp = rOutliner.CreateParaObject(0, nParaCount); rOutliner.Clear(); rObj.NbcSetOutlinerParaObjectForText( pTemp, pText ); @@ -257,11 +257,11 @@ namespace sdr // apply StyleSheet to all paragraphs rOutliner.SetText(*pParaObj); - sal_uInt32 nParaCount(rOutliner.GetParagraphCount()); + sal_Int32 nParaCount(rOutliner.GetParagraphCount()); if(nParaCount) { - for(sal_uInt16 nPara = 0; nPara < nParaCount; nPara++) + for(sal_Int32 nPara = 0; nPara < nParaCount; nPara++) { SfxItemSet* pTempSet = 0L; @@ -278,7 +278,7 @@ namespace sdr { String aNewStyleSheetName(GetStyleSheet()->GetName()); aNewStyleSheetName.Erase(aNewStyleSheetName.Len() - 1, 1); - sal_Int16 nDepth = rOutliner.GetDepth((sal_uInt16)nPara); + sal_Int16 nDepth = rOutliner.GetDepth(nPara); aNewStyleSheetName += OUString::number( nDepth <= 0 ? 1 : nDepth + 1); SdrModel* pModel = rObj.GetModel(); @@ -328,7 +328,7 @@ namespace sdr if(nW >= EE_ITEMS_START && nW <= EE_ITEMS_END) { - rOutliner.QuickRemoveCharAttribs((sal_uInt16)nPara, nW); + rOutliner.QuickRemoveCharAttribs(nPara, nW); } } pItem = aIter.NextItem(); @@ -342,7 +342,7 @@ namespace sdr } } - OutlinerParaObject* pTemp = rOutliner.CreateParaObject(0, (sal_uInt16)nParaCount); + OutlinerParaObject* pTemp = rOutliner.CreateParaObject(0, nParaCount); rOutliner.Clear(); rObj.NbcSetOutlinerParaObjectForText(pTemp, pText); } @@ -417,13 +417,13 @@ namespace sdr pOutliner->SetText(*pParaObj); - sal_uInt32 nParaCount(pOutliner->GetParagraphCount()); + sal_Int32 nParaCount(pOutliner->GetParagraphCount()); if(nParaCount) { bool bBurnIn(false); - for(sal_uInt16 nPara = 0; nPara < nParaCount; nPara++) + for(sal_Int32 nPara = 0; nPara < nParaCount; nPara++) { SfxStyleSheet* pSheet = pOutliner->GetStyleSheet(nPara); @@ -457,7 +457,7 @@ namespace sdr { EditEngine* pEditEngine = const_cast<EditEngine*>(&(pOutliner->GetEditEngine())); std::vector<EECharAttrib> aAttribs; - pEditEngine->GetCharAttribs((sal_uInt16)nPara, aAttribs); + pEditEngine->GetCharAttribs(nPara, aAttribs); for(std::vector<EECharAttrib>::iterator i = aAttribs.begin(); i < aAttribs.end(); ++i) { @@ -486,7 +486,7 @@ namespace sdr SfxItemSet aColorSet(*aSet.GetPool(), EE_CHAR_COLOR, EE_CHAR_COLOR ); aColorSet.Put(aSet, sal_False); - ESelection aSel((sal_uInt16)nPara, 0); + ESelection aSel(nPara, 0); for(std::vector<EECharAttrib>::iterator i = aAttribs.begin(); i < aAttribs.end(); ++i) { @@ -501,7 +501,7 @@ namespace sdr } } - aSel.nEndPos = pEditEngine->GetTextLen((sal_uInt16)nPara); + aSel.nEndPos = pEditEngine->GetTextLen(nPara); if(aSel.nStartPos != aSel.nEndPos) { @@ -525,7 +525,7 @@ namespace sdr if(bBurnIn) { - OutlinerParaObject* pTemp = pOutliner->CreateParaObject(0, (sal_uInt16)nParaCount); + OutlinerParaObject* pTemp = pOutliner->CreateParaObject(0, nParaCount); rObj.NbcSetOutlinerParaObjectForText(pTemp,pText); } } |