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

[Noel Grandin]

 include/svx/checklbx.hxx        |    2 +-
 include/svx/ctredlin.hxx        |    6 +++---
 include/svx/galmisc.hxx         |    2 +-
 svx/source/dialog/checklbx.cxx  |    2 +-
 svx/source/dialog/ctredlin.cxx  |    6 +++---
 svx/source/gallery2/galmisc.cxx |    2 +-
 6 files changed, 10 insertions(+), 10 deletions(-)

New commits:
commit 0f0f585e7822888ffc60bb0172cdd92e80e8a991
Author: Noel Grandin <noel.grandin at collabora.co.uk>
Date:   Thu Dec 14 10:40:45 2017 +0200

    sal_uIntPtr->sal_uInt32 in GalleryTransferable
    
    to match the underlying field
    
    Change-Id: I96bee1b19fb33e00bb09617a458f741654beb7f3
    Reviewed-on: https://gerrit.libreoffice.org/46479
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>

diff --git a/include/svx/galmisc.hxx b/include/svx/galmisc.hxx
index f0823ae6553a..62ad8c65b1f6 100644
--- a/include/svx/galmisc.hxx
+++ b/include/svx/galmisc.hxx
@@ -147,7 +147,7 @@ using TransferableHelper::CopyToClipboard;
     ImageMap*                       mpImageMap;
     INetURLObject*                  mpURL;
 
-                                    GalleryTransferable( GalleryTheme* pTheme, sal_uIntPtr nObjectPos, bool bLazy );
+                                    GalleryTransferable( GalleryTheme* pTheme, sal_uInt32 nObjectPos, bool bLazy );
                                     virtual ~GalleryTransferable() override;
 
     void                            InitData( bool bLazy );
diff --git a/svx/source/gallery2/galmisc.cxx b/svx/source/gallery2/galmisc.cxx
index 7e5c291d3491..2cd6376557c0 100644
--- a/svx/source/gallery2/galmisc.cxx
+++ b/svx/source/gallery2/galmisc.cxx
@@ -377,7 +377,7 @@ void GalleryProgress::Update( sal_Int32 nVal, sal_Int32 nMaxVal )
 }
 
 
-GalleryTransferable::GalleryTransferable( GalleryTheme* pTheme, sal_uIntPtr nObjectPos, bool bLazy ) :
+GalleryTransferable::GalleryTransferable( GalleryTheme* pTheme, sal_uInt32 nObjectPos, bool bLazy ) :
     mpTheme( pTheme ),
     meObjectKind( mpTheme->GetObjectKind( nObjectPos ) ),
     mnObjectPos( nObjectPos ),
commit eab5da91c74e16c9eec4e32fe19686b246902617
Author: Noel Grandin <noel.grandin at collabora.co.uk>
Date:   Thu Dec 14 09:13:37 2017 +0200

    sal_uIntPtr->sal_uLong in SvxRedlinTable and SvxCheckListBox
    
    which is not a vast improvement, but at least they are now consistent
    with the other InsertEntry methods in SvTreeListBox
    
    Change-Id: I3789f5fba4cdfee07f5c2f78e42f0071eab47c28
    Reviewed-on: https://gerrit.libreoffice.org/46478
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>

diff --git a/include/svx/checklbx.hxx b/include/svx/checklbx.hxx
index e96d45d057a0..76540dfd225b 100644
--- a/include/svx/checklbx.hxx
+++ b/include/svx/checklbx.hxx
@@ -48,7 +48,7 @@ private:
     // Avoid ambiguity with new InsertEntry:
     virtual SvTreeListEntry*    InsertEntry( const OUString& rText, SvTreeListEntry* pParent,
                                          bool bChildrenOnDemand,
-                                         sal_uIntPtr nPos, void* pUserData,
+                                         sal_uLong nPos, void* pUserData,
                                          SvLBoxButtonKind eButtonKind ) override;
 
 public:
diff --git a/include/svx/ctredlin.hxx b/include/svx/ctredlin.hxx
index 7ab194dece4a..693c0ba1b506 100644
--- a/include/svx/ctredlin.hxx
+++ b/include/svx/ctredlin.hxx
@@ -166,14 +166,14 @@ public:
         The rStr contains the entire redline entry; the columns are delimited by '\t'.
     */
     SvTreeListEntry* InsertEntry(const OUString &rStr, RedlinData *pUserData,
-                                 SvTreeListEntry* pParent = nullptr, sal_uIntPtr nPos = TREELIST_APPEND);
+                                 SvTreeListEntry* pParent = nullptr, sal_uLong nPos = TREELIST_APPEND);
 
     /** Insert a redline entry.
 
         The rStr contains the entire redline entry; the columns are delimited by '\t'.
     */
     SvTreeListEntry* InsertEntry(const OUString &rStr, RedlinData *pUserData, const Color&,
-                                 SvTreeListEntry* pParent, sal_uIntPtr nPos = TREELIST_APPEND);
+                                 SvTreeListEntry* pParent, sal_uLong nPos = TREELIST_APPEND);
 
     /** Insert a redline entry.
 
@@ -181,7 +181,7 @@ public:
         rStr contains the rest of the redline entry; the columns are delimited by '\t'.
     */
     SvTreeListEntry* InsertEntry(const Image &rRedlineType, const OUString &rStr, RedlinData *pUserData,
-                                 SvTreeListEntry* pParent, sal_uIntPtr nPos = TREELIST_APPEND);
+                                 SvTreeListEntry* pParent, sal_uLong nPos = TREELIST_APPEND);
 
     virtual SvTreeListEntry* CreateEntry() const override;
 
diff --git a/svx/source/dialog/checklbx.cxx b/svx/source/dialog/checklbx.cxx
index cb2b94e8a17e..66da800b57e7 100644
--- a/svx/source/dialog/checklbx.cxx
+++ b/svx/source/dialog/checklbx.cxx
@@ -223,7 +223,7 @@ void SvxCheckListBox::KeyInput( const KeyEvent& rKEvt )
 }
 
 
-SvTreeListEntry* SvxCheckListBox::InsertEntry( const OUString& rText, SvTreeListEntry* pParent, bool bChildrenOnDemand, sal_uIntPtr nPos, void* pUserData, SvLBoxButtonKind eButtonKind )
+SvTreeListEntry* SvxCheckListBox::InsertEntry( const OUString& rText, SvTreeListEntry* pParent, bool bChildrenOnDemand, sal_uLong nPos, void* pUserData, SvLBoxButtonKind eButtonKind )
 {
     return SvTreeListBox::InsertEntry( rText, pParent, bChildrenOnDemand, nPos, pUserData, eButtonKind );
 }
diff --git a/svx/source/dialog/ctredlin.cxx b/svx/source/dialog/ctredlin.cxx
index e7432febfd80..fa95f3badf17 100644
--- a/svx/source/dialog/ctredlin.cxx
+++ b/svx/source/dialog/ctredlin.cxx
@@ -296,7 +296,7 @@ bool SvxRedlinTable::IsValidComment(const OUString &rCommentStr)
 }
 
 SvTreeListEntry* SvxRedlinTable::InsertEntry(const OUString& rStr,
-        RedlinData *pUserData, SvTreeListEntry* pParent, sal_uIntPtr nPos)
+        RedlinData *pUserData, SvTreeListEntry* pParent, sal_uLong nPos)
 {
     const Color aColor = (pUserData && pUserData->bDisabled) ? Color(COL_GRAY) : GetTextColor();
 
@@ -304,7 +304,7 @@ SvTreeListEntry* SvxRedlinTable::InsertEntry(const OUString& rStr,
 }
 
 SvTreeListEntry* SvxRedlinTable::InsertEntry(const OUString& rStr,
-        RedlinData *pUserData, const Color& rColor, SvTreeListEntry* pParent, sal_uIntPtr nPos)
+        RedlinData *pUserData, const Color& rColor, SvTreeListEntry* pParent, sal_uLong nPos)
 {
     maEntryColor = rColor;
     maEntryImage = Image();
@@ -317,7 +317,7 @@ SvTreeListEntry* SvxRedlinTable::InsertEntry(const OUString& rStr,
 }
 
 SvTreeListEntry* SvxRedlinTable::InsertEntry(const Image &rRedlineType, const OUString& rStr,
-        RedlinData *pUserData, SvTreeListEntry* pParent, sal_uIntPtr nPos)
+        RedlinData *pUserData, SvTreeListEntry* pParent, sal_uLong nPos)
 {
     maEntryColor = (pUserData && pUserData->bDisabled) ? Color(COL_GRAY) : GetTextColor();
     maEntryImage = rRedlineType;