You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by ji...@apache.org on 2026/08/07 12:10:13 UTC
(openoffice) 05/05: Fix the ambiguity between NULL pointer and 0UL that MSVC complains about on the Windows/x86-64 build.
This is an automated email from the ASF dual-hosted git repository.
jimjag pushed a commit to branch AOO42X
in repository https://gitbox.apache.org/repos/asf/openoffice.git
commit f612a329d949995c5ddbe9c69f54790f1a78c359
Author: Damjan Jovanovic <da...@apache.org>
AuthorDate: Wed Jan 1 15:46:34 2025 +0200
Fix the ambiguity between NULL pointer and 0UL that MSVC
complains about on the Windows/x86-64 build.
Patch by: me
(cherry picked from commit 53abccca07615f75317952e908fe340e2b71d6c0)
---
main/xmloff/source/style/impastp1.cxx | 4 ++--
main/xmloff/source/style/impastp4.cxx | 2 +-
main/xmloff/source/style/xmlstyle.cxx | 4 ++--
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/main/xmloff/source/style/impastp1.cxx b/main/xmloff/source/style/impastp1.cxx
index c8df1feb45..fd3defed7c 100644
--- a/main/xmloff/source/style/impastp1.cxx
+++ b/main/xmloff/source/style/impastp1.cxx
@@ -61,7 +61,7 @@ XMLFamilyData_Impl::~XMLFamilyData_Impl()
if( pCache )
{
while( pCache->Count() )
- delete pCache->Remove( 0UL );
+ delete pCache->Remove( (sal_uIntPtr)0UL );
}
}
@@ -75,7 +75,7 @@ void XMLFamilyData_Impl::ClearEntries()
if( pCache )
{
while( pCache->Count() )
- delete pCache->Remove( 0UL );
+ delete pCache->Remove( (sal_uIntPtr)0UL );
}
}
diff --git a/main/xmloff/source/style/impastp4.cxx b/main/xmloff/source/style/impastp4.cxx
index 53bae4f1bf..022cdb36ac 100644
--- a/main/xmloff/source/style/impastp4.cxx
+++ b/main/xmloff/source/style/impastp4.cxx
@@ -349,7 +349,7 @@ OUString SvXMLAutoStylePoolP_Impl::FindAndRemoveCached( sal_Int32 nFamily ) cons
// completely.
if( pFamily->pCache && pFamily->pCache->Count() )
{
- OUString *pName = pFamily->pCache->Remove( 0UL );
+ OUString *pName = pFamily->pCache->Remove( (sal_uIntPtr)0UL );
sName = *pName;
delete pName;
}
diff --git a/main/xmloff/source/style/xmlstyle.cxx b/main/xmloff/source/style/xmlstyle.cxx
index 5872ce3468..d66b9e0524 100644
--- a/main/xmloff/source/style/xmlstyle.cxx
+++ b/main/xmloff/source/style/xmlstyle.cxx
@@ -322,7 +322,7 @@ SvXMLStylesContext_Impl::~SvXMLStylesContext_Impl()
while( aStyles.Count() )
{
SvXMLStyleContext *pStyle = aStyles.GetObject(0);
- aStyles.Remove( 0UL );
+ aStyles.Remove( (sal_uIntPtr)0UL );
pStyle->ReleaseRef();
}
}
@@ -342,7 +342,7 @@ void SvXMLStylesContext_Impl::Clear()
while( aStyles.Count() )
{
SvXMLStyleContext *pStyle = aStyles.GetObject(0);
- aStyles.Remove( 0UL );
+ aStyles.Remove( (sal_uIntPtr)0UL );
pStyle->ReleaseRef();
}
}