summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--fpicker/AllLangResTarget_fps_office.mk2
-rw-r--r--fpicker/Library_fps.mk2
-rw-r--r--fpicker/Library_fps_aqua.mk2
-rw-r--r--fpicker/Module_fpicker.mk1
-rw-r--r--fpicker/Package_inc.mk13
-rw-r--r--fpicker/source/aqua/resourceprovider.mm2
-rw-r--r--fpicker/source/office/OfficeFilePicker.hrc2
-rw-r--r--fpicker/source/win32/misc/resourceprovider.cxx3
-rw-r--r--vcl/Library_vclplug_kde.mk4
-rw-r--r--vcl/Library_vclplug_kde4.mk4
-rw-r--r--vcl/Library_vclplug_tde.mk4
-rw-r--r--vcl/Package_inc.mk1
-rw-r--r--vcl/inc/vcl/fpicker.hrc (renamed from fpicker/inc/fpicker/fpicker.hrc)0
-rw-r--r--vcl/prj/build.lst2
-rw-r--r--vcl/unx/kde/UnxFilePicker.cxx2
-rw-r--r--vcl/unx/kde4/KDE4FilePicker.cxx3
16 files changed, 10 insertions, 37 deletions
diff --git a/fpicker/AllLangResTarget_fps_office.mk b/fpicker/AllLangResTarget_fps_office.mk
index f8a8ccd47e69..7b2b4052f8ef 100644
--- a/fpicker/AllLangResTarget_fps_office.mk
+++ b/fpicker/AllLangResTarget_fps_office.mk
@@ -36,9 +36,9 @@ $(eval $(call gb_AllLangResTarget_add_srs,fps_office,\
$(eval $(call gb_SrsTarget_SrsTarget,fps_office/res))
$(eval $(call gb_SrsTarget_use_packages,fps_office/res,\
- fpicker_inc \
svl_inc \
svtools_inc \
+ vcl_inc \
))
$(eval $(call gb_SrsTarget_add_files,fps_office/res,\
diff --git a/fpicker/Library_fps.mk b/fpicker/Library_fps.mk
index a4d3c6438b67..000a4cf49470 100644
--- a/fpicker/Library_fps.mk
+++ b/fpicker/Library_fps.mk
@@ -32,7 +32,7 @@ $(eval $(call gb_Library_add_nativeres,fps,fps/src))
$(eval $(call gb_Library_set_componentfile,fps,fpicker/source/win32/fps))
$(eval $(call gb_Library_use_packages,fps,\
- fpicker_inc \
+ vcl_inc \
))
$(eval $(call gb_Library_use_api,fps,\
diff --git a/fpicker/Library_fps_aqua.mk b/fpicker/Library_fps_aqua.mk
index 6cb9c18b2252..12e36d6f24ce 100644
--- a/fpicker/Library_fps_aqua.mk
+++ b/fpicker/Library_fps_aqua.mk
@@ -30,7 +30,7 @@ $(eval $(call gb_Library_Library,fps_aqua))
$(eval $(call gb_Library_set_componentfile,fps_aqua,fpicker/source/aqua/fps_aqua))
$(eval $(call gb_Library_use_packages,fps_aqua,\
- fpicker_inc \
+ vcl_inc \
))
$(eval $(call gb_Library_use_api,fps_aqua,\
diff --git a/fpicker/Module_fpicker.mk b/fpicker/Module_fpicker.mk
index 30da957260bc..1edc7c9d17ef 100644
--- a/fpicker/Module_fpicker.mk
+++ b/fpicker/Module_fpicker.mk
@@ -33,7 +33,6 @@ $(eval $(call gb_Module_add_targets,fpicker,\
AllLangResTarget_fps_office \
Library_fpicker \
Library_fps_office \
- Package_inc \
))
ifeq ($(GUIBASE),aqua)
diff --git a/fpicker/Package_inc.mk b/fpicker/Package_inc.mk
deleted file mode 100644
index 81113e9e125d..000000000000
--- a/fpicker/Package_inc.mk
+++ /dev/null
@@ -1,13 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# Copyright 2012 LibreOffice contributors.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-
-$(eval $(call gb_Package_Package,fpicker_inc,$(SRCDIR)/fpicker/inc))
-$(eval $(call gb_Package_add_file,fpicker_inc,inc/fpicker/fpicker.hrc,fpicker/fpicker.hrc))
-
-# vim: set noet sw=4 ts=4:
diff --git a/fpicker/source/aqua/resourceprovider.mm b/fpicker/source/aqua/resourceprovider.mm
index 2bf6bf96760e..7c65cb686af2 100644
--- a/fpicker/source/aqua/resourceprovider.mm
+++ b/fpicker/source/aqua/resourceprovider.mm
@@ -33,12 +33,12 @@
#include <osl/diagnose.h>
#include <rtl/ustrbuf.hxx>
#include <osl/mutex.hxx>
+#include <vcl/fpicker.hrc>
#include <vcl/svapp.hxx>
#include <tools/resmgr.hxx>
#include <com/sun/star/ui/dialogs/CommonFilePickerElementIds.hpp>
#include <com/sun/star/ui/dialogs/ExtendedFilePickerElementIds.hpp>
-#include <fpicker/fpicker.hrc>
#include <svtools/filedlg2.hrc>
#include "NSString_OOoAdditions.hxx"
diff --git a/fpicker/source/office/OfficeFilePicker.hrc b/fpicker/source/office/OfficeFilePicker.hrc
index acb14a98503b..63a56a0c4e39 100644
--- a/fpicker/source/office/OfficeFilePicker.hrc
+++ b/fpicker/source/office/OfficeFilePicker.hrc
@@ -28,7 +28,7 @@
#ifndef _FPICKER_OFFICEFILEPICKER_HRC
#define _FPICKER_OFFICEFILEPICKER_HRC
-#include <fpicker/fpicker.hrc>
+#include <vcl/fpicker.hrc>
#define DLG_FPICKER_EXPLORERFILE (RID_FPICKER_START+14)
#define DLG_FPICKER_QUERYFOLDERNAME (RID_FPICKER_START+15)
diff --git a/fpicker/source/win32/misc/resourceprovider.cxx b/fpicker/source/win32/misc/resourceprovider.cxx
index b1e781e29165..8e689e1aba75 100644
--- a/fpicker/source/win32/misc/resourceprovider.cxx
+++ b/fpicker/source/win32/misc/resourceprovider.cxx
@@ -34,14 +34,13 @@
#include <rtl/ustrbuf.hxx>
#include "resourceprovider.hxx"
#include <osl/mutex.hxx>
+#include <vcl/fpicker.hrc>
#include <vcl/svapp.hxx>
#include <tools/simplerm.hxx>
#include <com/sun/star/ui/dialogs/CommonFilePickerElementIds.hpp>
#include <com/sun/star/ui/dialogs/ExtendedFilePickerElementIds.hpp>
-#include <fpicker/fpicker.hrc>
-
//------------------------------------------------------------
// namespace directives
//------------------------------------------------------------
diff --git a/vcl/Library_vclplug_kde.mk b/vcl/Library_vclplug_kde.mk
index 303b98cee8a7..dbfeb9148613 100644
--- a/vcl/Library_vclplug_kde.mk
+++ b/vcl/Library_vclplug_kde.mk
@@ -28,10 +28,6 @@
$(eval $(call gb_Library_Library,vclplug_kde))
-$(eval $(call gb_Library_use_packages,vclplug_kde,\
- fpicker_inc \
-))
-
$(eval $(call gb_Library_set_include,vclplug_kde,\
$$(INCLUDE) \
-I$(SRCDIR)/vcl/inc \
diff --git a/vcl/Library_vclplug_kde4.mk b/vcl/Library_vclplug_kde4.mk
index 8d39a4d1d776..a529bf32de31 100644
--- a/vcl/Library_vclplug_kde4.mk
+++ b/vcl/Library_vclplug_kde4.mk
@@ -28,10 +28,6 @@
$(eval $(call gb_Library_Library,vclplug_kde4))
-$(eval $(call gb_Library_use_packages,vclplug_kde4,\
- fpicker_inc \
-))
-
$(eval $(call gb_Library_use_custom_headers,vclplug_kde4,vcl/unx/kde4))
$(eval $(call gb_Library_set_include,vclplug_kde4,\
diff --git a/vcl/Library_vclplug_tde.mk b/vcl/Library_vclplug_tde.mk
index 2e3a8c659024..d4bf1efd5d41 100644
--- a/vcl/Library_vclplug_tde.mk
+++ b/vcl/Library_vclplug_tde.mk
@@ -26,10 +26,6 @@
$(eval $(call gb_Library_Library,vclplug_tde))
-$(eval $(call gb_Library_use_packages,vclplug_tde,\
- fpicker_inc \
-))
-
$(eval $(call gb_Library_set_include,vclplug_tde,\
$$(INCLUDE) \
-I$(SRCDIR)/vcl/inc \
diff --git a/vcl/Package_inc.mk b/vcl/Package_inc.mk
index 146eb6739120..18d6ff98d2ff 100644
--- a/vcl/Package_inc.mk
+++ b/vcl/Package_inc.mk
@@ -67,6 +67,7 @@ $(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/fntstyle.hxx,vcl/fntstyle.hxx)
$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/font.hxx,vcl/font.hxx))
$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/fontcapabilities.hxx,vcl/fontcapabilities.hxx))
$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/fontmanager.hxx,vcl/fontmanager.hxx))
+$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/fpicker.hrc,vcl/fpicker.hrc))
$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/gdimtf.hxx,vcl/gdimtf.hxx))
$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/gfxlink.hxx,vcl/gfxlink.hxx))
$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/gradient.hxx,vcl/gradient.hxx))
diff --git a/fpicker/inc/fpicker/fpicker.hrc b/vcl/inc/vcl/fpicker.hrc
index 521610fac3e5..521610fac3e5 100644
--- a/fpicker/inc/fpicker/fpicker.hrc
+++ b/vcl/inc/vcl/fpicker.hrc
diff --git a/vcl/prj/build.lst b/vcl/prj/build.lst
index 9b51836f052f..b5fd5eb2c506 100644
--- a/vcl/prj/build.lst
+++ b/vcl/prj/build.lst
@@ -1,4 +1,4 @@
-vc vcl : TRANSLATIONS:translations apple_remote BOOST:boost officecfg DESKTOP:rsc sot ucbhelper unotools ICU:icu GRAPHITE:graphite i18npool i18nutil unoil ridljar X11_EXTENSIONS:x11_extensions offapi basegfx basebmp tools DESKTOP:l10ntools icc cpputools svl LIBXSLT:libxslt CAIRO:cairo FREETYPE:freetype FONTCONFIG:fontconfig fpicker shell NULL
+vc vcl : TRANSLATIONS:translations apple_remote BOOST:boost officecfg DESKTOP:rsc sot ucbhelper unotools ICU:icu GRAPHITE:graphite i18npool i18nutil unoil ridljar X11_EXTENSIONS:x11_extensions offapi basegfx basebmp tools DESKTOP:l10ntools icc cpputools svl LIBXSLT:libxslt CAIRO:cairo FREETYPE:freetype FONTCONFIG:fontconfig shell NULL
vc vcl usr1 - all vc_mkout NULL
vc vcl\prj nmake - all vc_prj NULL
diff --git a/vcl/unx/kde/UnxFilePicker.cxx b/vcl/unx/kde/UnxFilePicker.cxx
index 0bb0451d0ced..f217720f9472 100644
--- a/vcl/unx/kde/UnxFilePicker.cxx
+++ b/vcl/unx/kde/UnxFilePicker.cxx
@@ -44,11 +44,11 @@
#include <rtl/bootstrap.hxx>
#include <tools/resmgr.hxx>
-#include <fpicker/fpicker.hrc>
#include <UnxFilePicker.hxx>
#include <UnxCommandThread.hxx>
#include <UnxNotifyThread.hxx>
+#include <vcl/fpicker.hrc>
#include <vcl/svapp.hxx>
#include <vcl/sysdata.hxx>
#include <vcl/syswin.hxx>
diff --git a/vcl/unx/kde4/KDE4FilePicker.cxx b/vcl/unx/kde4/KDE4FilePicker.cxx
index 3537bfe6f1f2..df08ed71896e 100644
--- a/vcl/unx/kde4/KDE4FilePicker.cxx
+++ b/vcl/unx/kde4/KDE4FilePicker.cxx
@@ -39,10 +39,9 @@
#include <com/sun/star/ui/dialogs/ControlActions.hpp>
#include <com/sun/star/ui/dialogs/ExecutableDialogResults.hpp>
-#include <fpicker/fpicker.hrc>
-
#include <osl/mutex.hxx>
+#include <vcl/fpicker.hrc>
#include <vcl/svapp.hxx>
#include <vcl/sysdata.hxx>
#include <vcl/syswin.hxx>
generated by cgit (git 2.34.1) at 2024-10-03 04:36:01 +0000