diff options
| -rw-r--r-- | include/svtools/ctrltool.hxx | 8 | ||||
| -rw-r--r-- | svtools/source/control/ctrlbox.cxx | 4 | ||||
| -rw-r--r-- | svtools/source/control/ctrltool.cxx | 8 | ||||
| -rw-r--r-- | svtools/source/control/stdmenu.cxx | 4 |
4 files changed, 12 insertions, 12 deletions
diff --git a/include/svtools/ctrltool.hxx b/include/svtools/ctrltool.hxx index efe7b53b7cb3..66de4f8b23be 100644 --- a/include/svtools/ctrltool.hxx +++ b/include/svtools/ctrltool.hxx @@ -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. Falls es sich dabei um einen skalierbaren Font handelt, werden Standard- @@ -158,7 +158,7 @@ private: OUString maBoldItalic; OUString maBlack; OUString maBlackItalic; - long* mpSizeAry; + sal_IntPtr* mpSizeAry; OutputDevice* mpDev; OutputDevice* mpDev2; boost::ptr_vector<ImplFontListNameInfo> maEntries; @@ -203,8 +203,8 @@ public: sal_Handle GetNextFontInfo( sal_Handle hFontInfo ) const; const FontInfo& GetFontInfo( sal_Handle hFontInfo ) const; - const long* GetSizeAry( const FontInfo& rInfo ) const; - static const long* GetStdSizeAry(); + const sal_IntPtr* GetSizeAry( const FontInfo& rInfo ) const; + static const sal_IntPtr* GetStdSizeAry(); private: FontList( const FontList& ); 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++; |