basic/source/runtime/ddectrl.cxx | 2 +-
include/vcl/dialog.hxx | 2 +-
sw/source/core/frmedt/fedesc.cxx | 4 ++--
sw/source/filter/ww8/docxexport.cxx | 2 +-
sw/source/filter/ww8/wrtw8sty.cxx | 6 +++---
sw/source/filter/ww8/wrtww8.cxx | 2 +-
6 files changed, 9 insertions(+), 9 deletions(-)
New commits:
commit 3b513aefa49ecc98800ff129360f04bda8405a11
Author: Stephan Bergmann <sberg...@redhat.com>
Date: Mon Feb 23 13:13:11 2015 +0100
tdf#86543: reinterpret_cast -1 of appropriate width as special marker
Change-Id: Idf0d2a77a78e0e8fcbf435984b9b8f4393e4c207
diff --git a/basic/source/runtime/ddectrl.cxx b/basic/source/runtime/ddectrl.cxx
index 232008a..56603d1 100644
--- a/basic/source/runtime/ddectrl.cxx
+++ b/basic/source/runtime/ddectrl.cxx
@@ -22,7 +22,7 @@
#include "ddectrl.hxx"
#include <basic/sberrors.hxx>
-#define DDE_FREECHANNEL (reinterpret_cast<DdeConnection*>(0xffffffff))
+#define DDE_FREECHANNEL (reinterpret_cast<DdeConnection*>(sal_IntPtr(-1)))
#define DDE_FIRSTERR 0x4000
#define DDE_LASTERR 0x4011
diff --git a/include/vcl/dialog.hxx b/include/vcl/dialog.hxx
index 0b00ebe..0568642 100644
--- a/include/vcl/dialog.hxx
+++ b/include/vcl/dialog.hxx
@@ -27,7 +27,7 @@
// parameter to pass to the dialog constructor if really no parent is wanted
// whereas NULL chooses the default dialog parent
-#define DIALOG_NO_PARENT (reinterpret_cast<vcl::Window*>(0xffffffff))
+#define DIALOG_NO_PARENT (reinterpret_cast<vcl::Window*>(sal_IntPtr(-1)))
// - Dialog -
diff --git a/sw/source/core/frmedt/fedesc.cxx b/sw/source/core/frmedt/fedesc.cxx
index f4fee9a..9db4fee 100644
--- a/sw/source/core/frmedt/fedesc.cxx
+++ b/sw/source/core/frmedt/fedesc.cxx
@@ -185,7 +185,7 @@ const SwPageDesc* SwFEShell::GetSelectedPageDescs() const
{
const SwCntntNode* pCNd;
const SwFrm* pMkFrm, *pPtFrm;
- const SwPageDesc* pFnd, *pRetDesc =
reinterpret_cast<SwPageDesc*>(0xffffffff);
+ const SwPageDesc* pFnd, *pRetDesc =
reinterpret_cast<SwPageDesc*>(sal_IntPtr(-1));
const Point aNulPt;
for(SwPaM& rPaM : GetCrsr()->GetRingContainer())
@@ -227,7 +227,7 @@ const SwPageDesc* SwFEShell::GetSelectedPageDescs() const
}
}
- if( reinterpret_cast<SwPageDesc*>(0xffffffff) == pRetDesc )
+ if( reinterpret_cast<SwPageDesc*>(sal_IntPtr(-1)) == pRetDesc )
pRetDesc = pFnd;
else if( pFnd != pRetDesc )
{
diff --git a/sw/source/filter/ww8/docxexport.cxx
b/sw/source/filter/ww8/docxexport.cxx
index ae2fbd2..8762fd2 100644
--- a/sw/source/filter/ww8/docxexport.cxx
+++ b/sw/source/filter/ww8/docxexport.cxx
@@ -486,7 +486,7 @@ void DocxExport::OutputEndNode( const SwEndNode& rEndNode )
{
const SwSectionFmt* pParentFmt = rSect.GetFmt()->GetParent();
if( !pParentFmt )
- pParentFmt = reinterpret_cast<SwSectionFmt*>(0xFFFFFFFF) ;
+ pParentFmt = reinterpret_cast<SwSectionFmt*>(sal_IntPtr(-1));
sal_uLong nRstLnNum;
if( rNd.IsCntntNode() )
diff --git a/sw/source/filter/ww8/wrtw8sty.cxx
b/sw/source/filter/ww8/wrtw8sty.cxx
index b46f2b4..c54fd45 100644
--- a/sw/source/filter/ww8/wrtw8sty.cxx
+++ b/sw/source/filter/ww8/wrtw8sty.cxx
@@ -1140,7 +1140,7 @@ sal_uInt16 MSWordSections::NumberOfColumns( const SwDoc
&rDoc, const WW8_SepInfo
aSet.SetParent( &rSet );
//0xffffffff, what the hell is going on with that!, fixme most terribly
- if ( rInfo.pSectionFmt && reinterpret_cast<SwSectionFmt*>(0xFFFFFFFF) !=
rInfo.pSectionFmt )
+ if ( rInfo.pSectionFmt && reinterpret_cast<SwSectionFmt*>(sal_IntPtr(-1))
!= rInfo.pSectionFmt )
aSet.Put( rInfo.pSectionFmt->GetFmtAttr( RES_COL ) );
const SwFmtCol& rCol = static_cast<const SwFmtCol&>(aSet.Get( RES_COL ));
@@ -1327,7 +1327,7 @@ bool WW8_SepInfo::IsProtected() const
bool bRet = false;
if (
pSectionFmt &&
- (reinterpret_cast<SwSectionFmt*>(0xFFFFFFFF) != pSectionFmt)
+ (reinterpret_cast<SwSectionFmt*>(sal_IntPtr(-1)) != pSectionFmt)
)
{
const SwSection *pSection = pSectionFmt->GetSection();
@@ -1663,7 +1663,7 @@ void MSWordExportBase::SectionProperties( const
WW8_SepInfo& rSepInfo, WW8_PdAtt
}
}
- if ( reinterpret_cast<SwSectionFmt*>(0xFFFFFFFF) !=
rSepInfo.pSectionFmt )
+ if ( reinterpret_cast<SwSectionFmt*>(sal_IntPtr(-1)) !=
rSepInfo.pSectionFmt )
{
if ( nBreakCode == 0 )
bOutPgDscSet = false;
diff --git a/sw/source/filter/ww8/wrtww8.cxx b/sw/source/filter/ww8/wrtww8.cxx
index d5872cb..cd8b821 100644
--- a/sw/source/filter/ww8/wrtww8.cxx
+++ b/sw/source/filter/ww8/wrtww8.cxx
@@ -2621,7 +2621,7 @@ void MSWordExportBase::WriteText()
const SwSectionFmt* pParentFmt =
rSect.GetFmt()->GetParent();
if ( !pParentFmt )
- pParentFmt =
reinterpret_cast<SwSectionFmt*>(0xFFFFFFFF);
+ pParentFmt =
reinterpret_cast<SwSectionFmt*>(sal_IntPtr(-1));
sal_uLong nRstLnNum;
if ( aIdx.GetNode().IsCntntNode() )
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
