summaryrefslogtreecommitdiff
path: root/sw
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2015-02-23 13:13:11 +0100
committerStephan Bergmann <sbergman@redhat.com>2015-02-23 13:13:39 +0100
commit3b513aefa49ecc98800ff129360f04bda8405a11 (patch)
treeefc65118346e43140713020cb052e4d7e5fd1a7b /sw
parentdaa20dcadfcfc7a8d16cddc7f5a08bf3e0a5c644 (diff)
tdf#86543: reinterpret_cast -1 of appropriate width as special marker
Change-Id: Idf0d2a77a78e0e8fcbf435984b9b8f4393e4c207
Diffstat (limited to 'sw')
-rw-r--r--sw/source/core/frmedt/fedesc.cxx4
-rw-r--r--sw/source/filter/ww8/docxexport.cxx2
-rw-r--r--sw/source/filter/ww8/wrtw8sty.cxx6
-rw-r--r--sw/source/filter/ww8/wrtww8.cxx2
4 files changed, 7 insertions, 7 deletions
diff --git a/sw/source/core/frmedt/fedesc.cxx b/sw/source/core/frmedt/fedesc.cxx
index f4fee9a1615a..9db4fee77545 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 ae2fbd2b5470..8762fd2109b6 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 b46f2b4cd78e..c54fd458d37b 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 d5872cbe230e..cd8b821c9a95 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() )