[Libreoffice-commits] core.git: 2 commits - include/svx include/vcl svx/Library_svxcore.mk svx/source vcl/Library_vcl.mk vcl/source

[Markus Mohrhard]

 include/vcl/listctrl.hxx        |    7 ++++---
 svx/Library_svxcore.mk          |    1 -
 vcl/Library_vcl.mk              |    1 +
 vcl/source/control/listctrl.cxx |    2 +-
 4 files changed, 6 insertions(+), 5 deletions(-)

New commits:
commit 856ff881318c478e0a56ca97444bc576cbb3d42c
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date:   Tue Aug 29 12:13:16 2017 +0200

    move ListControl to vcl
    
    Change-Id: I022bba9a9a4d3d0bdb25ca8fa43aef2544decddb
    Reviewed-on: https://gerrit.libreoffice.org/41682
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Markus Mohrhard <markus.mohrhard at googlemail.com>

diff --git a/include/svx/listctrl.hxx b/include/vcl/listctrl.hxx
similarity index 96%
rename from include/svx/listctrl.hxx
rename to include/vcl/listctrl.hxx
index 310ba378b7b2..4d56e2685e79 100644
--- a/include/svx/listctrl.hxx
+++ b/include/vcl/listctrl.hxx
@@ -26,9 +26,9 @@
 #include <vector>
 #include <limits>
 
-#include <svx/svxdllapi.h>
+#include <vcl/dllapi.h>
 
-class SVX_DLLPUBLIC ListControl : public Control
+class VCL_DLLPUBLIC ListControl : public Control
 {
 private:
     std::vector<VclPtr<Control>> maEntries;
diff --git a/svx/Library_svxcore.mk b/svx/Library_svxcore.mk
index ffb8321cfbe5..5bfbf899034d 100644
--- a/svx/Library_svxcore.mk
+++ b/svx/Library_svxcore.mk
@@ -117,7 +117,6 @@ $(eval $(call gb_Library_add_exception_objects,svxcore,\
     svx/source/dialog/hexcolorcontrol \
     svx/source/dialog/framelink \
     svx/source/dialog/langbox \
-    svx/source/dialog/listctrl \
     svx/source/dialog/pagenumberlistbox \
     svx/source/dialog/papersizelistbox \
     svx/source/dialog/samecontentlistbox \
diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk
index f6eaae2d4e13..3ce99c81f7a6 100644
--- a/vcl/Library_vcl.mk
+++ b/vcl/Library_vcl.mk
@@ -194,6 +194,7 @@ $(eval $(call gb_Library_add_exception_objects,vcl,\
     vcl/source/control/fixedhyper \
     vcl/source/control/group \
     vcl/source/control/imgctrl \
+    vcl/source/control/listctrl \
     vcl/source/control/longcurr \
     vcl/source/control/imp_listbox \
     vcl/source/control/listbox \
diff --git a/svx/source/dialog/listctrl.cxx b/vcl/source/control/listctrl.cxx
similarity index 99%
rename from svx/source/dialog/listctrl.cxx
rename to vcl/source/control/listctrl.cxx
index b1ecaf5b8972..3f846ad03138 100644
--- a/svx/source/dialog/listctrl.cxx
+++ b/vcl/source/control/listctrl.cxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <svx/listctrl.hxx>
+#include <vcl/listctrl.hxx>
 
 ListControl::ListControl(vcl::Window* pParent, WinBits nBits):
     Control(pParent, nBits),
commit b2e229ea407c840dff4809ec13db029f37981b7a
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date:   Mon Aug 28 22:42:44 2017 +0200

    ListControl: append new entries by default
    
    Change-Id: Ibd11b59526f95be054c4c1599bf45bc9e757dada
    Reviewed-on: https://gerrit.libreoffice.org/41681
    Reviewed-by: Markus Mohrhard <markus.mohrhard at googlemail.com>
    Tested-by: Markus Mohrhard <markus.mohrhard at googlemail.com>

diff --git a/include/svx/listctrl.hxx b/include/svx/listctrl.hxx
index ac88c7a1e32b..310ba378b7b2 100644
--- a/include/svx/listctrl.hxx
+++ b/include/svx/listctrl.hxx
@@ -24,6 +24,7 @@
 #include <vcl/scrbar.hxx>
 
 #include <vector>
+#include <limits>
 
 #include <svx/svxdllapi.h>
 
@@ -42,7 +43,7 @@ public:
     virtual ~ListControl() override;
     virtual void dispose() override;
 
-    void addEntry(VclPtr<Control> xEntry, sal_uInt32 nPos = 0);
+    void addEntry(VclPtr<Control> xEntry, sal_uInt32 nPos = std::numeric_limits<sal_uInt16>::max());
     void deleteEntry(sal_uInt32 nPos);
 
     virtual Size GetOptimalSize() const override;