From 43135665bf9093c52f424069bcf83d50a93bdc0c Mon Sep 17 00:00:00 2001
From: Fridrich Štrba <fridrich.strba@bluewin.ch>
Date: Mon, 10 Jun 2013 12:49:33 +0200
Subject: mingw64: use integers able to contain a size in svtools

Change-Id: Id5505f75a2331be682b74d085a7959fc4bf07df8
---
 svtools/source/control/ctrlbox.cxx  | 4 ++--
 svtools/source/control/ctrltool.cxx | 8 ++++----
 svtools/source/control/stdmenu.cxx  | 4 ++--
 3 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'svtools')

diff --git a/svtools/source/control/ctrlbox.cxx b/svtools/source/control/ctrlbox.cxx
index 556840f36085..a071cb27dc09 100644
--- a/svtools/source/control/ctrlbox.cxx
+++ b/svtools/source/control/ctrlbox.cxx
@@ -1809,8 +1809,8 @@ void FontSizeBox::Fill( const FontInfo* pInfo, const FontList* pList )
         return;
 
     // query font sizes
-    const long* pTempAry;
-    const long* pAry = 0;
+    const sal_IntPtr* pTempAry;
+    const sal_IntPtr* pAry = 0;
 
     if( pInfo )
     {
diff --git a/svtools/source/control/ctrltool.cxx b/svtools/source/control/ctrltool.cxx
index e4e6dd24bf29..9119102afcd2 100644
--- a/svtools/source/control/ctrltool.cxx
+++ b/svtools/source/control/ctrltool.cxx
@@ -33,7 +33,7 @@
 // =======================================================================
 
 // Standard Fontgroessen fuer scalierbare Fonts
-static const long aStdSizeAry[] =
+static const sal_IntPtr aStdSizeAry[] =
 {
      60,
      70,
@@ -770,7 +770,7 @@ const FontInfo& FontList::GetFontInfo( sal_Handle hFontInfo ) const
 
 // -----------------------------------------------------------------------
 
-const long* FontList::GetSizeAry( const FontInfo& rInfo ) const
+const sal_IntPtr* FontList::GetSizeAry( const FontInfo& rInfo ) const
 {
     // Size-Array vorher loeschen
     if ( mpSizeAry )
@@ -802,7 +802,7 @@ const long* FontList::GetSizeAry( const FontInfo& rInfo ) const
     sal_uInt16  i;
     sal_uInt16  nRealCount = 0;
     long    nOldHeight = 0;
-    ((FontList*)this)->mpSizeAry = new long[nDevSizeCount+1];
+    ((FontList*)this)->mpSizeAry = new sal_IntPtr[nDevSizeCount+1];
     for ( i = 0; i < nDevSizeCount; i++ )
     {
         Size aSize = pDevice->GetDevFontSize( rInfo, i );
@@ -821,7 +821,7 @@ const long* FontList::GetSizeAry( const FontInfo& rInfo ) const
 
 // -----------------------------------------------------------------------
 
-const long* FontList::GetStdSizeAry()
+const sal_IntPtr* FontList::GetStdSizeAry()
 {
     return aStdSizeAry;
 }
diff --git a/svtools/source/control/stdmenu.cxx b/svtools/source/control/stdmenu.cxx
index f5f0cf7ff1f1..1608004caffc 100644
--- a/svtools/source/control/stdmenu.cxx
+++ b/svtools/source/control/stdmenu.cxx
@@ -167,8 +167,8 @@ void FontSizeMenu::Fill( const FontInfo& rInfo, const FontList* pList )
     if ( mpHeightAry )
         delete[] mpHeightAry;
 
-    const long* pTempAry;
-    const long* pAry = pList->GetSizeAry( rInfo );
+    const sal_IntPtr* pTempAry;
+    const sal_IntPtr* pAry = pList->GetSizeAry( rInfo );
     sal_uInt16 nSizeCount = 0;
     while ( pAry[nSizeCount] )
         nSizeCount++;
-- 
cgit