summaryrefslogtreecommitdiff
path: root/sw/source/ui/config/uinums.cxx
diff options
context:
space:
mode:
Diffstat (limited to 'sw/source/ui/config/uinums.cxx')
-rw-r--r--sw/source/ui/config/uinums.cxx114
1 files changed, 57 insertions, 57 deletions
diff --git a/sw/source/ui/config/uinums.cxx b/sw/source/ui/config/uinums.cxx
index 40d56b3b6507..640471e441f1 100644
--- a/sw/source/ui/config/uinums.cxx
+++ b/sw/source/ui/config/uinums.cxx
@@ -56,11 +56,11 @@
using namespace ::com::sun::star;
-#define VERSION_30B ((USHORT)250)
-#define VERSION_31B ((USHORT)326)
-#define VERSION_40A ((USHORT)364)
-#define VERSION_50A ((USHORT)373)
-#define VERSION_53A ((USHORT)596)
+#define VERSION_30B ((sal_uInt16)250)
+#define VERSION_31B ((sal_uInt16)326)
+#define VERSION_40A ((sal_uInt16)364)
+#define VERSION_50A ((sal_uInt16)373)
+#define VERSION_53A ((sal_uInt16)596)
#define ACT_NUM_VERSION VERSION_53A
#define NUMRULE_FILENAME "numrule.cfg"
@@ -87,7 +87,7 @@ SwBaseNumRules::SwBaseNumRules( const String& rFileName )
:
sFileName( rFileName ),
nVersion(0),
- bModified( FALSE )
+ bModified( sal_False )
{
Init();
}
@@ -106,11 +106,11 @@ SwBaseNumRules::~SwBaseNumRules()
INetURLObject aTempObj(sNm);
sNm = aTempObj.GetFull();
SfxMedium aStrm( sNm, STREAM_WRITE | STREAM_TRUNC |
- STREAM_SHARE_DENYALL, TRUE );
+ STREAM_SHARE_DENYALL, sal_True );
Store( *aStrm.GetOutStream() );
}
- for( USHORT i = 0; i < nMaxRules; ++i )
+ for( sal_uInt16 i = 0; i < nMaxRules; ++i )
delete pNumRules[i];
}
@@ -119,14 +119,14 @@ SwBaseNumRules::~SwBaseNumRules()
------------------------------------------------------------------------*/
void SwBaseNumRules::Init()
{
- for(USHORT i = 0; i < nMaxRules; ++i )
+ for(sal_uInt16 i = 0; i < nMaxRules; ++i )
pNumRules[i] = 0;
String sNm( sFileName );
SvtPathOptions aOpt;
if( aOpt.SearchFile( sNm, SvtPathOptions::PATH_USERCONFIG ))
{
- SfxMedium aStrm( sNm, STREAM_STD_READ, TRUE );
+ SfxMedium aStrm( sNm, STREAM_STD_READ, sal_True );
Load( *aStrm.GetInStream() );
}
}
@@ -135,7 +135,7 @@ void SwBaseNumRules::Init()
--------------------------------------------------*/
-void SwBaseNumRules::ApplyNumRules(const SwNumRulesWithName &rCopy, USHORT nIdx)
+void SwBaseNumRules::ApplyNumRules(const SwNumRulesWithName &rCopy, sal_uInt16 nIdx)
{
ASSERT(nIdx < nMaxRules, Array der NumRules ueberindiziert.);
if( !pNumRules[nIdx] )
@@ -149,22 +149,22 @@ void SwBaseNumRules::ApplyNumRules(const SwNumRulesWithName &rCopy, USHORT nIdx)
Beschreibung: Speichern
------------------------------------------------------------------------*/
-BOOL /**/ SwBaseNumRules::Store(SvStream &rStream)
+sal_Bool /**/ SwBaseNumRules::Store(SvStream &rStream)
{
rStream << ACT_NUM_VERSION;
// Schreiben, welche Positionen durch eine Regel belegt sind
// Anschliessend Schreiben der einzelnen Rules
- for(USHORT i = 0; i < nMaxRules; ++i)
+ for(sal_uInt16 i = 0; i < nMaxRules; ++i)
{
if(pNumRules[i])
{
- rStream << (unsigned char) TRUE;
+ rStream << (unsigned char) sal_True;
pNumRules[i]->Store( rStream );
}
else
- rStream << (unsigned char) FALSE;
+ rStream << (unsigned char) sal_False;
}
- return TRUE;
+ return sal_True;
}
@@ -189,8 +189,8 @@ int SwBaseNumRules::Load(SvStream &rStream)
else if( VERSION_30B == nVersion || VERSION_31B == nVersion ||
ACT_NUM_VERSION >= nVersion )
{
- unsigned char bRule = FALSE;
- for(USHORT i = 0; i < nMaxRules; ++i)
+ unsigned char bRule = sal_False;
+ for(sal_uInt16 i = 0; i < nMaxRules; ++i)
{
rStream >> bRule;
if(bRule)
@@ -226,9 +226,9 @@ SwChapterNumRules::SwChapterNumRules() :
/*-----------------26.06.97 08.23-------------------
--------------------------------------------------*/
-void SwChapterNumRules::ApplyNumRules(const SwNumRulesWithName &rCopy, USHORT nIdx)
+void SwChapterNumRules::ApplyNumRules(const SwNumRulesWithName &rCopy, sal_uInt16 nIdx)
{
- bModified = TRUE;
+ bModified = sal_True;
SwBaseNumRules::ApplyNumRules(rCopy, nIdx);
}
@@ -238,7 +238,7 @@ SwNumRulesWithName::SwNumRulesWithName( const SwNumRule &rCopy,
const String &rName )
: aName(rName)
{
- for( USHORT n = 0; n < MAXLEVEL; ++n )
+ for( sal_uInt16 n = 0; n < MAXLEVEL; ++n )
{
const SwNumFmt* pFmt = rCopy.GetNumFmt( n );
if( pFmt )
@@ -292,13 +292,13 @@ const SwNumRulesWithName& SwNumRulesWithName::operator=(const SwNumRulesWithName
/*------------------------------------------------------------------------
Beschreibung:
------------------------------------------------------------------------*/
-SwNumRulesWithName::SwNumRulesWithName( SvStream &rStream, USHORT nVersion )
+SwNumRulesWithName::SwNumRulesWithName( SvStream &rStream, sal_uInt16 nVersion )
{
CharSet eEncoding = gsl_getSystemTextEncoding();
rStream.ReadByteString(aName, eEncoding);
char c;
- for(USHORT n = 0; n < MAXLEVEL; ++n )
+ for(sal_uInt16 n = 0; n < MAXLEVEL; ++n )
{
if( VERSION_30B == nVersion )
c = 1;
@@ -327,9 +327,9 @@ void SwNumRulesWithName::MakeNumRule( SwWrtShell& rSh, SwNumRule& rChg ) const
// --> OD 2008-06-06 #i89178#
rChg = SwNumRule( aName, numfunc::GetDefaultPositionAndSpaceMode() );
// <--
- rChg.SetAutoRule( FALSE );
+ rChg.SetAutoRule( sal_False );
_SwNumFmtGlobal* pFmt;
- for( USHORT n = 0; n < MAXLEVEL; ++n )
+ for( sal_uInt16 n = 0; n < MAXLEVEL; ++n )
if( 0 != ( pFmt = aFmts[ n ] ) )
{
SwNumFmt aNew;
@@ -346,7 +346,7 @@ void SwNumRulesWithName::Store( SvStream &rStream )
CharSet eEncoding = gsl_getSystemTextEncoding();
rStream.WriteByteString(aName, eEncoding);
- for( USHORT n = 0; n < MAXLEVEL; ++n )
+ for( sal_uInt16 n = 0; n < MAXLEVEL; ++n )
{
_SwNumFmtGlobal* pFmt = aFmts[ n ];
if( pFmt )
@@ -377,7 +377,7 @@ SwNumRulesWithName::_SwNumFmtGlobal::_SwNumFmtGlobal( const SwNumFmt& rFmt )
{
SfxItemIter aIter( pFmt->GetAttrSet() );
const SfxPoolItem *pCurr = aIter.GetCurItem();
- while( TRUE )
+ while( sal_True )
{
aItems.Insert( pCurr->Clone(), aItems.Count() );
if( aIter.IsAtEnd() )
@@ -400,7 +400,7 @@ SwNumRulesWithName::_SwNumFmtGlobal::_SwNumFmtGlobal( const _SwNumFmtGlobal& rFm
sCharFmtName( rFmt.sCharFmtName ),
nCharPoolId( rFmt.nCharPoolId )
{
- for( USHORT n = rFmt.aItems.Count(); n; )
+ for( sal_uInt16 n = rFmt.aItems.Count(); n; )
aItems.Insert( rFmt.aItems[ --n ]->Clone(), aItems.Count() );
}
@@ -409,15 +409,15 @@ SwNumRulesWithName::_SwNumFmtGlobal::_SwNumFmtGlobal( const _SwNumFmtGlobal& rFm
------------------------------------------------------------------------*/
SwNumRulesWithName::_SwNumFmtGlobal::_SwNumFmtGlobal( SvStream& rStream,
- USHORT nVersion )
+ sal_uInt16 nVersion )
: nCharPoolId( USHRT_MAX )
{
CharSet eEncoding = gsl_getSystemTextEncoding();
{
- USHORT nUS;
+ sal_uInt16 nUS;
sal_Char cChar;
short nShort;
- BOOL bFlag;
+ sal_Bool bFlag;
String sStr;
rStream >> nUS; aFmt.SetNumberingType((sal_Int16)nUS );
@@ -435,7 +435,7 @@ SwNumRulesWithName::_SwNumFmtGlobal::_SwNumFmtGlobal( SvStream& rStream,
if( VERSION_30B == nVersion )
{
long nL;
- rStream >> cChar; aFmt.SetStart( (USHORT)cChar );
+ rStream >> cChar; aFmt.SetStart( (sal_uInt16)cChar );
rStream.ReadByteString(sStr, eEncoding);
aFmt.SetPrefix( sStr );
@@ -460,11 +460,11 @@ SwNumRulesWithName::_SwNumFmtGlobal::_SwNumFmtGlobal( SvStream& rStream,
rStream >> bFlag;
}
- USHORT nFamily;
- USHORT nCharSet;
+ sal_uInt16 nFamily;
+ sal_uInt16 nCharSet;
short nWidth;
short nHeight;
- USHORT nPitch;
+ sal_uInt16 nPitch;
String aName;
rStream.ReadByteString(aName, eEncoding);
@@ -489,14 +489,14 @@ SwNumRulesWithName::_SwNumFmtGlobal::_SwNumFmtGlobal( SvStream& rStream,
if( VERSION_30B != nVersion )
{
- USHORT nItemCount;
+ sal_uInt16 nItemCount;
rStream >> nCharPoolId;
rStream.ReadByteString(sCharFmtName, eEncoding);
rStream >> nItemCount;
while( nItemCount-- )
{
- USHORT nWhich, nVers;
+ sal_uInt16 nWhich, nVers;
rStream >> nWhich >> nVers;
aItems.Insert( GetDfltAttr( nWhich )->Create( rStream, nVers ),
aItems.Count() );
@@ -505,7 +505,7 @@ SwNumRulesWithName::_SwNumFmtGlobal::_SwNumFmtGlobal( SvStream& rStream,
if( VERSION_40A == nVersion && SVX_NUM_BITMAP == aFmt.GetNumberingType() )
{
- BYTE cF;
+ sal_uInt8 cF;
Size aSz;
rStream >> aSz.Width() >> aSz.Height();
@@ -515,7 +515,7 @@ SwNumRulesWithName::_SwNumFmtGlobal::_SwNumFmtGlobal( SvStream& rStream,
{
SvxBrushItem* pBrush = 0;
SwFmtVertOrient* pVOrient = 0;
- USHORT nVer;
+ sal_uInt16 nVer;
if( cF & 1 )
{
@@ -556,32 +556,32 @@ void SwNumRulesWithName::_SwNumFmtGlobal::Store( SvStream& rStream )
CharSet eEncoding = gsl_getSystemTextEncoding();
{
String aName;
- USHORT nFamily = FAMILY_DONTKNOW, nCharSet = 0, nPitch = 0;
+ sal_uInt16 nFamily = FAMILY_DONTKNOW, nCharSet = 0, nPitch = 0;
short nWidth = 0, nHeight = 0;
const Font* pFnt = aFmt.GetBulletFont();
if( pFnt )
{
aName = pFnt->GetName();
- nFamily = (USHORT)pFnt->GetFamily();
- nCharSet = (USHORT)pFnt->GetCharSet();
+ nFamily = (sal_uInt16)pFnt->GetFamily();
+ nCharSet = (sal_uInt16)pFnt->GetCharSet();
nWidth = (short)pFnt->GetSize().Width();
nHeight = (short)pFnt->GetSize().Height();
- nPitch = (USHORT)pFnt->GetPitch();
+ nPitch = (sal_uInt16)pFnt->GetPitch();
}
- rStream << USHORT(aFmt.GetNumberingType())
+ rStream << sal_uInt16(aFmt.GetNumberingType())
<< aFmt.GetBulletChar()
<< (aFmt.GetIncludeUpperLevels() > 0)
<< aFmt.GetStart();
rStream.WriteByteString( aFmt.GetPrefix(), eEncoding );
rStream.WriteByteString( aFmt.GetSuffix(), eEncoding );
- rStream << USHORT( aFmt.GetNumAdjust() )
+ rStream << sal_uInt16( aFmt.GetNumAdjust() )
<< aFmt.GetAbsLSpace()
<< aFmt.GetFirstLineOffset()
<< aFmt.GetCharTextDistance()
<< aFmt.GetLSpace()
- << FALSE;//aFmt.IsRelLSpace();
+ << sal_False;//aFmt.IsRelLSpace();
rStream.WriteByteString( aName, eEncoding );
rStream << nFamily
<< nCharSet
@@ -593,10 +593,10 @@ void SwNumRulesWithName::_SwNumFmtGlobal::Store( SvStream& rStream )
rStream.WriteByteString( sCharFmtName, eEncoding );
rStream << aItems.Count();
- for( USHORT n = aItems.Count(); n; )
+ for( sal_uInt16 n = aItems.Count(); n; )
{
SfxPoolItem* pItem = aItems[ --n ];
- USHORT nIVers = pItem->GetVersion( SOFFICE_FILEFORMAT_50 );
+ sal_uInt16 nIVers = pItem->GetVersion( SOFFICE_FILEFORMAT_50 );
ASSERT( nIVers != USHRT_MAX,
"Was'n das: Item-Version USHRT_MAX in der aktuellen Version" );
rStream << pItem->Which()
@@ -608,21 +608,21 @@ void SwNumRulesWithName::_SwNumFmtGlobal::Store( SvStream& rStream )
if( SVX_NUM_BITMAP == aFmt.GetNumberingType() )
{
- rStream << (INT32)aFmt.GetGraphicSize().Width()
- << (INT32)aFmt.GetGraphicSize().Height();
- BYTE cFlg = ( 0 != aFmt.GetBrush() ? 1 : 0 ) +
+ rStream << (sal_Int32)aFmt.GetGraphicSize().Width()
+ << (sal_Int32)aFmt.GetGraphicSize().Height();
+ sal_uInt8 cFlg = ( 0 != aFmt.GetBrush() ? 1 : 0 ) +
( 0 != aFmt.GetGraphicOrientation() ? 2 : 0 );
rStream << cFlg;
if( aFmt.GetBrush() )
{
- USHORT nVersion = aFmt.GetBrush()->GetVersion( SOFFICE_FILEFORMAT_50 );
+ sal_uInt16 nVersion = aFmt.GetBrush()->GetVersion( SOFFICE_FILEFORMAT_50 );
rStream << nVersion;
aFmt.GetBrush()->Store( rStream, nVersion );
}
if( aFmt.GetGraphicOrientation() )
{
- USHORT nVersion = aFmt.GetGraphicOrientation()->GetVersion( SOFFICE_FILEFORMAT_50 );
+ sal_uInt16 nVersion = aFmt.GetGraphicOrientation()->GetVersion( SOFFICE_FILEFORMAT_50 );
rStream << nVersion;
aFmt.GetGraphicOrientation()->Store( rStream, nVersion );
}
@@ -640,8 +640,8 @@ void SwNumRulesWithName::_SwNumFmtGlobal::ChgNumFmt( SwWrtShell& rSh,
if( sCharFmtName.Len() )
{
// suche erstmal ueber den Namen
- USHORT nArrLen = rSh.GetCharFmtCount();
- for( USHORT i = 1; i < nArrLen; ++i )
+ sal_uInt16 nArrLen = rSh.GetCharFmtCount();
+ for( sal_uInt16 i = 1; i < nArrLen; ++i )
{
pFmt = &rSh.GetCharFmt( i );
if( COMPARE_EQUAL == pFmt->GetName().CompareTo( sCharFmtName ))
@@ -655,13 +655,13 @@ void SwNumRulesWithName::_SwNumFmtGlobal::ChgNumFmt( SwWrtShell& rSh,
if( IsPoolUserFmt( nCharPoolId ) )
{
pFmt = rSh.MakeCharFmt( sCharFmtName );
- pFmt->SetAuto( FALSE );
+ pFmt->SetAuto( sal_False );
}
else
pFmt = rSh.GetCharFmtFromPool( nCharPoolId );
if( !pFmt->GetDepends() ) // Attribute setzen
- for( USHORT n = aItems.Count(); n; )
+ for( sal_uInt16 n = aItems.Count(); n; )
pFmt->SetFmtAttr( *aItems[ --n ] );
}
}
generated by cgit v1.2.3 (git 2.39.1) at 2024-04-25 09:00:40 +0000