connectivity/AllLangResTarget_hsqldb.mk | 29 ------- connectivity/source/drivers/hsqldb/hsqlui.ilst | 1 connectivity/source/drivers/hsqldb/hsqlui.src | 39 ---------- filter/source/config/fragments/filters/draw_flash_Export.xcu | 2 filter/source/config/fragments/filters/impress_flash_Export.xcu | 2 postprocess/CustomTarget_images.mk | 2 scp2/source/graphicfilter/file_graphicfilter.scp | 1 scp2/source/graphicfilter/module_graphicfilter.scp | 1 solenv/gbuild/UnoApi.mk | 11 -- 9 files changed, 7 insertions(+), 81 deletions(-)
New commits: commit b777604017afa02471313404c7ed13dcc378c423 Author: David Tardon <[email protected]> Date: Sun May 5 09:21:19 2013 +0200 drop pointless build of a resource file Change-Id: Ic3d554bbcc8bdbad85c868c06d451bd6f12def54 diff --git a/connectivity/AllLangResTarget_hsqldb.mk b/connectivity/AllLangResTarget_hsqldb.mk deleted file mode 100644 index 315c5bb..0000000 --- a/connectivity/AllLangResTarget_hsqldb.mk +++ /dev/null @@ -1,29 +0,0 @@ -# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- -# -# This file is part of the LibreOffice project. -# -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/. -# - -$(eval $(call gb_AllLangResTarget_AllLangResTarget,hsqldb)) - -$(eval $(call gb_AllLangResTarget_set_reslocation,hsqldb,database)) - -$(eval $(call gb_AllLangResTarget_add_srs,hsqldb,\ - hsqldb/res \ -)) - -$(eval $(call gb_SrsTarget_SrsTarget,hsqldb/res)) - -$(eval $(call gb_SrsTarget_set_include,hsqldb/res,\ - -I$(SRCDIR)/connectivity/source/drivers/hsqldb \ - $$(INCLUDE) \ -)) - -$(eval $(call gb_SrsTarget_add_nonlocalized_files,hsqldb/res,\ - connectivity/source/drivers/hsqldb/hsqlui.src \ -)) - -# vim: set noet sw=4 ts=4: diff --git a/connectivity/source/drivers/hsqldb/hsqlui.ilst b/connectivity/source/drivers/hsqldb/hsqlui.ilst new file mode 100644 index 0000000..9590ff4 --- /dev/null +++ b/connectivity/source/drivers/hsqldb/hsqlui.ilst @@ -0,0 +1 @@ +%MODULE%/database/linked_text_table.png diff --git a/connectivity/source/drivers/hsqldb/hsqlui.src b/connectivity/source/drivers/hsqldb/hsqlui.src deleted file mode 100644 index 3e31fe7..0000000 --- a/connectivity/source/drivers/hsqldb/hsqlui.src +++ /dev/null @@ -1,39 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - -#include "hsqlui.hrc" - -// Note: -// The resource file built here (hsqldb.res, finally) is *not* included -// in the final OOo installation. Instead, it is only built to ensure that -// the image below is included in the application-wide image repository -// (images.zip). This way, they can be accessed at runtime, but without the -// indirection via a resource file - the GraphicProvider service supports -// a "private:imagerepository/*" protocol meanwhile, which allows this. -// -// If there were another possibility to ensure that the images are -// put into the repository, instead of creating a resource file for them, -// then we would use this other way ... - -Image 1000 -{ - ImageBitmap = Bitmap { File = LINKED_TEXT_TABLE_IMAGE_RESOURCE; }; -}; - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/postprocess/CustomTarget_images.mk b/postprocess/CustomTarget_images.mk index 7c59b03..8dcc689 100644 --- a/postprocess/CustomTarget_images.mk +++ b/postprocess/CustomTarget_images.mk @@ -31,6 +31,7 @@ $(packimages_DIR)/%.zip : \ $(packimages_DIR)/sorted.lst \ $(packimages_DIR)/commandimagelist.ilst \ $(call gb_Helper_optional,HELP,$(helpimages_DIR)/helpimg.ilst) \ + $(call gb_Helper_optional,DBCONNECTIVITY,$(if $(SOLAR_JAVA),$(SRCDIR)/connectivity/source/drivers/hsqldb/hsqlui.ilst)) \ $(call gb_Postprocess_get_target,AllResources) \ $(call gb_Postprocess_get_target,AllUIConfigs) $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),PRL,2) @@ -47,6 +48,7 @@ $(packimages_DIR)/%.zip : \ -l $(dir $(call gb_ResTarget_get_imagelist_target)) \ -l $(dir $(call gb_UIConfig_get_imagelist_target)) \ -l $(dir $(call gb_UIConfig_get_imagelist_target,modules/)) \ + $(call gb_Helper_optional,DBCONNECTIVITY,$(if $(SOLAR_JAVA),-l $(SRCDIR)/connectivity/source/drivers/hsqldb)) \ -s $< -o $@ \ $(if $(findstring s,$(MAKEFLAGS)),> /dev/null)) commit bda4c6ab5d0a7c64babe529bab056ad6af7dcf7f Author: David Tardon <[email protected]> Date: Sun May 5 08:50:49 2013 +0200 resurrect Macromedia Flash export dialog This has never been enabled during the open source history of openoffice.org . Yet we have been building the code and the resource file for it. Should I be surprised? Change-Id: Iba8262f125d0ea3a35fa7f256a3cdbd353e598bc diff --git a/filter/source/config/fragments/filters/draw_flash_Export.xcu b/filter/source/config/fragments/filters/draw_flash_Export.xcu index 7ef8e3c..6d243d6 100644 --- a/filter/source/config/fragments/filters/draw_flash_Export.xcu +++ b/filter/source/config/fragments/filters/draw_flash_Export.xcu @@ -17,7 +17,7 @@ --> <node oor:name="draw_flash_Export" oor:op="replace"> <prop oor:name="Flags"><value>EXPORT ALIEN 3RDPARTYFILTER</value></prop> - <prop oor:name="UIComponent"/> + <prop oor:name="UIComponent"><value>com.sun.star.Impress.FlashExportDialog</value></prop> <prop oor:name="FilterService"><value>com.sun.star.comp.Impress.FlashExportFilter</value></prop> <prop oor:name="UserData"><value></value></prop> <prop oor:name="UIName"> diff --git a/filter/source/config/fragments/filters/impress_flash_Export.xcu b/filter/source/config/fragments/filters/impress_flash_Export.xcu index 1354df5..75a129e 100644 --- a/filter/source/config/fragments/filters/impress_flash_Export.xcu +++ b/filter/source/config/fragments/filters/impress_flash_Export.xcu @@ -17,7 +17,7 @@ --> <node oor:name="impress_flash_Export" oor:op="replace"> <prop oor:name="Flags"><value>EXPORT ALIEN 3RDPARTYFILTER</value></prop> - <prop oor:name="UIComponent"/> + <prop oor:name="UIComponent"><value>com.sun.star.Impress.FlashExportDialog</value></prop> <prop oor:name="FilterService"><value>com.sun.star.comp.Impress.FlashExportFilter</value></prop> <prop oor:name="UserData"><value></value></prop> <prop oor:name="UIName"> diff --git a/scp2/source/graphicfilter/file_graphicfilter.scp b/scp2/source/graphicfilter/file_graphicfilter.scp index 4fe8a8d..535688d 100644 --- a/scp2/source/graphicfilter/file_graphicfilter.scp +++ b/scp2/source/graphicfilter/file_graphicfilter.scp @@ -35,6 +35,7 @@ File gid_File_Share_Registry_Graphicfilter_Xcd End STD_LIB_FILE( gid_File_Lib_Flash, flash ) +STD_RES_FILE( gid_File_Res_Flash, flash ) STD_LIB_FILE( gid_File_Lib_Svg, svgfilter ) diff --git a/scp2/source/graphicfilter/module_graphicfilter.scp b/scp2/source/graphicfilter/module_graphicfilter.scp index cd7e4a6..bb2692b 100644 --- a/scp2/source/graphicfilter/module_graphicfilter.scp +++ b/scp2/source/graphicfilter/module_graphicfilter.scp @@ -38,5 +38,6 @@ Module gid_Module_Optional_Grfflt gid_File_Lib_Flash, gid_File_Lib_WpftDraw, gid_File_Lib_Graphic, + gid_File_Res_Flash, gid_File_Share_Registry_Graphicfilter_Xcd); End commit 02b6e89e3c00b857b19ac59f03ba008f179629fb Author: David Tardon <[email protected]> Date: Sun May 5 08:47:10 2013 +0200 Revert "gbuild: fix generated deps for API headers" It's been quite a time since the big header move. I suppose this iss not needed anymore. This reverts commit 1b2f3b9c64c7903dfa56953b91db4f5f105e4e7d. Conflicts: solenv/gbuild/UnoApi.mk Change-Id: Iea817c17a2559e853709d3b7686365dd29e12ea8 diff --git a/solenv/gbuild/UnoApi.mk b/solenv/gbuild/UnoApi.mk index 6897af9..c3ee107 100644 --- a/solenv/gbuild/UnoApi.mk +++ b/solenv/gbuild/UnoApi.mk @@ -12,15 +12,6 @@ gb_UnoApi_DOCDIR := $(gb_Package_SDKDIRNAME)/docs/common/ref gb_UnoApi_SRCDOCDIR := $(call gb_CustomTarget_get_workdir,odk/docs/common/ref) gb_UnoApi_ENABLE_INSTALL := $(and $(filter host,$(gb_Side)),$(filter ODK,$(BUILD_TYPE))) -# NOTE: This is needed temporarily to force rebuild with API files from -# $(WORKDIR), thus fixing generated deps. Otherwise, a change of an .idl -# file would not rebuild a .cxx if it still depended on the $(OUTDIR) -# version of the header. -define gb_UnoApi__make_outdir_headers_rule -$(OUTDIR)/inc/$(1)/%.hdl $(OUTDIR)/inc/$(1)/%.hpp : - @true -endef - .PHONY : $(call gb_UnoApi_get_clean_target,%) $(call gb_UnoApi_get_clean_target,%) : $(call gb_Helper_abbreviate_dirs,\ @@ -44,8 +35,6 @@ $(call gb_UnoApi_get_target,$(1)) : $(call gb_UnoApiHeadersTarget_get_target,$(1 $(call gb_UnoApi_get_clean_target,$(1)) : $(call gb_UnoApiTarget_get_clean_target,$(1)) $(call gb_UnoApi_get_clean_target,$(1)) : $(call gb_UnoApiHeadersTarget_get_clean_target,$(1)) -$(call gb_UnoApi__make_outdir_headers_rule,$(1)) - $(call gb_Deliver_add_deliverable,$(call gb_UnoApi_get_target,$(1)),$(call gb_UnoApiTarget_get_target,$(1)),$(1)) $$(eval $$(call gb_Module_register_target,$(call gb_UnoApi_get_target,$(1)),$(call gb_UnoApi_get_clean_target,$(1)))) _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
