diff options
Diffstat (limited to 'svx/source')
| -rw-r--r-- | svx/source/sidebar/line/LineWidthControl.cxx | 2 | ||||
| -rw-r--r-- | svx/source/svdraw/svdhdl.cxx | 6 | ||||
| -rw-r--r-- | svx/source/svdraw/svdmark.cxx | 2 | ||||
| -rw-r--r-- | svx/source/svdraw/svdograf.cxx | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/svx/source/sidebar/line/LineWidthControl.cxx b/svx/source/sidebar/line/LineWidthControl.cxx index 66c0019f655e..bd804eeee787 100644 --- a/svx/source/sidebar/line/LineWidthControl.cxx +++ b/svx/source/sidebar/line/LineWidthControl.cxx @@ -277,7 +277,7 @@ IMPL_LINK(LineWidthControl, VSSelectHdl, void *, pControl) sal_uInt16 iPos = maVSWidth.GetSelectItemId(); if(iPos >= 1 && iPos <= 8) { - long nVal = LogicToLogic((long)(unsigned long)maVSWidth.GetItemData( iPos ) , MAP_POINT, (MapUnit)meMapUnit); + sal_IntPtr nVal = LogicToLogic((sal_IntPtr)maVSWidth.GetItemData( iPos ) , MAP_POINT, (MapUnit)meMapUnit); nVal = maMFWidth.Denormalize(nVal); XLineWidthItem aWidthItem( nVal ); mpBindings->GetDispatcher()->Execute(SID_ATTR_LINE_WIDTH, SFX_CALLMODE_RECORD, &aWidthItem, 0L); diff --git a/svx/source/svdraw/svdhdl.cxx b/svx/source/svdraw/svdhdl.cxx index a153bdd8f7a4..4559e69b4cd6 100644 --- a/svx/source/svdraw/svdhdl.cxx +++ b/svx/source/svdraw/svdhdl.cxx @@ -1694,7 +1694,7 @@ static bool ImpSdrHdlListSorter(SdrHdl* const& lhs, SdrHdl* const& rhs) if (nNum1==nNum2) { if (eKind1==eKind2) - return (long)lhs<(long)rhs; // Hack, to always get to the same sorting + return (sal_IntPtr)lhs<(sal_IntPtr)rhs; // Hack, to always get to the same sorting return (sal_uInt16)eKind1<(sal_uInt16)eKind2; } else @@ -1702,12 +1702,12 @@ static bool ImpSdrHdlListSorter(SdrHdl* const& lhs, SdrHdl* const& rhs) } else { - return (long)pObj1<(long)pObj2; + return (sal_IntPtr)pObj1<(sal_IntPtr)pObj2; } } else { - return (long)pPV1<(long)pPV2; + return (sal_IntPtr)pPV1<(sal_IntPtr)pPV2; } } else diff --git a/svx/source/svdraw/svdmark.cxx b/svx/source/svdraw/svdmark.cxx index 2827c4f47f22..40820e7efb66 100644 --- a/svx/source/svdraw/svdmark.cxx +++ b/svx/source/svdraw/svdmark.cxx @@ -239,7 +239,7 @@ static bool ImpSdrMarkListSorter(SdrMark* const& lhs, SdrMark* const& rhs) } else { - return (long)pOL1 < (long)pOL2; + return (sal_IntPtr)pOL1 < (sal_IntPtr)pOL2; } } diff --git a/svx/source/svdraw/svdograf.cxx b/svx/source/svdraw/svdograf.cxx index c968809e20ea..56a8a0203d9a 100644 --- a/svx/source/svdraw/svdograf.cxx +++ b/svx/source/svdraw/svdograf.cxx @@ -1383,7 +1383,7 @@ IMPL_LINK( SdrGrafObj, ImpSwapHdl, GraphicObject*, pO ) pRet = GRFMGR_AUTOSWAPSTREAM_TEMP; } - return (long)(void*) pRet; + return (sal_IntPtr)(void*) pRet; } void SdrGrafObj::SetGrafAnimationAllowed(bool bNew) |