diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2019-10-20 20:43:25 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2019-10-21 11:32:55 +0200 |
| commit | 976d595a0f1c5d6a4e60b408f8c0e2340339e770 (patch) | |
| tree | 4fe9c1bc9bacf0bbb6d0bcf0d1e81322a90a436f | |
| parent | Fix FIXME sortMarks should be private (sw) (diff) | |
| download | core-976d595a0f1c5d6a4e60b408f8c0e2340339e770.tar.gz core-976d595a0f1c5d6a4e60b408f8c0e2340339e770.zip | |
move AutocompleteEdit to fpicker
Change-Id: I00b1b4f21ffcb183d098b8af296e1dea64a2a482
Reviewed-on: https://gerrit.libreoffice.org/81177
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
| -rw-r--r-- | fpicker/Library_fps_office.mk | 1 | ||||
| -rw-r--r-- | fpicker/source/office/RemoteFilesDialog.hxx | 2 | ||||
| -rw-r--r-- | fpicker/source/office/autocmpledit.cxx (renamed from svtools/source/control/autocmpledit.cxx) | 2 | ||||
| -rw-r--r-- | fpicker/source/office/autocmpledit.hxx (renamed from include/svtools/autocmpledit.hxx) | 7 | ||||
| -rw-r--r-- | solenv/clang-format/blacklist | 4 | ||||
| -rw-r--r-- | svtools/Library_svt.mk | 1 |
6 files changed, 7 insertions, 10 deletions
diff --git a/fpicker/Library_fps_office.mk b/fpicker/Library_fps_office.mk index 626f357a98b3..eff3f5ebe84f 100644 --- a/fpicker/Library_fps_office.mk +++ b/fpicker/Library_fps_office.mk @@ -43,6 +43,7 @@ $(eval $(call gb_Library_use_libraries,fps_office,\ $(eval $(call gb_Library_add_exception_objects,fps_office,\ fpicker/source/office/asyncfilepicker \ + fpicker/source/office/autocmpledit \ fpicker/source/office/breadcrumb \ fpicker/source/office/commonpicker \ fpicker/source/office/contentenumeration \ diff --git a/fpicker/source/office/RemoteFilesDialog.hxx b/fpicker/source/office/RemoteFilesDialog.hxx index 5331107018d5..e37e9a37f7e4 100644 --- a/fpicker/source/office/RemoteFilesDialog.hxx +++ b/fpicker/source/office/RemoteFilesDialog.hxx @@ -10,7 +10,7 @@ #ifndef INCLUDED_SVTOOLS_REMOTEFILESDIALOG_HXX #define INCLUDED_SVTOOLS_REMOTEFILESDIALOG_HXX -#include <svtools/autocmpledit.hxx> +#include "autocmpledit.hxx" #include <svtools/place.hxx> #include <svtools/PlaceEditDialog.hxx> diff --git a/svtools/source/control/autocmpledit.cxx b/fpicker/source/office/autocmpledit.cxx index 9c60a830c10d..d7b5f6359da3 100644 --- a/svtools/source/control/autocmpledit.cxx +++ b/fpicker/source/office/autocmpledit.cxx @@ -7,7 +7,7 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#include <svtools/autocmpledit.hxx> +#include "autocmpledit.hxx" #include <vcl/svapp.hxx> #include <vcl/event.hxx> diff --git a/include/svtools/autocmpledit.hxx b/fpicker/source/office/autocmpledit.hxx index 78777a176320..89b431ebc9e0 100644 --- a/include/svtools/autocmpledit.hxx +++ b/fpicker/source/office/autocmpledit.hxx @@ -10,20 +10,17 @@ #ifndef INCLUDED_SVTOOLS_AUTOCMPLEDIT_HXX #define INCLUDED_SVTOOLS_AUTOCMPLEDIT_HXX -#include <svtools/svtdllapi.h> - #include <vcl/edit.hxx> - #include <vector> -class SVT_DLLPUBLIC AutocompleteEdit : public Edit +class AutocompleteEdit : public Edit { private: std::vector< OUString > m_aEntries; std::vector< OUString > m_aMatching; std::vector< OUString >::size_type m_nCurrent; - DECL_DLLPRIVATE_LINK(AutoCompleteHdl_Impl, Edit&, void); + DECL_LINK(AutoCompleteHdl_Impl, Edit&, void); bool Match( const OUString& rText ); bool PreNotify( NotifyEvent& rNEvt ) override; diff --git a/solenv/clang-format/blacklist b/solenv/clang-format/blacklist index 0db65dd1969b..0adda72cfef0 100644 --- a/solenv/clang-format/blacklist +++ b/solenv/clang-format/blacklist @@ -4970,6 +4970,8 @@ fpicker/source/office/RemoteFilesDialog.cxx fpicker/source/office/RemoteFilesDialog.hxx fpicker/source/office/asyncfilepicker.cxx fpicker/source/office/asyncfilepicker.hxx +fpicker/source/office/autocmpledit.cxx +fpicker/source/office/autocmpledit.hxx fpicker/source/office/breadcrumb.cxx fpicker/source/office/breadcrumb.hxx fpicker/source/office/commonpicker.cxx @@ -6900,7 +6902,6 @@ include/svtools/accessibleruler.hxx include/svtools/addresstemplate.hxx include/svtools/apearcfg.hxx include/svtools/asynclink.hxx -include/svtools/autocmpledit.hxx include/svtools/bindablecontrolhelper.hxx include/svtools/borderhelper.hxx include/svtools/borderline.hxx @@ -13673,7 +13674,6 @@ svtools/source/contnr/templwin.cxx svtools/source/contnr/templwin.hxx svtools/source/control/accessibleruler.cxx svtools/source/control/asynclink.cxx -svtools/source/control/autocmpledit.cxx svtools/source/control/calendar.cxx svtools/source/control/collatorres.cxx svtools/source/control/ctrlbox.cxx diff --git a/svtools/Library_svt.mk b/svtools/Library_svt.mk index 6b0c994041c0..95486e42b328 100644 --- a/svtools/Library_svt.mk +++ b/svtools/Library_svt.mk @@ -92,7 +92,6 @@ $(eval $(call gb_Library_add_exception_objects,svt,\ svtools/source/contnr/templwin \ svtools/source/control/accessibleruler \ svtools/source/control/asynclink \ - svtools/source/control/autocmpledit \ svtools/source/control/calendar \ svtools/source/control/collatorres \ svtools/source/control/ctrlbox \ |