summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--svx/source/svdraw/svdpntv.cxx2
-rw-r--r--svx/source/svdraw/svdtrans.cxx16
-rw-r--r--svx/workben/edittest.cxx2
-rw-r--r--xmloff/source/style/XMLFontAutoStylePool.cxx4
-rw-r--r--xmloff/source/style/impastp4.cxx18
-rw-r--r--xmloff/source/style/xmlstyle.cxx2
-rw-r--r--xmloff/source/text/XMLTextListAutoStylePool.cxx4
7 files changed, 24 insertions, 24 deletions
diff --git a/svx/source/svdraw/svdpntv.cxx b/svx/source/svdraw/svdpntv.cxx
index 79776559a738..aaa83ed5f1fe 100644
--- a/svx/source/svdraw/svdpntv.cxx
+++ b/svx/source/svdraw/svdpntv.cxx
@@ -1248,7 +1248,7 @@ void SdrPaintView::SetDefaultAttr(const SfxItemSet& rAttr, sal_Bool bReplaceAll)
}
#endif
if (bReplaceAll) aDefaultAttr.Set(rAttr);
- else aDefaultAttr.Put(rAttr,FALSE); // FALSE= InvalidItems nicht als Default, sondern als "Loecher" betrachten
+ else aDefaultAttr.Put(rAttr,sal_False); // FALSE= InvalidItems nicht als Default, sondern als "Loecher" betrachten
SetNotPersistDefaultAttr(rAttr,bReplaceAll);
#ifdef DBG_UTIL
if (pItemBrowser!=NULL) pItemBrowser->SetDirty();
diff --git a/svx/source/svdraw/svdtrans.cxx b/svx/source/svdraw/svdtrans.cxx
index 2dffd558cf49..5559b3a9df03 100644
--- a/svx/source/svdraw/svdtrans.cxx
+++ b/svx/source/svdraw/svdtrans.cxx
@@ -879,8 +879,8 @@ void GetMeterOrInch(MapUnit eMU, short& rnKomma, long& rnMul, long& rnDiv, int&
case MAP_100TH_INCH : bInch=sal_True; nKomma=2; break;
case MAP_10TH_INCH : bInch=sal_True; nKomma=1; break;
case MAP_INCH : bInch=sal_True; nKomma=0; break;
- case MAP_POINT : bInch=TRUE; rnDiv=72; break; // 1Pt = 1/72"
- case MAP_TWIP : bInch=TRUE; rnDiv=144; nKomma=1; break; // 1Twip = 1/1440"
+ case MAP_POINT : bInch=sal_True; rnDiv=72; break; // 1Pt = 1/72"
+ case MAP_TWIP : bInch=sal_True; rnDiv=144; nKomma=1; break; // 1Twip = 1/1440"
// Sonstiges
case MAP_PIXEL : break;
case MAP_SYSFONT : break;
@@ -907,12 +907,12 @@ void GetMeterOrInch(FieldUnit eFU, short& rnKomma, long& rnMul, long& rnDiv, int
case FUNIT_M : bMetr=sal_True; nKomma=0; break;
case FUNIT_KM : bMetr=sal_True; nKomma=-3; break;
// Inch
- case FUNIT_TWIP : bInch=TRUE; rnDiv=144; nKomma=1; break; // 1Twip = 1/1440"
- case FUNIT_POINT : bInch=TRUE; rnDiv=72; break; // 1Pt = 1/72"
- case FUNIT_PICA : bInch=TRUE; rnDiv=6; break; // 1Pica = 1/6" ?
- case FUNIT_INCH : bInch=TRUE; break; // 1" = 1"
- case FUNIT_FOOT : bInch=TRUE; rnMul=12; break; // 1Ft = 12"
- case FUNIT_MILE : bInch=TRUE; rnMul=6336; nKomma=-1; break; // 1mile = 63360"
+ case FUNIT_TWIP : bInch=sal_True; rnDiv=144; nKomma=1; break; // 1Twip = 1/1440"
+ case FUNIT_POINT : bInch=sal_True; rnDiv=72; break; // 1Pt = 1/72"
+ case FUNIT_PICA : bInch=sal_True; rnDiv=6; break; // 1Pica = 1/6" ?
+ case FUNIT_INCH : bInch=sal_True; break; // 1" = 1"
+ case FUNIT_FOOT : bInch=sal_True; rnMul=12; break; // 1Ft = 12"
+ case FUNIT_MILE : bInch=sal_True; rnMul=6336; nKomma=-1; break; // 1mile = 63360"
// sonstiges
case FUNIT_CUSTOM : break;
case FUNIT_PERCENT : nKomma=2; break;
diff --git a/svx/workben/edittest.cxx b/svx/workben/edittest.cxx
index 125de9b29b6b..9b2f4f2e2aac 100644
--- a/svx/workben/edittest.cxx
+++ b/svx/workben/edittest.cxx
@@ -153,7 +153,7 @@
// VARS...
short nRotation = 0;
USHORT nZoom = 100;
-BOOL bURLClicked = FALSE;
+sal_Bool bURLClicked = sal_False;
using namespace ::com::sun::star::connection;
using namespace ::vos;
diff --git a/xmloff/source/style/XMLFontAutoStylePool.cxx b/xmloff/source/style/XMLFontAutoStylePool.cxx
index ad01b5b1e9d3..0337ff32136f 100644
--- a/xmloff/source/style/XMLFontAutoStylePool.cxx
+++ b/xmloff/source/style/XMLFontAutoStylePool.cxx
@@ -172,7 +172,7 @@ OUString XMLFontAutoStylePool::Add(
OUString sPoolName;
XMLFontAutoStylePoolEntry_Impl aTmp( rFamilyName, rStyleName, nFamily,
nPitch, eEnc );
- sal_uIntPtr nPos;
+ sal_uLong nPos;
if( pPool->Seek_Entry( &aTmp, &nPos ) )
{
sPoolName = pPool->GetObject( nPos )->GetName();
@@ -226,7 +226,7 @@ OUString XMLFontAutoStylePool::Add(
OUString sName;
XMLFontAutoStylePoolEntry_Impl aTmp( rFamilyName, rStyleName, nFamily,
nPitch, eEnc );
- sal_uIntPtr nPos;
+ sal_uLong nPos;
if( pPool->Seek_Entry( &aTmp, &nPos ) )
{
sName = pPool->GetObject( nPos )->GetName();
diff --git a/xmloff/source/style/impastp4.cxx b/xmloff/source/style/impastp4.cxx
index 3e429ca65417..38d4f8698761 100644
--- a/xmloff/source/style/impastp4.cxx
+++ b/xmloff/source/style/impastp4.cxx
@@ -67,7 +67,7 @@ SvXMLAutoStylePoolP_Impl::SvXMLAutoStylePoolP_Impl( SvXMLExport& rExp)
SvXMLAutoStylePoolP_Impl::~SvXMLAutoStylePoolP_Impl()
{
for (;;) {
- XMLFamilyData_Impl* pData = maFamilyList.Remove( sal_uIntPtr(0) );
+ XMLFamilyData_Impl* pData = maFamilyList.Remove( sal_uLong(0) );
if (pData == NULL) {
break;
}
@@ -88,7 +88,7 @@ void SvXMLAutoStylePoolP_Impl::AddFamily(
sal_Bool bAsFamily )
{
// store family in a list if not already stored
- sal_uIntPtr nPos;
+ sal_uLong nPos;
sal_uInt16 nExportFlags = GetExport().getExportFlags();
sal_Bool bStylesOnly = (nExportFlags & EXPORT_STYLES) != 0 && (nExportFlags & EXPORT_CONTENT) == 0;
@@ -116,7 +116,7 @@ void SvXMLAutoStylePoolP_Impl::RegisterName( sal_Int32 nFamily, const OUString&
{
SvXMLAutoStylePoolNamesP_Impl *pNames = 0;
- sal_uIntPtr nPos;
+ sal_uLong nPos;
XMLFamilyData_Impl aTmp( nFamily );
if( maFamilyList.Seek_Entry( &aTmp, &nPos ) )
pNames = maFamilyList.GetObject( nPos )->mpNameList;
@@ -187,7 +187,7 @@ sal_Bool SvXMLAutoStylePoolP_Impl::Add(OUString& rName, sal_Int32 nFamily,
bool bDontSeek )
{
sal_Bool bRet(sal_False);
- sal_uIntPtr nPos;
+ sal_uLong nPos;
XMLFamilyData_Impl *pFamily = 0;
XMLFamilyData_Impl aTemporary( nFamily );
@@ -237,7 +237,7 @@ sal_Bool SvXMLAutoStylePoolP_Impl::AddNamed(const OUString& rName, sal_Int32 nFa
{
// get family and parent the same way as in Add()
sal_Bool bRet(sal_False);
- sal_uIntPtr nPos;
+ sal_uLong nPos;
XMLFamilyData_Impl *pFamily = 0;
XMLFamilyData_Impl aTemporary( nFamily );
@@ -276,7 +276,7 @@ sal_Bool SvXMLAutoStylePoolP_Impl::AddNamed(const OUString& rName, sal_Int32 nFa
OUString SvXMLAutoStylePoolP_Impl::AddToCache( sal_Int32 nFamily,
const OUString& rParent )
{
- sal_uIntPtr nPos;
+ sal_uLong nPos;
XMLFamilyData_Impl *pFamily = 0;
XMLFamilyData_Impl aTmp( nFamily );
@@ -308,7 +308,7 @@ OUString SvXMLAutoStylePoolP_Impl::Find( sal_Int32 nFamily,
{
OUString sName;
- sal_uIntPtr nPos;
+ sal_uLong nPos;
XMLFamilyData_Impl aTemporary( nFamily );
XMLFamilyData_Impl *pFamily = 0;
if( maFamilyList.Seek_Entry( &aTemporary, &nPos ) )
@@ -335,7 +335,7 @@ OUString SvXMLAutoStylePoolP_Impl::FindAndRemoveCached( sal_Int32 nFamily ) cons
{
OUString sName;
- sal_uIntPtr nPos;
+ sal_uLong nPos;
XMLFamilyData_Impl aTmp( nFamily );
XMLFamilyData_Impl *pFamily = 0;
if( maFamilyList.Seek_Entry( &aTmp, &nPos ) )
@@ -377,7 +377,7 @@ void SvXMLAutoStylePoolP_Impl::exportXML(
sal_uInt32 nCount = 0;
// Get list of parents for current family (nFamily)
- sal_uIntPtr nPos;
+ sal_uLong nPos;
XMLFamilyData_Impl aTmp( nFamily );
XMLFamilyData_Impl *pFamily = 0;
if( maFamilyList.Seek_Entry( &aTmp, &nPos ) )
diff --git a/xmloff/source/style/xmlstyle.cxx b/xmloff/source/style/xmlstyle.cxx
index 4977a37e45f3..cce7d30577f3 100644
--- a/xmloff/source/style/xmlstyle.cxx
+++ b/xmloff/source/style/xmlstyle.cxx
@@ -384,7 +384,7 @@ const SvXMLStyleContext *SvXMLStylesContext_Impl::FindStyleChildContext(
if( pIndices )
{
SvXMLStyleIndex_Impl aIndex( nFamily, rName );
- sal_uIntPtr nPos = 0;
+ sal_uLong nPos = 0;
if( pIndices->Seek_Entry( &aIndex, &nPos ) )
pStyle = pIndices->GetObject( nPos )->GetStyle();
}
diff --git a/xmloff/source/text/XMLTextListAutoStylePool.cxx b/xmloff/source/text/XMLTextListAutoStylePool.cxx
index 615978e7b609..6bf7ba3ecdba 100644
--- a/xmloff/source/text/XMLTextListAutoStylePool.cxx
+++ b/xmloff/source/text/XMLTextListAutoStylePool.cxx
@@ -186,7 +186,7 @@ XMLTextListAutoStylePool::XMLTextListAutoStylePool( SvXMLExport& rExp ) :
XMLTextListAutoStylePool::~XMLTextListAutoStylePool()
{
// The XMLTextListAutoStylePoolEntry_Impl object in the pool need delete explicitly in dtor.
- sal_uIntPtr nCount = pPool->Count();
+ sal_uLong nCount = pPool->Count();
while ( nCount-- )
delete pPool->Remove(nCount);
delete pPool;
@@ -211,7 +211,7 @@ sal_Bool XMLTextListAutoStylePool::HasName( const OUString& rName ) const
sal_uInt32 XMLTextListAutoStylePool::Find( XMLTextListAutoStylePoolEntry_Impl* pEntry ) const
{
- sal_uIntPtr nPos;
+ sal_uLong nPos;
if( !pEntry->IsNamed() && mxNumRuleCompare.is() )
{
const sal_uInt32 nCount = pPool->Count();
generated by cgit (git 2.34.1) at 2025-01-17 15:21:29 +0000