break dep. cycle between vcl and fpicker

Change-Id: I04c68440d7c5e5b6c620b406ff52b1cca9e2fbfb
2012-05-27 12:34:10 +02:00
parent 510bfdc31d
commit 8e0552fca7
16 changed files with 10 additions and 37 deletions
--- 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,\
--- 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,\
--- 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,\
--- 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)
--- a/fpicker/Package_inc.mk
+++ b/fpicker/Package_inc.mk
@@ -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:
--- 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"

--- 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)
--- 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
 //------------------------------------------------------------
--- 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 \
--- 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,\
--- 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 \
--- 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))
--- a/fpicker/inc/fpicker/fpicker.hrc
+++ b/fpicker/inc/fpicker/fpicker.hrc
--- 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

--- 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>
--- 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>