[Libreoffice-commits] .: 2 commits - fpicker/AllLangResTarget_fps_office.mk fpicker/Executable_kdefilepicker.mk fpicker/inc fpicker/Library_fop.mk fpicker/Library_fpicker.mk fpicker/Library_fps_aqua.mk fpicker/Library_fps_kde4.mk fpicker/Library_fps_kde.mk fpicker/Library_fps.mk fpicker/Library_fps_odma.mk fpicker/Library_fps_office.mk fpicker/Makefile fpicker/Module_fpicker.mk fpicker/Package_xml.mk fpicker/prj fpicker/source fpicker/util fpicker/WinResTarget_fps.mk postprocess/packcomponents Repository.mk RepositoryModule_ooo.mk
Matus Kukan
mkukan at kemper.freedesktop.org
Tue Dec 27 04:06:45 PST 2011
Repository.mk | 22
RepositoryModule_ooo.mk | 1
fpicker/AllLangResTarget_fps_office.mk | 47 +
fpicker/Executable_kdefilepicker.mk | 59 +
fpicker/Library_fop.mk | 67 +
fpicker/Library_fpicker.mk | 57 +
fpicker/Library_fps.mk | 101 ++
fpicker/Library_fps_aqua.mk | 60 +
fpicker/Library_fps_kde.mk | 51 +
fpicker/Library_fps_kde4.mk | 68 +
fpicker/Library_fps_odma.mk | 62 +
fpicker/Library_fps_office.mk | 65 +
fpicker/Makefile | 40 +
fpicker/Module_fpicker.mk | 59 +
fpicker/Package_xml.mk | 33
fpicker/WinResTarget_fps.mk | 36
fpicker/inc/makefile.mk | 39
fpicker/prj/build.lst | 13
fpicker/prj/d.lst | 13
fpicker/prj/makefile.mk | 1
fpicker/source/aqua/CFStringUtilities.cxx | 128 ---
fpicker/source/aqua/CFStringUtilities.mm | 128 +++
fpicker/source/aqua/ControlHelper.cxx | 1022 --------------------------
fpicker/source/aqua/ControlHelper.mm | 1022 ++++++++++++++++++++++++++
fpicker/source/aqua/FPentry.cxx | 114 --
fpicker/source/aqua/FPentry.mm | 114 ++
fpicker/source/aqua/FilterHelper.cxx | 556 --------------
fpicker/source/aqua/FilterHelper.mm | 556 ++++++++++++++
fpicker/source/aqua/SalAquaFilePicker.cxx | 816 --------------------
fpicker/source/aqua/SalAquaFilePicker.mm | 816 ++++++++++++++++++++
fpicker/source/aqua/SalAquaFolderPicker.cxx | 290 -------
fpicker/source/aqua/SalAquaFolderPicker.mm | 290 +++++++
fpicker/source/aqua/SalAquaPicker.cxx | 267 ------
fpicker/source/aqua/SalAquaPicker.mm | 267 ++++++
fpicker/source/aqua/makefile.mk | 93 --
fpicker/source/aqua/resourceprovider.cxx | 239 ------
fpicker/source/aqua/resourceprovider.mm | 239 ++++++
fpicker/source/generic/makefile.mk | 71 -
fpicker/source/odma/makefile.mk | 72 -
fpicker/source/office/makefile.mk | 96 --
fpicker/source/unx/kde/makefile.mk | 77 -
fpicker/source/unx/kde4/makefile.mk | 90 --
fpicker/source/unx/kde_unx/makefile.mk | 77 -
fpicker/source/win32/filepicker/makefile.mk | 80 --
fpicker/source/win32/folderpicker/makefile.mk | 52 -
fpicker/source/win32/misc/makefile.mk | 57 -
fpicker/util/exports.dxp | 1
fpicker/util/makefile.mk | 121 ---
postprocess/packcomponents/makefile.mk | 12
49 files changed, 4268 insertions(+), 4389 deletions(-)
New commits:
commit 073b50b11ec2f817e2500407019a8a06ee13e2a2
Author: Matúš Kukan <matus.kukan at gmail.com>
Date: Sat Dec 24 01:50:21 2011 +0100
fpicker: convert to gbuild
diff --git a/Repository.mk b/Repository.mk
index b64a8ef..e94a23b 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -48,6 +48,9 @@ $(eval $(call gb_Helper_register_executables,NONE, \
$(eval $(call gb_Helper_register_executables,OOO, \
spadmin.bin \
+ $(if $(filter $(GUIBASE)$(ENABLE_KDE),unxTRUE), \
+ kdefilepicker \
+ ) \
))
ifeq ($(OS),WNT)
@@ -312,6 +315,8 @@ ifeq ($(OS),WNT)
$(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \
dnd \
dtrans \
+ fop \
+ fps \
ftransl \
sysdtrans \
))
@@ -348,6 +353,8 @@ $(eval $(call gb_Helper_register_libraries,UNOLIBS_OOO, \
dlgprov \
expwrap \
fastsax \
+ fpicker \
+ fps_office \
fsstorage \
gdipluscanvas \
hatchwindowfactory \
@@ -372,6 +379,18 @@ $(eval $(call gb_Helper_register_libraries,UNOLIBS_OOO, \
vclcanvas \
writerfilter_uno \
writerfilter_debug \
+ $(if $(filter $(GUIBASE),aqua), \
+ fps_aqua \
+ ) \
+ $(if $(filter $(OS),WNT), \
+ fps_odma \
+ ) \
+ $(if $(filter $(GUIBASE)$(ENABLE_KDE),unxTRUE), \
+ fps_kde \
+ ) \
+ $(if $(filter $(GUIBASE)$(ENABLE_KDE4),unxTRUE), \
+ fps_kde4 \
+ ) \
))
$(eval $(call gb_Helper_register_libraries,UNOLIBS_URE, \
@@ -395,6 +414,9 @@ $(eval $(call gb_Helper_register_static_libraries,PLAINLIBS, \
ulingu \
vclmain \
writerperfect \
+ $(if $(filter $(OS),WNT), \
+ odma_lib \
+ ) \
))
ifeq ($(OS),WNT)
diff --git a/RepositoryModule_ooo.mk b/RepositoryModule_ooo.mk
index 1e4ff6e..947a06e 100644
--- a/RepositoryModule_ooo.mk
+++ b/RepositoryModule_ooo.mk
@@ -53,6 +53,7 @@ $(eval $(call gb_Module_add_moduledirs,ooo,\
filter \
forms \
formula \
+ fpicker \
framework \
hwpfilter \
i18npool \
diff --git a/fpicker/AllLangResTarget_fps_office.mk b/fpicker/AllLangResTarget_fps_office.mk
new file mode 100644
index 0000000..27e0f85
--- /dev/null
+++ b/fpicker/AllLangResTarget_fps_office.mk
@@ -0,0 +1,47 @@
+# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+#
+# 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) 2011 Matúš Kukan <matus.kukan at gmail.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.
+
+$(eval $(call gb_AllLangResTarget_AllLangResTarget,fps_office))
+
+$(eval $(call gb_AllLangResTarget_set_reslocation,fps_office,fpicker))
+
+$(eval $(call gb_AllLangResTarget_add_srs,fps_office,\
+ fps_office/res \
+))
+
+$(eval $(call gb_SrsTarget_SrsTarget,fps_office/res))
+
+$(eval $(call gb_SrsTarget_set_include,fps_office/res,\
+ $$(INCLUDE) \
+))
+
+$(eval $(call gb_SrsTarget_add_files,fps_office/res,\
+ fpicker/source/office/OfficeFilePicker.src \
+ fpicker/source/office/iodlg.src \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/fpicker/Executable_kdefilepicker.mk b/fpicker/Executable_kdefilepicker.mk
new file mode 100644
index 0000000..1352efd
--- /dev/null
+++ b/fpicker/Executable_kdefilepicker.mk
@@ -0,0 +1,59 @@
+# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+#
+# 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) 2011 Matúš Kukan <matus.kukan at gmail.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.
+
+$(eval $(call gb_Executable_Executable,kdefilepicker))
+
+$(eval $(call gb_Executable_add_defs,kdefilepicker,\
+ $(KDE_CFLAGS) \
+))
+
+$(eval $(call gb_Executable_add_linked_libs,kdefilepicker,\
+ sal \
+ $(gb_STDLIBS) \
+))
+
+$(eval $(call gb_Executable_add_libs,kdefilepicker,\
+ $(KDE_LIBS) \
+ -lkio -lX11 \
+))
+
+$(eval $(call gb_Executable_add_exception_objects,kdefilepicker,\
+ fpicker/source/unx/kde/kdecommandthread \
+ fpicker/source/unx/kde/kdefilepicker \
+ fpicker/source/unx/kde/kdefpmain \
+ fpicker/source/unx/kde/kdemodalityfilter \
+))
+
+$(eval $(call gb_Executable_add_generated_cxxobjects,kdefilepicker,\
+ CustomTarget/fpicker/source/unx/kde/kdefilepicker.moc \
+))
+
+$(WORKDIR)/CustomTarget/fpicker/source/unx/kde/kdefilepicker.moc.cxx : $(SRCDIR)/fpicker/source/unx/kde/kdefilepicker.hxx
+ mkdir -p $(dir $@)
+ $(MOC) $< -o $@
+
+# vim: set noet sw=4 ts=4:
diff --git a/fpicker/Library_fop.mk b/fpicker/Library_fop.mk
new file mode 100644
index 0000000..2d6091d
--- /dev/null
+++ b/fpicker/Library_fop.mk
@@ -0,0 +1,67 @@
+# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+#
+# 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) 2011 Matúš Kukan <matus.kukan at gmail.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.
+
+$(eval $(call gb_Library_Library,fop))
+
+$(eval $(call gb_Library_set_componentfile,fop,fpicker/util/fop))
+
+$(eval $(call gb_Library_add_api,fop,\
+ offapi \
+ udkapi \
+))
+
+$(eval $(call gb_Library_add_defs,fop,\
+ -DUNICODE \
+ -D_UNICODE \
+))
+
+$(eval $(call gb_Library_add_linked_libs,fop,\
+ comphelper \
+ cppu \
+ cppuhelper \
+ sal \
+ tl \
+ vcl \
+ advapi32 \
+ gdi32 \
+ ole32 \
+ oleaut32 \
+ shell32 \
+ $(gb_STDLIBS) \
+))
+
+$(eval $(call gb_Library_add_exception_objects,fop,\
+ fpicker/source/win32/folderpicker/FolderPicker \
+ fpicker/source/win32/folderpicker/Fopentry \
+ fpicker/source/win32/folderpicker/MtaFop \
+ fpicker/source/win32/folderpicker/WinFOPImpl \
+ fpicker/source/win32/misc/AutoBuffer \
+ fpicker/source/win32/misc/resourceprovider \
+ fpicker/source/win32/misc/WinImplHelper \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/fpicker/Library_fpicker.mk b/fpicker/Library_fpicker.mk
new file mode 100644
index 0000000..229b003
--- /dev/null
+++ b/fpicker/Library_fpicker.mk
@@ -0,0 +1,57 @@
+# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+#
+# 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) 2011 Matúš Kukan <matus.kukan at gmail.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.
+
+$(eval $(call gb_Library_Library,fpicker))
+
+$(eval $(call gb_Library_set_componentfile,fpicker,fpicker/source/generic/fpicker))
+
+$(eval $(call gb_Library_add_api,fpicker,\
+ offapi \
+ udkapi \
+))
+
+$(eval $(call gb_Library_add_linked_libs,fpicker,\
+ cppu \
+ cppuhelper \
+ sal \
+ svl \
+ svt \
+ vcl \
+ $(gb_STDLIBS) \
+))
+
+ifeq ($(OS),WNT)
+$(eval $(call gb_Library_add_linked_static_libs,fpicker,\
+ odma_lib \
+))
+endif
+
+$(eval $(call gb_Library_add_exception_objects,fpicker,\
+ fpicker/source/generic/fpicker \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/fpicker/Library_fps.mk b/fpicker/Library_fps.mk
new file mode 100644
index 0000000..85245e3
--- /dev/null
+++ b/fpicker/Library_fps.mk
@@ -0,0 +1,101 @@
+# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+#
+# 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) 2011 Matúš Kukan <matus.kukan at gmail.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.
+
+$(eval $(call gb_Library_Library,fps))
+
+$(eval $(call gb_Library_add_nativeres,fps,fps/src))
+
+$(eval $(call gb_Library_set_componentfile,fps,fpicker/util/fps))
+
+$(eval $(call gb_Library_add_api,fps,\
+ offapi \
+ udkapi \
+))
+
+$(eval $(call gb_Library_add_defs,fps,\
+ -D_UNICODE \
+ -DUNICODE \
+ -U_WIN32_WINNT \
+ -D_WIN32_WINNT=0x0600 \
+))
+
+$(eval $(call gb_Library_add_linked_libs,fps,\
+ cppu \
+ cppuhelper \
+ sal \
+ tl \
+ utl \
+ vcl \
+ advapi32 \
+ comdlg32 \
+ gdi32 \
+ kernel32 \
+ ole32 \
+ oleaut32 \
+ shell32 \
+ uuid \
+ $(gb_STDLIBS) \
+))
+
+ifeq ($(COM),MSC)
+$(eval $(call gb_Library_add_libs,fps,\
+ Delayimp.lib /DELAYLOAD:shell32.dll
+))
+endif
+
+$(eval $(call gb_Library_add_exception_objects,fps,\
+ fpicker/source/win32/filepicker/asynceventnotifier \
+ fpicker/source/win32/filepicker/asyncrequests \
+ fpicker/source/win32/filepicker/controlaccess \
+ fpicker/source/win32/filepicker/controlcommand \
+ fpicker/source/win32/filepicker/customcontrolcontainer \
+ fpicker/source/win32/filepicker/customcontrol \
+ fpicker/source/win32/filepicker/customcontrolfactory \
+ fpicker/source/win32/filepicker/dialogcustomcontrols \
+ fpicker/source/win32/filepicker/dibpreview \
+ fpicker/source/win32/filepicker/FileOpenDlg \
+ fpicker/source/win32/filepicker/FilePicker \
+ fpicker/source/win32/filepicker/filepickereventnotification \
+ fpicker/source/win32/filepicker/filepickerstate \
+ fpicker/source/win32/filepicker/FilterContainer \
+ fpicker/source/win32/filepicker/FPentry \
+ fpicker/source/win32/filepicker/getfilenamewrapper \
+ fpicker/source/win32/filepicker/helppopupwindow \
+ fpicker/source/win32/filepicker/previewadapter \
+ fpicker/source/win32/filepicker/previewbase \
+ fpicker/source/win32/filepicker/SolarMutex \
+ fpicker/source/win32/filepicker/VistaFilePicker \
+ fpicker/source/win32/filepicker/VistaFilePickerEventHandler \
+ fpicker/source/win32/filepicker/VistaFilePickerImpl \
+ fpicker/source/win32/filepicker/WinFileOpenImpl \
+ fpicker/source/win32/misc/AutoBuffer \
+ fpicker/source/win32/misc/resourceprovider \
+ fpicker/source/win32/misc/WinImplHelper \
+))
+# fpicker/source/win32/filepicker/PreviewCtrl \
+
+# vim: set noet sw=4 ts=4:
diff --git a/fpicker/Library_fps_aqua.mk b/fpicker/Library_fps_aqua.mk
new file mode 100644
index 0000000..ca39922
--- /dev/null
+++ b/fpicker/Library_fps_aqua.mk
@@ -0,0 +1,60 @@
+# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+#
+# 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) 2011 Matúš Kukan <matus.kukan at gmail.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.
+
+$(eval $(call gb_Library_Library,fps_aqua))
+
+$(eval $(call gb_Library_set_componentfile,fps_aqua,fpicker/source/aqua/fps_aqua))
+
+$(eval $(call gb_Library_add_api,fps_aqua,\
+ offapi \
+ udkapi \
+))
+
+$(eval $(call gb_Library_add_linked_libs,fps_aqua,\
+ cppu \
+ cppuhelper \
+ sal \
+ tl \
+ vcl \
+ $(gb_STDLIBS) \
+))
+
+$(eval $(call gb_Library_add_objcxxobjects,fps_aqua,\
+ fpicker/source/aqua/AquaFilePickerDelegate \
+ fpicker/source/aqua/CFStringUtilities \
+ fpicker/source/aqua/ControlHelper \
+ fpicker/source/aqua/FilterHelper \
+ fpicker/source/aqua/FPentry \
+ fpicker/source/aqua/NSString_OOoAdditions \
+ fpicker/source/aqua/NSURL_OOoAdditions \
+ fpicker/source/aqua/resourceprovider \
+ fpicker/source/aqua/SalAquaFilePicker \
+ fpicker/source/aqua/SalAquaFolderPicker \
+ fpicker/source/aqua/SalAquaPicker \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/fpicker/Library_fps_kde.mk b/fpicker/Library_fps_kde.mk
new file mode 100644
index 0000000..5624fd6
--- /dev/null
+++ b/fpicker/Library_fps_kde.mk
@@ -0,0 +1,51 @@
+# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+#
+# 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) 2011 Matúš Kukan <matus.kukan at gmail.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.
+
+$(eval $(call gb_Library_Library,fps_kde))
+
+$(eval $(call gb_Library_add_api,fps_kde,\
+ offapi \
+ udkapi \
+))
+
+$(eval $(call gb_Library_add_linked_libs,fps_kde,\
+ cppu \
+ cppuhelper \
+ sal \
+ tl \
+ vcl \
+ $(gb_STDLIBS) \
+))
+
+$(eval $(call gb_Library_add_exception_objects,fps_kde,\
+ fpicker/source/unx/kde_unx/UnxCommandThread \
+ fpicker/source/unx/kde_unx/UnxFilePicker \
+ fpicker/source/unx/kde_unx/UnxFPentry \
+ fpicker/source/unx/kde_unx/UnxNotifyThread \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/fpicker/Library_fps_kde4.mk b/fpicker/Library_fps_kde4.mk
new file mode 100644
index 0000000..db41506
--- /dev/null
+++ b/fpicker/Library_fps_kde4.mk
@@ -0,0 +1,68 @@
+# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+#
+# 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) 2011 Matúš Kukan <matus.kukan at gmail.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.
+
+$(eval $(call gb_Library_Library,fps_kde4))
+
+$(eval $(call gb_Library_set_componentfile,fps_kde4,fpicker/source/unx/kde4/fps_kde4))
+
+$(eval $(call gb_Library_add_api,fps_kde4,\
+ offapi \
+ udkapi \
+))
+
+$(eval $(call gb_Library_add_defs,fps_kde4,\
+ $(KDE4_CFLAGS) \
+))
+
+$(eval $(call gb_Library_add_linked_libs,fps_kde4,\
+ cppu \
+ cppuhelper \
+ sal \
+ tl \
+ vcl \
+ $(gb_STDLIBS) \
+))
+
+$(eval $(call gb_Library_add_libs,fps_kde4,\
+ $(KDE4_LIBS) \
+ -lkio -lkfile \
+))
+
+$(eval $(call gb_Library_add_exception_objects,fps_kde4,\
+ fpicker/source/unx/kde4/KDE4FilePicker \
+ fpicker/source/unx/kde4/KDE4FPEntry \
+))
+
+$(eval $(call gb_Library_add_generated_cxxobjects,fps_kde4,\
+ CustomTarget/fpicker/source/unx/kde4/KDE4FilePicker.moc \
+))
+
+$(WORKDIR)/CustomTarget/fpicker/source/unx/kde4/KDE4FilePicker.moc.cxx: $(SRCDIR)/fpicker/source/unx/kde4/KDE4FilePicker.hxx
+ mkdir -p $(dir $@)
+ $(MOC4) $< -o $@
+
+# vim: set noet sw=4 ts=4:
diff --git a/fpicker/Library_fps_odma.mk b/fpicker/Library_fps_odma.mk
new file mode 100644
index 0000000..7544876
--- /dev/null
+++ b/fpicker/Library_fps_odma.mk
@@ -0,0 +1,62 @@
+# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+#
+# 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) 2011 Matúš Kukan <matus.kukan at gmail.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.
+
+$(eval $(call gb_Library_Library,fps_odma))
+
+$(eval $(call gb_Library_add_api,fps_odma,\
+ offapi \
+ udkapi \
+))
+
+$(eval $(call gb_Library_add_linked_libs,fps_odma,\
+ comphelper \
+ cppu \
+ cppuhelper \
+ sal \
+ svl \
+ svt \
+ tk \
+ tl \
+ ucbhelper \
+ utl \
+ vcl \
+ $(gb_STDLIBS) \
+))
+
+ifeq ($(OS),WNT)
+$(eval $(call gb_Library_add_linked_static_libs,fps_odma,\
+ odma_lib \
+))
+endif
+
+$(eval $(call gb_Library_add_exception_objects,fps_odma,\
+ fpicker/source/odma/fps_odma \
+ fpicker/source/odma/ODMAFilePicker \
+ fpicker/source/odma/ODMAFolderPicker \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/fpicker/Library_fps_office.mk b/fpicker/Library_fps_office.mk
new file mode 100644
index 0000000..1d5b6a1
--- /dev/null
+++ b/fpicker/Library_fps_office.mk
@@ -0,0 +1,65 @@
+# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+#
+# 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) 2011 Matúš Kukan <matus.kukan at gmail.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.
+
+$(eval $(call gb_Library_Library,fps_office))
+
+$(eval $(call gb_Library_set_componentfile,fps_office,fpicker/source/office/fps_office))
+
+$(eval $(call gb_Library_add_api,fps_office,\
+ offapi \
+ udkapi \
+))
+
+$(eval $(call gb_Library_add_linked_libs,fps_office,\
+ comphelper \
+ cppu \
+ cppuhelper \
+ sal \
+ svl \
+ svt \
+ tk \
+ tl \
+ ucbhelper \
+ utl \
+ vcl \
+ $(gb_STDLIBS) \
+))
+
+$(eval $(call gb_Library_add_exception_objects,fps_office,\
+ fpicker/source/office/asyncfilepicker \
+ fpicker/source/office/commonpicker \
+ fpicker/source/office/fpinteraction \
+ fpicker/source/office/fpsmartcontent \
+ fpicker/source/office/fps_office \
+ fpicker/source/office/iodlg \
+ fpicker/source/office/iodlgimp \
+ fpicker/source/office/OfficeControlAccess \
+ fpicker/source/office/OfficeFilePicker \
+ fpicker/source/office/OfficeFolderPicker \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/fpicker/Makefile b/fpicker/Makefile
new file mode 100644
index 0000000..7bbbe6c
--- /dev/null
+++ b/fpicker/Makefile
@@ -0,0 +1,40 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# Copyright 2000, 2010 Oracle and/or its affiliates.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with OpenOffice.org. If not, see
+# <http://www.openoffice.org/license.html>
+# for a copy of the LGPLv3 License.
+#
+#*************************************************************************
+
+gb_PARTIALBUILD := T
+ifeq ($(strip $(SOLARENV)),)
+include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk
+else
+
+gb_SourceEnvAndRecurse_STAGE=gbuild
+include $(SOLARENV)/gbuild/gbuild.mk
+
+$(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk)))
+
+endif
+# vim: set noet sw=4 ts=4:
diff --git a/fpicker/Module_fpicker.mk b/fpicker/Module_fpicker.mk
new file mode 100644
index 0000000..133eebf
--- /dev/null
+++ b/fpicker/Module_fpicker.mk
@@ -0,0 +1,59 @@
+# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+#
+# 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) 2011 Matúš Kukan <matus.kukan at gmail.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.
+
+$(eval $(call gb_Module_Module,fpicker))
+
+ifneq ($(filter DESKTOP,$(BUILD_TYPE)),)
+
+$(eval $(call gb_Module_add_targets,fpicker,\
+ AllLangResTarget_fps_office \
+ Library_fpicker \
+ Library_fps_office \
+ $(if $(filter $(GUIBASE),aqua), \
+ Library_fps_aqua \
+ ) \
+ $(if $(filter $(OS),WNT), \
+ Library_fps_odma \
+ Library_fop \
+ Library_fps \
+ Package_xml \
+ WinResTarget_fps \
+ ) \
+ $(if $(filter $(GUIBASE),unx), \
+ $(if $(filter $(ENABLE_KDE),TRUE), \
+ Executable_kdefilepicker \
+ Library_fps_kde \
+ ) \
+ $(if $(filter $(ENABLE_KDE4),TRUE), \
+ Library_fps_kde4 \
+ ) \
+ ) \
+))
+
+endif
+
+# vim: set noet sw=4 ts=4:
diff --git a/fpicker/Package_xml.mk b/fpicker/Package_xml.mk
new file mode 100644
index 0000000..75a710c
--- /dev/null
+++ b/fpicker/Package_xml.mk
@@ -0,0 +1,33 @@
+# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+#
+# 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) 2011 Matúš Kukan <matus.kukan at gmail.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.
+
+$(eval $(call gb_Package_Package,fpicker_xml,$(SRCDIR)/fpicker/source/win32))
+
+$(eval $(call gb_Package_add_file,fpicker_xml,xml/fps.xml,filepicker/fps.xml))
+$(eval $(call gb_Package_add_file,fpicker_xml,xml/fop.xml,folderpicker/fop.xml))
+
+# vim: set noet sw=4 ts=4:
diff --git a/fpicker/WinResTarget_fps.mk b/fpicker/WinResTarget_fps.mk
new file mode 100644
index 0000000..2720a48
--- /dev/null
+++ b/fpicker/WinResTarget_fps.mk
@@ -0,0 +1,36 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+# 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) 2011 Red Hat, Inc., David Tardon <dtardon at redhat.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.
+
+$(eval $(call gb_WinResTarget_WinResTarget,fps/src))
+
+$(eval $(call gb_WinResTarget_set_include,fps/src,\
+ $$(INCLUDE) \
+))
+
+$(eval $(call gb_WinResTarget_add_file,fps/src,fpicker/source/win32/filepicker/Fps))
+
+# vim: set ts=4 sw=4 et:
diff --git a/fpicker/inc/makefile.mk b/fpicker/inc/makefile.mk
deleted file mode 100644
index 4624443..0000000
--- a/fpicker/inc/makefile.mk
+++ /dev/null
@@ -1,39 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org. If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-PRJ=..
-
-PRJNAME=fpicker
-TARGET=inc
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE : settings.mk
-
-# --- Files --------------------------------------------------------
-# --- Targets -------------------------------------------------------
-
-.INCLUDE : target.mk
diff --git a/fpicker/prj/build.lst b/fpicker/prj/build.lst
index 4e74e59..6c6a892 100644
--- a/fpicker/prj/build.lst
+++ b/fpicker/prj/build.lst
@@ -1,13 +1,2 @@
fp fpicker : LIBXSLT:libxslt TRANSLATIONS:translations DESKTOP:rdbmaker svtools ucb NULL
-fp fpicker\inc nmake - all fp_inc NULL
-fp fpicker\source\generic nmake - all fp_generic fp_inc NULL
-fp fpicker\source\office nmake - all fp_office fp_inc NULL
-fp fpicker\source\odma nmake - w fp_odma NULL
-fp fpicker\source\unx\kde4 nmake - u fp_kde4_filepicker fp_inc NULL
-fp fpicker\source\unx\kde_unx nmake - u fp_unx_common fp_inc NULL
-fp fpicker\source\unx\kde nmake - u fp_unx_kde_filepicker fp_inc NULL
-fp fpicker\source\aqua nmake - u fp_macosx_filepicker NULL
-fp fpicker\source\win32\filepicker nmake - w fp_win32_filepicker fp_inc NULL
-fp fpicker\source\win32\folderpicker nmake - w fp_win32_folderpicker fp_inc NULL
-fp fpicker\source\win32\misc nmake - w fp_win32_misc fp_win32_filepicker.w fp_win32_folderpicker.w fp_inc NULL
-fp fpicker\util nmake - all fp_util fp_unx_common.u fp_unx_kde_filepicker.u fp_win32_filepicker.w fp_win32_misc.w fp_win32_folderpicker.w NULL
+fp fpicker\prj nmake - all fp_prj NULL
diff --git a/fpicker/prj/d.lst b/fpicker/prj/d.lst
index 71ec565..e69de29 100644
--- a/fpicker/prj/d.lst
+++ b/fpicker/prj/d.lst
@@ -1,13 +0,0 @@
-mkdir: %COMMON_DEST%\bin\hid
-
-..\%COMMON_OUTDIR%\misc\*.hid %COMMON_DEST%\bin\hid\*.hid
-
-..\%__SRC%\bin\f*.res %_DEST%\bin\
-..\%__SRC%\bin\f*.dll %_DEST%\bin\
-..\%__SRC%\bin\kdefilepicker %_DEST%\bin\kdefilepicker
-..\%__SRC%\lib\f*.so %_DEST%\lib\
-..\%__SRC%\lib\*.dylib %_DEST%\lib\*.dylib
-
-..\source\win32\filepicker\*.xml %_DEST%\xml\*.xml
-..\source\win32\folderpicker\*.xml %_DEST%\xml\*.xml
-..\%__SRC%\misc\*.component %_DEST%\xml\*.component
diff --git a/fpicker/prj/makefile.mk b/fpicker/prj/makefile.mk
new file mode 100644
index 0000000..0997622
--- /dev/null
+++ b/fpicker/prj/makefile.mk
@@ -0,0 +1 @@
+.INCLUDE : gbuildbridge.mk
diff --git a/fpicker/source/aqua/makefile.mk b/fpicker/source/aqua/makefile.mk
deleted file mode 100644
index ff0473c..0000000
--- a/fpicker/source/aqua/makefile.mk
+++ /dev/null
@@ -1,93 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org. If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..
-
-PRJNAME=fpicker
-TARGET=fps_aqua.uno
-TARGETTYPE=GUI
-LIBTARGET=NO
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE : settings.mk
-
-DLLPRE=
-
-# ------------------------------------------------------------------
-
-.IF "$(GUIBASE)" != "aqua"
-
-dummy:
- @echo "Nothing to build. GUIBASE == $(GUIBASE)"
-
-.ELSE # we build for aqua
-CFLAGSCXX+=$(OBJCXXFLAGS)
-
-# --- Files --------------------------------------------------------
-
-SLOFILES =\
- $(SLO)$/resourceprovider.obj \
- $(SLO)$/FPentry.obj \
- $(SLO)$/SalAquaPicker.obj \
- $(SLO)$/SalAquaFilePicker.obj \
- $(SLO)$/SalAquaFolderPicker.obj \
- $(SLO)$/CFStringUtilities.obj \
- $(SLO)$/FilterHelper.obj \
- $(SLO)$/ControlHelper.obj \
- $(SLO)$/NSString_OOoAdditions.obj \
- $(SLO)$/NSURL_OOoAdditions.obj \
- $(SLO)$/AquaFilePickerDelegate.obj
-
-SHL1NOCHECK=TRUE
-SHL1TARGET= $(TARGET)
-SHL1OBJS= $(SLOFILES)
-SHL1STDLIBS=\
- $(VCLLIB) \
- $(TOOLSLIB) \
- $(CPPUHELPERLIB) \
- $(CPPULIB) \
- $(SALLIB)
-
-SHL1VERSIONMAP=$(SOLARENV)/src/component.map
-SHL1DEF= $(MISC)$/$(SHL1TARGET).def
-DEF1NAME=$(SHL1TARGET)
-
-.ENDIF # "$(GUIBASE)" != "aqua"
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE : target.mk
-
-ALLTAR : $(MISC)/fps_aqua.component
-
-$(MISC)/fps_aqua.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
- fps_aqua.component
- $(XSLTPROC) --nonet --stringparam uri \
- '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
- $(SOLARENV)/bin/createcomponent.xslt fps_aqua.component
diff --git a/fpicker/source/generic/makefile.mk b/fpicker/source/generic/makefile.mk
deleted file mode 100644
index 29f900a..0000000
--- a/fpicker/source/generic/makefile.mk
+++ /dev/null
@@ -1,71 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org. If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..
-
-PRJNAME=fpicker
-TARGET=fpicker.uno
-LIBTARGET=NO
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE : settings.mk
-DLLPRE=
-
-# --- Files --------------------------------------------------------
-
-SLOFILES= \
- $(SLO)$/fpicker.obj
-
-SHL1TARGET= $(TARGET)
-SHL1IMPLIB= i$(TARGET)
-SHL1OBJS= $(SLOFILES)
-SHL1STDLIBS=\
- $(ODMA_LIB_LIB) \
- $(VCLLIB) \
- $(SVLLIB) \
- $(SVTOOLLIB) \
- $(CPPUHELPERLIB) \
- $(CPPULIB) \
- $(SALLIB)
-
-SHL1VERSIONMAP=$(SOLARENV)/src/component.map
-SHL1DEF= $(MISC)$/$(SHL1TARGET).def
-DEF1NAME= $(SHL1TARGET)
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE : target.mk
-
-ALLTAR : $(MISC)/fpicker.component
-
-$(MISC)/fpicker.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
- fpicker.component
- $(XSLTPROC) --nonet --stringparam uri \
- '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
- $(SOLARENV)/bin/createcomponent.xslt fpicker.component
diff --git a/fpicker/source/odma/makefile.mk b/fpicker/source/odma/makefile.mk
deleted file mode 100644
index 3cc62d6..0000000
--- a/fpicker/source/odma/makefile.mk
+++ /dev/null
@@ -1,72 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-# Copyright 2010 Novell, Inc.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org. If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..
-
-PRJNAME=fpicker
-TARGET=fps_odma
-LIBTARGET=NO
-ENABLE_EXCEPTIONS=TRUE
-GEN_HID=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE : settings.mk
-DLLPRE=
-
-# --- Files --------------------------------------------------------
-
-SLOFILES=\
- $(SLO)$/ODMAFilePicker.obj \
- $(SLO)$/ODMAFolderPicker.obj \
- $(SLO)$/fps_odma.obj
-
-SHL1TARGET= $(TARGET).uno
-SHL1IMPLIB= i$(TARGET)
-SHL1OBJS= $(SLOFILES)
-SHL1STDLIBS=\
- $(ODMA_LIB_LIB) \
- $(SVTOOLLIB) \
- $(TKLIB) \
- $(VCLLIB) \
- $(SVLLIB) \
- $(UNOTOOLSLIB) \
- $(TOOLSLIB) \
- $(UCBHELPERLIB) \
- $(COMPHELPERLIB) \
- $(CPPUHELPERLIB) \
- $(CPPULIB) \
- $(SALLIB)
-
-SHL1VERSIONMAP=exports.map
-SHL1DEF= $(MISC)$/$(SHL1TARGET).def
-DEF1NAME= $(SHL1TARGET)
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE : target.mk
diff --git a/fpicker/source/office/makefile.mk b/fpicker/source/office/makefile.mk
deleted file mode 100644
index 7481fd8..0000000
--- a/fpicker/source/office/makefile.mk
+++ /dev/null
@@ -1,96 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org. If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..
-
-PRJNAME=fpicker
-TARGET=fps_office
-LIBTARGET=NO
-ENABLE_EXCEPTIONS=TRUE
-VISIBILITY_HIDDEN=TRUE
-GEN_HID=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE : settings.mk
-DLLPRE=
-
-# --- Files --------------------------------------------------------
-
-SLOFILES=\
- $(SLO)$/asyncfilepicker.obj \
- $(SLO)$/commonpicker.obj \
- $(SLO)$/OfficeControlAccess.obj \
- $(SLO)$/OfficeFilePicker.obj \
- $(SLO)$/OfficeFolderPicker.obj \
- $(SLO)$/fpinteraction.obj \
- $(SLO)$/fpsmartcontent.obj \
- $(SLO)$/fps_office.obj \
- $(SLO)$/iodlg.obj \
- $(SLO)$/iodlgimp.obj
-
-SHL1TARGET= $(TARGET).uno
-SHL1IMPLIB= i$(TARGET)
-SHL1OBJS= $(SLOFILES)
-SHL1STDLIBS=\
- $(SVTOOLLIB) \
- $(TKLIB) \
- $(VCLLIB) \
- $(SVLLIB) \
- $(UNOTOOLSLIB) \
- $(TOOLSLIB) \
- $(UCBHELPERLIB) \
- $(COMPHELPERLIB) \
- $(CPPUHELPERLIB) \
- $(CPPULIB) \
- $(SALLIB)
-
-SHL1VERSIONMAP=$(SOLARENV)/src/component.map
-SHL1DEF= $(MISC)$/$(SHL1TARGET).def
-DEF1NAME= $(SHL1TARGET)
-
-SRS1NAME= $(TARGET)
-SRC1FILES= \
- OfficeFilePicker.src \
- iodlg.src
-
-RESLIB1NAME=$(TARGET)
-RESLIB1IMAGES=$(PRJ)$/res
-RESLIB1SRSFILES=\
- $(SRS)$/fps_office.srs
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE : target.mk
-
-ALLTAR : $(MISC)/fps_office.component
-
-$(MISC)/fps_office.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
- fps_office.component
- $(XSLTPROC) --nonet --stringparam uri \
- '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
- $(SOLARENV)/bin/createcomponent.xslt fps_office.component
diff --git a/fpicker/source/unx/kde/makefile.mk b/fpicker/source/unx/kde/makefile.mk
deleted file mode 100644
index 1548d7b..0000000
--- a/fpicker/source/unx/kde/makefile.mk
+++ /dev/null
@@ -1,77 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2010 Novell, Inc.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org. If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..$/..
-
-PRJNAME=fpicker
-TARGET=kdefilepicker
-LIBTARGET=NO
-ENABLE_EXCEPTIONS=TRUE
-EXTERNAL_WARNINGS_NOT_ERRORS=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE : settings.mk
-
-# ------------------------------------------------------------------
-
-.IF "$(GUIBASE)" != "unx" || "$(ENABLE_KDE)" != "TRUE"
-
-dummy:
- @echo "Nothing to build. GUIBASE == $(GUIBASE), ENABLE_KDE is not set"
-
-.ELSE # we build for KDE
-
-CFLAGS+= $(KDE_CFLAGS)
-
-.IF "$(COM)" == "GCC"
-CFLAGSCXX+=-Wno-shadow
-.ENDIF
-
-# --- Files --------------------------------------------------------
-
-SLOFILES =\
- $(SLO)$/kdecommandthread.obj \
- $(SLO)$/kdefilepicker.obj \
- $(SLO)$/kdefilepicker.moc.obj \
- $(SLO)$/kdefpmain.obj \
- $(SLO)$/kdemodalityfilter.obj
-
-APP1TARGET=$(TARGET)
-APP1OBJS=$(SLOFILES)
-APP1RPATH=OOO
-APP1LINKFLAGS=$(KDE_LIBS) -lkio -lX11
-APP1STDLIBS=$(SALLIB)
-
-.ENDIF # "$(GUIBASE)" != "unx" || "$(ENABLE_KDE)" != "TRUE"
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE : target.mk
-
-$(MISC)$/kdefilepicker.moc.cxx : kdefilepicker.hxx
- $(MOC) $< -o $@
diff --git a/fpicker/source/unx/kde4/makefile.mk b/fpicker/source/unx/kde4/makefile.mk
deleted file mode 100644
index 7ccf6df..0000000
--- a/fpicker/source/unx/kde4/makefile.mk
+++ /dev/null
@@ -1,90 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org. If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..$/..
-
-PRJNAME=fpicker
-TARGET=fps_kde4.uno
-LIBTARGET=NO
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE : settings.mk
-DLLPRE=
-
-# ------------------------------------------------------------------
-
-# Currently just KDE is supported...
-.IF "$(GUIBASE)" != "unx" || "$(ENABLE_KDE4)" != "TRUE"
-
-dummy:
- @echo "Nothing to build. GUIBASE == $(GUIBASE), ENABLE_KDE4 is not set"
-
-.ELSE # we build for KDE
-
-CFLAGS+= $(KDE4_CFLAGS)
-
-# --- Files --------------------------------------------------------
-
-SLOFILES =\
- $(SLO)$/KDE4FilePicker.obj \
- $(SLO)$/KDE4FilePicker.moc.obj \
- $(SLO)$/KDE4FPEntry.obj
-
-SHL1NOCHECK=TRUE
-SHL1TARGET=$(TARGET)
-SHL1STDLIBS=$(CPPULIB)\
- $(CPPUHELPERLIB)\
- $(SALLIB)\
- $(VCLLIB)\
- $(TOOLSLIB) \
- $(KDE4_LIBS) -lkio -lkfile
-
-
-SHL1OBJS=$(SLOFILES)
-SHL1DEF=$(MISC)$/$(SHL1TARGET).def
-
-DEF1NAME=$(SHL1TARGET)
-DEF1VERSIONMAP=exports.map
-
-.ENDIF
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE : target.mk
-
-$(MISC)$/KDE4FilePicker.moc.cxx : KDE4FilePicker.hxx
- $(MOC4) $< -o $@
-
-ALLTAR : $(MISC)/fps_kde4.component
-
-$(MISC)/fps_kde4.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
- fps_kde4.component
- $(XSLTPROC) --nonet --stringparam uri \
- '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
- $(SOLARENV)/bin/createcomponent.xslt fps_kde4.component
diff --git a/fpicker/source/unx/kde_unx/makefile.mk b/fpicker/source/unx/kde_unx/makefile.mk
deleted file mode 100644
index 067399b..0000000
--- a/fpicker/source/unx/kde_unx/makefile.mk
+++ /dev/null
@@ -1,77 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-# Copyright 2010 Novell, Inc.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org. If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..$/..
-
-PRJNAME=fpicker
-TARGET=fps_kde.uno
-LIBTARGET=NO
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE : settings.mk
-DLLPRE=
-
-# ------------------------------------------------------------------
-
-# Currently just KDE is supported...
-.IF "$(GUIBASE)" != "unx" || "$(ENABLE_KDE)" != "TRUE"
-
-dummy:
- @echo "Nothing to build. GUIBASE == $(GUIBASE), ENABLE_KDE is not set"
-
-.ELSE # we build for KDE
-
-# --- Files --------------------------------------------------------
-
-SLOFILES =\
- $(SLO)$/UnxCommandThread.obj \
- $(SLO)$/UnxFilePicker.obj \
- $(SLO)$/UnxNotifyThread.obj \
- $(SLO)$/UnxFPentry.obj
-
-SHL1NOCHECK=TRUE
-SHL1TARGET=fps_kde.uno
-SHL1STDLIBS=$(CPPULIB)\
- $(CPPUHELPERLIB)\
- $(SALLIB)\
- $(VCLLIB)\
- $(TOOLSLIB)
-
-SHL1OBJS=$(SLOFILES)
-SHL1DEF=$(MISC)$/$(SHL1TARGET).def
-
-DEF1NAME=$(SHL1TARGET)
-DEF1VERSIONMAP=$(SOLARENV)/src/component.map
-
-.ENDIF # "$(GUIBASE)" != "unx" || "$(ENABLE_KDE)" != "TRUE"
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE : target.mk
diff --git a/fpicker/source/win32/filepicker/makefile.mk b/fpicker/source/win32/filepicker/makefile.mk
deleted file mode 100644
index 32ecc86..0000000
--- a/fpicker/source/win32/filepicker/makefile.mk
+++ /dev/null
@@ -1,80 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org. If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..$/..
-
-PRJNAME=fpicker
-TARGET=fps
-ENABLE_EXCEPTIONS=TRUE
-COMP1TYPELIST=$(TARGET)
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE : settings.mk
-
-# ------------------------------------------------------------------
-
-CDEFS+=-D_UNICODE
-CDEFS+=-DUNICODE
-CDEFS+=-U_WIN32_WINNT -D_WIN32_WINNT=0x0600
-
-# --- Resources ----------------------------------------------------
-
-.IF "$(GUI)" == "WNT"
-RCFILES=Fps.rc
-.ENDIF
-
-# --- Files --------------------------------------------------------
-
-SLOFILES=$(SLO)$/FileOpenDlg.obj\
- $(SLO)$/FPentry.obj\
- $(SLO)$/FilePicker.obj\
- $(SLO)$/WinFileOpenImpl.obj\
- $(SLO)$/FilterContainer.obj\
- $(SLO)$/controlaccess.obj\
- $(SLO)$/dibpreview.obj\
- $(SLO)$/helppopupwindow.obj\
- $(SLO)$/controlcommand.obj\
- $(SLO)$/filepickerstate.obj\
- $(SLO)$/getfilenamewrapper.obj\
- $(SLO)$/asynceventnotifier.obj\
- $(SLO)$/previewadapter.obj\
- $(SLO)$/previewbase.obj\
- $(SLO)$/filepickereventnotification.obj\
- $(SLO)$/customcontrol.obj\
- $(SLO)$/customcontrolcontainer.obj\
- $(SLO)$/customcontrolfactory.obj\
- $(SLO)$/dialogcustomcontrols.obj\
- $(SLO)$/asyncrequests.obj\
- $(SLO)$/VistaFilePickerEventHandler.obj\
- $(SLO)$/VistaFilePickerImpl.obj\
- $(SLO)$/VistaFilePicker.obj\
- $(SLO)$/SolarMutex.obj
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE : target.mk
diff --git a/fpicker/source/win32/folderpicker/makefile.mk b/fpicker/source/win32/folderpicker/makefile.mk
deleted file mode 100644
index 68c0e5c..0000000
--- a/fpicker/source/win32/folderpicker/makefile.mk
+++ /dev/null
@@ -1,52 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org. If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..$/..
-PRJNAME=fpicker
-TARGET=fop
-ENABLE_EXCEPTIONS=TRUE
-COMP1TYPELIST=$(TARGET)
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE : settings.mk
-
-# --- Files --------------------------------------------------------
-
-# enable rtti
-.IF "$(COM)" == "MSC"
-CFLAGS+=-GR
-.ENDIF
-
-SLOFILES=$(SLO)$/Fopentry.obj\
- $(SLO)$/FolderPicker.obj\
- $(SLO)$/WinFOPImpl.obj\
- $(SLO)$/MtaFop.obj
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE : target.mk
diff --git a/fpicker/source/win32/misc/makefile.mk b/fpicker/source/win32/misc/makefile.mk
deleted file mode 100644
index 70faefd..0000000
--- a/fpicker/source/win32/misc/makefile.mk
+++ /dev/null
@@ -1,57 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org. If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..$/..
-PRJNAME=fpicker
-TARGET=utils
-LIBTARGET=NO
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings ----------------------------------
-
-.INCLUDE : settings.mk
-
-.IF "$(COM)"=="GCC"
-CFLAGSAPPEND+=-fexceptions -fno-enforce-eh-specs -DUNICODE -D_UNICODE
-.ELSE
-CFLAGS+=-EHa -DUNICODE -D_UNICODE
-.ENDIF
-
-# --- Files -------------------------------------
-
-SLOFILES=$(SLO)$/WinImplHelper.obj\
- $(SLO)$/AutoBuffer.obj\
- $(SLO)$/resourceprovider.obj
-
-LIB1TARGET=$(SLB)$/$(TARGET).lib
-LIB1OBJFILES=$(SLOFILES)
-
-# --- Targets ----------------------------------
-
-.INCLUDE : target.mk
-
-
diff --git a/fpicker/util/exports.dxp b/fpicker/util/exports.dxp
deleted file mode 100644
index 7003307..0000000
--- a/fpicker/util/exports.dxp
+++ /dev/null
@@ -1 +0,0 @@
-component_getFactory
diff --git a/fpicker/util/makefile.mk b/fpicker/util/makefile.mk
deleted file mode 100644
index 7d42971..0000000
--- a/fpicker/util/makefile.mk
+++ /dev/null
@@ -1,121 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org. If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..
-
-PRJNAME=fpicker
-TARGET=fpicker
-TARGET1=fps
-TARGET2=fop
-USE_LDUMP2=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE : settings.mk
-
-# --- fps dynlib ----------------------------------------------
-
-COMMON_LIBS=$(CPPULIB)\
- $(CPPUHELPERLIB)\
- $(COMPHELPERLIB)\
- $(SALLIB)\
- $(VCLLIB)\
- $(TOOLSLIB)
-
-.IF "$(GUI)"=="WNT"
-
-SHL1TARGET=$(TARGET1)
-SHL1STDLIBS= $(COMMON_LIBS) \
- $(UWINAPILIB) \
- $(ADVAPI32LIB) \
- $(SHELL32LIB)\
- $(OLE32LIB)\
- $(GDI32LIB)\
- $(OLEAUT32LIB)\
- $(COMDLG32LIB)\
- $(KERNEL32LIB)\
- $(UUIDLIB)
-
-.IF "$(COM)" == "MSC"
-SHL1STDLIBS+=\
- Delayimp.lib\
- /DELAYLOAD:shell32.dll
-.ENDIF
-
-SHL1DEPN=
-SHL1IMPLIB=i$(SHL1TARGET)
-SHL1LIBS=$(SLB)$/fps.lib\
- $(SLB)$/utils.lib
-SHL1RES=$(RES)$/$(TARGET1).res
-SHL1DEF=$(MISC)$/$(SHL1TARGET).def
-
-DEF1NAME=$(SHL1TARGET)
-DEF1EXPORTFILE= exports.dxp
-
-.ENDIF # "$(GUI)"=="WNT"
-
-# --- fop dynlib --------------------------------------------------
-
-.IF "$(GUI)"=="WNT"
-SHL2NOCHECK=TRUE
-SHL2TARGET=$(TARGET2)
-
-SHL2STDLIBS= $(COMMON_LIBS) \
- $(UWINAPILIB) \
- $(ADVAPI32LIB) \
- $(OLE32LIB)\
- $(GDI32LIB)\
- $(SHELL32LIB)\
- $(OLEAUT32LIB)
-
-SHL2DEPN=
-SHL2IMPLIB=i$(SHL2TARGET)
-SHL2LIBS=$(SLB)$/fop.lib\
- $(SLB)$/utils.lib
-SHL2DEF=$(MISC)$/$(SHL2TARGET).def
-
-DEF2NAME=$(SHL2TARGET)
-DEF2EXPORTFILE= exports.dxp
-
-.ENDIF # "$(GUI)"=="WNT"
-
-
-.INCLUDE : target.mk
-
-ALLTAR : $(MISC)/fop.component $(MISC)/fps.component
-
-$(MISC)/fop.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
- fop.component
- $(XSLTPROC) --nonet --stringparam uri \
- '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL2TARGETN:f)' -o $@ \
- $(SOLARENV)/bin/createcomponent.xslt fop.component
-
-$(MISC)/fps.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
- fps.component
- $(XSLTPROC) --nonet --stringparam uri \
- '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
- $(SOLARENV)/bin/createcomponent.xslt fps.component
diff --git a/postprocess/packcomponents/makefile.mk b/postprocess/packcomponents/makefile.mk
index 9c78706..1b1714e 100644
--- a/postprocess/packcomponents/makefile.mk
+++ b/postprocess/packcomponents/makefile.mk
@@ -173,9 +173,9 @@ my_components += \
component/desktop/source/migration/services/migrationoo3 \
component/desktop/source/offacc/offacc \
component/desktop/source/splash/spl \
+ component/fpicker/source/generic/fpicker \
+ component/fpicker/source/office/fps_office \
dbp \
- fpicker \
- fps_office \
log \
pcr \
res \
@@ -285,9 +285,9 @@ my_components += component/xmlsecurity/util/xsec_xmlsec
.IF "$(OS)" == "MACOSX"
my_components += \
- fps_aqua \
macab1 \
macbe1 \
+ component/fpicker/source/aqua/fps_aqua \
component/vcl/vcl.macosx
.END
@@ -300,8 +300,6 @@ my_components += \
.IF "$(OS)" == "WNT"
my_components += \
ado \
- fop \
- fps \
smplmail \
wininetbe1 \
component/accessibility/bridge/org/openoffice/accessibility/java_uno_accessbridge \
@@ -309,6 +307,8 @@ my_components += \
component/dtrans/util/dnd \
component/dtrans/util/ftransl \
component/dtrans/util/sysdtrans \
+ component/fpicker/util/fop \
+ component/fpicker/util/fps \
component/vcl/vcl.windows
.END
@@ -343,7 +343,7 @@ my_components += mozbootstrap
.END
.IF "$(OS)" != "MACOSX" && "$(OS)" != "WNT" && "$(ENABLE_KDE4)" != ""
-my_components += fps_kde4
+my_components += component/fpicker/source/unx/kde4/fps_kde4
.END
.IF "$(OS)" != "WNT" && "$(OS)" != "ANDROID" && "$(OS)" != "IOS"
commit 6b287bb919017fa96910f68d1a5ee1a05bef0b83
Author: Matúš Kukan <matus.kukan at gmail.com>
Date: Mon Dec 26 14:42:06 2011 +0100
fpicker: aqua: move source files .cxx -> .mm
diff --git a/fpicker/source/aqua/CFStringUtilities.cxx b/fpicker/source/aqua/CFStringUtilities.cxx
deleted file mode 100644
index da624fe..0000000
--- a/fpicker/source/aqua/CFStringUtilities.cxx
+++ /dev/null
@@ -1,128 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#include <osl/diagnose.h>
-#include "CFStringUtilities.hxx"
-
-rtl::OUString CFStringToOUString(const CFStringRef sOrig) {
- //DBG_PRINT_ENTRY("CFStringUtilities", __func__, "sOrig", sOrig);
-
- if (NULL == sOrig) {
- return rtl::OUString();
- }
-
- CFRetain(sOrig);
- CFIndex nFileNameLength = CFStringGetLength(sOrig);
- //OSL_TRACE("FH: string length: %d", (int)(nFileNameLength));
- UniChar unichars[nFileNameLength+1];
- //'close' the string buffer correctly
- unichars[nFileNameLength] = '\0';
-
- CFStringGetCharacters (sOrig, CFRangeMake(0,nFileNameLength), unichars);
-
- //we no longer need the original string
- CFRelease(sOrig);
-
- //DBG_PRINT_EXIT("CFStringUtilities", __func__, unichars);
-
- return rtl::OUString(unichars);
-}
-
-CFStringRef CFStringCreateWithOUString(const rtl::OUString& aString) {
- //DBG_PRINT_ENTRY("CFStringUtilities", __func__);
-
- CFStringRef ref = CFStringCreateWithCharacters(kCFAllocatorDefault, aString.getStr(), aString.getLength());
-
- //DBG_PRINT_EXIT("CFStringUtilities", __func__, ref);
-
- return ref;
-}
-
-rtl::OUString FSRefToOUString(FSRef fsRef, InfoType info)
-{
- //DBG_PRINT_ENTRY("CFStringUtilities", __func__);
-
- CFURLRef aUrlRef = CFURLCreateFromFSRef(NULL, &fsRef);
-
- rtl::OUString sResult = CFURLRefToOUString(aUrlRef, info);
-
- //we no longer need the CFURLRef
- CFRelease(aUrlRef);
-
- //DBG_PRINT_EXIT("CFStringUtilities", __func__, OUStringToOString(sResult, RTL_TEXTENCODING_UTF8).getStr());
-
- return sResult;
-}
-
-rtl::OUString CFURLRefToOUString(CFURLRef aUrlRef, InfoType info)
-{
- //DBG_PRINT_ENTRY("CFStringUtilities", __func__);
-
- CFStringRef sURLString = NULL;
-
- switch(info) {
- case FULLPATH:
- OSL_TRACE("Extracting the full path of an item");
- sURLString = CFURLGetString(aUrlRef);
- CFRetain(sURLString);
- break;
- case FILENAME:
- {
- OSL_TRACE("Extracting the file name of an item");
- CFStringRef fullString = CFURLGetString(aUrlRef);
- CFURLRef dirRef = CFURLCreateCopyDeletingLastPathComponent(NULL,aUrlRef);
- CFIndex dirLength = CFStringGetLength(CFURLGetString(dirRef));
- CFRelease(dirRef);
- CFIndex fullLength = CFStringGetLength(fullString);
- CFRange substringRange = CFRangeMake(dirLength, fullLength - dirLength);
- sURLString = CFStringCreateWithSubstring(NULL, fullString, substringRange);
- }
- break;
- case PATHWITHOUTLASTCOMPONENT:
- {
- OSL_TRACE("Extracting the last but one component of an item's path");
- CFURLRef directoryRef = CFURLCreateCopyDeletingLastPathComponent(NULL,aUrlRef);
- sURLString = CFURLGetString(directoryRef);
- CFRetain(sURLString);
- CFRelease(directoryRef);
- }
- break;
- default:
- break;
- }
-
- rtl::OUString sResult = CFStringToOUString(sURLString);
-
- CFRelease(sURLString);
-
- //DBG_PRINT_EXIT("CFStringUtilities", __func__, OUStringToOString(sResult, RTL_TEXTENCODING_UTF8).getStr());
-
- return sResult;
-}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/fpicker/source/aqua/CFStringUtilities.mm b/fpicker/source/aqua/CFStringUtilities.mm
new file mode 100644
index 0000000..da624fe
--- /dev/null
+++ b/fpicker/source/aqua/CFStringUtilities.mm
@@ -0,0 +1,128 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org. If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#include <osl/diagnose.h>
+#include "CFStringUtilities.hxx"
+
+rtl::OUString CFStringToOUString(const CFStringRef sOrig) {
+ //DBG_PRINT_ENTRY("CFStringUtilities", __func__, "sOrig", sOrig);
+
+ if (NULL == sOrig) {
+ return rtl::OUString();
+ }
+
+ CFRetain(sOrig);
+ CFIndex nFileNameLength = CFStringGetLength(sOrig);
+ //OSL_TRACE("FH: string length: %d", (int)(nFileNameLength));
+ UniChar unichars[nFileNameLength+1];
+ //'close' the string buffer correctly
+ unichars[nFileNameLength] = '\0';
+
+ CFStringGetCharacters (sOrig, CFRangeMake(0,nFileNameLength), unichars);
+
+ //we no longer need the original string
+ CFRelease(sOrig);
+
+ //DBG_PRINT_EXIT("CFStringUtilities", __func__, unichars);
+
+ return rtl::OUString(unichars);
+}
+
+CFStringRef CFStringCreateWithOUString(const rtl::OUString& aString) {
+ //DBG_PRINT_ENTRY("CFStringUtilities", __func__);
+
+ CFStringRef ref = CFStringCreateWithCharacters(kCFAllocatorDefault, aString.getStr(), aString.getLength());
+
+ //DBG_PRINT_EXIT("CFStringUtilities", __func__, ref);
+
+ return ref;
+}
+
+rtl::OUString FSRefToOUString(FSRef fsRef, InfoType info)
+{
+ //DBG_PRINT_ENTRY("CFStringUtilities", __func__);
+
+ CFURLRef aUrlRef = CFURLCreateFromFSRef(NULL, &fsRef);
+
+ rtl::OUString sResult = CFURLRefToOUString(aUrlRef, info);
+
+ //we no longer need the CFURLRef
+ CFRelease(aUrlRef);
+
+ //DBG_PRINT_EXIT("CFStringUtilities", __func__, OUStringToOString(sResult, RTL_TEXTENCODING_UTF8).getStr());
+
+ return sResult;
+}
+
+rtl::OUString CFURLRefToOUString(CFURLRef aUrlRef, InfoType info)
+{
+ //DBG_PRINT_ENTRY("CFStringUtilities", __func__);
+
+ CFStringRef sURLString = NULL;
+
+ switch(info) {
+ case FULLPATH:
+ OSL_TRACE("Extracting the full path of an item");
+ sURLString = CFURLGetString(aUrlRef);
+ CFRetain(sURLString);
+ break;
+ case FILENAME:
+ {
+ OSL_TRACE("Extracting the file name of an item");
+ CFStringRef fullString = CFURLGetString(aUrlRef);
+ CFURLRef dirRef = CFURLCreateCopyDeletingLastPathComponent(NULL,aUrlRef);
+ CFIndex dirLength = CFStringGetLength(CFURLGetString(dirRef));
+ CFRelease(dirRef);
+ CFIndex fullLength = CFStringGetLength(fullString);
+ CFRange substringRange = CFRangeMake(dirLength, fullLength - dirLength);
+ sURLString = CFStringCreateWithSubstring(NULL, fullString, substringRange);
+ }
+ break;
+ case PATHWITHOUTLASTCOMPONENT:
+ {
+ OSL_TRACE("Extracting the last but one component of an item's path");
+ CFURLRef directoryRef = CFURLCreateCopyDeletingLastPathComponent(NULL,aUrlRef);
+ sURLString = CFURLGetString(directoryRef);
+ CFRetain(sURLString);
+ CFRelease(directoryRef);
+ }
+ break;
+ default:
+ break;
+ }
+
+ rtl::OUString sResult = CFStringToOUString(sURLString);
+
+ CFRelease(sURLString);
+
+ //DBG_PRINT_EXIT("CFStringUtilities", __func__, OUStringToOString(sResult, RTL_TEXTENCODING_UTF8).getStr());
+
+ return sResult;
+}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/fpicker/source/aqua/ControlHelper.cxx b/fpicker/source/aqua/ControlHelper.cxx
deleted file mode 100644
index a781f07..0000000
--- a/fpicker/source/aqua/ControlHelper.cxx
+++ /dev/null
@@ -1,1022 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#include <com/sun/star/ui/dialogs/ExtendedFilePickerElementIds.hpp>
-#include <com/sun/star/ui/dialogs/CommonFilePickerElementIds.hpp>
-#include <com/sun/star/ui/dialogs/ControlActions.hpp>
-#include <com/sun/star/ui/dialogs/TemplateDescription.hpp>
-#include <osl/mutex.hxx>
-#include <vcl/svapp.hxx>
-#include "CFStringUtilities.hxx"
-#include "resourceprovider.hxx"
-#include "NSString_OOoAdditions.hxx"
-
-#include "ControlHelper.hxx"
-
-#pragma mark DEFINES
-#define CLASS_NAME "ControlHelper"
-#define POPUP_WIDTH_MIN 200
-#define POPUP_WIDTH_MAX 350
-
-using namespace ::com::sun::star::ui::dialogs;
-using namespace ::com::sun::star::ui::dialogs::TemplateDescription;
-using namespace ::com::sun::star::ui::dialogs::ExtendedFilePickerElementIds;
-using namespace ::com::sun::star::ui::dialogs::CommonFilePickerElementIds;
-using namespace ::rtl;
-
-#pragma mark Constructor / Destructor
-//------------------------------------------------------------------------------------
-// Constructor / Destructor
-//------------------------------------------------------------------------------------
-ControlHelper::ControlHelper()
-: m_pUserPane(NULL)
-, m_pFilterControl(nil)
-, m_bUserPaneNeeded( false )
-, m_bIsUserPaneLaidOut(false)
-, m_bIsFilterControlNeeded(false)
-, m_pFilterHelper(NULL)
-{
- DBG_PRINT_ENTRY(CLASS_NAME, __func__);
-
- int i;
-
- for( i = 0; i < TOGGLE_LAST; i++ ) {
- m_bToggleVisibility[i] = false;
- }
-
- for( i = 0; i < LIST_LAST; i++ ) {
- m_bListVisibility[i] = false;
- }
-
- DBG_PRINT_EXIT(CLASS_NAME, __func__);
-}
-
-ControlHelper::~ControlHelper()
-{
- DBG_PRINT_ENTRY(CLASS_NAME, __func__);
-
- NSAutoreleasePool *pool = [NSAutoreleasePool new];
-
- if (NULL != m_pUserPane) {
- [m_pUserPane release];
- }
-
- for(std::list<NSControl *>::iterator control = m_aActiveControls.begin(); control != m_aActiveControls.end(); ++control) {
- NSControl* pControl = (*control);
- NSString* sLabelName = m_aMapListLabels[pControl];
- if (sLabelName != nil) {
- [sLabelName release];
- }
- if ([pControl class] == [NSPopUpButton class]) {
- NSTextField* pField = m_aMapListLabelFields[(NSPopUpButton*)pControl];
- if (pField != nil) {
- [pField release];
- }
- }
- [pControl release];
- }
-
- if (m_pFilterControl != NULL) {
- [m_pFilterControl setTarget:nil];
- }
-
- [pool release];
-
- DBG_PRINT_EXIT(CLASS_NAME, __func__);
-}
-
-#pragma mark XInitialization delegate
-//------------------------------------------------
-// XInitialization delegate
-//------------------------------------------------
-void ControlHelper::initialize( sal_Int16 nTemplateId )
-{
- DBG_PRINT_ENTRY(CLASS_NAME, __func__, "templateId", nTemplateId);
-
- switch( nTemplateId )
- {
- case FILESAVE_AUTOEXTENSION_PASSWORD:
- m_bToggleVisibility[AUTOEXTENSION] = true;
- m_bToggleVisibility[PASSWORD] = true;
- break;
- case FILESAVE_AUTOEXTENSION_PASSWORD_FILTEROPTIONS:
- m_bToggleVisibility[AUTOEXTENSION] = true;
- m_bToggleVisibility[PASSWORD] = true;
- m_bToggleVisibility[FILTEROPTIONS] = true;
- break;
- case FILESAVE_AUTOEXTENSION_SELECTION:
- m_bToggleVisibility[AUTOEXTENSION] = true;
- m_bToggleVisibility[SELECTION] = true;
- break;
- case FILESAVE_AUTOEXTENSION_TEMPLATE:
- m_bToggleVisibility[AUTOEXTENSION] = true;
- m_bListVisibility[TEMPLATE] = true;
- break;
- case FILEOPEN_LINK_PREVIEW_IMAGE_TEMPLATE:
- m_bToggleVisibility[LINK] = true;
- m_bToggleVisibility[PREVIEW] = true;
- m_bListVisibility[IMAGE_TEMPLATE] = true;
- break;
- case FILEOPEN_READONLY_VERSION:
- m_bToggleVisibility[READONLY] = true;
- m_bListVisibility[VERSION] = true;
- break;
- case FILEOPEN_LINK_PREVIEW:
- m_bToggleVisibility[LINK] = true;
- m_bToggleVisibility[PREVIEW] = true;
- break;
- case FILESAVE_AUTOEXTENSION:
- m_bToggleVisibility[AUTOEXTENSION] = true;
- break;
- }
-
- createControls();
-
- DBG_PRINT_EXIT(CLASS_NAME, __func__);
-}
-
-#pragma mark XFilePickerControlAccess delegates
-//------------------------------------------------------------------------------------
-// XFilePickerControlAccess functions
-//------------------------------------------------------------------------------------
-
-void ControlHelper::enableControl( const sal_Int16 nControlId, const sal_Bool bEnable ) const
-{
- DBG_PRINT_ENTRY(CLASS_NAME, __func__, "controlId", nControlId, "enable", bEnable);
-
- SolarMutexGuard aGuard;
-
- if (nControlId == ExtendedFilePickerElementIds::CHECKBOX_PREVIEW) {
- OSL_TRACE(" preview checkbox cannot be changed");
- DBG_PRINT_EXIT(CLASS_NAME, __func__);
- return;
- }
-
- NSControl* pControl = getControl(nControlId);
-
- if( pControl != nil ) {
- if( bEnable ) {
- OSL_TRACE( "enable" );
- } else {
- OSL_TRACE( "disable" );
- }
- [pControl setEnabled:bEnable];
- } else {
- OSL_TRACE("enable unknown control %d", nControlId );
- }
-
- DBG_PRINT_EXIT(CLASS_NAME, __func__);
-}
-
-OUString ControlHelper::getLabel( sal_Int16 nControlId )
-{
- DBG_PRINT_ENTRY(CLASS_NAME, __func__, "controlId", nControlId);
-
- SolarMutexGuard aGuard;
-
- NSControl* pControl = getControl( nControlId );
-
- if( pControl == nil ) {
- OSL_TRACE("Get label for unknown control %d", nControlId);
- return OUString();
- }
-
- rtl::OUString retVal;
- if ([pControl class] == [NSPopUpButton class]) {
- NSString *temp = m_aMapListLabels[pControl];
- if (temp != nil)
- retVal = [temp OUString];
- }
- else {
- NSString* sLabel = [[pControl cell] title];
- retVal = [sLabel OUString];
- }
-
- DBG_PRINT_EXIT(CLASS_NAME, __func__, retVal);
-
- return retVal;
-}
-
-void ControlHelper::setLabel( sal_Int16 nControlId, NSString* aLabel )
-{
- DBG_PRINT_ENTRY(CLASS_NAME, __func__, "controlId", nControlId, "label", aLabel);
-
- SolarMutexGuard aGuard;
-
- NSAutoreleasePool *pool = [NSAutoreleasePool new];
-
- NSControl* pControl = getControl(nControlId);
-
- if (nil != pControl) {
- if ([pControl class] == [NSPopUpButton class]) {
- NSString *sOldName = m_aMapListLabels[pControl];
- if (sOldName != NULL && sOldName != aLabel) {
- [sOldName release];
- }
-
- m_aMapListLabels[pControl] = [aLabel retain];
- } else if ([pControl class] == [NSButton class]) {
- [[pControl cell] setTitle:aLabel];
- }
- } else {
- OSL_TRACE("Control not found to set label for");
- }
-
- layoutControls();
-
- [pool release];
-
- DBG_PRINT_EXIT(CLASS_NAME, __func__);
-}
-
-void ControlHelper::setValue( sal_Int16 nControlId, sal_Int16 nControlAction, const uno::Any& rValue )
-{
- DBG_PRINT_ENTRY(CLASS_NAME, __func__, "controlId", nControlId, "controlAction", nControlAction);
-
- SolarMutexGuard aGuard;
-
- if (nControlId == ExtendedFilePickerElementIds::CHECKBOX_PREVIEW) {
- OSL_TRACE(" value for preview is unchangeable");
- }
- else {
- NSControl* pControl = getControl( nControlId );
-
- if( pControl == nil ) {
- OSL_TRACE("enable unknown control %d", nControlId);
- } else {
- if( [pControl class] == [NSPopUpButton class] ) {
- HandleSetListValue(pControl, nControlAction, rValue);
- } else if( [pControl class] == [NSButton class] ) {
- sal_Bool bChecked = false;
- rValue >>= bChecked;
- OSL_TRACE(" value is a bool: %d", bChecked);
- [(NSButton*)pControl setState:(bChecked ? NSOnState : NSOffState)];
- } else
- {
- OSL_TRACE("Can't set value on button / list %d %d",
- nControlId, nControlAction);
- }
- }
- }
-
- DBG_PRINT_EXIT(CLASS_NAME, __func__);
-}
-
-uno::Any ControlHelper::getValue( sal_Int16 nControlId, sal_Int16 nControlAction ) const
-{
- DBG_PRINT_ENTRY(CLASS_NAME, __func__, "controlId", nControlId, "controlAction", nControlAction);
-
- SolarMutexGuard aGuard;
- uno::Any aRetval;
-
- NSControl* pControl = getControl( nControlId );
-
- if( pControl == nil ) {
- OSL_TRACE("get value for unknown control %d", nControlId);
- aRetval <<= sal_True;
- } else {
- if( [pControl class] == [NSPopUpButton class] ) {
- aRetval = HandleGetListValue(pControl, nControlAction);
- } else if( [pControl class] == [NSButton class] ) {
- //NSLog(@"control: %@", [[pControl cell] title]);
- sal_Bool bValue = [(NSButton*)pControl state] == NSOnState ? sal_True : sal_False;
- aRetval <<= bValue;
- OSL_TRACE("value is a bool (checkbox): %d", bValue);
- }
- }
-
- DBG_PRINT_EXIT(CLASS_NAME, __func__);
-
- return aRetval;
-}
-
-void ControlHelper::createUserPane()
-{
- DBG_PRINT_ENTRY(CLASS_NAME, __func__);
-
- if (m_bUserPaneNeeded == false) {
- OSL_TRACE("no user pane needed");
- DBG_PRINT_EXIT(CLASS_NAME, __func__);
- return;
- }
-
- if (nil != m_pUserPane) {
- OSL_TRACE("user pane already exists");
- DBG_PRINT_EXIT(CLASS_NAME, __func__);
- return;
- }
-
- if (m_bIsFilterControlNeeded == true && m_pFilterControl == nil) {
- createFilterControl();
- }
-
- NSRect minRect = NSMakeRect(0,0,300,33);
- m_pUserPane = [[NSView alloc] initWithFrame:minRect];
-
- int currentHeight = kAquaSpaceBoxFrameViewDiffTop + kAquaSpaceBoxFrameViewDiffBottom;
- int currentWidth = 300;
-
- sal_Bool bPopupControlPresent = NO;
- sal_Bool bButtonControlPresent = NO;
-
- int nCheckboxMaxWidth = 0;
- int nPopupMaxWidth = 0;
- int nPopupLabelMaxWidth = 0;
-
- for (::std::list<NSControl*>::iterator child = m_aActiveControls.begin(); child != m_aActiveControls.end(); child++) {
- OSL_TRACE("currentHeight: %d", currentHeight);
-
- NSControl* pControl = *child;
-
- //let the control calculate its size
- [pControl sizeToFit];
-
- NSRect frame = [pControl frame];
- OSL_TRACE("frame for control %s is {%f, %f, %f, %f}", [[pControl description] UTF8String], frame.origin.x, frame.origin.y, frame.size.width, frame.size.height);
-
- int nControlHeight = frame.size.height;
- int nControlWidth = frame.size.width;
-
- // Note: controls are grouped by kind, first all popup menus, then checkboxes
- if ([pControl class] == [NSPopUpButton class]) {
- if (bPopupControlPresent == YES) {
- //this is not the first popup
- currentHeight += kAquaSpaceBetweenPopupMenus;
- }
- else if (child != m_aActiveControls.begin()){
- currentHeight += kAquaSpaceBetweenControls;
- }
-
- bPopupControlPresent = YES;
-
- // we have to add the label text width
- NSString *label = m_aMapListLabels[pControl];
-
- NSTextField *textField = createLabelWithString(label);
- [textField sizeToFit];
- m_aMapListLabelFields[(NSPopUpButton*)pControl] = textField;
- [m_pUserPane addSubview:textField];
-
- NSRect tfRect = [textField frame];
- OSL_TRACE("frame for textfield %s is {%f, %f, %f, %f}", [[textField description] UTF8String], tfRect.origin.x, tfRect.origin.y, tfRect.size.width, tfRect.size.height);
-
- int tfWidth = tfRect.size.width;
-
- if (nPopupLabelMaxWidth < tfWidth) {
- nPopupLabelMaxWidth = tfWidth;
- }
-
- frame.origin.x += (kAquaSpaceBetweenControls - kAquaSpaceLabelFrameBoundsDiffH - kAquaSpacePopupMenuFrameBoundsDiffLeft) + tfWidth;
-
- if (nControlWidth < POPUP_WIDTH_MIN) {
- nControlWidth = POPUP_WIDTH_MIN;
- frame.size.width = nControlWidth;
- [pControl setFrame:frame];
- }
-
- if (nControlWidth > POPUP_WIDTH_MAX) {
- nControlWidth = POPUP_WIDTH_MAX;
- frame.size.width = nControlWidth;
- [pControl setFrame:frame];
- }
-
- //set the max size
- if (nPopupMaxWidth < nControlWidth) {
- nPopupMaxWidth = nControlWidth;
- }
-
- nControlWidth += tfWidth + kAquaSpaceBetweenControls - kAquaSpaceLabelFrameBoundsDiffH - kAquaSpacePopupMenuFrameBoundsDiffLeft;
- if (nControlHeight < kAquaPopupButtonDefaultHeight) {
- //maybe the popup has no menu item yet, so set a default height
- nControlHeight = kAquaPopupButtonDefaultHeight;
- }
-
- nControlHeight -= kAquaSpacePopupMenuFrameBoundsDiffV;
- }
- else if ([pControl class] == [NSButton class]) {
- if (child != m_aActiveControls.begin()){
- currentHeight += kAquaSpaceBetweenControls;
- }
-
- if (nCheckboxMaxWidth < nControlWidth) {
- nCheckboxMaxWidth = nControlWidth;
- }
-
- bButtonControlPresent = YES;
- nControlWidth -= 2 * kAquaSpaceSwitchButtonFrameBoundsDiff;
- nControlHeight -= 2 * kAquaSpaceSwitchButtonFrameBoundsDiff;
- }
-
- // if ((nControlWidth + 2 * kAquaSpaceInsideGroupH) > currentWidth) {
- // currentWidth = nControlWidth + 2 * kAquaSpaceInsideGroupH;
- // }
-
- currentHeight += nControlHeight;
-
- [m_pUserPane addSubview:pControl];
- }
-
- OSL_TRACE("height after adding all controls: %d", currentHeight);
-
- if (bPopupControlPresent && bButtonControlPresent)
- {
- //after a popup button (array) and before a different kind of control we need some extra space instead of the standard
- currentHeight -= kAquaSpaceBetweenControls;
- currentHeight += kAquaSpaceAfterPopupButtonsV;
- OSL_TRACE("popup extra space added, currentHeight: %d", currentHeight);
- }
-
- int nLongestPopupWidth = nPopupMaxWidth + nPopupLabelMaxWidth + kAquaSpaceBetweenControls - kAquaSpacePopupMenuFrameBoundsDiffLeft - kAquaSpaceLabelFrameBoundsDiffH;
-
- currentWidth = nLongestPopupWidth > nCheckboxMaxWidth ? nLongestPopupWidth : nCheckboxMaxWidth;
- OSL_TRACE("longest control width: %d", currentWidth);
-
- currentWidth += 2* kAquaSpaceInsideGroupH;
-
- if (currentWidth < minRect.size.width)
- currentWidth = minRect.size.width;
-
- if (currentHeight < minRect.size.height)
- currentHeight = minRect.size.height;
-
- NSRect upRect = NSMakeRect(0, 0, currentWidth, currentHeight );
- OSL_TRACE("setting user pane rect to {%f, %f, %f, %f}",upRect.origin.x, upRect.origin.y, upRect.size.width, upRect.size.height);
-
- [m_pUserPane setFrame:upRect];
-
- layoutControls();
-
- DBG_PRINT_EXIT(CLASS_NAME, __func__);
-}
-
-#pragma mark Private / Misc
-//------------------------------------------------------------------------------------
-// Private / Misc
-//------------------------------------------------------------------------------------
-void ControlHelper::createControls()
-{
- DBG_PRINT_ENTRY(CLASS_NAME, __func__);
-
- CResourceProvider aResProvider;
- for (int i = 0; i < LIST_LAST; i++) {
- if (true == m_bListVisibility[i]) {
- m_bUserPaneNeeded = true;
-
- int elementName = getControlElementName([NSPopUpButton class], i);
- NSString* sLabel = aResProvider.getResString(elementName);
-
- m_pListControls[i] = [NSPopUpButton new];
-
-#define MAP_LIST_( elem ) \
- case elem: \
- setLabel(ExtendedFilePickerElementIds::LISTBOX_##elem, sLabel); \
- break
-
- switch(i) {
- MAP_LIST_(VERSION);
- MAP_LIST_(TEMPLATE);
- MAP_LIST_(IMAGE_TEMPLATE);
- }
-
- m_aActiveControls.push_back(m_pListControls[i]);
- } else {
- m_pListControls[i] = nil;
- }
- }
-
- for (int i = 0/*#i102102*/; i < TOGGLE_LAST; i++) {
- if (true == m_bToggleVisibility[i]) {
- m_bUserPaneNeeded = true;
-
- int elementName = getControlElementName([NSButton class], i);
- NSString* sLabel = aResProvider.getResString(elementName);
-
- NSButton *button = [NSButton new];
- [button setTitle:sLabel];
-
- [button setButtonType:NSSwitchButton];
-
- [button setState:NSOffState];
-
- if (i == AUTOEXTENSION) {
- [button setTarget:m_pDelegate];
- [button setAction:@selector(autoextensionChanged:)];
- }
-
- m_pToggles[i] = button;
-
- m_aActiveControls.push_back(m_pToggles[i]);
- } else {
- m_pToggles[i] = nil;
- }
- }
-
- //preview is always on with Mac OS X
- NSControl *pPreviewBox = m_pToggles[PREVIEW];
- if (pPreviewBox != nil) {
- [pPreviewBox setEnabled:NO];
- [(NSButton*)pPreviewBox setState:NSOnState];
- }
-
- DBG_PRINT_EXIT(CLASS_NAME, __func__);
-}
-
-#define TOGGLE_ELEMENT( elem ) \
-case elem: \
- nReturn = CHECKBOX_##elem; \
- DBG_PRINT_EXIT(CLASS_NAME, __func__, nReturn); \
- return nReturn
-#define LIST_ELEMENT( elem ) \
-case elem: \
- nReturn = LISTBOX_##elem##_LABEL; \
- DBG_PRINT_EXIT(CLASS_NAME, __func__, nReturn); \
- return nReturn
-
-int ControlHelper::getControlElementName(const Class aClazz, const int nControlId) const
-{
- DBG_PRINT_ENTRY(CLASS_NAME, __func__, "aClazz", [[aClazz description] UTF8String], "controlId", nControlId);
-
- int nReturn = -1;
- if (aClazz == [NSButton class])
- {
- switch (nControlId) {
- TOGGLE_ELEMENT( AUTOEXTENSION );
- TOGGLE_ELEMENT( PASSWORD );
- TOGGLE_ELEMENT( FILTEROPTIONS );
- TOGGLE_ELEMENT( READONLY );
- TOGGLE_ELEMENT( LINK );
- TOGGLE_ELEMENT( PREVIEW );
- TOGGLE_ELEMENT( SELECTION );
- }
- }
- else if (aClazz == [NSPopUpButton class])
- {
- switch (nControlId) {
- LIST_ELEMENT( VERSION );
- LIST_ELEMENT( TEMPLATE );
- LIST_ELEMENT( IMAGE_TEMPLATE );
- }
- }
-
- DBG_PRINT_EXIT(CLASS_NAME, __func__, nReturn);
-
- return nReturn;
-}
-
-void ControlHelper::HandleSetListValue(const NSControl* pControl, const sal_Int16 nControlAction, const uno::Any& rValue)
-{
- DBG_PRINT_ENTRY(CLASS_NAME, __func__, "controlAction", nControlAction);
-
- if ([pControl class] != [NSPopUpButton class]) {
- OSL_TRACE("not a popup menu");
- DBG_PRINT_EXIT(CLASS_NAME, __func__);
- return;
- }
-
- NSPopUpButton *pButton = (NSPopUpButton*)pControl;
- NSMenu *rMenu = [pButton menu];
- if (nil == rMenu) {
- OSL_TRACE("button has no menu");
- DBG_PRINT_EXIT(CLASS_NAME, __func__);
- return;
- }
-
- switch (nControlAction)
- {
- case ControlActions::ADD_ITEM:
- {
- OSL_TRACE("ADD_ITEMS");
- OUString sItem;
- rValue >>= sItem;
-
- NSString* sCFItem = [NSString stringWithOUString:sItem];
- OSL_TRACE("Adding menu item: %s", OUStringToOString(sItem, RTL_TEXTENCODING_UTF8).getStr());
- [pButton addItemWithTitle:sCFItem];
- }
- break;
- case ControlActions::ADD_ITEMS:
- {
- OSL_TRACE("ADD_ITEMS");
- uno::Sequence< OUString > aStringList;
- rValue >>= aStringList;
- sal_Int32 nItemCount = aStringList.getLength();
- for (sal_Int32 i = 0; i < nItemCount; ++i)
- {
- NSString* sCFItem = [NSString stringWithOUString:aStringList[i]];
- OSL_TRACE("Adding menu item: %s", OUStringToOString(aStringList[i], RTL_TEXTENCODING_UTF8).getStr());
- [pButton addItemWithTitle:sCFItem];
- }
- }
- break;
- case ControlActions::DELETE_ITEM:
- {
- OSL_TRACE("DELETE_ITEM");
- sal_Int32 nPos = -1;
- rValue >>= nPos;
- OSL_TRACE("Deleting item at position %d", (nPos));
- [rMenu removeItemAtIndex:nPos];
- }
- break;
- case ControlActions::DELETE_ITEMS:
- {
- OSL_TRACE("DELETE_ITEMS");
- int nItems = [rMenu numberOfItems];
- if (nItems == 0) {
- OSL_TRACE("no menu items to delete");
- DBG_PRINT_EXIT(CLASS_NAME, __func__);
- return;
- }
- for(sal_Int32 i = 0; i < nItems; i++) {
- [rMenu removeItemAtIndex:i];
- }
- }
- break;
- case ControlActions::SET_SELECT_ITEM:
- {
- sal_Int32 nPos = -1;
- rValue >>= nPos;
- OSL_TRACE("Selecting item at position %d", nPos);
- [pButton selectItemAtIndex:nPos];
- }
- break;
- default:
- OSL_TRACE("undocumented/unimplemented ControlAction for a list");
- break;
- }
-
- layoutControls();
-
- DBG_PRINT_EXIT(CLASS_NAME, __func__);
-}
-
-
-uno::Any ControlHelper::HandleGetListValue(const NSControl* pControl, const sal_Int16 nControlAction) const
-{
- DBG_PRINT_ENTRY(CLASS_NAME, __func__, "controlAction", nControlAction);
-
- uno::Any aAny;
-
- if ([pControl class] != [NSPopUpButton class]) {
- OSL_TRACE("not a popup button");
- DBG_PRINT_EXIT(CLASS_NAME, __func__);
- return aAny;
- }
-
- NSPopUpButton *pButton = (NSPopUpButton*)pControl;
- NSMenu *rMenu = [pButton menu];
- if (nil == rMenu) {
- OSL_TRACE("button has no menu");
- DBG_PRINT_EXIT(CLASS_NAME, __func__);
- return aAny;
- }
-
- switch (nControlAction)
- {
- case ControlActions::GET_ITEMS:
- {
- OSL_TRACE("GET_ITEMS");
- uno::Sequence< OUString > aItemList;
-
- int nItems = [rMenu numberOfItems];
- if (nItems > 0) {
- aItemList.realloc(nItems);
- }
- for (int i = 0; i < nItems; i++) {
- NSString* sCFItem = [pButton itemTitleAtIndex:i];
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list