From 8e0552fca75e7b82975a3ed05fd8c50b00f53254 Mon Sep 17 00:00:00 2001 From: David Tardon Date: Sun, 27 May 2012 12:34:10 +0200 Subject: break dep. cycle between vcl and fpicker Change-Id: I04c68440d7c5e5b6c620b406ff52b1cca9e2fbfb --- fpicker/AllLangResTarget_fps_office.mk | 2 +- fpicker/Library_fps.mk | 2 +- fpicker/Library_fps_aqua.mk | 2 +- fpicker/Module_fpicker.mk | 1 - fpicker/Package_inc.mk | 13 ------- fpicker/inc/fpicker/fpicker.hrc | 53 -------------------------- fpicker/source/aqua/resourceprovider.mm | 2 +- fpicker/source/office/OfficeFilePicker.hrc | 2 +- fpicker/source/win32/misc/resourceprovider.cxx | 3 +- 9 files changed, 6 insertions(+), 74 deletions(-) delete mode 100644 fpicker/Package_inc.mk delete mode 100644 fpicker/inc/fpicker/fpicker.hrc (limited to 'fpicker') 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/inc/fpicker/fpicker.hrc b/fpicker/inc/fpicker/fpicker.hrc deleted file mode 100644 index 521610fac3e5..000000000000 --- a/fpicker/inc/fpicker/fpicker.hrc +++ /dev/null @@ -1,53 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * Version: MPL 1.1 / GPLv3+ / LGPLv3+ - * - * The contents of this file are subject to the Mozilla Public License Version - * 1.1 (the "License"); you may not use this file except in compliance with - * the License or as specified alternatively below. You may obtain a copy of - * the License at http://www.mozilla.org/MPL/ - * - * Software distributed under the License is distributed on an "AS IS" basis, - * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License - * for the specific language governing rights and limitations under the - * License. - * - * Major Contributor(s): - * [ Copyright (C) 2012 SUSE (initial developer) ] - * - * All Rights Reserved. - * - * For minor contributions see the git repository. - * - * Alternatively, the contents of this file may be used under the terms of - * either the GNU General Public License Version 3 or later (the "GPLv3+"), or - * the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"), - * in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable - * instead of those above. - */ -#ifndef _FPICKER_HRC -#define _FPICKER_HRC - -#include - -#define STR_SVT_FILEPICKER_START (RID_FPICKER_START+1) -#define STR_SVT_FILEPICKER_AUTO_EXTENSION (STR_SVT_FILEPICKER_START+ 0) -#define STR_SVT_FILEPICKER_PASSWORD (STR_SVT_FILEPICKER_START+ 1) -#define STR_SVT_FILEPICKER_FILTER_OPTIONS (STR_SVT_FILEPICKER_START+ 2) -#define STR_SVT_FILEPICKER_READONLY (STR_SVT_FILEPICKER_START+ 3) -#define STR_SVT_FILEPICKER_INSERT_AS_LINK (STR_SVT_FILEPICKER_START+ 4) -#define STR_SVT_FILEPICKER_SHOW_PREVIEW (STR_SVT_FILEPICKER_START+ 5) -#define STR_SVT_FILEPICKER_PLAY (STR_SVT_FILEPICKER_START+ 6) -#define STR_SVT_FILEPICKER_VERSION (STR_SVT_FILEPICKER_START+ 7) -#define STR_SVT_FILEPICKER_TEMPLATES (STR_SVT_FILEPICKER_START+ 8) -#define STR_SVT_FILEPICKER_IMAGE_TEMPLATE (STR_SVT_FILEPICKER_START+ 9) -#define STR_SVT_FILEPICKER_SELECTION (STR_SVT_FILEPICKER_START+10) -#define STR_SVT_FILEPICKER_FILTER_TITLE (STR_SVT_FILEPICKER_START+11) -#define STR_SVT_FOLDERPICKER_DEFAULT_TITLE (STR_SVT_FILEPICKER_START+12) -#define STR_SVT_FOLDERPICKER_DEFAULT_DESCRIPTION (STR_SVT_FILEPICKER_START+13) -#define STR_SVT_ALREADYEXISTOVERWRITE (STR_SVT_FILEPICKER_START+14) -#define STR_SVT_FILEPICKER_END (STR_SVT_ALREADYEXISTOVERWRITE) - - -#endif -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ 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 #include #include +#include #include #include #include #include -#include #include #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 +#include #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 #include "resourceprovider.hxx" #include +#include #include #include #include #include -#include - //------------------------------------------------------------ // namespace directives //------------------------------------------------------------ -- cgit