[Libreoffice-commits] core.git: include/svx svx/source

Noel Grandin noel.grandin at collabora.co.uk
Thu Dec 14 06:19:51 UTC 2017


 include/svx/gallery1.hxx         |    2 +-
 svx/source/gallery2/gallery1.cxx |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit e54cae8b40602b958db760489bf9fe048bb1aa93
Author: Noel Grandin <noel.grandin at collabora.co.uk>
Date:   Wed Dec 13 09:54:21 2017 +0200

    sal_uIntPtr->sal_uInt32 in Gallery
    
    to match GetId() on class GalleryThemeEntry
    
    Change-Id: I81944c7e89fa8c9ca65987901f4d598c042d836c
    Reviewed-on: https://gerrit.libreoffice.org/46391
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>

diff --git a/include/svx/gallery1.hxx b/include/svx/gallery1.hxx
index ada646b08a02..932e7c4dc8d5 100644
--- a/include/svx/gallery1.hxx
+++ b/include/svx/gallery1.hxx
@@ -122,7 +122,7 @@ public:
     SAL_DLLPRIVATE const GalleryThemeEntry* GetThemeInfo( const OUString& rThemeName ) { return ImplGetThemeEntry( rThemeName ); }
 
     bool                        HasTheme( const OUString& rThemeName );
-    SAL_DLLPRIVATE OUString     GetThemeName( sal_uIntPtr nThemeId ) const;
+    SAL_DLLPRIVATE OUString     GetThemeName( sal_uInt32 nThemeId ) const;
 
     bool                        CreateTheme( const OUString& rThemeName );
     SAL_DLLPRIVATE void         RenameTheme( const OUString& rOldName, const OUString& rNewName );
diff --git a/svx/source/gallery2/gallery1.cxx b/svx/source/gallery2/gallery1.cxx
index c3d32d6f1971..a4b65b5297aa 100644
--- a/svx/source/gallery2/gallery1.cxx
+++ b/svx/source/gallery2/gallery1.cxx
@@ -520,7 +520,7 @@ GalleryThemeEntry* Gallery::ImplGetThemeEntry( const OUString& rThemeName )
     return pFound;
 }
 
-OUString Gallery::GetThemeName( sal_uIntPtr nThemeId ) const
+OUString Gallery::GetThemeName( sal_uInt32 nThemeId ) const
 {
     GalleryThemeEntry* pFound = nullptr;
 


More information about the Libreoffice-commits mailing list