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

[Caolán McNamara (via logerrit)]

 solenv/clang-format/blacklist       |    2 +-
 svtools/source/control/filectrl.cxx |    2 +-
 svtools/source/inc/filectrl.hxx     |   13 ++++++-------
 svtools/source/uno/unoiface.cxx     |    2 +-
 4 files changed, 9 insertions(+), 10 deletions(-)

New commits:
commit 8fe484a989a1bea05dd9d1bc032c859c83966b0b
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Fri Oct 4 15:07:02 2019 +0100
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Sat Oct 5 19:51:20 2019 +0200

    FileControl can be private inside svtools
    
    Change-Id: I52edd5166edc9aceeafffed898835fe5bc46880c
    Reviewed-on: https://gerrit.libreoffice.org/80232
    Tested-by: Jenkins
    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 0367f48f13e2..8d8a0a30b3c1 100644
--- a/solenv/clang-format/blacklist
+++ b/solenv/clang-format/blacklist
@@ -6938,7 +6938,6 @@ include/svtools/embedhlp.hxx
 include/svtools/embedtransfer.hxx
 include/svtools/extcolorcfg.hxx
 include/svtools/filechangedchecker.hxx
-include/svtools/filectrl.hxx
 include/svtools/fileurlbox.hxx
 include/svtools/fontsubstconfig.hxx
 include/svtools/framestatuslistener.hxx
@@ -13739,6 +13738,7 @@ svtools/source/hatchwindow/hatchwindow.cxx
 svtools/source/hatchwindow/hatchwindowfactory.cxx
 svtools/source/hatchwindow/ipwin.cxx
 svtools/source/hatchwindow/ipwin.hxx
+svtools/source/inc/filectrl.hxx
 svtools/source/inc/hatchwindow.hxx
 svtools/source/inc/unoiface.hxx
 svtools/source/java/javacontext.cxx
diff --git a/svtools/source/control/filectrl.cxx b/svtools/source/control/filectrl.cxx
index f615e282a7c1..6f3704d9d3bb 100644
--- a/svtools/source/control/filectrl.cxx
+++ b/svtools/source/control/filectrl.cxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <svtools/filectrl.hxx>
+#include <filectrl.hxx>
 
 #include <com/sun/star/ui/dialogs/FilePicker.hpp>
 #include <com/sun/star/ui/dialogs/TemplateDescription.hpp>
diff --git a/include/svtools/filectrl.hxx b/svtools/source/inc/filectrl.hxx
similarity index 84%
rename from include/svtools/filectrl.hxx
rename to svtools/source/inc/filectrl.hxx
index fc4fd00f003c..87cd28a33645 100644
--- a/include/svtools/filectrl.hxx
+++ b/svtools/source/inc/filectrl.hxx
@@ -20,7 +20,6 @@
 #ifndef INCLUDED_SVTOOLS_FILECTRL_HXX
 #define INCLUDED_SVTOOLS_FILECTRL_HXX
 
-#include <svtools/svtdllapi.h>
 #include <vcl/window.hxx>
 #include <vcl/button.hxx>
 
@@ -39,18 +38,18 @@ namespace o3tl
 }
 
 
-class SVT_DLLPUBLIC FileControl final : public vcl::Window
+class FileControl final : public vcl::Window
 {
     VclPtr<Edit>       maEdit;
     VclPtr<PushButton> maButton;
     OUString const           maButtonText;
     FileControlMode_Internal    mnInternalFlags;
 
-    SVT_DLLPRIVATE void     Resize() override;
-    SVT_DLLPRIVATE void     GetFocus() override;
-    SVT_DLLPRIVATE void     StateChanged( StateChangedType nType ) override;
-    SVT_DLLPRIVATE WinBits  ImplInitStyle( WinBits nStyle );
-    DECL_DLLPRIVATE_LINK( ButtonHdl, Button*, void );
+    void     Resize() override;
+    void     GetFocus() override;
+    void     StateChanged( StateChangedType nType ) override;
+    WinBits  ImplInitStyle( WinBits nStyle );
+    DECL_LINK( ButtonHdl, Button*, void );
 
 public:
                     FileControl( vcl::Window* pParent, WinBits nStyle );
diff --git a/svtools/source/uno/unoiface.cxx b/svtools/source/uno/unoiface.cxx
index 05c377dfcb36..6cfd6f304905 100644
--- a/svtools/source/uno/unoiface.cxx
+++ b/svtools/source/uno/unoiface.cxx
@@ -24,8 +24,8 @@
 #include <vcl/svapp.hxx>
 #include <svl/zforlist.hxx>
 #include <svtools/svmedit.hxx>
+#include <filectrl.hxx>
 #include <unoiface.hxx>
-#include <svtools/filectrl.hxx>
 #include <com/sun/star/awt/LineEndFormat.hpp>
 #include <cppuhelper/queryinterface.hxx>
 #include <cppuhelper/typeprovider.hxx>