[Libreoffice-commits] core.git: include/toolkit solenv/clang-format toolkit/inc toolkit/source

[Libreoffice Gerrit user]

 solenv/clang-format/blacklist           |    2 +-
 toolkit/source/awt/scrollabledialog.cxx |    2 +-
 toolkit/source/awt/vclxcontainer.cxx    |    2 +-
 toolkit/source/awt/vclxtoolkit.cxx      |    2 +-
 toolkit/source/awt/vclxwindows.cxx      |    2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

New commits:
commit fca8704954c9e38719ac0158ba66edd8d85522ed
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Sat Oct 6 16:08:50 2018 +0100
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Sat Oct 6 20:54:55 2018 +0200

    make scrollabledialog.hxx a private header
    
    Change-Id: I16c68436c35568867677c33f70ef48287bc9e8ac
    Reviewed-on: https://gerrit.libreoffice.org/61470
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/solenv/clang-format/blacklist b/solenv/clang-format/blacklist
index 22ca1d639ca1..16dc194b4dce 100644
--- a/solenv/clang-format/blacklist
+++ b/solenv/clang-format/blacklist
@@ -7659,7 +7659,6 @@ include/test/util/xsearchable.hxx
 include/test/xmldiff.hxx
 include/test/xmltesttools.hxx
 include/toolkit/awt/animatedimagespeer.hxx
-include/toolkit/awt/scrollabledialog.hxx
 include/toolkit/awt/vclxaccessiblecomponent.hxx
 include/toolkit/awt/vclxbitmap.hxx
 include/toolkit/awt/vclxcontainer.hxx
@@ -16674,6 +16673,7 @@ toolkit/inc/helper/accessibilityclient.hxx
 toolkit/inc/helper/imagealign.hxx
 toolkit/inc/helper/tkresmgr.hxx
 toolkit/inc/helper/btndlg.hxx
+toolkit/inc/helper/scrollabledialog.hxx
 toolkit/inc/helper/unopropertyarrayhelper.hxx
 toolkit/inc/helper/unowrapper.hxx
 toolkit/source/awt/animatedimagespeer.cxx
diff --git a/include/toolkit/awt/scrollabledialog.hxx b/toolkit/inc/helper/scrollabledialog.hxx
similarity index 100%
rename from include/toolkit/awt/scrollabledialog.hxx
rename to toolkit/inc/helper/scrollabledialog.hxx
diff --git a/toolkit/source/awt/scrollabledialog.cxx b/toolkit/source/awt/scrollabledialog.cxx
index 3751ad5f29b9..fe0da4118e3f 100644
--- a/toolkit/source/awt/scrollabledialog.cxx
+++ b/toolkit/source/awt/scrollabledialog.cxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <toolkit/awt/scrollabledialog.hxx>
+#include <helper/scrollabledialog.hxx>
 #include <vcl/group.hxx>
 #include <vcl/settings.hxx>
 
diff --git a/toolkit/source/awt/vclxcontainer.cxx b/toolkit/source/awt/vclxcontainer.cxx
index 27be3f5e6c98..708f2e6ed420 100644
--- a/toolkit/source/awt/vclxcontainer.cxx
+++ b/toolkit/source/awt/vclxcontainer.cxx
@@ -27,7 +27,7 @@
 #include <vcl/svapp.hxx>
 #include <vcl/window.hxx>
 #include <tools/debug.hxx>
-#include <toolkit/awt/scrollabledialog.hxx>
+#include <helper/scrollabledialog.hxx>
 #include <toolkit/helper/property.hxx>
 
 
diff --git a/toolkit/source/awt/vclxtoolkit.cxx b/toolkit/source/awt/vclxtoolkit.cxx
index 737bdc529554..d65bf794dc88 100644
--- a/toolkit/source/awt/vclxtoolkit.cxx
+++ b/toolkit/source/awt/vclxtoolkit.cxx
@@ -124,10 +124,10 @@
 #include <tools/debug.hxx>
 #include <tools/diagnose_ex.h>
 #include <comphelper/processfactory.hxx>
-#include <toolkit/awt/scrollabledialog.hxx>
 #include <comphelper/profilezone.hxx>
 
 #include <helper/msgbox.hxx>
+#include <helper/scrollabledialog.hxx>
 #include <helper/unowrapper.hxx>
 
 #if defined(_WIN32)
diff --git a/toolkit/source/awt/vclxwindows.cxx b/toolkit/source/awt/vclxwindows.cxx
index 504dfa8e8a78..f56d8b224056 100644
--- a/toolkit/source/awt/vclxwindows.cxx
+++ b/toolkit/source/awt/vclxwindows.cxx
@@ -18,7 +18,7 @@
  */
 
 #include <toolkit/awt/vclxwindows.hxx>
-#include <toolkit/awt/scrollabledialog.hxx>
+#include <helper/scrollabledialog.hxx>
 #include <com/sun/star/awt/ScrollBarOrientation.hpp>
 #include <com/sun/star/graphic/GraphicProvider.hpp>
 #include <com/sun/star/graphic/XGraphicProvider.hpp>