[Libreoffice-commits] core.git: solenv/clang-format svtools/Library_svt.mk svtools/source toolkit/inc toolkit/Library_tk.mk toolkit/source

[Caolán McNamara (via logerrit)]

 solenv/clang-format/blacklist                    |    4 ++--
 svtools/Library_svt.mk                           |    1 -
 svtools/source/uno/unoiface.cxx                  |    7 -------
 toolkit/Library_tk.mk                            |    1 +
 toolkit/source/awt/vclxtoolkit.cxx               |    7 +++++++
 toolkit/source/controls/tree/treecontrolpeer.cxx |    2 +-
 6 files changed, 11 insertions(+), 11 deletions(-)

New commits:
commit 475d6c193f043d796825bdde3944f006491a1794
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Sun Feb 16 16:00:45 2020 +0000
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Sun Feb 16 20:17:08 2020 +0100

    move TreeControlPeer to toolkit
    
    Change-Id: Id5298615f0f3dad6e61955e23367c0345b33f2b6
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88813
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/solenv/clang-format/blacklist b/solenv/clang-format/blacklist
index da3c2da49188..a605ccdd3b02 100644
--- a/solenv/clang-format/blacklist
+++ b/solenv/clang-format/blacklist
@@ -13271,8 +13271,6 @@ svtools/source/uno/statusbarcontroller.cxx
 svtools/source/uno/svtxgridcontrol.cxx
 svtools/source/uno/svtxgridcontrol.hxx
 svtools/source/uno/toolboxcontroller.cxx
-svtools/source/uno/treecontrolpeer.cxx
-svtools/source/uno/treecontrolpeer.hxx
 svtools/source/uno/unocontroltablemodel.cxx
 svtools/source/uno/unocontroltablemodel.hxx
 svtools/source/uno/unoevent.cxx
@@ -15923,6 +15921,7 @@ toolkit/inc/controls/stdtabcontroller.hxx
 toolkit/inc/controls/stdtabcontrollermodel.hxx
 toolkit/inc/controls/tabpagecontainer.hxx
 toolkit/inc/controls/tabpagemodel.hxx
+toolkit/inc/controls/treecontrolpeer.hxx
 toolkit/inc/controls/tkscrollbar.hxx
 toolkit/inc/controls/unocontrolcontainer.hxx
 toolkit/inc/controls/unocontrolcontainermodel.hxx
@@ -15987,6 +15986,7 @@ toolkit/source/controls/tkscrollbar.cxx
 toolkit/source/controls/tkspinbutton.cxx
 toolkit/source/controls/tree/treecontrol.cxx
 toolkit/source/controls/tree/treecontrol.hxx
+toolkit/source/controls/tree/treecontrolpeer.cxx
 toolkit/source/controls/tree/treedatamodel.cxx
 toolkit/source/controls/unocontrol.cxx
 toolkit/source/controls/unocontrolbase.cxx
diff --git a/svtools/Library_svt.mk b/svtools/Library_svt.mk
index 759b880600f9..afa07288f2da 100644
--- a/svtools/Library_svt.mk
+++ b/svtools/Library_svt.mk
@@ -175,7 +175,6 @@ $(eval $(call gb_Library_add_exception_objects,svt,\
     svtools/source/uno/statusbarcontroller \
     svtools/source/uno/svtxgridcontrol \
     svtools/source/uno/toolboxcontroller \
-    svtools/source/uno/treecontrolpeer \
     svtools/source/uno/unocontroltablemodel \
     svtools/source/uno/unogridcolumnfacade \
     svtools/source/uno/unoevent \
diff --git a/svtools/source/uno/unoiface.cxx b/svtools/source/uno/unoiface.cxx
index 6f0550135725..b7f80ff920f4 100644
--- a/svtools/source/uno/unoiface.cxx
+++ b/svtools/source/uno/unoiface.cxx
@@ -31,7 +31,6 @@
 #include <vcl/fmtfield.hxx>
 #include <svl/numuno.hxx>
 #include <svtools/calendar.hxx>
-#include "treecontrolpeer.hxx"
 #include "svtxgridcontrol.hxx"
 #include <table/tablecontrol.hxx>
 
@@ -97,12 +96,6 @@ SAL_DLLPUBLIC_EXPORT vcl::Window* CreateWindow( VCLXWindow** ppNewComp, const cs
         *ppNewComp = newComp;
         newComp->SetFormatter( static_cast<FormatterBase*>(static_cast<DateField*>(pWindow)) );
     }
-    else if ( aServiceName.equalsIgnoreAsciiCase( "Tree" ) )
-    {
-        TreeControlPeer* pPeer = new TreeControlPeer;
-        *ppNewComp = pPeer;
-        pWindow = pPeer->createVclControl( pParent, nWinBits );
-    }
     else if ( aServiceName.equalsIgnoreAsciiCase( "Grid" ) )
     {
         if ( pParent )
diff --git a/toolkit/Library_tk.mk b/toolkit/Library_tk.mk
index 55639910d7fb..752a0cc15f7b 100644
--- a/toolkit/Library_tk.mk
+++ b/toolkit/Library_tk.mk
@@ -103,6 +103,7 @@ $(eval $(call gb_Library_add_exception_objects,tk,\
     toolkit/source/controls/animatedimages \
     toolkit/source/controls/spinningprogress \
     toolkit/source/controls/tree/treecontrol \
+    toolkit/source/controls/tree/treecontrolpeer \
     toolkit/source/controls/tree/treedatamodel \
     toolkit/source/controls/unocontrol \
     toolkit/source/controls/unocontrolbase \
diff --git a/svtools/source/uno/treecontrolpeer.hxx b/toolkit/inc/controls/treecontrolpeer.hxx
similarity index 100%
rename from svtools/source/uno/treecontrolpeer.hxx
rename to toolkit/inc/controls/treecontrolpeer.hxx
diff --git a/toolkit/source/awt/vclxtoolkit.cxx b/toolkit/source/awt/vclxtoolkit.cxx
index cc3adf9c3cde..64b33e4de956 100644
--- a/toolkit/source/awt/vclxtoolkit.cxx
+++ b/toolkit/source/awt/vclxtoolkit.cxx
@@ -79,6 +79,7 @@
 
 #include <toolkit/helper/convert.hxx>
 #include <controls/filectrl.hxx>
+#include <controls/treecontrolpeer.hxx>
 #include <vcl/button.hxx>
 #include <vcl/combobox.hxx>
 #include <vcl/ctrl.hxx>
@@ -1808,6 +1809,12 @@ vcl::Window* VCLXToolkit::ImplCreateWindow( VCLXWindow** ppNewComp,
                     pNewWindow = VclPtr<FileControl>::Create( pParent, nWinBits );
                     *ppNewComp = new VCLXFileControl;
                 }
+                else if (aServiceName == "tree")
+                {
+                    TreeControlPeer* pPeer = new TreeControlPeer;
+                    *ppNewComp = pPeer;
+                    pNewWindow = pPeer->createVclControl( pParent, nWinBits );
+                }
             break;
             default:
                 OSL_ENSURE( false, "VCLXToolkit::ImplCreateWindow: unknown window type!" );
diff --git a/svtools/source/uno/treecontrolpeer.cxx b/toolkit/source/controls/tree/treecontrolpeer.cxx
similarity index 99%
rename from svtools/source/uno/treecontrolpeer.cxx
rename to toolkit/source/controls/tree/treecontrolpeer.cxx
index 1f67bbdd0af7..cefb7d4762ea 100644
--- a/svtools/source/uno/treecontrolpeer.cxx
+++ b/toolkit/source/controls/tree/treecontrolpeer.cxx
@@ -28,7 +28,7 @@
 #include <toolkit/helper/vclunohelper.hxx>
 
 #include <com/sun/star/awt/tree/XMutableTreeNode.hpp>
-#include "treecontrolpeer.hxx"
+#include <controls/treecontrolpeer.hxx>
 #include <comphelper/processfactory.hxx>
 
 #include <cppuhelper/implbase.hxx>