mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

mingw64: use integers able to contain a size in svtools

Browse Source 
Change-Id: Id5505f75a2331be682b74d085a7959fc4bf07df8
This commit is contained in:
Fridrich Štrba
2013-06-10 12:49:33 +02:00
parent 378b2522b4
commit 43135665bf
4 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
include/svtools/ctrltool.hxx
View File

@@ -121,7 +121,7 @@ FontList::GetStyleName()
-------------------------------------------------------------------------- --------------------------------------------------------------------------
const long* FontList::GetSizeAry( const FontInfo& rInfo ) const; const sal_IntPtr* FontList::GetSizeAry( const FontInfo& rInfo ) const;
Diese Methode liefert zum uebergebenen Font die vorhandenen Groessen. Diese Methode liefert zum uebergebenen Font die vorhandenen Groessen.
Falls es sich dabei um einen skalierbaren Font handelt, werden Standard- Falls es sich dabei um einen skalierbaren Font handelt, werden Standard-
@@ -158,7 +158,7 @@ private:
OUString maBoldItalic; OUString maBoldItalic;
OUString maBlack; OUString maBlack;
OUString maBlackItalic; OUString maBlackItalic;
long* mpSizeAry; sal_IntPtr* mpSizeAry;
OutputDevice* mpDev; OutputDevice* mpDev;
OutputDevice* mpDev2; OutputDevice* mpDev2;
boost::ptr_vector<ImplFontListNameInfo> maEntries; boost::ptr_vector<ImplFontListNameInfo> maEntries;
@@ -203,8 +203,8 @@ public:
sal_Handle GetNextFontInfo( sal_Handle hFontInfo ) const; sal_Handle GetNextFontInfo( sal_Handle hFontInfo ) const;
const FontInfo& GetFontInfo( sal_Handle hFontInfo ) const; const FontInfo& GetFontInfo( sal_Handle hFontInfo ) const;
const long* GetSizeAry( const FontInfo& rInfo ) const; const sal_IntPtr* GetSizeAry( const FontInfo& rInfo ) const;
static const long* GetStdSizeAry(); static const sal_IntPtr* GetStdSizeAry();
private: private:
FontList( const FontList& ); FontList( const FontList& );

4
svtools/source/control/ctrlbox.cxx
View File

@@ -1809,8 +1809,8 @@ void FontSizeBox::Fill( const FontInfo* pInfo, const FontList* pList )
return; return;
// query font sizes // query font sizes
const long* pTempAry; const sal_IntPtr* pTempAry;
const long* pAry = 0; const sal_IntPtr* pAry = 0;
if( pInfo ) if( pInfo )
{ {

8
svtools/source/control/ctrltool.cxx
View File

@@ -33,7 +33,7 @@
// ======================================================================= // =======================================================================
// Standard Fontgroessen fuer scalierbare Fonts // Standard Fontgroessen fuer scalierbare Fonts
static const long aStdSizeAry[] = static const sal_IntPtr aStdSizeAry[] =
{ {
60, 60,
70, 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 // Size-Array vorher loeschen
if ( mpSizeAry ) if ( mpSizeAry )
@@ -802,7 +802,7 @@ const long* FontList::GetSizeAry( const FontInfo& rInfo ) const
sal_uInt16 i; sal_uInt16 i;
sal_uInt16 nRealCount = 0; sal_uInt16 nRealCount = 0;
long nOldHeight = 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++ ) for ( i = 0; i < nDevSizeCount; i++ )
{ {
Size aSize = pDevice->GetDevFontSize( rInfo, 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; return aStdSizeAry;
} }

4
svtools/source/control/stdmenu.cxx
View File

@@ -167,8 +167,8 @@ void FontSizeMenu::Fill( const FontInfo& rInfo, const FontList* pList )
if ( mpHeightAry ) if ( mpHeightAry )
delete[] mpHeightAry; delete[] mpHeightAry;
const long* pTempAry; const sal_IntPtr* pTempAry;
const long* pAry = pList->GetSizeAry( rInfo ); const sal_IntPtr* pAry = pList->GetSizeAry( rInfo );
sal_uInt16 nSizeCount = 0; sal_uInt16 nSizeCount = 0;
while ( pAry[nSizeCount] ) while ( pAry[nSizeCount] )
nSizeCount++; nSizeCount++;