summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortymyjan <tymyjan@yahoo.co.uk>2016-07-09 18:17:27 +0200
committerNoel Grandin <noelgrandin@gmail.com>2016-07-11 07:31:16 +0000
commite9bded5b87b491c0a0d7a62512e9c0923a08ce28 (patch)
tree506c36fd6ddf6fba9debab953b3a3ddad7274f9f
parent07fb94655f4745eb4e80bf6e8d4cdd95371f23bb (diff)
tdf#75280 Cleaning up of sal_uIntPtr usage #3
Change-Id: I465d126652f4dd21c19ee6730466719445d835b3 Reviewed-on: https://gerrit.libreoffice.org/27074 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
-rw-r--r--include/svx/gallery.hxx18
-rw-r--r--svx/source/gallery2/galexpl.cxx28
2 files changed, 23 insertions, 23 deletions
diff --git a/include/svx/gallery.hxx b/include/svx/gallery.hxx
index 51cc52c714bf..f0ca115d5b61 100644
--- a/include/svx/gallery.hxx
+++ b/include/svx/gallery.hxx
@@ -59,28 +59,28 @@ public:
static bool FillObjListTitle( const sal_uInt32 nThemeId, std::vector< OUString >& rList );
static bool InsertURL( const OUString& rThemeName, const OUString& rURL );
- static bool InsertURL( sal_uIntPtr nThemeId, const OUString& rURL );
+ static bool InsertURL( sal_uInt32 nThemeId, const OUString& rURL );
- static bool GetGraphicObj( const OUString& rThemeName, sal_uIntPtr nPos,
+ static bool GetGraphicObj( const OUString& rThemeName, sal_uInt32 nPos,
Graphic* pGraphic = nullptr, BitmapEx* pThumb = nullptr,
bool bProgess = false );
- static bool GetGraphicObj( sal_uIntPtr nThemeId, sal_uIntPtr nPos,
+ static bool GetGraphicObj( sal_uInt32 nThemeId, sal_uInt32 nPos,
Graphic* pGraphic = nullptr, BitmapEx* pThumb = nullptr,
bool bProgess = false );
- static sal_uIntPtr GetSdrObjCount( const OUString& rThemeName );
- static sal_uIntPtr GetSdrObjCount( sal_uIntPtr nThemeId );
+ static sal_uInt32 GetSdrObjCount( const OUString& rThemeName );
+ static sal_uInt32 GetSdrObjCount( sal_uInt32 nThemeId );
- static bool GetSdrObj( const OUString& rThemeName, sal_uIntPtr nSdrModelPos,
+ static bool GetSdrObj( const OUString& rThemeName, sal_uInt32 nSdrModelPos,
SdrModel* pModel = nullptr, BitmapEx* pThumb = nullptr );
- static bool GetSdrObj( sal_uIntPtr nThemeId, sal_uIntPtr nSdrModelPos,
+ static bool GetSdrObj( sal_uInt32 nThemeId, sal_uInt32 nSdrModelPos,
SdrModel* pModel = nullptr, BitmapEx* pThumb = nullptr );
static bool BeginLocking( const OUString& rThemeName );
- static bool BeginLocking( sal_uIntPtr nThemeId );
+ static bool BeginLocking( sal_uInt32 nThemeId );
static bool EndLocking( const OUString& rThemeName );
- static bool EndLocking( sal_uIntPtr nThemeId );
+ static bool EndLocking( sal_uInt32 nThemeId );
};
#endif // INCLUDED_SVX_GALLERY_HXX
diff --git a/svx/source/gallery2/galexpl.cxx b/svx/source/gallery2/galexpl.cxx
index a12417505e7f..9c3e4c013035 100644
--- a/svx/source/gallery2/galexpl.cxx
+++ b/svx/source/gallery2/galexpl.cxx
@@ -38,7 +38,7 @@ bool GalleryExplorer::FillThemeList( std::vector<OUString>& rThemeList )
if( pGal )
{
- for( sal_uIntPtr i = 0, nCount = pGal->GetThemeCount(); i < nCount; i++ )
+ for( sal_uInt32 i = 0, nCount = pGal->GetThemeCount(); i < nCount; i++ )
{
const GalleryThemeEntry* pEntry = pGal->GetThemeInfo( i );
@@ -91,7 +91,7 @@ bool GalleryExplorer::FillObjListTitle( const sal_uInt32 nThemeId, std::vector<
if( pTheme )
{
- for( sal_uIntPtr i = 0, nCount = pTheme->GetObjectCount(); i < nCount; i++ )
+ for( sal_uInt32 i = 0, nCount = pTheme->GetObjectCount(); i < nCount; i++ )
{
SgaObject* pObj = pTheme->AcquireObject( i );
if ( pObj )
@@ -129,13 +129,13 @@ bool GalleryExplorer::InsertURL( const OUString& rThemeName, const OUString& rUR
return bRet;
}
-bool GalleryExplorer::InsertURL( sal_uIntPtr nThemeId, const OUString& rURL )
+bool GalleryExplorer::InsertURL( sal_uInt32 nThemeId, const OUString& rURL )
{
Gallery* pGal = ::Gallery::GetGalleryInstance();
return pGal && InsertURL( pGal->GetThemeName( nThemeId ), rURL );
}
-bool GalleryExplorer::GetGraphicObj( const OUString& rThemeName, sal_uIntPtr nPos,
+bool GalleryExplorer::GetGraphicObj( const OUString& rThemeName, sal_uInt32 nPos,
Graphic* pGraphic, BitmapEx* pThumb,
bool bProgress )
{
@@ -162,7 +162,7 @@ bool GalleryExplorer::GetGraphicObj( const OUString& rThemeName, sal_uIntPtr nPo
return bRet;
}
-bool GalleryExplorer::GetGraphicObj( sal_uIntPtr nThemeId, sal_uIntPtr nPos,
+bool GalleryExplorer::GetGraphicObj( sal_uInt32 nThemeId, sal_uInt32 nPos,
Graphic* pGraphic, BitmapEx* pThumb,
bool bProgress )
{
@@ -170,10 +170,10 @@ bool GalleryExplorer::GetGraphicObj( sal_uIntPtr nThemeId, sal_uIntPtr nPos,
return pGal && GetGraphicObj( pGal->GetThemeName( nThemeId ), nPos, pGraphic, pThumb, bProgress );
}
-sal_uIntPtr GalleryExplorer::GetSdrObjCount( const OUString& rThemeName )
+sal_uInt32 GalleryExplorer::GetSdrObjCount( const OUString& rThemeName )
{
Gallery* pGal = ::Gallery::GetGalleryInstance();
- sal_uIntPtr nRet = 0;
+ sal_uInt32 nRet = 0;
if( pGal )
{
@@ -182,7 +182,7 @@ sal_uIntPtr GalleryExplorer::GetSdrObjCount( const OUString& rThemeName )
if( pTheme )
{
- for( sal_uIntPtr i = 0, nCount = pTheme->GetObjectCount(); i < nCount; i++ )
+ for( sal_uInt32 i = 0, nCount = pTheme->GetObjectCount(); i < nCount; i++ )
if( SGA_OBJ_SVDRAW == pTheme->GetObjectKind( i ) )
nRet++;
@@ -193,13 +193,13 @@ sal_uIntPtr GalleryExplorer::GetSdrObjCount( const OUString& rThemeName )
return nRet;
}
-sal_uIntPtr GalleryExplorer::GetSdrObjCount( sal_uIntPtr nThemeId )
+sal_uInt32 GalleryExplorer::GetSdrObjCount( sal_uInt32 nThemeId )
{
Gallery* pGal = ::Gallery::GetGalleryInstance();
return( pGal ? GetSdrObjCount( pGal->GetThemeName( nThemeId ) ) : 0 );
}
-bool GalleryExplorer::GetSdrObj( const OUString& rThemeName, sal_uIntPtr nSdrModelPos,
+bool GalleryExplorer::GetSdrObj( const OUString& rThemeName, sal_uInt32 nSdrModelPos,
SdrModel* pModel, BitmapEx* pThumb )
{
Gallery* pGal = ::Gallery::GetGalleryInstance();
@@ -212,7 +212,7 @@ bool GalleryExplorer::GetSdrObj( const OUString& rThemeName, sal_uIntPtr nSdrMod
if( pTheme )
{
- for( sal_uIntPtr i = 0, nCount = pTheme->GetObjectCount(), nActPos = 0; ( i < nCount ) && !bRet; i++ )
+ for( sal_uInt32 i = 0, nCount = pTheme->GetObjectCount(), nActPos = 0; ( i < nCount ) && !bRet; i++ )
{
if( SGA_OBJ_SVDRAW == pTheme->GetObjectKind( i ) )
{
@@ -234,7 +234,7 @@ bool GalleryExplorer::GetSdrObj( const OUString& rThemeName, sal_uIntPtr nSdrMod
return bRet;
}
-bool GalleryExplorer::GetSdrObj( sal_uIntPtr nThemeId, sal_uIntPtr nSdrModelPos,
+bool GalleryExplorer::GetSdrObj( sal_uInt32 nThemeId, sal_uInt32 nSdrModelPos,
SdrModel* pModel, BitmapEx* pThumb )
{
Gallery* pGal = ::Gallery::GetGalleryInstance();
@@ -260,7 +260,7 @@ bool GalleryExplorer::BeginLocking( const OUString& rThemeName )
return bRet;
}
-bool GalleryExplorer::BeginLocking( sal_uIntPtr nThemeId )
+bool GalleryExplorer::BeginLocking( sal_uInt32 nThemeId )
{
Gallery* pGal = ::Gallery::GetGalleryInstance();
return pGal && BeginLocking( pGal->GetThemeName( nThemeId ) );
@@ -295,7 +295,7 @@ bool GalleryExplorer::EndLocking( const OUString& rThemeName )
return bRet;
}
-bool GalleryExplorer::EndLocking( sal_uIntPtr nThemeId )
+bool GalleryExplorer::EndLocking( sal_uInt32 nThemeId )
{
Gallery* pGal = ::Gallery::GetGalleryInstance();
return pGal && EndLocking( pGal->GetThemeName( nThemeId ) );