summaryrefslogtreecommitdiff
path: root/svx/source
diff options
context:
space:
mode:
Diffstat (limited to 'svx/source')
-rw-r--r--svx/source/accessibility/AccessibleEmptyEditSource.cxx48
-rw-r--r--svx/source/accessibility/AccessibleTextHelper.cxx24
-rw-r--r--svx/source/customshapes/EnhancedCustomShapeFontWork.cxx2
-rw-r--r--svx/source/sdr/properties/textproperties.cxx34
-rw-r--r--svx/source/svdraw/svdedxv.cxx17
-rw-r--r--svx/source/svdraw/svdomeas.cxx2
-rw-r--r--svx/source/svdraw/svdotext.cxx4
-rw-r--r--svx/source/svdraw/svdotextpathdecomposition.cxx8
-rw-r--r--svx/source/svdraw/svdotxat.cxx12
-rw-r--r--svx/source/svdraw/svdotxed.cxx2
-rw-r--r--svx/source/svdraw/svdotxfl.cxx2
-rw-r--r--svx/source/svdraw/svdoutl.cxx2
-rw-r--r--svx/source/svdraw/svdview.cxx4
-rw-r--r--svx/source/table/cell.cxx16
-rw-r--r--svx/source/table/svdotable.cxx4
-rw-r--r--svx/source/table/tablecontroller.cxx2
-rw-r--r--svx/source/table/tablertfimporter.cxx4
17 files changed, 93 insertions, 94 deletions
diff --git a/svx/source/accessibility/AccessibleEmptyEditSource.cxx b/svx/source/accessibility/AccessibleEmptyEditSource.cxx
index 43b952c1dcee..1f2b3b9efd82 100644
--- a/svx/source/accessibility/AccessibleEmptyEditSource.cxx
+++ b/svx/source/accessibility/AccessibleEmptyEditSource.cxx
@@ -95,8 +95,8 @@ namespace accessibility
SfxBroadcaster& GetBroadcaster() const { return *(const_cast<AccessibleEmptyEditSource_Impl*>(this)); }
// SvxTextForwarder
- sal_uInt16 GetParagraphCount() const { return 1; }
- sal_uInt16 GetTextLen( sal_uInt16 /*nParagraph*/ ) const { return 0; }
+ sal_Int32 GetParagraphCount() const { return 1; }
+ sal_uInt16 GetTextLen( sal_Int32 /*nParagraph*/ ) const { return 0; }
String GetText( const ESelection& /*rSel*/ ) const { return String(); }
SfxItemSet GetAttribs( const ESelection& /*rSel*/, sal_Bool /*bOnlyHardAttrib*/ = 0 ) const
{
@@ -105,13 +105,13 @@ namespace accessibility
// a deleted Pool by design.
return SfxItemSet(SdrObject::GetGlobalDrawObjectItemPool());
}
- SfxItemSet GetParaAttribs( sal_uInt16 /*nPara*/ ) const { return GetAttribs(ESelection()); }
- void SetParaAttribs( sal_uInt16 /*nPara*/, const SfxItemSet& /*rSet*/ ) {}
+ SfxItemSet GetParaAttribs( sal_Int32 /*nPara*/ ) const { return GetAttribs(ESelection()); }
+ void SetParaAttribs( sal_Int32 /*nPara*/, const SfxItemSet& /*rSet*/ ) {}
void RemoveAttribs( const ESelection& /*rSelection*/, sal_Bool /*bRemoveParaAttribs*/, sal_uInt16 /*nWhich*/ ){}
- void GetPortions( sal_uInt16 /*nPara*/, std::vector<sal_uInt16>& /*rList*/ ) const {}
+ void GetPortions( sal_Int32 /*nPara*/, std::vector<sal_uInt16>& /*rList*/ ) const {}
sal_uInt16 GetItemState( const ESelection& /*rSel*/, sal_uInt16 /*nWhich*/ ) const { return 0; }
- sal_uInt16 GetItemState( sal_uInt16 /*nPara*/, sal_uInt16 /*nWhich*/ ) const { return 0; }
+ sal_uInt16 GetItemState( sal_Int32 /*nPara*/, sal_uInt16 /*nWhich*/ ) const { return 0; }
SfxItemPool* GetPool() const { return NULL; }
@@ -123,35 +123,35 @@ namespace accessibility
const SfxItemSet * GetEmptyItemSetPtr() { return 0; }
void AppendParagraph() {}
- xub_StrLen AppendTextPortion( sal_uInt16 /*nPara*/, const String & /*rText*/, const SfxItemSet & /*rSet*/ ) { return 0; }
+ xub_StrLen AppendTextPortion( sal_Int32 /*nPara*/, const String & /*rText*/, const SfxItemSet & /*rSet*/ ) { return 0; }
//XTextCopy
void CopyText(const SvxTextForwarder& ){}
- OUString CalcFieldValue( const SvxFieldItem& /*rField*/, sal_uInt16 /*nPara*/, sal_uInt16 /*nPos*/, Color*& /*rpTxtColor*/, Color*& /*rpFldColor*/ )
+ OUString CalcFieldValue( const SvxFieldItem& /*rField*/, sal_Int32 /*nPara*/, sal_uInt16 /*nPos*/, Color*& /*rpTxtColor*/, Color*& /*rpFldColor*/ )
{
return OUString();
}
- void FieldClicked( const SvxFieldItem&, sal_uInt16, xub_StrLen ) {;}
+ void FieldClicked( const SvxFieldItem&, sal_Int32, xub_StrLen ) {;}
sal_Bool IsValid() const { return sal_True; }
void SetNotifyHdl( const Link& ) {}
- LanguageType GetLanguage( sal_uInt16, sal_uInt16 ) const { return LANGUAGE_DONTKNOW; }
- sal_uInt16 GetFieldCount( sal_uInt16 ) const { return 0; }
- EFieldInfo GetFieldInfo( sal_uInt16, sal_uInt16 ) const { return EFieldInfo(); }
- EBulletInfo GetBulletInfo( sal_uInt16 ) const { return EBulletInfo(); }
- Rectangle GetCharBounds( sal_uInt16, sal_uInt16 ) const { return Rectangle(); }
- Rectangle GetParaBounds( sal_uInt16 ) const { return Rectangle(); }
+ LanguageType GetLanguage( sal_Int32, sal_uInt16 ) const { return LANGUAGE_DONTKNOW; }
+ sal_uInt16 GetFieldCount( sal_Int32 ) const { return 0; }
+ EFieldInfo GetFieldInfo( sal_Int32, sal_uInt16 ) const { return EFieldInfo(); }
+ EBulletInfo GetBulletInfo( sal_Int32 ) const { return EBulletInfo(); }
+ Rectangle GetCharBounds( sal_Int32, sal_uInt16 ) const { return Rectangle(); }
+ Rectangle GetParaBounds( sal_Int32 ) const { return Rectangle(); }
MapMode GetMapMode() const { return MapMode(); }
OutputDevice* GetRefDevice() const { return NULL; }
- sal_Bool GetIndexAtPoint( const Point&, sal_uInt16&, sal_uInt16& ) const { return sal_False; }
- sal_Bool GetWordIndices( sal_uInt16, sal_uInt16, sal_uInt16&, sal_uInt16& ) const { return sal_False; }
- sal_Bool GetAttributeRun( sal_uInt16&, sal_uInt16&, sal_uInt16, sal_uInt16 ) const { return sal_False; }
- sal_uInt16 GetLineCount( sal_uInt16 nPara ) const { return nPara == 0 ? 1 : 0; }
- sal_uInt16 GetLineLen( sal_uInt16, sal_uInt16 ) const { return 0; }
- void GetLineBoundaries( /*out*/sal_uInt16 & rStart, /*out*/sal_uInt16 & rEnd, sal_uInt16 /*nParagraph*/, sal_uInt16 /*nLine*/ ) const { rStart = rEnd = 0; }
- sal_uInt16 GetLineNumberAtIndex( sal_uInt16 /*nPara*/, sal_uInt16 /*nIndex*/ ) const { return 0; }
+ sal_Bool GetIndexAtPoint( const Point&, sal_Int32&, sal_uInt16& ) const { return sal_False; }
+ sal_Bool GetWordIndices( sal_Int32, sal_uInt16, sal_uInt16&, sal_uInt16& ) const { return sal_False; }
+ sal_Bool GetAttributeRun( sal_uInt16&, sal_uInt16&, sal_Int32, sal_uInt16 ) const { return sal_False; }
+ sal_uInt16 GetLineCount( sal_Int32 nPara ) const { return nPara == 0 ? 1 : 0; }
+ sal_uInt16 GetLineLen( sal_Int32, sal_uInt16 ) const { return 0; }
+ void GetLineBoundaries( /*out*/sal_uInt16 & rStart, /*out*/sal_uInt16 & rEnd, sal_Int32 /*nParagraph*/, sal_uInt16 /*nLine*/ ) const { rStart = rEnd = 0; }
+ sal_uInt16 GetLineNumberAtIndex( sal_Int32 /*nPara*/, sal_uInt16 /*nIndex*/ ) const { return 0; }
// the following two methods would, strictly speaking, require
// a switch to a real EditSource, too. Fortunately, the
@@ -164,8 +164,8 @@ namespace accessibility
sal_Bool Delete( const ESelection& ) { return sal_False; }
sal_Bool InsertText( const String&, const ESelection& ) { return sal_False; }
sal_Bool QuickFormatDoc( sal_Bool ) { return sal_True; }
- sal_Int16 GetDepth( sal_uInt16 ) const { return -1; }
- sal_Bool SetDepth( sal_uInt16, sal_Int16 ) { return sal_True; }
+ sal_Int16 GetDepth( sal_Int32 ) const { return -1; }
+ sal_Bool SetDepth( sal_Int32, sal_Int16 ) { return sal_True; }
Rectangle GetVisArea() const { return Rectangle(); }
Point LogicToPixel( const Point& rPoint, const MapMode& /*rMapMode*/ ) const { return rPoint; }
diff --git a/svx/source/accessibility/AccessibleTextHelper.cxx b/svx/source/accessibility/AccessibleTextHelper.cxx
index 179acb9d65a2..4d3b5a2ec80c 100644
--- a/svx/source/accessibility/AccessibleTextHelper.cxx
+++ b/svx/source/accessibility/AccessibleTextHelper.cxx
@@ -257,7 +257,7 @@ namespace accessibility
AccessibleTextHelper_Impl::AccessibleTextHelper_Impl() :
mxFrontEnd( NULL ),
- maLastSelection( EE_PARA_NOT_FOUND,EE_PARA_NOT_FOUND,EE_PARA_NOT_FOUND,EE_PARA_NOT_FOUND ),
+ maLastSelection( EE_PARA_NOT_FOUND,EE_INDEX_NOT_FOUND,EE_PARA_NOT_FOUND,EE_INDEX_NOT_FOUND ),
mnFirstVisibleChild( -1 ),
mnLastVisibleChild( -2 ),
mnStartIndex( 0 ),
@@ -562,7 +562,7 @@ namespace accessibility
OSL_TRACE("AccessibleTextHelper_Impl::UpdateSelection(): Parent has focus!");
}
- sal_uInt16 nMaxValidParaIndex( static_cast< sal_uInt16 >( GetTextForwarder().GetParagraphCount() ) - 1 );
+ sal_Int32 nMaxValidParaIndex( GetTextForwarder().GetParagraphCount() - 1 );
// notify all affected paragraphs (TODO: may be suboptimal,
// since some paragraphs might stay selected)
@@ -674,7 +674,7 @@ namespace accessibility
ESelection aTmpSel( aSelection );
aTmpSel.Adjust();
// first submit event for new and changed selection
- sal_uInt32 nPara = aTmpSel.nStartPara;
+ sal_Int32 nPara = aTmpSel.nStartPara;
for ( ; nPara <= aTmpSel.nEndPara; ++nPara )
{
if ( nPara < aTmpLastSel.nStartPara ||
@@ -835,7 +835,7 @@ namespace accessibility
DBG_ASSERT(nCurrPara >= 0 && nCurrPara <= USHRT_MAX,
"AccessibleTextHelper_Impl::UpdateVisibleChildren: index value overflow");
- aTmpBB = rCacheTF.GetParaBounds( static_cast< sal_uInt16 >( nCurrPara ) );
+ aTmpBB = rCacheTF.GetParaBounds( nCurrPara );
// convert to screen coordinates
aParaBB = ::accessibility::AccessibleEditableTextPara::LogicToPixel( aTmpBB, rCacheTF.GetMapMode(), rCacheVF );
@@ -1102,13 +1102,13 @@ namespace accessibility
@return number of changed paragraphs, -1 for
"every paragraph changed"
*/
- int GetNumberOfParasChanged() { return mnParasChanged; }
+ sal_Int32 GetNumberOfParasChanged() { return mnParasChanged; }
/** Query index of last added/removed paragraph
@return index of lastly added paragraphs, -1 for none
added so far.
*/
- int GetParaIndex() { return mnParaIndex; }
+ sal_Int32 GetParaIndex() { return mnParaIndex; }
/** Query hint id of last interesting event
@return hint id of last interesting event (REMOVED/INSERTED).
@@ -1119,9 +1119,9 @@ namespace accessibility
/** number of paragraphs changed during queue processing. -1 for
"every paragraph changed"
*/
- int mnParasChanged;
+ sal_Int32 mnParasChanged;
/// index of paragraph added/removed last
- int mnParaIndex;
+ sal_Int32 mnParaIndex;
/// TextHint ID (removed/inserted) of last interesting event
int mnHintId;
};
@@ -1302,7 +1302,7 @@ namespace accessibility
// #108900# Delegate change event to children
AccessibleTextHelper_ChildrenTextChanged aNotifyChildrenFunctor;
- if( nPara == static_cast<sal_Int32>(EE_PARA_ALL) )
+ if( nPara == EE_PARA_ALL )
{
// #108900# Call every child
::std::for_each( maParaManager.begin(), maParaManager.end(),
@@ -1374,8 +1374,8 @@ namespace accessibility
// change children state
maParaManager.SetActive( sal_False );
- maLastSelection = ESelection( EE_PARA_NOT_FOUND, EE_PARA_NOT_FOUND,
- EE_PARA_NOT_FOUND, EE_PARA_NOT_FOUND);
+ maLastSelection = ESelection( EE_PARA_NOT_FOUND, EE_INDEX_NOT_FOUND,
+ EE_PARA_NOT_FOUND, EE_INDEX_NOT_FOUND);
break;
}
default:
@@ -1696,7 +1696,7 @@ namespace accessibility
DBG_ASSERT(nChild >= 0 && nChild <= USHRT_MAX,
"AccessibleTextHelper_Impl::getAccessibleAt: index value overflow");
- Rectangle aParaBounds( rCacheTF.GetParaBounds( static_cast< sal_uInt16 > (nChild) ) );
+ Rectangle aParaBounds( rCacheTF.GetParaBounds( nChild ) );
if( aParaBounds.IsInside( aLogPoint ) )
return getAccessibleChild( nChild - mnFirstVisibleChild + GetStartIndex() );
diff --git a/svx/source/customshapes/EnhancedCustomShapeFontWork.cxx b/svx/source/customshapes/EnhancedCustomShapeFontWork.cxx
index b648dc7193ce..cd34d60adfb3 100644
--- a/svx/source/customshapes/EnhancedCustomShapeFontWork.cxx
+++ b/svx/source/customshapes/EnhancedCustomShapeFontWork.cxx
@@ -106,7 +106,7 @@ static bool InitializeFontWorkData( const SdrObject* pCustomShape, const sal_uIn
sal_Int32 nParagraphsLeft = rTextObj.GetParagraphCount();
rFWData.nMaxParagraphsPerTextArea = ( ( nParagraphsLeft - 1 ) / nTextAreaCount ) + 1;
- sal_Int16 j = 0;
+ sal_Int32 j = 0;
while( nParagraphsLeft && nTextAreaCount )
{
FWTextArea aTextArea;
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);
}
}
diff --git a/svx/source/svdraw/svdedxv.cxx b/svx/source/svdraw/svdedxv.cxx
index 046531981b78..8e4be83c0ec1 100644
--- a/svx/source/svdraw/svdedxv.cxx
+++ b/svx/source/svdraw/svdedxv.cxx
@@ -1274,11 +1274,11 @@ sal_Bool SdrObjEditView::ImpIsTextEditAllSelected() const
{
if(SdrTextObj::HasTextImpl( pTextEditOutliner ) )
{
- const sal_uInt32 nParaAnz=pTextEditOutliner->GetParagraphCount();
+ const sal_Int32 nParaAnz=pTextEditOutliner->GetParagraphCount();
Paragraph* pLastPara=pTextEditOutliner->GetParagraph( nParaAnz > 1 ? nParaAnz - 1 : 0 );
ESelection aESel(pTextEditOutlinerView->GetSelection());
- if (aESel.nStartPara==0 && aESel.nStartPos==0 && aESel.nEndPara==sal_uInt16(nParaAnz-1))
+ if (aESel.nStartPara==0 && aESel.nStartPos==0 && aESel.nEndPara==(nParaAnz-1))
{
XubString aStr(pTextEditOutliner->GetText(pLastPara));
@@ -1286,7 +1286,7 @@ sal_Bool SdrObjEditView::ImpIsTextEditAllSelected() const
bRet = sal_True;
}
// in case the selection was done backwards
- if (!bRet && aESel.nEndPara==0 && aESel.nEndPos==0 && aESel.nStartPara==sal_uInt16(nParaAnz-1))
+ if (!bRet && aESel.nEndPara==0 && aESel.nEndPos==0 && aESel.nStartPara==(nParaAnz-1))
{
XubString aStr(pTextEditOutliner->GetText(pLastPara));
@@ -1572,9 +1572,8 @@ sal_Bool SdrObjEditView::SetStyleSheet(SfxStyleSheet* pStyleSheet, sal_Bool bDon
{
Outliner* pOutliner = pTextEditOutlinerView->GetOutliner();
- const sal_uIntPtr nParaCount = pOutliner->GetParagraphCount();
- sal_uIntPtr nPara;
- for( nPara = 0; nPara < nParaCount; nPara++ )
+ const sal_Int32 nParaCount = pOutliner->GetParagraphCount();
+ for( sal_Int32 nPara = 0; nPara < nParaCount; nPara++ )
{
pOutliner->SetStyleSheet( nPara, pStyleSheet );
}
@@ -1938,11 +1937,11 @@ void SdrObjEditView::ApplyFormatPaintBrushToText( SfxItemSet& rFormatSet, SdrTex
SdrOutliner& rOutliner = rTextObj.ImpGetDrawOutliner();
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++)
{
if( !bNoCharacterFormats )
rOutliner.QuickRemoveCharAttribs( nPara, /* remove all */0 );
@@ -1952,7 +1951,7 @@ void SdrObjEditView::ApplyFormatPaintBrushToText( SfxItemSet& rFormatSet, SdrTex
rOutliner.SetParaAttribs(nPara, aSet);
}
- OutlinerParaObject* pTemp = rOutliner.CreateParaObject(0, (sal_uInt16)nParaCount);
+ OutlinerParaObject* pTemp = rOutliner.CreateParaObject(0, nParaCount);
rOutliner.Clear();
rTextObj.NbcSetOutlinerParaObjectForText(pTemp,pText);
diff --git a/svx/source/svdraw/svdomeas.cxx b/svx/source/svdraw/svdomeas.cxx
index dc2868c78c27..02599bb73d41 100644
--- a/svx/source/svdraw/svdomeas.cxx
+++ b/svx/source/svdraw/svdomeas.cxx
@@ -571,7 +571,7 @@ basegfx::B2DPolyPolygon SdrMeasureObj::ImpCalcXPoly(const ImpMeasurePoly& rPol)
return aRetval;
}
-bool SdrMeasureObj::CalcFieldValue(const SvxFieldItem& rField, sal_uInt16 nPara, sal_uInt16 nPos,
+bool SdrMeasureObj::CalcFieldValue(const SvxFieldItem& rField, sal_Int32 nPara, sal_uInt16 nPos,
bool bEdit,
Color*& rpTxtColor, Color*& rpFldColor, XubString& rRet) const
{
diff --git a/svx/source/svdraw/svdotext.cxx b/svx/source/svdraw/svdotext.cxx
index 20551221b7d1..23b04e78cc17 100644
--- a/svx/source/svdraw/svdotext.cxx
+++ b/svx/source/svdraw/svdotext.cxx
@@ -465,7 +465,7 @@ bool SdrTextObj::HasTextImpl( SdrOutliner* pOutliner )
if(pOutliner)
{
Paragraph* p1stPara=pOutliner->GetParagraph( 0 );
- sal_uIntPtr nParaAnz=pOutliner->GetParagraphCount();
+ sal_Int32 nParaAnz=pOutliner->GetParagraphCount();
if(p1stPara==NULL)
nParaAnz=0;
@@ -840,7 +840,7 @@ OutlinerParaObject* SdrTextObj::GetEditOutlinerParaObject() const
OutlinerParaObject* pPara=NULL;
if( HasTextImpl( pEdtOutl ) )
{
- sal_uInt16 nParaAnz = static_cast< sal_uInt16 >( pEdtOutl->GetParagraphCount() );
+ sal_Int32 nParaAnz = pEdtOutl->GetParagraphCount();
pPara = pEdtOutl->CreateParaObject(0, nParaAnz);
}
return pPara;
diff --git a/svx/source/svdraw/svdotextpathdecomposition.cxx b/svx/source/svdraw/svdotextpathdecomposition.cxx
index 2bb9e7a6193a..097b47639177 100644
--- a/svx/source/svdraw/svdotextpathdecomposition.cxx
+++ b/svx/source/svdraw/svdotextpathdecomposition.cxx
@@ -74,7 +74,7 @@ namespace
String maText;
xub_StrLen mnTextStart;
xub_StrLen mnTextLength;
- sal_uInt16 mnParagraph;
+ sal_Int32 mnParagraph;
xub_StrLen mnIndex;
SvxFont maFont;
::std::vector< double > maDblDXArray; // double DXArray, font size independent -> unit coordinate system
@@ -127,7 +127,7 @@ namespace
const String& getText() const { return maText; }
xub_StrLen getTextStart() const { return mnTextStart; }
xub_StrLen getTextLength() const { return mnTextLength; }
- sal_uInt16 getParagraph() const { return mnParagraph; }
+ sal_Int32 getParagraph() const { return mnParagraph; }
xub_StrLen getIndex() const { return mnIndex; }
const SvxFont& getFont() const { return maFont; }
bool isRTL() const { return mbRTL; }
@@ -705,7 +705,7 @@ void SdrTextObj::impDecomposePathTextPrimitive(
// get loop count
sal_uInt32 nLoopCount(rPathPolyPolygon.count());
- if(rOutliner.GetParagraphCount() < nLoopCount)
+ if(static_cast<sal_uInt32>(rOutliner.GetParagraphCount()) < nLoopCount)
{
nLoopCount = rOutliner.GetParagraphCount();
}
@@ -730,7 +730,7 @@ void SdrTextObj::impDecomposePathTextPrimitive(
{
const impPathTextPortion& rCandidate = rPathTextPortions[b];
- if(rCandidate.getParagraph() == a)
+ if(static_cast<sal_uInt32>(rCandidate.getParagraph()) == a)
{
aParagraphTextPortions.push_back(&rCandidate);
}
diff --git a/svx/source/svdraw/svdotxat.cxx b/svx/source/svdraw/svdotxat.cxx
index c2604d2bd49f..f532a3c65e22 100644
--- a/svx/source/svdraw/svdotxat.cxx
+++ b/svx/source/svdraw/svdotxat.cxx
@@ -234,9 +234,9 @@ void SdrTextObj::ImpSetTextStyleSheetListeners()
const EditTextObject& rTextObj=pOutlinerParaObject->GetTextObject();
XubString aStyleName;
SfxStyleFamily eStyleFam;
- sal_uInt16 nParaAnz=rTextObj.GetParagraphCount();
+ sal_Int32 nParaAnz=rTextObj.GetParagraphCount();
- for(sal_uInt16 nParaNum(0); nParaNum < nParaAnz; nParaNum++)
+ for(sal_Int32 nParaNum(0); nParaNum < nParaAnz; nParaNum++)
{
rTextObj.GetStyleSheet(nParaNum, aStyleName, eStyleFam);
@@ -335,7 +335,7 @@ void SdrTextObj::RemoveOutlinerCharacterAttribs( const std::vector<sal_uInt16>&
pOutliner->SetText(*pOutlinerParaObject);
}
- ESelection aSelAll( 0, 0, 0xffff, 0xffff );
+ ESelection aSelAll( 0, 0, EE_PARA_ALL, EE_TEXTPOS_ALL );
std::vector<sal_uInt16>::const_iterator aIter( rCharWhichIds.begin() );
while( aIter != rCharWhichIds.end() )
{
@@ -344,8 +344,8 @@ void SdrTextObj::RemoveOutlinerCharacterAttribs( const std::vector<sal_uInt16>&
if(!pEdtOutl || (pText != getActiveText()) )
{
- const sal_uInt32 nParaCount = pOutliner->GetParagraphCount();
- OutlinerParaObject* pTemp = pOutliner->CreateParaObject(0, (sal_uInt16)nParaCount);
+ const sal_Int32 nParaCount = pOutliner->GetParagraphCount();
+ OutlinerParaObject* pTemp = pOutliner->CreateParaObject(0, nParaCount);
pOutliner->Clear();
NbcSetOutlinerParaObjectForText(pTemp, pText);
}
@@ -364,7 +364,7 @@ bool SdrTextObj::HasText() const
if( pOPO )
{
const EditTextObject& rETO = pOPO->GetTextObject();
- sal_uInt16 nParaCount = rETO.GetParagraphCount();
+ sal_Int32 nParaCount = rETO.GetParagraphCount();
if( nParaCount > 0 )
bHasText = (nParaCount > 1) || (rETO.GetText( 0 ).Len() != 0);
diff --git a/svx/source/svdraw/svdotxed.cxx b/svx/source/svdraw/svdotxed.cxx
index dc60325662c9..7efe8d1d61d2 100644
--- a/svx/source/svdraw/svdotxed.cxx
+++ b/svx/source/svdraw/svdotxed.cxx
@@ -234,7 +234,7 @@ void SdrTextObj::EndTextEdit(SdrOutliner& rOutl)
// to make the gray field background vanish again
rOutl.UpdateFields();
- sal_uInt16 nParaAnz = static_cast< sal_uInt16 >( rOutl.GetParagraphCount() );
+ sal_Int32 nParaAnz = rOutl.GetParagraphCount();
pNewText = rOutl.CreateParaObject( 0, nParaAnz );
// need to end edit mode early since SetOutlinerParaObject already
diff --git a/svx/source/svdraw/svdotxfl.cxx b/svx/source/svdraw/svdotxfl.cxx
index d83419f590d9..264f5e4ac36c 100644
--- a/svx/source/svdraw/svdotxfl.cxx
+++ b/svx/source/svdraw/svdotxfl.cxx
@@ -40,7 +40,7 @@ void SdrRegisterFieldClasses()
///////////////////////////////////////////////////////////////////////////////////////////////// */
-bool SdrTextObj::CalcFieldValue(const SvxFieldItem& /*rField*/, sal_uInt16 /*nPara*/, sal_uInt16 /*nPos*/,
+bool SdrTextObj::CalcFieldValue(const SvxFieldItem& /*rField*/, sal_Int32 /*nPara*/, sal_uInt16 /*nPos*/,
bool /*bEdit*/, Color*& /*rpTxtColor*/, Color*& /*rpFldColor*/, XubString& /*rRet*/) const
{
return false;
diff --git a/svx/source/svdraw/svdoutl.cxx b/svx/source/svdraw/svdoutl.cxx
index da979b29b67c..9439514608a9 100644
--- a/svx/source/svdraw/svdoutl.cxx
+++ b/svx/source/svdraw/svdoutl.cxx
@@ -74,7 +74,7 @@ void SdrOutliner::SetTextObjNoInit( const SdrTextObj* pObj )
mpTextObj.reset( const_cast< SdrTextObj* >(pObj) );
}
-OUString SdrOutliner::CalcFieldValue(const SvxFieldItem& rField, sal_uInt16 nPara, sal_uInt16 nPos,
+OUString SdrOutliner::CalcFieldValue(const SvxFieldItem& rField, sal_Int32 nPara, sal_uInt16 nPos,
Color*& rpTxtColor, Color*& rpFldColor)
{
bool bOk = false;
diff --git a/svx/source/svdraw/svdview.cxx b/svx/source/svdraw/svdview.cxx
index 65616bd8d0c0..ea1c73700395 100644
--- a/svx/source/svdraw/svdview.cxx
+++ b/svx/source/svdraw/svdview.cxx
@@ -1225,7 +1225,7 @@ XubString SdrView::GetStatusText()
ESelection aSel(pTextEditOutlinerView->GetSelection());
long nPar=aSel.nEndPara,nLin=0,nCol=aSel.nEndPos;
if (aSel.nEndPara>0) {
- for (sal_uInt16 nParaNum=0; nParaNum<aSel.nEndPara; nParaNum++) {
+ for (sal_Int32 nParaNum=0; nParaNum<aSel.nEndPara; nParaNum++) {
nLin+=pTextEditOutliner->GetLineCount(nParaNum);
}
}
@@ -1341,7 +1341,7 @@ SdrViewContext SdrView::GetContext() const
void SdrView::MarkAll()
{
if (IsTextEdit()) {
- GetTextEditOutlinerView()->SetSelection(ESelection(0,0,0xFFFF,0xFFFF));
+ GetTextEditOutlinerView()->SetSelection(ESelection(0,0,EE_PARA_ALL,EE_TEXTPOS_ALL));
#ifdef DBG_UTIL
if (pItemBrowser!=NULL) pItemBrowser->SetDirty();
#endif
diff --git a/svx/source/table/cell.cxx b/svx/source/table/cell.cxx
index dd6c37f81938..ccb71c9381b8 100644
--- a/svx/source/table/cell.cxx
+++ b/svx/source/table/cell.cxx
@@ -258,9 +258,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);
@@ -278,7 +278,7 @@ namespace sdr
mpItemSet->Put(aNewSet);
}
- OutlinerParaObject* pTemp = pOutliner->CreateParaObject(0, (sal_uInt16)nParaCount);
+ OutlinerParaObject* pTemp = pOutliner->CreateParaObject(0, nParaCount);
pOutliner->Clear();
mxCell->SetOutlinerParaObject(pTemp);
@@ -750,7 +750,7 @@ SdrTextHorzAdjust Cell::GetTextHorizontalAdjust() const
void Cell::SetOutlinerParaObject( OutlinerParaObject* pTextObject )
{
SdrText::SetOutlinerParaObject( pTextObject );
- maSelection.nStartPara = 0xffff;
+ maSelection.nStartPara = EE_PARA_MAX_COUNT;
if( pTextObject == 0 )
ForceOutlinerParaObject( OUTLINERMODE_TEXTOBJECT );
@@ -1593,14 +1593,14 @@ void SAL_CALL Cell::setAllPropertiesToDefault( ) throw (RuntimeException)
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();
SetOutlinerParaObject(pTemp);
@@ -1730,7 +1730,7 @@ Reference< XTextRange > SAL_CALL Cell::getEnd( ) throw (RuntimeException)
OUString SAL_CALL Cell::getString( ) throw (RuntimeException)
{
- maSelection.nStartPara = 0xffff;
+ maSelection.nStartPara = EE_PARA_MAX_COUNT;
return SvxUnoTextBase::getString();
}
diff --git a/svx/source/table/svdotable.cxx b/svx/source/table/svdotable.cxx
index a9a7030cef3d..bed3988c7c81 100644
--- a/svx/source/table/svdotable.cxx
+++ b/svx/source/table/svdotable.cxx
@@ -1882,7 +1882,7 @@ void SdrTableObj::EndTextEdit(SdrOutliner& rOutl)
OutlinerParaObject* pNewText = 0;
Paragraph* p1stPara = rOutl.GetParagraph( 0 );
- sal_uInt32 nParaAnz = rOutl.GetParagraphCount();
+ sal_Int32 nParaAnz = rOutl.GetParagraphCount();
if(p1stPara)
{
@@ -1903,7 +1903,7 @@ void SdrTableObj::EndTextEdit(SdrOutliner& rOutl)
if(nParaAnz != 0)
{
// create new text object
- pNewText = rOutl.CreateParaObject( 0, (sal_uInt16)nParaAnz );
+ pNewText = rOutl.CreateParaObject( 0, nParaAnz );
}
}
SetOutlinerParaObject(pNewText);
diff --git a/svx/source/table/tablecontroller.cxx b/svx/source/table/tablecontroller.cxx
index 0358b3c1739d..5faf3fe2b61b 100644
--- a/svx/source/table/tablecontroller.cxx
+++ b/svx/source/table/tablecontroller.cxx
@@ -1653,7 +1653,7 @@ void SvxTableController::EditCell( const CellPos& rPos, ::Window* pWindow, const
if(!pTableObj->GetOutlinerParaObject() && mpView->GetTextEditOutliner())
{
::Outliner* pOutl = mpView->GetTextEditOutliner();
- sal_uIntPtr nParaAnz = pOutl->GetParagraphCount();
+ sal_Int32 nParaAnz = pOutl->GetParagraphCount();
Paragraph* p1stPara = pOutl->GetParagraph( 0 );
if(nParaAnz==1 && p1stPara)
diff --git a/svx/source/table/tablertfimporter.cxx b/svx/source/table/tablertfimporter.cxx
index ec6e78ac66cb..eb4deb3011a4 100644
--- a/svx/source/table/tablertfimporter.cxx
+++ b/svx/source/table/tablertfimporter.cxx
@@ -107,7 +107,7 @@ private:
int mnLastToken;
bool mbNewDef;
- sal_uInt16 mnStartPara;
+ sal_Int32 mnStartPara;
sal_Int32 mnColCnt;
sal_Int32 mnRowCnt;
@@ -272,7 +272,7 @@ void SdrTableRTFParser::FillTable()
if( xCellInfo->maItemSet.GetItemState(SDRATTR_TABLE_BORDER,sal_False,&pPoolItem)==SFX_ITEM_SET)
xCell->SetMergedItem( *pPoolItem );
- OutlinerParaObject* pTextObject = mpOutliner->CreateParaObject( (sal_uInt16)xCellInfo->mnStartPara, (sal_uInt16)xCellInfo->mnParaCount );
+ OutlinerParaObject* pTextObject = mpOutliner->CreateParaObject( xCellInfo->mnStartPara, xCellInfo->mnParaCount );
if( pTextObject )
{
SdrOutliner& rOutliner=mrTableObj.ImpGetDrawOutliner();
generated by cgit v1.2.3 (git 2.39.1) at 2024-05-25 02:33:40 +0000