diff options
-rw-r--r-- | fpicker/Library_fps_office.mk | 1 | ||||
-rw-r--r-- | fpicker/source/office/RemoteFilesDialog.hxx | 2 | ||||
-rw-r--r-- | fpicker/source/office/breadcrumb.cxx (renamed from svtools/source/control/breadcrumb.cxx) | 2 | ||||
-rw-r--r-- | fpicker/source/office/breadcrumb.hxx (renamed from include/svtools/breadcrumb.hxx) | 4 | ||||
-rw-r--r-- | solenv/clang-format/blacklist | 4 | ||||
-rw-r--r-- | svtools/Library_svt.mk | 1 |
6 files changed, 6 insertions, 8 deletions
diff --git a/fpicker/Library_fps_office.mk b/fpicker/Library_fps_office.mk index 661332c0119b..996e5994d07a 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/breadcrumb \ fpicker/source/office/commonpicker \ fpicker/source/office/fpinteraction \ fpicker/source/office/fpsmartcontent \ diff --git a/fpicker/source/office/RemoteFilesDialog.hxx b/fpicker/source/office/RemoteFilesDialog.hxx index 61d4575fd23a..140dd65622ec 100644 --- a/fpicker/source/office/RemoteFilesDialog.hxx +++ b/fpicker/source/office/RemoteFilesDialog.hxx @@ -14,7 +14,6 @@ #include <svtools/foldertree.hxx> #include <svtools/place.hxx> #include <svtools/PlaceEditDialog.hxx> -#include <svtools/breadcrumb.hxx> #include <svtools/fileview.hxx> #include <vcl/errinf.hxx> @@ -38,6 +37,7 @@ #include <vector> #include "fpdialogbase.hxx" +#include "breadcrumb.hxx" #include "QueryFolderName.hxx" using namespace ::com::sun::star::beans; diff --git a/svtools/source/control/breadcrumb.cxx b/fpicker/source/office/breadcrumb.cxx index 8513f882a1e3..039664778056 100644 --- a/svtools/source/control/breadcrumb.cxx +++ b/fpicker/source/office/breadcrumb.cxx @@ -7,9 +7,9 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#include <svtools/breadcrumb.hxx> #include <tools/urlobj.hxx> #include <vcl/fixedhyper.hxx> +#include "breadcrumb.hxx" class CustomLink : public FixedHyperlink { diff --git a/include/svtools/breadcrumb.hxx b/fpicker/source/office/breadcrumb.hxx index 7a8672775739..0fe53c4b821c 100644 --- a/include/svtools/breadcrumb.hxx +++ b/fpicker/source/office/breadcrumb.hxx @@ -10,8 +10,6 @@ #ifndef INCLUDED_SVTOOLS_BREADCRUMB_HXX #define INCLUDED_SVTOOLS_BREADCRUMB_HXX -#include <svtools/svtdllapi.h> - #include <vcl/layout.hxx> #include <vector> @@ -28,7 +26,7 @@ enum SvtBreadcrumbMode class CustomLink; -class SVT_DLLPUBLIC Breadcrumb : public VclHBox +class Breadcrumb : public VclHBox { private: std::vector< VclPtr< CustomLink > > m_aLinks; diff --git a/solenv/clang-format/blacklist b/solenv/clang-format/blacklist index d694f0b3d02b..7977b05d094c 100644 --- a/solenv/clang-format/blacklist +++ b/solenv/clang-format/blacklist @@ -4981,6 +4981,8 @@ fpicker/source/office/RemoteFilesDialog.cxx fpicker/source/office/RemoteFilesDialog.hxx fpicker/source/office/asyncfilepicker.cxx fpicker/source/office/asyncfilepicker.hxx +fpicker/source/office/breadcrumb.cxx +fpicker/source/office/breadcrumb.hxx fpicker/source/office/commonpicker.cxx fpicker/source/office/commonpicker.hxx fpicker/source/office/fpdialogbase.hxx @@ -6908,7 +6910,6 @@ include/svtools/autocmpledit.hxx include/svtools/bindablecontrolhelper.hxx include/svtools/borderhelper.hxx include/svtools/borderline.hxx -include/svtools/breadcrumb.hxx include/svtools/brwbox.hxx include/svtools/brwhead.hxx include/svtools/calendar.hxx @@ -13698,7 +13699,6 @@ svtools/source/contnr/templwin.hxx svtools/source/control/accessibleruler.cxx svtools/source/control/asynclink.cxx svtools/source/control/autocmpledit.cxx -svtools/source/control/breadcrumb.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 262e16e9f3d4..9bc158bed49a 100644 --- a/svtools/Library_svt.mk +++ b/svtools/Library_svt.mk @@ -98,7 +98,6 @@ $(eval $(call gb_Library_add_exception_objects,svt,\ svtools/source/control/accessibleruler \ svtools/source/control/asynclink \ svtools/source/control/autocmpledit \ - svtools/source/control/breadcrumb \ svtools/source/control/calendar \ svtools/source/control/collatorres \ svtools/source/control/ctrlbox \ |