[Libreoffice-commits] .: 2 commits - external/mingw-dlls external/prj fpicker/AllLangResTarget_fps_office.mk fpicker/inc fpicker/Library_fps_aqua.mk fpicker/Library_fps.mk fpicker/Module_fpicker.mk fpicker/Package_inc.mk fpicker/source vcl/inc vcl/Library_vclplug_kde4.mk vcl/Library_vclplug_kde.mk vcl/Library_vclplug_tde.mk vcl/Package_inc.mk vcl/prj vcl/unx
David Tardon
dtardon at kemper.freedesktop.org
Sun May 27 03:40:17 PDT 2012
external/mingw-dlls/makefile.mk | 115 -------------------------
external/prj/build.lst | 1
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
vcl/Library_vclplug_kde.mk | 4
vcl/Library_vclplug_kde4.mk | 4
vcl/Library_vclplug_tde.mk | 4
vcl/Package_inc.mk | 1
vcl/inc/vcl/fpicker.hrc | 53 +++++++++++
vcl/prj/build.lst | 2
vcl/unx/kde/UnxFilePicker.cxx | 2
vcl/unx/kde4/KDE4FilePicker.cxx | 3
19 files changed, 63 insertions(+), 206 deletions(-)
New commits:
commit 5faaada54cc40713980d7f74e3534279e8395ead
Author: David Tardon <dtardon at redhat.com>
Date: Sun May 27 12:35:34 2012 +0200
remove redundant test for presence of dlls
Change-Id: I59a14d5579b7cb7fcf2ac5634723a8f18ed6e084
diff --git a/external/mingw-dlls/makefile.mk b/external/mingw-dlls/makefile.mk
deleted file mode 100644
index 50aa73b..0000000
--- a/external/mingw-dlls/makefile.mk
+++ /dev/null
@@ -1,115 +0,0 @@
-#
-# 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):
-# Tor Lillqvist <tml at iki.fi> (initial developer)
-# Jan Holesovsky <kendy at suse.cz>
-#
-# 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.
-#
-
-PRJ=..
-PRJNAME=external
-TARGET=mingw-dlls
-
-.INCLUDE: settings.mk
-
-# ------------------------------------------------------------------
-
-.IF "$(GUI)$(COM)" != "WNTGCC"
-
-dummy:
- @echo "Nothing to do."
-
-.ELSE
-
-MINGW_DLLS:= \
- $(MINGW_CAIRO_DLL) \
- $(MINGW_CRYPTO_DLL) \
- $(MINGW_CURL_DLL) \
- $(MINGW_DB_DLL) \
- $(MINGW_EXPAT_DLL) \
- $(MINGW_FONTCONFIG_DLL) \
- $(MINGW_FREETYPE_DLL) \
- $(MINGW_GCRYPT_DLL) \
- $(MINGW_GNUTLS_DLL) \
- $(MINGW_GPG_ERROR_DLL) \
- $(MINGW_GRAPHITE2_DLL) \
- $(MINGW_HUNSPELL_DLL) \
- $(MINGW_HYPHEN_DLL) \
- $(MINGW_ICONV_DLL) \
- $(MINGW_ICUDATA_DLL) \
- $(MINGW_ICUI18N_DLL) \
- $(MINGW_ICUUC_DLL) \
- $(MINGW_IDN_DLL) \
- $(MINGW_INTL_DLL) \
- $(MINGW_JPEG_DLL) \
- $(MINGW_LCMS2_DLL) \
- $(MINGW_LIBXML_DLL) \
- $(MINGW_LIBXSLT_DLL) \
- $(MINGW_LPSOLVE_DLL) \
- $(MINGW_MINIZIP_DLL) \
- $(MINGW_MYTHES_DLL) \
- $(MINGW_NEON_DLL) \
- $(MINGW_NSPR4_DLL) \
- $(MINGW_NSS3_DLL) \
- $(MINGW_NSSUTIL3_DLL) \
- $(MINGW_PIXMAN_DLL) \
- $(MINGW_PLC4_DLL) \
- $(MINGW_PLDS4_DLL) \
- $(MINGW_PNG15_DLL) \
- $(MINGW_RAPTOR_DLL) \
- $(MINGW_RASQAL_DLL) \
- $(MINGW_REDLAND_DLL) \
- $(MINGW_SQLITE3_DLL) \
- $(MINGW_SSH2_DLL) \
- $(MINGW_SSL3_DLL) \
- $(MINGW_SSL_DLL) \
- $(MINGW_TASN1_DLL) \
- $(MINGW_ZLIB_DLL)
-
-.IF "$(MINGW_SHARED_GCCLIB)" == "YES"
-MINGW_DLLS+=$(MINGW_GCCDLL)
-.ENDIF
-
-.IF "$(MINGW_SHARED_GXXLIB)" == "YES"
-MINGW_DLLS+=$(MINGW_GXXDLL)
-.ENDIF
-
-# Guesstimate where the DLLs can be
-
-POTENTIAL_MINGW_RUNTIME_BINDIRS = \
- $(COMPATH)/$(HOST_PLATFORM)/sys-root/mingw/bin \
- /usr/$(HOST_PLATFORM)/sys-root/mingw/bin \
-
-all:
- @for DLL in $(MINGW_DLLS) ; do \
- for D in $(POTENTIAL_MINGW_RUNTIME_BINDIRS); do \
- test -f $$D/$$DLL && $(COPY) -p $$D/$$DLL $(BIN)$/ && break; \
- done ; \
- test -f $(BIN)$/$$DLL || { echo Could not find $$DLL in none of $(POTENTIAL_MINGW_RUNTIME_BINDIRS) ; exit 1 ; } ; \
- done
-
-.ENDIF
-
-# ------------------------------------------------------------------
-
-.INCLUDE: target.mk
diff --git a/external/prj/build.lst b/external/prj/build.lst
index 65665db..7847f24 100644
--- a/external/prj/build.lst
+++ b/external/prj/build.lst
@@ -3,6 +3,5 @@ el external usr1 - all el_mkout NULL
el external\glibc nmake - all el_glibc NULL
el external\gcc3_specific nmake - all el_gcc3 NULL
el external\mingwheaders nmake - w el_mingwheaders NULL
-el external\mingw-dlls nmake - w el_mingwdlls NULL
el external\jawt nmake - w el_jawt NULL
el external\wine nmake - w el_wine NULL
commit 8e0552fca75e7b82975a3ed05fd8c50b00f53254
Author: David Tardon <dtardon at redhat.com>
Date: Sun May 27 12:34:10 2012 +0200
break dep. cycle between vcl and fpicker
Change-Id: I04c68440d7c5e5b6c620b406ff52b1cca9e2fbfb
diff --git a/fpicker/AllLangResTarget_fps_office.mk b/fpicker/AllLangResTarget_fps_office.mk
index f8a8ccd..7b2b405 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 a4d3c64..000a4cf 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 6cb9c18..12e36d6 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 30da957..1edc7c9 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 81113e9..0000000
--- 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 521610f..0000000
--- 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 <cbosdonnat at suse.com> (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 <svl/solar.hrc>
-
-#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 2bf6bf9..7c65cb6 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 acb14a9..63a56a0 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 b1e781e..8e689e1 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 303b98c..dbfeb91 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 8d39a4d..a529bf3 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 2e3a8c6..d4bf1ef 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 146eb67..18d6ff9 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/vcl/inc/vcl/fpicker.hrc b/vcl/inc/vcl/fpicker.hrc
new file mode 100644
index 0000000..521610f
--- /dev/null
+++ b/vcl/inc/vcl/fpicker.hrc
@@ -0,0 +1,53 @@
+/* -*- 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 <cbosdonnat at suse.com> (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 <svl/solar.hrc>
+
+#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/vcl/prj/build.lst b/vcl/prj/build.lst
index 9b51836..b5fd5eb 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 0bb0451..f217720 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 3537bfe..df08ed7 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>
More information about the Libreoffice-commits
mailing list