summaryrefslogtreecommitdiff
path: root/editeng/source/items/numitem.cxx
diff options
context:
space:
mode:
Diffstat (limited to 'editeng/source/items/numitem.cxx')
-rw-r--r--editeng/source/items/numitem.cxx168
1 files changed, 84 insertions, 84 deletions
diff --git a/editeng/source/items/numitem.cxx b/editeng/source/items/numitem.cxx
index fd4ccfa005..12ce768eac 100644
--- a/editeng/source/items/numitem.cxx
+++ b/editeng/source/items/numitem.cxx
@@ -117,7 +117,7 @@ SvxNumberType::~SvxNumberType()
/* -----------------------------22.02.01 11:09--------------------------------
---------------------------------------------------------------------------*/
-String SvxNumberType::GetNumStr( ULONG nNo ) const
+String SvxNumberType::GetNumStr( sal_uLong nNo ) const
{
LanguageType eLang = Application::GetSettings().GetLanguage();
Locale aLocale = SvxCreateLocale(eLang);
@@ -126,7 +126,7 @@ String SvxNumberType::GetNumStr( ULONG nNo ) const
/* -----------------28.10.98 15:56-------------------
*
* --------------------------------------------------*/
-String SvxNumberType::GetNumStr( ULONG nNo, const Locale& rLocale ) const
+String SvxNumberType::GetNumStr( sal_uLong nNo, const Locale& rLocale ) const
{
lcl_getFormatter(xFormatter);
String aTmpStr;
@@ -231,16 +231,16 @@ SvxNumberFormat::SvxNumberFormat(SvStream &rStream)
mnIndentAt( 0 )
{
- USHORT nVersion;
+ sal_uInt16 nVersion;
rStream >> nVersion;
- USHORT nUSHORT;
+ sal_uInt16 nUSHORT;
rStream >> nUSHORT;
SetNumberingType((sal_Int16)nUSHORT);
rStream >> nUSHORT;
eNumAdjust = (SvxAdjust)nUSHORT;
rStream >> nUSHORT;
- nInclUpperLevels = (BYTE)nUSHORT;
+ nInclUpperLevels = (sal_uInt8)nUSHORT;
rStream >> nUSHORT;
nStart = nUSHORT;
rStream >> nUSHORT;
@@ -288,7 +288,7 @@ SvxNumberFormat::SvxNumberFormat(SvStream &rStream)
rStream >> nUSHORT;
nBulletRelSize = nUSHORT;
rStream >> nUSHORT;
- SetShowSymbol((BOOL)nUSHORT);
+ SetShowSymbol((sal_Bool)nUSHORT);
if( nVersion < NUMITEM_VERSION_03 )
cBullet = ByteString::ConvertToUnicode( (sal_Char)cBullet,
@@ -296,7 +296,7 @@ SvxNumberFormat::SvxNumberFormat(SvStream &rStream)
: RTL_TEXTENCODING_SYMBOL );
if(pBulletFont)
{
- BOOL bConvertBulletFont = rStream.GetVersion() <= SOFFICE_FILEFORMAT_50;
+ sal_Bool bConvertBulletFont = rStream.GetVersion() <= SOFFICE_FILEFORMAT_50;
if(bConvertBulletFont)
{
@@ -340,13 +340,13 @@ SvStream& SvxNumberFormat::Store(SvStream &rStream, FontToSubsFontConverter pC
pBulletFont->SetName(sFontName);
}
- rStream << (USHORT)NUMITEM_VERSION_04;
+ rStream << (sal_uInt16)NUMITEM_VERSION_04;
- rStream << (USHORT)GetNumberingType();
- rStream << (USHORT)eNumAdjust;
- rStream << (USHORT)nInclUpperLevels;
+ rStream << (sal_uInt16)GetNumberingType();
+ rStream << (sal_uInt16)eNumAdjust;
+ rStream << (sal_uInt16)nInclUpperLevels;
rStream << nStart;
- rStream << (USHORT)cBullet;
+ rStream << (sal_uInt16)cBullet;
rStream << nFirstLineOffset;
rStream << nAbsLSpace;
@@ -359,7 +359,7 @@ SvStream& SvxNumberFormat::Store(SvStream &rStream, FontToSubsFontConverter pC
rStream.WriteByteString(sCharStyleName, eEnc);
if(pGraphicBrush)
{
- rStream << (USHORT)1;
+ rStream << (sal_uInt16)1;
// #75113# in SD or SI force bullet itself to be stored,
// for that purpose throw away link when link and graphic
@@ -373,16 +373,16 @@ SvStream& SvxNumberFormat::Store(SvStream &rStream, FontToSubsFontConverter pC
pGraphicBrush->Store(rStream, BRUSH_GRAPHIC_VERSION);
}
else
- rStream << (USHORT)0;
+ rStream << (sal_uInt16)0;
- rStream << (USHORT)eVertOrient;
+ rStream << (sal_uInt16)eVertOrient;
if(pBulletFont)
{
- rStream << (USHORT)1;
+ rStream << (sal_uInt16)1;
rStream << *pBulletFont;
}
else
- rStream << (USHORT)0;
+ rStream << (sal_uInt16)0;
rStream << aGraphicSize;
Color nTempColor = nBulletColor;
@@ -390,10 +390,10 @@ SvStream& SvxNumberFormat::Store(SvStream &rStream, FontToSubsFontConverter pC
nTempColor = COL_BLACK;
rStream << nTempColor;
rStream << nBulletRelSize;
- rStream << (USHORT)IsShowSymbol();
+ rStream << (sal_uInt16)IsShowSymbol();
- rStream << ( USHORT ) mePositionAndSpaceMode;
- rStream << ( USHORT ) meLabelFollowedBy;
+ rStream << ( sal_uInt16 ) mePositionAndSpaceMode;
+ rStream << ( sal_uInt16 ) meLabelFollowedBy;
rStream << ( long ) mnListtabPos;
rStream << ( long ) mnFirstLineIndent;
rStream << ( long ) mnIndentAt;
@@ -446,7 +446,7 @@ SvxNumberFormat& SvxNumberFormat::operator=( const SvxNumberFormat& rFormat )
/* -----------------27.10.98 10:56-------------------
*
* --------------------------------------------------*/
-BOOL SvxNumberFormat::operator==( const SvxNumberFormat& rFormat) const
+sal_Bool SvxNumberFormat::operator==( const SvxNumberFormat& rFormat) const
{
if( GetNumberingType() != rFormat.GetNumberingType() ||
eNumAdjust != rFormat.eNumAdjust ||
@@ -475,14 +475,14 @@ BOOL SvxNumberFormat::operator==( const SvxNumberFormat& rFormat) const
IsShowSymbol() != rFormat.IsShowSymbol() ||
sCharStyleName != rFormat.sCharStyleName
)
- return FALSE;
+ return sal_False;
if (
(pGraphicBrush && !rFormat.pGraphicBrush) ||
(!pGraphicBrush && rFormat.pGraphicBrush) ||
(pGraphicBrush && *pGraphicBrush != *rFormat.pGraphicBrush)
)
{
- return FALSE;
+ return sal_False;
}
if (
(pBulletFont && !rFormat.pBulletFont) ||
@@ -490,9 +490,9 @@ BOOL SvxNumberFormat::operator==( const SvxNumberFormat& rFormat) const
(pBulletFont && *pBulletFont != *rFormat.pBulletFont)
)
{
- return FALSE;
+ return sal_False;
}
- return TRUE;
+ return sal_True;
}
/* -----------------28.10.98 09:53-------------------
*
@@ -690,7 +690,7 @@ Size SvxNumberFormat::GetGraphicSizeMM100(const Graphic* pGraphic)
/* -----------------28.10.98 15:57-------------------
*
* --------------------------------------------------*/
-String SvxNumberFormat::CreateRomanString( ULONG nNo, BOOL bUpper )
+String SvxNumberFormat::CreateRomanString( sal_uLong nNo, sal_Bool bUpper )
{
nNo %= 4000; // mehr kann nicht dargestellt werden
// i, ii, iii, iv, v, vi, vii, vii, viii, ix
@@ -700,11 +700,11 @@ String SvxNumberFormat::CreateRomanString( ULONG nNo, BOOL bUpper )
: "mdclxvi--"; // +2 Dummy-Eintraege !!
String sRet;
- USHORT nMask = 1000;
+ sal_uInt16 nMask = 1000;
while( nMask )
{
- BYTE nZahl = BYTE(nNo / nMask);
- BYTE nDiff = 1;
+ sal_uInt8 nZahl = sal_uInt8(nNo / nMask);
+ sal_uInt8 nDiff = 1;
nNo %= nMask;
if( 5 < nZahl )
@@ -736,13 +736,13 @@ String SvxNumberFormat::CreateRomanString( ULONG nNo, BOOL bUpper )
return sRet;
}
#ifdef OLD_NUMBER_FORMATTING
-void SvxNumberFormat::GetCharStr( ULONG nNo, String& rStr ) const
+void SvxNumberFormat::GetCharStr( sal_uLong nNo, String& rStr ) const
{
DBG_ASSERT( nNo, "0 ist eine ungueltige Nummer !!" );
- const ULONG coDiff = 'Z' - 'A' +1;
+ const sal_uLong coDiff = 'Z' - 'A' +1;
char cAdd = (SVX_NUM_CHARS_UPPER_LETTER == eNumType ? 'A' : 'a') - 1;
- ULONG nCalc;
+ sal_uLong nCalc;
do {
nCalc = nNo % coDiff;
@@ -755,18 +755,18 @@ void SvxNumberFormat::GetCharStr( ULONG nNo, String& rStr ) const
} while( nNo );
}
-void SvxNumberFormat::GetCharStrN( ULONG nNo, String& rStr ) const
+void SvxNumberFormat::GetCharStrN( sal_uLong nNo, String& rStr ) const
{
DBG_ASSERT( nNo, "0 ist eine ungueltige Nummer !!" );
- const ULONG coDiff = 'Z' - 'A' +1;
+ const sal_uLong coDiff = 'Z' - 'A' +1;
char cChar = (char)(--nNo % coDiff);
if( SVX_NUM_CHARS_UPPER_LETTER_N == eNumType )
cChar += 'A';
else
cChar += 'a';
- rStr.Fill( (USHORT)(nNo / coDiff) + 1, sal_Unicode(cChar) );
+ rStr.Fill( (sal_uInt16)(nNo / coDiff) + 1, sal_Unicode(cChar) );
}
#endif //OLD_NUMBER_FORMATTING
/* -----------------------------22.02.01 13:31--------------------------------
@@ -783,9 +783,9 @@ sal_Int32 SvxNumRule::nRefCount = 0;
static SvxNumberFormat* pStdNumFmt = 0;
static SvxNumberFormat* pStdOutlineNumFmt = 0;
// --> OD 2008-02-11 #newlistlevelattrs#
-SvxNumRule::SvxNumRule( ULONG nFeatures,
- USHORT nLevels,
- BOOL bCont,
+SvxNumRule::SvxNumRule( sal_uLong nFeatures,
+ sal_uInt16 nLevels,
+ sal_Bool bCont,
SvxNumRuleType eType,
SvxNumberFormat::SvxNumPositionAndSpaceMode
eDefaultNumberFormatPositionAndSpaceMode )
@@ -797,7 +797,7 @@ SvxNumRule::SvxNumRule( ULONG nFeatures,
++nRefCount;
LanguageType eLang = Application::GetSettings().GetLanguage();
aLocale = SvxCreateLocale(eLang);
- for(USHORT i = 0; i < SVX_MAX_NUM; i++)
+ for(sal_uInt16 i = 0; i < SVX_MAX_NUM; i++)
{
if(i < nLevels)
{
@@ -838,7 +838,7 @@ SvxNumRule::SvxNumRule( ULONG nFeatures,
}
else
aFmts[i] = 0;
- aFmtsSet[i] = FALSE;
+ aFmtsSet[i] = sal_False;
}
}
/* -----------------27.10.98 10:41-------------------
@@ -853,7 +853,7 @@ SvxNumRule::SvxNumRule(const SvxNumRule& rCopy)
bContinuousNumbering = rCopy.bContinuousNumbering;
eNumberingType = rCopy.eNumberingType;
memset( aFmts, 0, sizeof( aFmts ));
- for(USHORT i = 0; i < SVX_MAX_NUM; i++)
+ for(sal_uInt16 i = 0; i < SVX_MAX_NUM; i++)
{
if(rCopy.aFmts[i])
aFmts[i] = new SvxNumberFormat(*rCopy.aFmts[i]);
@@ -870,31 +870,31 @@ SvxNumRule::SvxNumRule(SvStream &rStream)
++nRefCount;
LanguageType eLang = Application::GetSettings().GetLanguage();
aLocale = SvxCreateLocale(eLang);
- USHORT nVersion;
- USHORT nTemp;
+ sal_uInt16 nVersion;
+ sal_uInt16 nTemp;
rStream >> nVersion;
rStream >> nLevelCount;
rStream >> nTemp;
nFeatureFlags = nTemp;
rStream >> nTemp;
- bContinuousNumbering = (BOOL)nTemp;
+ bContinuousNumbering = (sal_Bool)nTemp;
rStream >> nTemp;
eNumberingType = (SvxNumRuleType)nTemp;
memset( aFmts, 0, sizeof( aFmts ));
- for(USHORT i = 0; i < SVX_MAX_NUM; i++)
+ for(sal_uInt16 i = 0; i < SVX_MAX_NUM; i++)
{
- USHORT nSet;
+ sal_uInt16 nSet;
rStream >> nSet;
if(nSet)
aFmts[i] = new SvxNumberFormat(rStream);
else
aFmts[i] = 0;
- aFmtsSet[i] = aFmts[i] ? TRUE : FALSE;
+ aFmtsSet[i] = aFmts[i] ? sal_True : sal_False;
}
if(NUMITEM_VERSION_02 <= nVersion)
{
- USHORT nShort;
+ sal_uInt16 nShort;
rStream >> nShort;
nFeatureFlags = nShort;
}
@@ -905,20 +905,20 @@ SvxNumRule::SvxNumRule(SvStream &rStream)
* --------------------------------------------------*/
SvStream& SvxNumRule::Store(SvStream &rStream)
{
- rStream<<(USHORT)NUMITEM_VERSION_03;
+ rStream<<(sal_uInt16)NUMITEM_VERSION_03;
rStream<<nLevelCount;
//first save of nFeatureFlags for old versions
- rStream<<(USHORT)nFeatureFlags;
- rStream<<(USHORT)bContinuousNumbering;
- rStream<<(USHORT)eNumberingType;
+ rStream<<(sal_uInt16)nFeatureFlags;
+ rStream<<(sal_uInt16)bContinuousNumbering;
+ rStream<<(sal_uInt16)eNumberingType;
FontToSubsFontConverter pConverter = 0;
- BOOL bConvertBulletFont = rStream.GetVersion() <= SOFFICE_FILEFORMAT_50;
- for(USHORT i = 0; i < SVX_MAX_NUM; i++)
+ sal_Bool bConvertBulletFont = rStream.GetVersion() <= SOFFICE_FILEFORMAT_50;
+ for(sal_uInt16 i = 0; i < SVX_MAX_NUM; i++)
{
if(aFmts[i])
{
- rStream << USHORT(1);
+ rStream << sal_uInt16(1);
if(bConvertBulletFont && aFmts[i]->GetBulletFont())
{
if(!pConverter)
@@ -929,10 +929,10 @@ SvStream& SvxNumRule::Store(SvStream &rStream)
aFmts[i]->Store(rStream, pConverter);
}
else
- rStream << USHORT(0);
+ rStream << sal_uInt16(0);
}
//second save of nFeatureFlags for new versions
- rStream<<(USHORT)nFeatureFlags;
+ rStream<<(sal_uInt16)nFeatureFlags;
if(pConverter)
DestroyFontToSubsFontConverter(pConverter);
@@ -944,7 +944,7 @@ SvStream& SvxNumRule::Store(SvStream &rStream)
* --------------------------------------------------*/
SvxNumRule::~SvxNumRule()
{
- for(USHORT i = 0; i < SVX_MAX_NUM; i++)
+ for(sal_uInt16 i = 0; i < SVX_MAX_NUM; i++)
delete aFmts[i];
if(!--nRefCount)
{
@@ -961,7 +961,7 @@ SvxNumRule& SvxNumRule::operator=( const SvxNumRule& rCopy )
nFeatureFlags = rCopy.nFeatureFlags;
bContinuousNumbering = rCopy.bContinuousNumbering;
eNumberingType = rCopy.eNumberingType;
- for(USHORT i = 0; i < SVX_MAX_NUM; i++)
+ for(sal_uInt16 i = 0; i < SVX_MAX_NUM; i++)
{
delete aFmts[i];
if(rCopy.aFmts[i])
@@ -981,8 +981,8 @@ int SvxNumRule::operator==( const SvxNumRule& rCopy) const
nFeatureFlags != rCopy.nFeatureFlags ||
bContinuousNumbering != rCopy.bContinuousNumbering ||
eNumberingType != rCopy.eNumberingType)
- return FALSE;
- for(USHORT i = 0; i < nLevelCount; i++)
+ return sal_False;
+ for(sal_uInt16 i = 0; i < nLevelCount; i++)
{
if (
(aFmtsSet[i] != rCopy.aFmtsSet[i]) ||
@@ -991,15 +991,15 @@ int SvxNumRule::operator==( const SvxNumRule& rCopy) const
(aFmts[i] && *aFmts[i] != *rCopy.aFmts[i])
)
{
- return FALSE;
+ return sal_False;
}
}
- return TRUE;
+ return sal_True;
}
/* -----------------27.10.98 10:41-------------------
*
* --------------------------------------------------*/
-const SvxNumberFormat* SvxNumRule::Get(USHORT nLevel)const
+const SvxNumberFormat* SvxNumRule::Get(sal_uInt16 nLevel)const
{
DBG_ASSERT(nLevel < SVX_MAX_NUM, "falsches Level" );
if( nLevel < SVX_MAX_NUM )
@@ -1010,7 +1010,7 @@ const SvxNumberFormat* SvxNumRule::Get(USHORT nLevel)const
/* -----------------02.11.98 09:10-------------------
*
* --------------------------------------------------*/
-const SvxNumberFormat& SvxNumRule::GetLevel(USHORT nLevel)const
+const SvxNumberFormat& SvxNumRule::GetLevel(sal_uInt16 nLevel)const
{
if(!pStdNumFmt)
{
@@ -1028,7 +1028,7 @@ const SvxNumberFormat& SvxNumRule::GetLevel(USHORT nLevel)const
/* -----------------29.10.98 09:08-------------------
*
* --------------------------------------------------*/
-void SvxNumRule::SetLevel( USHORT i, const SvxNumberFormat& rNumFmt, BOOL bIsValid )
+void SvxNumRule::SetLevel( sal_uInt16 i, const SvxNumberFormat& rNumFmt, sal_Bool bIsValid )
{
DBG_ASSERT(i < SVX_MAX_NUM, "falsches Level" );
@@ -1037,13 +1037,13 @@ void SvxNumRule::SetLevel( USHORT i, const SvxNumberFormat& rNumFmt, BOOL bIsVal
delete aFmts[ i ];
aFmts[ i ] = new SvxNumberFormat( rNumFmt );
aFmtsSet[i] = bIsValid;
-// bInvalidRuleFlag = TRUE;
+// bInvalidRuleFlag = sal_True;
}
}
/* -----------------30.10.98 12:44-------------------
*
* --------------------------------------------------*/
-void SvxNumRule::SetLevel(USHORT nLevel, const SvxNumberFormat* pFmt)
+void SvxNumRule::SetLevel(sal_uInt16 nLevel, const SvxNumberFormat* pFmt)
{
DBG_ASSERT(nLevel < SVX_MAX_NUM, "falsches Level" );
@@ -1062,7 +1062,7 @@ void SvxNumRule::SetLevel(USHORT nLevel, const SvxNumberFormat* pFmt)
/* -----------------28.10.98 15:38-------------------
*
* --------------------------------------------------*/
-String SvxNumRule::MakeNumString( const SvxNodeNum& rNum, BOOL bInclStrings ) const
+String SvxNumRule::MakeNumString( const SvxNodeNum& rNum, sal_Bool bInclStrings ) const
{
String aStr;
if( SVX_NO_NUM > rNum.GetLevel() && !( SVX_NO_NUMLEVEL & rNum.GetLevel() ) )
@@ -1070,12 +1070,12 @@ String SvxNumRule::MakeNumString( const SvxNodeNum& rNum, BOOL bInclStrings ) c
const SvxNumberFormat& rMyNFmt = GetLevel( rNum.GetLevel() );
if( SVX_NUM_NUMBER_NONE != rMyNFmt.GetNumberingType() )
{
- BYTE i = rNum.GetLevel();
+ sal_uInt8 i = rNum.GetLevel();
if( !IsContinuousNumbering() &&
1 < rMyNFmt.GetIncludeUpperLevels() ) // nur der eigene Level ?
{
- BYTE n = rMyNFmt.GetIncludeUpperLevels();
+ sal_uInt8 n = rMyNFmt.GetIncludeUpperLevels();
if( 1 < n )
{
if( i+1 >= n )
@@ -1122,10 +1122,10 @@ String SvxNumRule::MakeNumString( const SvxNodeNum& rNum, BOOL bInclStrings ) c
/* -----------------18.08.99 10:18-------------------
Description: changes linked to embedded bitmaps
--------------------------------------------------*/
-BOOL SvxNumRule::UnLinkGraphics()
+sal_Bool SvxNumRule::UnLinkGraphics()
{
- BOOL bRet = FALSE;
- for(USHORT i = 0; i < GetLevelCount(); i++)
+ sal_Bool bRet = sal_False;
+ for(sal_uInt16 i = 0; i < GetLevelCount(); i++)
{
SvxNumberFormat aFmt(GetLevel(i));
const SvxBrushItem* pBrush = aFmt.GetBrush();
@@ -1143,7 +1143,7 @@ BOOL SvxNumRule::UnLinkGraphics()
aTempItem.SetGraphic(*pGraphic);
sal_Int16 eOrient = aFmt.GetVertOrient();
aFmt.SetGraphicBrush( &aTempItem, &aFmt.GetGraphicSize(), &eOrient );
- bRet = TRUE;
+ bRet = sal_True;
}
}
else if((SVX_NUM_BITMAP|LINK_TOKEN) == aFmt.GetNumberingType())
@@ -1165,13 +1165,13 @@ SvxNumBulletItem::SvxNumBulletItem(SvxNumRule& rRule) :
/*-----------------23.11.98 10:36-------------------
MT: Das sind ja sehr sinnige Kommentare...
--------------------------------------------------*/
-SvxNumBulletItem::SvxNumBulletItem(SvxNumRule& rRule, USHORT _nWhich ) :
+SvxNumBulletItem::SvxNumBulletItem(SvxNumRule& rRule, sal_uInt16 _nWhich ) :
SfxPoolItem(_nWhich),
pNumRule(new SvxNumRule(rRule))
{
}
-SfxPoolItem* SvxNumBulletItem::Create(SvStream &s, USHORT n) const
+SfxPoolItem* SvxNumBulletItem::Create(SvStream &s, sal_uInt16 n) const
{
return SfxPoolItem::Create(s, n );
}
@@ -1209,14 +1209,14 @@ SfxPoolItem* SvxNumBulletItem::Clone( SfxItemPool * ) const
/* -----------------08.12.98 10:43-------------------
*
* --------------------------------------------------*/
-USHORT SvxNumBulletItem::GetVersion( USHORT /*nFileVersion*/ ) const
+sal_uInt16 SvxNumBulletItem::GetVersion( sal_uInt16 /*nFileVersion*/ ) const
{
return NUMITEM_VERSION_03;
}
/* -----------------08.12.98 10:43-------------------
*
* --------------------------------------------------*/
-SvStream& SvxNumBulletItem::Store(SvStream &rStream, USHORT /*nItemVersion*/ )const
+SvStream& SvxNumBulletItem::Store(SvStream &rStream, sal_uInt16 /*nItemVersion*/ )const
{
pNumRule->Store(rStream);
return rStream;
@@ -1226,13 +1226,13 @@ SvStream& SvxNumBulletItem::Store(SvStream &rStream, USHORT /*nItemVersion*/ )
*
* --------------------------------------------------*/
-sal_Bool SvxNumBulletItem::QueryValue( com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/ ) const
+sal_Bool SvxNumBulletItem::QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/ ) const
{
rVal <<= SvxCreateNumRule( pNumRule );
return sal_True;
}
-sal_Bool SvxNumBulletItem::PutValue( const com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/ )
+sal_Bool SvxNumBulletItem::PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/ )
{
uno::Reference< container::XIndexReplace > xRule;
if( rVal >>= xRule )
@@ -1261,12 +1261,12 @@ sal_Bool SvxNumBulletItem::PutValue( const com::sun::star::uno::Any& rVal, BYTE
/* -----------------08.12.98 10:43-------------------
*
* --------------------------------------------------*/
-SvxNumRule* SvxConvertNumRule( const SvxNumRule* pRule, USHORT nLevels, SvxNumRuleType eType )
+SvxNumRule* SvxConvertNumRule( const SvxNumRule* pRule, sal_uInt16 nLevels, SvxNumRuleType eType )
{
- const USHORT nSrcLevels = pRule->GetLevelCount();
+ const sal_uInt16 nSrcLevels = pRule->GetLevelCount();
SvxNumRule* pNewRule = new SvxNumRule( pRule->GetFeatureFlags(), nLevels, pRule->IsContinuousNumbering(), eType );
- for( USHORT nLevel = 0; (nLevel < nLevels) && (nLevel < nSrcLevels); nLevel++ )
+ for( sal_uInt16 nLevel = 0; (nLevel < nLevels) && (nLevel < nSrcLevels); nLevel++ )
pNewRule->SetLevel( nLevel, pRule->GetLevel( nLevel ) );
return pNewRule;
generated by cgit v1.2.3 (git 2.39.1) at 2024-06-16 15:32:31 +0000