svx/source/form/navigatortree.cxx | 4 ++--
svx/source/form/navigatortreemodel.cxx | 2 +-
svx/source/inc/fmexpl.hxx | 6 +++---
3 files changed, 6 insertions(+), 6 deletions(-)
New commits:
commit 9906db915184b83ef292eae9cba6cbdd4952b051
Author: Caolán McNamara <caol...@redhat.com>
Date: Mon Dec 18 10:01:26 2017 +0000
sal_uLong->sal_uInt32
the position here is cast to sal_uInt32 so begin as sal_uInt32 initially
Change-Id: I221d97961292988e90a23091ffc9324d42fc366e
Reviewed-on: https://gerrit.libreoffice.org/46698
Reviewed-by: Caolán McNamara <caol...@redhat.com>
Tested-by: Caolán McNamara <caol...@redhat.com>
diff --git a/svx/source/form/navigatortree.cxx
b/svx/source/form/navigatortree.cxx
index 0528be0da8ac..c530948ea002 100644
--- a/svx/source/form/navigatortree.cxx
+++ b/svx/source/form/navigatortree.cxx
@@ -1343,7 +1343,7 @@ namespace svxform
// insert form
- GetNavModel()->Insert( pNewFormData, TREELIST_APPEND, true );
+ GetNavModel()->Insert(pNewFormData, SAL_MAX_UINT32, true);
// set new form as active
@@ -1394,7 +1394,7 @@ namespace svxform
// insert FormComponent
- GetNavModel()->Insert( pNewFormControlData, TREELIST_APPEND, true );
+ GetNavModel()->Insert(pNewFormControlData, SAL_MAX_UINT32, true);
GetNavModel()->SetModified();
if (bEditName)
diff --git a/svx/source/form/navigatortreemodel.cxx
b/svx/source/form/navigatortreemodel.cxx
index 8c8cedd6f0a4..3d54e3aea7f7 100644
--- a/svx/source/form/navigatortreemodel.cxx
+++ b/svx/source/form/navigatortreemodel.cxx
@@ -250,7 +250,7 @@ namespace svxform
}
- void NavigatorTreeModel::Insert(FmEntryData* pEntry, sal_uLong nRelPos,
bool bAlterModel)
+ void NavigatorTreeModel::Insert(FmEntryData* pEntry, sal_uInt32 nRelPos,
bool bAlterModel)
{
if (IsListening(*m_pFormModel))
EndListening(*m_pFormModel);
diff --git a/svx/source/inc/fmexpl.hxx b/svx/source/inc/fmexpl.hxx
index 31d4668e3b55..469b9edf35be 100644
--- a/svx/source/inc/fmexpl.hxx
+++ b/svx/source/inc/fmexpl.hxx
@@ -348,9 +348,9 @@ namespace svxform
void FillBranch( FmFormData* pParentData );
void UpdateContent( FmFormShell* pNewShell );
- void Insert( FmEntryData* pEntryData, sal_uLong nRelPos =
CONTAINER_APPEND,
- bool bAlterModel = false );
- void Remove( FmEntryData* pEntryData, bool bAlterModel = false );
+ void Insert(FmEntryData* pEntryData, sal_uInt32 nRelPos =
SAL_MAX_UINT32,
+ bool bAlterModel = false);
+ void Remove(FmEntryData* pEntryData, bool bAlterModel = false);
static bool Rename( FmEntryData* pEntryData, const OUString& rNewText
);
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
