[PUSHED] fdo#63197, Convert Zip_databasebiblio
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/3318 Approvals: David Tardon: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/3318 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I58d387c4bbfd4af9cc1e800bc8c715e34a61a970 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Julien Nabet serval2...@yahoo.fr Gerrit-Reviewer: David Tardon dtar...@redhat.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: solenv/gbuild
solenv/gbuild/UIConfig.mk | 40 ++-- 1 file changed, 30 insertions(+), 10 deletions(-) New commits: commit 3404d1e7d9125773466e2f55849c55704d8565f2 Author: David Tardon dtar...@redhat.com Date: Sat Apr 6 14:02:02 2013 +0200 use extra package for every lang Change-Id: Iccd5225b65887734ff599ca247109c2c1ce4ec25 Reviewed-on: https://gerrit.libreoffice.org/3226 Reviewed-by: David Tardon dtar...@redhat.com Tested-by: David Tardon dtar...@redhat.com diff --git a/solenv/gbuild/UIConfig.mk b/solenv/gbuild/UIConfig.mk index 1bd01be..3cc33ba 100644 --- a/solenv/gbuild/UIConfig.mk +++ b/solenv/gbuild/UIConfig.mk @@ -107,20 +107,21 @@ $(call gb_UIConfig_get_clean_target,%) : rm -f $(call gb_UIConfig_get_target,$*) \ ) +gb_UIConfig_get_packagename = UIConfig/$(1) +gb_UIConfig_get_packagename_for_lang = UIConfig/$(1)_$(2) + # Processes and delivers a set of UI configuration files. # # gb_UIConfig_UIConfig modulename define gb_UIConfig_UIConfig -$(call gb_Package_Package_internal,$(1)_ui,$(SRCDIR)) +$(call gb_Package_Package_internal,$(call gb_UIConfig_get_packagename,$(1)),$(SRCDIR)) $(call gb_UIConfig_get_target,$(1)) :| $(dir $(call gb_UIConfig_get_target,$(1))).dir -$(call gb_UIConfig_get_target,$(1)) :| $(call gb_Package_get_target,$(1)_ui) +$(call gb_UIConfig_get_target,$(1)) :| $(call gb_Package_get_target,$(call gb_UIConfig_get_packagename,$(1))) $(call gb_Postprocess_get_target,AllUIConfigs) : $(call gb_UIConfig_get_target,$(1)) -$(call gb_UIConfig_get_clean_target,$(1)) : $(call gb_Package_get_clean_target,$(1)_ui) +$(call gb_UIConfig_get_clean_target,$(1)) : $(call gb_Package_get_clean_target,$(call gb_UIConfig_get_packagename,$(1))) ifneq ($(gb_UIConfig_LANGS),) -$(call gb_Package_Package_internal,$(1)_ui_localized,$(gb_UILocalizeTarget_WORKDIR)) -$(call gb_UIConfig_get_target,$(1)) :| $(call gb_Package_get_target,$(1)_ui_localized) -$(call gb_UIConfig_get_clean_target,$(1)) : $(call gb_Package_get_clean_target,$(1)_ui_localized) +$(foreach lang,$(gb_UIConfig_LANGS),$(call gb_UIConfig__UIConfig_for_lang,$(1),$(lang))) endif $$(eval $$(call gb_Module_register_target,$(call gb_UIConfig_get_target,$(1)),$(call gb_UIConfig_get_clean_target,$(1 @@ -128,6 +129,13 @@ $(call gb_Helper_make_userfriendly_targets,$(1),UIConfig) endef +define gb_UIConfig__UIConfig_for_lang +$(call gb_Package_Package_internal,$(call gb_UIConfig_get_packagename_for_lang,$(1),$(2)),$(gb_UILocalizeTarget_WORKDIR)) +$(call gb_UIConfig_get_target,$(1)) :| $(call gb_Package_get_target,$(call gb_UIConfig_get_packagename_for_lang,$(1),$(2))) +$(call gb_UIConfig_get_clean_target,$(1)) : $(call gb_Package_get_clean_target,$(call gb_UIConfig_get_packagename_for_lang,$(1),$(2))) + +endef + # gb_UIConfig__package_uifile target package destfile srcfile define gb_UIConfig__package_uifile $(call gb_Package_add_file,$(2),xml/uiconfig/$(1)/ui/$(3),$(4)) @@ -136,23 +144,35 @@ endef # gb_UIConfig__add_uifile target file define gb_UIConfig__add_uifile -$(call gb_UIConfig__package_uifile,$(1),$(1)_ui,$(notdir $(2)).ui,$(2).ui) +$(call gb_UIConfig__package_uifile,$(1),$(call gb_UIConfig_get_packagename,$(1)),$(notdir $(2)).ui,$(2).ui) endef +# Add a l10n for an .ui file to respective lang package. +# # gb_UIConfig__add_uifile_for_lang target file lang define gb_UIConfig__add_uifile_for_lang -$(call gb_UIConfig__package_uifile,$(1),$(1)_ui_localized,res/$(3)/$(notdir $(2)),$(2)/$(3).ui) +$(call gb_UIConfig__package_uifile,$(1),$(call gb_UIConfig_get_packagename_for_lang,$(1),$(3)),res/$(3)/$(notdir $(2)),$(2)/$(3).ui) endef +# Add a l10n for an .ui file to respective lang package. +# +# This is only for real languages, i.e., everything except qtz. +# +# gb_UIConfig__add_uifile_for_real_lang target file lang +define gb_UIConfig__add_uifile_for_real_lang +$(if $(filter qtz,$(3)),$(call gb_Output_error,gb_UIConfig__add_uifile_for_real_lang called with qtz)) +$(call gb_Package_get_preparation_target,$(call gb_UIConfig_get_packagename_for_lang,$(1),$(lang))) : $(call gb_UILocalizeTarget_get_target,$(2)) +$(call gb_UIConfig__add_uifile_for_lang,$(1),$(2),$(lang)) +endef + # gb_UIConfig__add_translations_impl target uifile langs define gb_UIConfig__add_translations_impl $(call gb_UILocalizeTarget_UILocalizeTarget,$(2)) $(call gb_UIConfig_get_target,$(1)) : $(call gb_UILocalizeTarget_get_target,$(2)) $(call gb_UIConfig_get_clean_target,$(1)) : $(call gb_UILocalizeTarget_get_clean_target,$(2)) -$(call gb_Package_get_preparation_target,$(1)_ui_localized) : $(call gb_UILocalizeTarget_get_target,$(2)) -$(foreach lang,$(3),$(call gb_UIConfig__add_uifile_for_lang,$(1),$(2),$(lang))) +$(foreach lang,$(3),$(call gb_UIConfig__add_uifile_for_real_lang,$(1),$(2),$(lang))) endef ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org
[Libreoffice-commits] core.git: solenv/gbuild
solenv/gbuild/UIConfig.mk | 90 +- 1 file changed, 89 insertions(+), 1 deletion(-) New commits: commit 63c0d1a90f6cd2d681b3669260a02a80fa8190a7 Author: David Tardon dtar...@redhat.com Date: Sat Apr 6 14:31:48 2013 +0200 allow to add other types of UI config files Change-Id: I878b41783e043efe19097829495a8f13b0f995c0 Reviewed-on: https://gerrit.libreoffice.org/3228 Reviewed-by: David Tardon dtar...@redhat.com Tested-by: David Tardon dtar...@redhat.com diff --git a/solenv/gbuild/UIConfig.mk b/solenv/gbuild/UIConfig.mk index 6aaab28..a38b838 100644 --- a/solenv/gbuild/UIConfig.mk +++ b/solenv/gbuild/UIConfig.mk @@ -115,6 +115,7 @@ gb_UIConfig_get_packagename_for_lang = UIConfig/$(1)_$(2) # gb_UIConfig_UIConfig modulename define gb_UIConfig_UIConfig $(call gb_Package_Package_internal,$(call gb_UIConfig_get_packagename,$(1)),$(SRCDIR)) +$(call gb_Package_Package_internal,$(call gb_UIConfig_get_packagename,$(1)_generated),$(WORKDIR)) $(call gb_UIConfig_get_target,$(1)) :| $(dir $(call gb_UIConfig_get_target,$(1))).dir $(call gb_UIConfig_get_target,$(1)) : $(call gb_Package_get_target,$(call gb_UIConfig_get_packagename,$(1))) $(call gb_Postprocess_get_target,AllUIConfigs) : $(call gb_UIConfig_get_target,$(1)) @@ -136,9 +137,15 @@ $(call gb_UIConfig_get_clean_target,$(1)) : $(call gb_Package_get_clean_target,$ endef +# gb_UIConfig__package_file target package type destfile srcfile +define gb_UIConfig__package_file +$(call gb_Package_add_file,$(2),xml/uiconfig/$(1)/$(3)/$(4),$(5)) + +endef + # gb_UIConfig__package_uifile target package destfile srcfile define gb_UIConfig__package_uifile -$(call gb_Package_add_file,$(2),xml/uiconfig/$(1)/ui/$(3),$(4)) +$(call gb_UIConfig__package_file,$(1),$(2),ui,$(3),$(4)) endef @@ -218,4 +225,85 @@ $(foreach uifile,$(2),$(call gb_UIConfig_add_uifile,$(1),$(uifile))) endef +# gb_UIConfig__add_xmlfile target package-target type xmlfile +define gb_UIConfig__add_xmlfile +$(call gb_UIConfig__package_file,$(1),$(call gb_UIConfig_get_packagename,$(2)),$(3),$(notdir $(4)).xml,$(4).xml) + +endef + +# Add menubar config file to the package. +# +# The file is relative to $(SRCDIR) and without extension. +# +# gb_UIConfig_add_menubarfile target file +define gb_UIConfig_add_menubarfile +$(call gb_UIConfig__add_xmlfile,$(1),$(1),menubar,$(2)) + +endef + +# Adds multiple menubar config files to the package. +# +# gb_UIConfig_add_menubarfiles target file(s) +define gb_UIConfig_add_menubarfiles +$(foreach menubarfile,$(2),$(call gb_UIConfig_add_menubarfile,$(1),$(menubarfile))) + +endef + +# Add a generated menubar config file to the package. +# +# The file is relative to $(WORKDIR) and without extension. +# +# gb_UIConfig_add_generated_menubarfile target file +define gb_UIConfig_add_generated_menubarfile +$(call gb_UIConfig__add_xmlfile,$(1),$(1)_generated,menubar,$(2)) + +$(call gb_UIConfig_get_target,$(1)) : $(call gb_Package_get_target,$(call gb_UIConfig_get_packagename,$(1)_generated)) +$(call gb_UIConfig_get_clean_target,$(1)) : $(call gb_Package_get_clean_target,$(call gb_UIConfig_get_packagename,$(1)_generated)) + +endef + +# Adds multiple menubar config files to the package. +# +# gb_UIConfig_add_generated_menubarfiles target file(s) +define gb_UIConfig_add_generated_menubarfiles +$(foreach menubarfile,$(2),$(call gb_UIConfig_add_generated_menubarfile,$(1),$(menubarfile))) + +endef + +# Add statusbar config file to the package. +# +# The file is relative to $(SRCDIR) and without extension. +# +# gb_UIConfig_add_statusbarfile target file +define gb_UIConfig_add_statusbarfile +$(call gb_UIConfig__add_xmlfile,$(1),$(1),statusbar,$(2)) + +endef + +# Adds multiple statusbar config files to the package. +# +# gb_UIConfig_add_statusbarfiles target file(s) +define gb_UIConfig_add_statusbarfiles +$(foreach statusbarfile,$(2),$(call gb_UIConfig_add_statusbarfile,$(1),$(statusbarfile))) + +endef + +# Add toolbar config file to the package. +# +# The file is relative to $(SRCDIR) and without extension. +# +# gb_UIConfig_add_toolbarfile target file +define gb_UIConfig_add_toolbarfile +$(call gb_UIConfig__add_xmlfile,$(1),$(1),toolbar,$(2)) + +endef + +# Adds multiple toolbar config files to the package. +# +# gb_UIConfig_add_toolbarfiles target file(s) +define gb_UIConfig_add_toolbarfiles +$(foreach toolbarfile,$(2),$(call gb_UIConfig_add_toolbarfile,$(1),$(toolbarfile))) + +endef + # vim: set noet sw=4 ts=4: ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: solenv/gbuild
solenv/gbuild/UIConfig.mk |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit 4aea9bcf9caa8b2dbc6629ddc0e232497b085d64 Author: David Tardon dtar...@redhat.com Date: Sat Apr 6 14:02:55 2013 +0200 use normal deps for depending on Package Change-Id: Idaf0f5c938deff5b774e675991d0c6aa328ffd4f Reviewed-on: https://gerrit.libreoffice.org/3227 Reviewed-by: David Tardon dtar...@redhat.com Tested-by: David Tardon dtar...@redhat.com diff --git a/solenv/gbuild/UIConfig.mk b/solenv/gbuild/UIConfig.mk index 3cc33ba..6aaab28 100644 --- a/solenv/gbuild/UIConfig.mk +++ b/solenv/gbuild/UIConfig.mk @@ -116,7 +116,7 @@ gb_UIConfig_get_packagename_for_lang = UIConfig/$(1)_$(2) define gb_UIConfig_UIConfig $(call gb_Package_Package_internal,$(call gb_UIConfig_get_packagename,$(1)),$(SRCDIR)) $(call gb_UIConfig_get_target,$(1)) :| $(dir $(call gb_UIConfig_get_target,$(1))).dir -$(call gb_UIConfig_get_target,$(1)) :| $(call gb_Package_get_target,$(call gb_UIConfig_get_packagename,$(1))) +$(call gb_UIConfig_get_target,$(1)) : $(call gb_Package_get_target,$(call gb_UIConfig_get_packagename,$(1))) $(call gb_Postprocess_get_target,AllUIConfigs) : $(call gb_UIConfig_get_target,$(1)) $(call gb_UIConfig_get_clean_target,$(1)) : $(call gb_Package_get_clean_target,$(call gb_UIConfig_get_packagename,$(1))) @@ -131,7 +131,7 @@ endef define gb_UIConfig__UIConfig_for_lang $(call gb_Package_Package_internal,$(call gb_UIConfig_get_packagename_for_lang,$(1),$(2)),$(gb_UILocalizeTarget_WORKDIR)) -$(call gb_UIConfig_get_target,$(1)) :| $(call gb_Package_get_target,$(call gb_UIConfig_get_packagename_for_lang,$(1),$(2))) +$(call gb_UIConfig_get_target,$(1)) : $(call gb_Package_get_target,$(call gb_UIConfig_get_packagename_for_lang,$(1),$(2))) $(call gb_UIConfig_get_clean_target,$(1)) : $(call gb_Package_get_clean_target,$(call gb_UIConfig_get_packagename_for_lang,$(1),$(2))) endef ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: instsetoo_native/util Makefile.in solenv/bin solenv/gbuild
Makefile.in |1
instsetoo_native/util/openoffice.lst.in |8 +-
solenv/bin/modules/installer/environment.pm |2
solenv/gbuild/PackageSet.mk | 75
solenv/gbuild/TargetLocations.mk|2
solenv/gbuild/gbuild.mk |1
6 files changed, 84 insertions(+), 5 deletions(-)
New commits:
commit 9d54f0e1dec4d84f914f17c8c2445dfc53190d8a
Author: David Tardon dtar...@redhat.com
Date: Sun Apr 7 09:45:19 2013 +0200
add gbuild class PackageSet
This is intended for bundling filelists of multiple Packages together,
to simplify the scp2 configuration.
Change-Id: I6f700f691b37375a09a5400166aac80a8bb2a2b4
Reviewed-on: https://gerrit.libreoffice.org/3230
Reviewed-by: David Tardon dtar...@redhat.com
Tested-by: David Tardon dtar...@redhat.com
diff --git a/Makefile.in b/Makefile.in
index 56b3632..183f4ea 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -116,6 +116,7 @@ gbuild_TARGETS := AllLangHelp \
Library \
Module \
Package \
+ PackageSet \
Pagein \
Pyuno \
Rdb \
diff --git a/instsetoo_native/util/openoffice.lst.in
b/instsetoo_native/util/openoffice.lst.in
index 8e831e7..9bf1472 100644
--- a/instsetoo_native/util/openoffice.lst.in
+++ b/instsetoo_native/util/openoffice.lst.in
@@ -83,7 +83,7 @@ LibreOffice
downloadnameLibreOffice_{productversion}_{os}_install_{languages}
langpackdownloadname
LibreOffice_{productversion}_languagepack_{os}_install_{languages}
helppackdownloadname
LibreOffice_{productversion}_helppack_{os}_install_{languages}
-include
{solarenvpath}/{os}/loader2,.,{localpath}/bin,{solarpath}/bin.{minor}/ooowoure,{solarpath}/bin.{minor}/osl,{solarpath}/bin.{minor}/desktop-integration/{pkgtype},{solarpath}/bin.{minor},{solarpath}/lib.{minor},{solarpath}/pck.{minor}/openoffice,{solarpath}/pck.{minor},{solarpath}/xml.{minor}/office/instance,{solarpath}/xml.{minor},../../external/common,{solarenvpath}/{os}/OOo_external,{filelistpath}
+include
{solarenvpath}/{os}/loader2,.,{localpath}/bin,{solarpath}/bin.{minor}/ooowoure,{solarpath}/bin.{minor}/osl,{solarpath}/bin.{minor}/desktop-integration/{pkgtype},{solarpath}/bin.{minor},{solarpath}/lib.{minor},{solarpath}/pck.{minor}/openoffice,{solarpath}/pck.{minor},{solarpath}/xml.{minor}/office/instance,{solarpath}/xml.{minor},../../external/common,{solarenvpath}/{os}/OOo_external,{filelistpath}/PackageSet,{filelistpath}/Package
}
}
@@ -140,7 +140,7 @@ LibreOffice_Dev
downloadname
LibreOfficeDev_{productversion}_{os}_install_{languages}
langpackdownloadname
LibreOfficeDev_{productversion}_languagepack_{os}_install_{languages}
helppackdownloadname
LibreOfficeDev_{productversion}_helppack_{os}_install_{languages}
-include
{solarenvpath}/{os}/loader2,.,{localpath}/bin/dev,{localpath}/bin,{solarpath}/bin.{minor}/osl,{solarpath}/bin.{minor}/desktop-integration/{pkgtype},{solarpath}/bin.{minor},{solarpath}/lib.{minor},{solarpath}/pck.{minor}/openoffice_dev,{solarpath}/pck.{minor}/openoffice,{solarpath}/pck.{minor},{solarpath}/xml.{minor}/office/instance,{solarpath}/xml.{minor},../../external/common,{solarenvpath}/{os}/OOo_external,{filelistpath}
+include
{solarenvpath}/{os}/loader2,.,{localpath}/bin/dev,{localpath}/bin,{solarpath}/bin.{minor}/osl,{solarpath}/bin.{minor}/desktop-integration/{pkgtype},{solarpath}/bin.{minor},{solarpath}/lib.{minor},{solarpath}/pck.{minor}/openoffice_dev,{solarpath}/pck.{minor}/openoffice,{solarpath}/pck.{minor},{solarpath}/xml.{minor}/office/instance,{solarpath}/xml.{minor},../../external/common,{solarenvpath}/{os}/OOo_external,{filelistpath}/PackageSet,{filelistpath}/Package
}
}
@@ -179,7 +179,7 @@ LibreOffice_SDK
active 1
compression 5
script sdkoo
-include
{solarenvpath}/{os}/loader2,{solarpath}/bin.{minor}/sdkoo,{solarpath}/bin.{minor}/osl,{solarpath}/bin.{minor},{solarpath}/filelists.{minor},{solarpath}/lib.{minor},{solarpath}/pck.{minor},{solarenvpath}/{os}/MS,{filelistpath}
+include
{solarenvpath}/{os}/loader2,{solarpath}/bin.{minor}/sdkoo,{solarpath}/bin.{minor}/osl,{solarpath}/bin.{minor},{solarpath}/filelists.{minor},{solarpath}/lib.{minor},{solarpath}/pck.{minor},{solarenvpath}/{os}/MS,{filelistpath}/PackageSet,{filelistpath}/Package
}
}
@@ -224,7 +224,7 @@ LibreOffice_Dev_SDK
active 1
compression 5
script sdkoo
-include
{solarenvpath}/{os}/loader2,{solarpath}/bin.{minor}/sdkoo,{solarpath}/bin.{minor}/osl,{solarpath}/bin.{minor},{solarpath}/filelists.{minor},{solarpath}/lib.{minor},{solarpath}/pck.{minor},{solarenvpath}/{os}/MS,{filelistpath}
+include
[PATCH] remove obsoleted postprocess/packconfig
Hello LibreOffice gerrit bot, I'd like you to reexamine a change. Please visit https://gerrit.libreoffice.org/3234 to look at the new patch set (#5). Change subject: remove obsoleted postprocess/packconfig .. remove obsoleted postprocess/packconfig Change-Id: I93313dc03e8ed7d4d1a653df92145a153e20e5b1 --- D postprocess/packconfig/packconfig.pl R solenv/bin/macosx_menubar_modification.xsl M solenv/gbuild/platform/macosx.mk 3 files changed, 2 insertions(+), 332 deletions(-) git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/34/3234/5 -- To view, visit https://gerrit.libreoffice.org/3234 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newpatchset Gerrit-Change-Id: I93313dc03e8ed7d4d1a653df92145a153e20e5b1 Gerrit-PatchSet: 5 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: David Tardon dtar...@redhat.com Gerrit-Reviewer: LibreOffice gerrit bot ger...@libreoffice.org ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] rename UI to UIConfig
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/3225 Approvals: David Tardon: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/3225 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ie7b4434b2f247165e3ab69a4d0c193418720a149 Gerrit-PatchSet: 6 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: David Tardon dtar...@redhat.com Gerrit-Reviewer: David Tardon dtar...@redhat.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] use normal deps for depending on Package
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/3227 Approvals: David Tardon: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/3227 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Idaf0f5c938deff5b774e675991d0c6aa328ffd4f Gerrit-PatchSet: 6 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: David Tardon dtar...@redhat.com Gerrit-Reviewer: David Tardon dtar...@redhat.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] use extra package for every lang
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/3226 Approvals: David Tardon: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/3226 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Iccd5225b65887734ff599ca247109c2c1ce4ec25 Gerrit-PatchSet: 6 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: David Tardon dtar...@redhat.com Gerrit-Reviewer: David Tardon dtar...@redhat.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] deliver all uiconfig files by UIConfig
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/3229 Approvals: David Tardon: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/3229 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ie78b7ce399ba34485146ca7622c59d31f8105d02 Gerrit-PatchSet: 6 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: David Tardon dtar...@redhat.com Gerrit-Reviewer: David Tardon dtar...@redhat.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] allow to add other types of UI config files
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/3228 Approvals: David Tardon: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/3228 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I878b41783e043efe19097829495a8f13b0f995c0 Gerrit-PatchSet: 6 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: David Tardon dtar...@redhat.com Gerrit-Reviewer: David Tardon dtar...@redhat.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] add gbuild class PackageSet
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/3230 Approvals: David Tardon: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/3230 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I6f700f691b37375a09a5400166aac80a8bb2a2b4 Gerrit-PatchSet: 6 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: David Tardon dtar...@redhat.com Gerrit-Reviewer: David Tardon dtar...@redhat.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: solenv/gbuild
solenv/gbuild/UIConfig.mk | 19 ++- 1 file changed, 14 insertions(+), 5 deletions(-) New commits: commit b9018c54f5b694f8c8d254b2883a6bcb06205522 Author: David Tardon dtar...@redhat.com Date: Sun Apr 7 10:05:04 2013 +0200 prepare UIConfig for producing filelists Change-Id: I0285f6371e68aaccfc7b3347c87b4e24c4a3fda2 Reviewed-on: https://gerrit.libreoffice.org/3231 Reviewed-by: David Tardon dtar...@redhat.com Tested-by: David Tardon dtar...@redhat.com diff --git a/solenv/gbuild/UIConfig.mk b/solenv/gbuild/UIConfig.mk index a38b838..3aa008f 100644 --- a/solenv/gbuild/UIConfig.mk +++ b/solenv/gbuild/UIConfig.mk @@ -84,6 +84,12 @@ endef # # This mostly means UI description files (suffix .ui) for the new layouting # mechanism. +# +# This class provides the following filelists: +# * UIConfig/name containing all nontranslatable files +# * UIConfig/name_lang for each active lang, containing translations +# of .ui files. This filelist only exists if the UIConfig contains any +# .ui files. # en-US is the default, so there is no translation for it gb_UIConfig_LANGS := $(filter-out en-US,$(gb_WITH_LANG)) @@ -109,17 +115,22 @@ $(call gb_UIConfig_get_clean_target,%) : gb_UIConfig_get_packagename = UIConfig/$(1) gb_UIConfig_get_packagename_for_lang = UIConfig/$(1)_$(2) +gb_UIConfig_get_packagesetname = UIConfig/$(1) # Processes and delivers a set of UI configuration files. # # gb_UIConfig_UIConfig modulename define gb_UIConfig_UIConfig +$(call gb_PackageSet_PackageSet_internal,$(call gb_UIConfig_get_packagesetname,$(1))) $(call gb_Package_Package_internal,$(call gb_UIConfig_get_packagename,$(1)),$(SRCDIR)) $(call gb_Package_Package_internal,$(call gb_UIConfig_get_packagename,$(1)_generated),$(WORKDIR)) + +$(call gb_PackageSet_add_package,$(call gb_UIConfig_get_packagesetname,$(1)),$(call gb_UIConfig_get_packagename,$(1))) + $(call gb_UIConfig_get_target,$(1)) :| $(dir $(call gb_UIConfig_get_target,$(1))).dir -$(call gb_UIConfig_get_target,$(1)) : $(call gb_Package_get_target,$(call gb_UIConfig_get_packagename,$(1))) +$(call gb_UIConfig_get_target,$(1)) : $(call gb_PackageSet_get_target,$(call gb_UIConfig_get_packagesetname,$(1))) $(call gb_Postprocess_get_target,AllUIConfigs) : $(call gb_UIConfig_get_target,$(1)) -$(call gb_UIConfig_get_clean_target,$(1)) : $(call gb_Package_get_clean_target,$(call gb_UIConfig_get_packagename,$(1))) +$(call gb_UIConfig_get_clean_target,$(1)) : $(call gb_PackageSet_get_clean_target,$(call gb_UIConfig_get_packagesetname,$(1))) ifneq ($(gb_UIConfig_LANGS),) $(foreach lang,$(gb_UIConfig_LANGS),$(call gb_UIConfig__UIConfig_for_lang,$(1),$(lang))) @@ -256,9 +267,7 @@ endef # gb_UIConfig_add_generated_menubarfile target file define gb_UIConfig_add_generated_menubarfile $(call gb_UIConfig__add_xmlfile,$(1),$(1)_generated,menubar,$(2)) - -$(call gb_UIConfig_get_target,$(1)) : $(call gb_Package_get_target,$(call gb_UIConfig_get_packagename,$(1)_generated)) -$(call gb_UIConfig_get_clean_target,$(1)) : $(call gb_Package_get_clean_target,$(call gb_UIConfig_get_packagename,$(1)_generated)) +$(call gb_PackageSet_add_package,$(call gb_UIConfig_get_packagesetname,$(1)),$(call gb_UIConfig_get_packagename,$(1)_generated)) endef ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: solenv/gbuild
solenv/gbuild/TargetLocations.mk|2 + solenv/gbuild/UIConfig.mk | 48 ++-- solenv/gbuild/platform/IOS_ARM_GCC.mk | 10 ++ solenv/gbuild/platform/WNT_INTEL_GCC.mk | 10 ++ solenv/gbuild/platform/com_MSC_class.mk | 10 ++ solenv/gbuild/platform/macosx.mk| 15 ++ solenv/gbuild/platform/solaris.mk | 10 ++ solenv/gbuild/platform/unxgcc.mk| 10 ++ 8 files changed, 112 insertions(+), 3 deletions(-) New commits: commit 7007f0db77241c8cb6c542918f417d6722723ae5 Author: David Tardon dtar...@redhat.com Date: Sun Apr 7 12:03:09 2013 +0200 impl. platform-specific processing for menubar configs This is the last step needed to obsolete postprocess/packconfig/packconfig.pl. Change-Id: Iad6de126a467aadc829244951f98fc8b202fbd95 Reviewed-on: https://gerrit.libreoffice.org/3232 Reviewed-by: David Tardon dtar...@redhat.com Tested-by: David Tardon dtar...@redhat.com diff --git a/solenv/gbuild/TargetLocations.mk b/solenv/gbuild/TargetLocations.mk index 381c5d7..50d2d91 100644 --- a/solenv/gbuild/TargetLocations.mk +++ b/solenv/gbuild/TargetLocations.mk @@ -195,6 +195,7 @@ gb_ThesaurusIndexTarget_get_target = $(WORKDIR)/ThesaurusIndexTarget/$(basename gb_UIConfig_get_target = $(WORKDIR)/UIConfig/$(1) gb_UILocalizeTarget_get_target = $(WORKDIR)/UILocalizeTarget/$(1).done gb_UILocalizeTarget_get_workdir = $(WORKDIR)/UILocalizeTarget/$(1) +gb_UIMenubarTarget_get_target = $(WORKDIR)/UIMenubarTarget/$(1).xml gb_UnoApiTarget_get_external_headers_target = $(WORKDIR)/UnoApiTarget/$(1).external gb_UnoApiTarget_get_headers_target = $(WORKDIR)/UnoApiTarget/$(1).headers gb_UnoApiTarget_get_target = $(WORKDIR)/UnoApiTarget/$(1).rdb @@ -310,6 +311,7 @@ $(eval $(call gb_Helper_make_clean_targets,\ ExternalProject \ UIConfig \ UILocalizeTarget \ + UIMenubarTarget \ UnoApiHeadersTarget \ UnoApiTarget \ UnpackedTarball \ diff --git a/solenv/gbuild/UIConfig.mk b/solenv/gbuild/UIConfig.mk index 3aa008f..cf56de6 100644 --- a/solenv/gbuild/UIConfig.mk +++ b/solenv/gbuild/UIConfig.mk @@ -78,6 +78,39 @@ $(call gb_UILocalizeTarget_get_target,$(1)) :| \ endef +# class UIMenubarTarget + +# Handles platform-specific processing of menubar config files. + +# defined by platform: +# gb_UIMenubarTarget_UIMenubarTarget_platform +# gb_UIMenubarTarget__command + +$(dir $(call gb_UIMenubarTarget_get_target,%)).dir : + $(if $(wildcard $(dir $@)),,mkdir -p $(dir $@)) + +$(dir $(call gb_UIMenubarTarget_get_target,%))%/.dir : + $(if $(wildcard $(dir $@)),,mkdir -p $(dir $@)) + +$(call gb_UIMenubarTarget_get_target,%) : + $(call gb_UIMenubarTarget__command,$@,$*,$) + +.PHONY : $(call gb_UIMenubarTarget_get_clean_target,%) +$(call gb_UIMenubarTarget_get_clean_target,%) : + $(call gb_Output_announce,$(2),$(false),UIM,1) + rm -f $(call gb_UIMenubarTarget_get_target,$*) + +# Process a menubar configuration file. +# +# gb_UIMenubarTarget_UIMenubarTarget target source +define gb_UIMenubarTarget_UIMenubarTarget +$(call gb_UIMenubarTarget_get_target,$(1)) : $(2) +$(call gb_UIMenubarTarget_get_target,$(1)) :| $(dir $(call gb_UIMenubarTarget_get_target,$(1))).dir + +$(call gb_UIMenubarTarget_UIMenubarTarget_platform,$(1),$(2)) + +endef + # class UIConfig # Handles UI configuration files. @@ -242,13 +275,23 @@ $(call gb_UIConfig__package_file,$(1),$(call gb_UIConfig_get_packagename,$(2)),$ endef +define gb_UIConfig__add_menubarfile +$(call gb_UIMenubarTarget_UIMenubarTarget,$(2),$(3)) +$(call gb_Package_add_file,$(call gb_UIConfig_get_packagename,$(1)_generated),xml/uiconfig/$(1)/menubar/$(notdir $(2)).xml,$(subst $(WORKDIR)/,,$(call gb_UIMenubarTarget_get_target,$(2 +$(call gb_PackageSet_add_package,$(call gb_UIConfig_get_packagesetname,$(1)),$(call gb_UIConfig_get_packagename,$(1)_generated)) + +$(call gb_Package_get_target,$(call gb_UIConfig_get_packagename,$(1)_generated)) : $(call gb_UIMenubarTarget_get_target,$(2)) +$(call gb_Package_get_clean_target,$(call gb_UIConfig_get_packagename,$(1)_generated)) : $(call gb_UIMenubarTarget_get_clean_target,$(2)) + +endef + # Add menubar config file to the package. # # The file is relative to $(SRCDIR) and without extension. # # gb_UIConfig_add_menubarfile target file define gb_UIConfig_add_menubarfile -$(call gb_UIConfig__add_xmlfile,$(1),$(1),menubar,$(2)) +$(call gb_UIConfig__add_menubarfile,$(1),$(2),$(SRCDIR)/$(2).xml) endef @@ -266,8 +309,7 @@ endef # # gb_UIConfig_add_generated_menubarfile target file define gb_UIConfig_add_generated_menubarfile -$(call gb_UIConfig__add_xmlfile,$(1),$(1)_generated,menubar,$(2)) -$(call gb_PackageSet_add_package,$(call gb_UIConfig_get_packagesetname,$(1)),$(call gb_UIConfig_get_packagename,$(1)_generated)) +$(call gb_UIConfig__add_menubarfile,$(1),$(2),$(WORKDIR)/$(2).xml) endef diff --git
[Libreoffice-commits] core.git: postprocess/CustomTarget_config.mk postprocess/CustomTarget_images.mk postprocess/Module_postprocess.mk postprocess/Package_config.mk postprocess/packimages scp2/inc sc
postprocess/CustomTarget_config.mk | 31 - postprocess/CustomTarget_images.mk |4 postprocess/Module_postprocess.mk|2 postprocess/Package_config.mk| 18 postprocess/packimages/image-sort.lst| 562 +++ scp2/InstallModule_ooo.mk| 12 scp2/inc/macros.inc | 15 scp2/source/ooo/file_ooo.scp | 81 +++- scp2/source/ooo/module_hidden_ooo.scp| 42 ++ scp2/source/ooo/module_lang_template.scp | 26 + solenv/gbuild/UIConfig.mk| 12 11 files changed, 450 insertions(+), 355 deletions(-) New commits: commit 94d6136e1c3ce929be9cf7ba1ec9d5c9710abf1d Author: David Tardon dtar...@redhat.com Date: Sun Apr 7 13:00:56 2013 +0200 install UI config. files using filelists Change-Id: I422c8912bc2557c2c03bb885e5c193deb93d1d5e Reviewed-on: https://gerrit.libreoffice.org/3233 Reviewed-by: David Tardon dtar...@redhat.com Tested-by: David Tardon dtar...@redhat.com diff --git a/postprocess/CustomTarget_config.mk b/postprocess/CustomTarget_config.mk deleted file mode 100644 index 80a4158..000 --- a/postprocess/CustomTarget_config.mk +++ /dev/null @@ -1,31 +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_CustomTarget_CustomTarget,postprocess/config)) - -$(eval $(call gb_CustomTarget_register_targets,postprocess/config,\ - uiconfig.zip \ -)) - -.PHONY: $(call gb_CustomTarget_get_workdir,postprocess/config)/uiconfig.zip - -# We need this dependency for delivering in package postprocess_config: -$(call gb_CustomTarget_get_workdir,postprocess/config)/uiconfig_%.zip : \ - $(call gb_CustomTarget_get_workdir,postprocess/config)/uiconfig.zip - @true - -$(call gb_CustomTarget_get_workdir,postprocess/config)/uiconfig.zip : \ - $(SRCDIR)/postprocess/packconfig/packconfig.pl \ - $(call gb_Postprocess_get_target,AllPackages) \ - $(call gb_Postprocess_get_target,AllUIs) - $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),PRL,2) - cd $(SRCDIR)/postprocess/packconfig \ -$(PERL) packconfig.pl -i $(OUTDIR)/xml/uiconfig -o $(dir $@) - -# vim: set noet sw=4 ts=4: diff --git a/postprocess/CustomTarget_images.mk b/postprocess/CustomTarget_images.mk index 1555b1a..31591b2 100644 --- a/postprocess/CustomTarget_images.mk +++ b/postprocess/CustomTarget_images.mk @@ -87,9 +87,9 @@ $(packimages_DIR)/commandimagelist.ilst : $(packimages_DIR)/sorted.lst : \ $(SRCDIR)/postprocess/packimages/image-sort.lst \ - $(call gb_Postprocess_get_target,AllPackages) + $(call gb_Postprocess_get_target,AllUIConfigs) $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),PRL,1) $(call gb_Helper_abbreviate_dirs, \ - $(PERL) $(SOLARENV)/bin/image-sort.pl $ $(OUTDIR)/xml $@) + $(PERL) $(SOLARENV)/bin/image-sort.pl $ $(INSTDIR)/$(gb_UIConfig_INSTDIR) $@) # vim: set noet sw=4 ts=4: diff --git a/postprocess/Module_postprocess.mk b/postprocess/Module_postprocess.mk index 808d7f3..9ed1a75 100644 --- a/postprocess/Module_postprocess.mk +++ b/postprocess/Module_postprocess.mk @@ -13,10 +13,8 @@ $(eval $(call gb_Module_Module,postprocess)) # is reused in Package_registry! $(eval $(call gb_Module_add_targets,postprocess,\ - CustomTarget_config \ CustomTarget_images \ CustomTarget_registry \ - Package_config \ Package_images \ Package_registry \ Rdb_services \ diff --git a/postprocess/Package_config.mk b/postprocess/Package_config.mk deleted file mode 100644 index 03350d4..000 --- a/postprocess/Package_config.mk +++ /dev/null @@ -1,18 +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_Package_Package,postprocess_config,$(call gb_CustomTarget_get_workdir,postprocess/config))) - -$(eval $(call gb_Package_add_file,postprocess_config,bin/uiconfig.zip,uiconfig.zip)) - -$(eval $(call gb_Package_add_files,postprocess_config,bin,\ - $(foreach lang,$(filter-out en-US,$(gb_WITH_LANG)),uiconfig_$(lang).zip) \ -)) - -# vim: set noet sw=4 ts=4: diff --git a/postprocess/packimages/image-sort.lst b/postprocess/packimages/image-sort.lst index 6a84af7..223668c 100644 --- a/postprocess/packimages/image-sort.lst +++ b/postprocess/packimages/image-sort.lst
[PUSHED] impl. platform-specific processing for menubar configs
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/3232 Approvals: David Tardon: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/3232 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Iad6de126a467aadc829244951f98fc8b202fbd95 Gerrit-PatchSet: 6 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: David Tardon dtar...@redhat.com Gerrit-Reviewer: David Tardon dtar...@redhat.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] prepare UIConfig for producing filelists
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/3231 Approvals: David Tardon: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/3231 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I0285f6371e68aaccfc7b3347c87b4e24c4a3fda2 Gerrit-PatchSet: 6 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: David Tardon dtar...@redhat.com Gerrit-Reviewer: David Tardon dtar...@redhat.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: postprocess/packconfig solenv/bin solenv/gbuild
postprocess/packconfig/macosx/macosx_menubar_modification.xsl | 43 -
postprocess/packconfig/packconfig.pl | 330 --
solenv/bin/macosx_menubar_modification.xsl| 43 +
solenv/gbuild/platform/macosx.mk |4
4 files changed, 45 insertions(+), 375 deletions(-)
New commits:
commit 7fdf4e84e13feb5b94060dc830cfa95ac9795ea1
Author: David Tardon dtar...@redhat.com
Date: Sun Apr 7 13:02:05 2013 +0200
remove obsoleted postprocess/packconfig
Change-Id: I93313dc03e8ed7d4d1a653df92145a153e20e5b1
Reviewed-on: https://gerrit.libreoffice.org/3234
Reviewed-by: David Tardon dtar...@redhat.com
Tested-by: David Tardon dtar...@redhat.com
diff --git a/postprocess/packconfig/macosx/macosx_menubar_modification.xsl
b/postprocess/packconfig/macosx/macosx_menubar_modification.xsl
deleted file mode 100644
index 14a8be0..000
--- a/postprocess/packconfig/macosx/macosx_menubar_modification.xsl
+++ /dev/null
@@ -1,43 +0,0 @@
-?xml version=1.0 encoding=utf-8?
-!--
- * 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 .
---
-xsl:stylesheet version='1.0'
- xmlns:menu=http://openoffice.org/2001/menu;
- xmlns:xsl='http://www.w3.org/1999/XSL/Transform'
-
- !-- identity template, does reproduce every IN node on the output --
- xsl:template match=node()|@*
-xsl:copy
- xsl:apply-templates select=node()|@*/
-/xsl:copy
- /xsl:template
-
- !-- filtering template : removes the concerned nodes --
- !-- removes the separator just before the expected item --
- xsl:template
match=menu:menuseparator[following-sibling::menu:menuitem[1]/@menu:id='.uno:Quit']/
- !-- suppression of the Quit item --
- xsl:template match=menu:menuitem[@menu:id='.uno:Quit']/
-
- xsl:template
match=menu:menuseparator[following-sibling::menu:menuitem[1]/@menu:id='.uno:About']/
- !-- suppression of the About item --
- xsl:template match=menu:menuitem[@menu:id='.uno:About']/
-
- !-- suppression of the OptionsTreeDialog item --
- xsl:template match=menu:menuitem[@menu:id='.uno:OptionsTreeDialog']/
-
-/xsl:stylesheet
diff --git a/postprocess/packconfig/packconfig.pl
b/postprocess/packconfig/packconfig.pl
deleted file mode 100644
index 0ce653d..000
--- a/postprocess/packconfig/packconfig.pl
+++ /dev/null
@@ -1,330 +0,0 @@
-:
-eval 'exec perl -wS $0 ${1+$@}'
-if 0;
-#
-# 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 .
-#
-
-#
-# packconfig.pl - pack xml configuration into archives
-#
-
-use strict;
-use Getopt::Long;
-use File::Find;
-use File::Basename;
-use File::Spec;
-use Archive::Zip qw(:ERROR_CODES :CONSTANTS);
-
- globals
-
-my $out_path;# path to output archives in
-my $files_path; # path to look for desired files
-my $verbose; # be verbose
-my $extra_verbose; # be extra verbose
-my $current_lang;# big fat global because File::Find is a pig
-
- script id #
-
-( my $script_name = $0 ) =~ s/^.*\b(\w+)\.pl$/$1/;
-
- main #
-
-parse_options();
-
-#pack the .ui translations
-my @langs = split(/\s+/, $ENV{WITH_LANG_LIST});
-foreach (@langs) {
-next if ($_ eq en-US);
-my %files_hash;
-my $file_ref = get_lang_files(\%files_hash, $_);
-my $out_file=$out_path.uiconfig_.$_..zip;
-packzip(\%files_hash, $out_file);
-}
-
-#pack the core files
-my %files_hash;
-my $file_ref = get_core_files(\%files_hash);
-my
[PUSHED] remove obsoleted postprocess/packconfig
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/3234 Approvals: David Tardon: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/3234 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I93313dc03e8ed7d4d1a653df92145a153e20e5b1 Gerrit-PatchSet: 6 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: David Tardon dtar...@redhat.com Gerrit-Reviewer: David Tardon dtar...@redhat.com Gerrit-Reviewer: LibreOffice gerrit bot ger...@libreoffice.org ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] install UI config. files using filelists
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/3233 Approvals: David Tardon: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/3233 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I422c8912bc2557c2c03bb885e5c193deb93d1d5e Gerrit-PatchSet: 6 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: David Tardon dtar...@redhat.com Gerrit-Reviewer: David Tardon dtar...@redhat.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'feature/orcus-update' - 2 commits - sfx2/inc sfx2/source
sfx2/inc/sfx2/sfxbasemodel.hxx |3 +
sfx2/source/doc/sfxbasemodel.cxx | 78 ---
2 files changed, 44 insertions(+), 37 deletions(-)
New commits:
commit 51617bb6c1374a9e699f67964c586e70d8ab0dbc
Author: Kohei Yoshida kohei.yosh...@gmail.com
Date: Thu Apr 11 00:18:40 2013 -0400
Share error handling code between DoLoad() and DoLoadExternal().
Change-Id: I34167b80e9ac31b32639cd3be903ba9edbdfa41a
diff --git a/sfx2/inc/sfx2/sfxbasemodel.hxx b/sfx2/inc/sfx2/sfxbasemodel.hxx
index 9c15b50..524c86b 100644
--- a/sfx2/inc/sfx2/sfxbasemodel.hxx
+++ b/sfx2/inc/sfx2/sfxbasemodel.hxx
@@ -91,6 +91,7 @@
#include svl/lstner.hxx
+class SfxMedium;
class SfxPrinter;
class SfxViewShell;
class SfxObjectShell ;
@@ -1456,6 +1457,8 @@ private:
SAL_DLLPRIVATE void loadCmisProperties();
+SAL_DLLPRIVATE void handleLoadError( sal_uInt32 nError, SfxMedium* pMedium
);
+
//
// private variables and methods
//
diff --git a/sfx2/source/doc/sfxbasemodel.cxx b/sfx2/source/doc/sfxbasemodel.cxx
index c84e2ad..5b28cc2 100644
--- a/sfx2/source/doc/sfxbasemodel.cxx
+++ b/sfx2/source/doc/sfxbasemodel.cxx
@@ -1851,15 +1851,14 @@ void SAL_CALL SfxBaseModel::load( const Sequence
beans::PropertyValue seqA
SfxMedium* pMedium = new SfxMedium( seqArguments );
+sal_uInt32 nError = ERRCODE_NONE;
OUString aFilterProvider = getFilterProvider(seqArguments);
if (!aFilterProvider.isEmpty())
{
if (!m_pData-m_pObjectShell-DoLoadExternal(pMedium))
-{
-throw task::ErrorCodeIOException(
-OUString(), ReferenceXInterface(), ERRCODE_IO_CANTREAD);
-}
+nError = ERRCODE_IO_GENERAL;
+handleLoadError(nError, pMedium);
pMedium-SetUpdatePickList(false);
return;
}
@@ -1879,7 +1878,6 @@ void SAL_CALL SfxBaseModel::load( const Sequence
beans::PropertyValue seqA
sal_Bool bSalvage = pSalvageItem ? sal_True : sal_False;
// load document
-sal_uInt32 nError = ERRCODE_NONE;
if ( !m_pData-m_pObjectShell-DoLoad(pMedium) )
nError=ERRCODE_IO_GENERAL;
@@ -1948,38 +1946,7 @@ void SAL_CALL SfxBaseModel::load( const Sequence
beans::PropertyValue seqA
m_pData-m_pObjectShell-ResetError();
-if ( nError )
-{
-sal_Bool bSilent = sal_False;
-SFX_ITEMSET_ARG( pMedium-GetItemSet(), pSilentItem, SfxBoolItem,
SID_SILENT, sal_False);
-if( pSilentItem )
-bSilent = pSilentItem-GetValue();
-
- sal_Bool bWarning = ((nError ERRCODE_WARNING_MASK) ==
ERRCODE_WARNING_MASK);
-if ( nError != ERRCODE_IO_BROKENPACKAGE !bSilent )
-{
-// broken package was handled already
-if ( SfxObjectShell::UseInteractionToHandleError( xHandler,
nError ) !bWarning )
-{
-// abort loading (except for warnings)
- nError = ERRCODE_IO_ABORT;
-}
-}
-
-if ( m_pData-m_pObjectShell-GetMedium() != pMedium )
-{
-// for whatever reason document now has another medium
-OSL_FAIL(Document has rejected the medium?!);
-delete pMedium;
-}
-
-if ( !bWarning )// #i30711# don't abort loading if it's only a
warning
-{
-throw task::ErrorCodeIOException( OUString(),
-Reference XInterface (),
-nError ? nError :
ERRCODE_IO_CANTREAD );
-}
-}
+handleLoadError(nError, pMedium);
loadCmisProperties( );
@@ -2711,6 +2678,43 @@ void SfxBaseModel::loadCmisProperties( )
}
}
+void SfxBaseModel::handleLoadError( sal_uInt32 nError, SfxMedium* pMedium )
+{
+if (!nError)
+// No error condition.
+return;
+
+bool bSilent = false;
+SFX_ITEMSET_ARG( pMedium-GetItemSet(), pSilentItem, SfxBoolItem,
SID_SILENT, false);
+if( pSilentItem )
+bSilent = pSilentItem-GetValue();
+
+bool bWarning = ((nError ERRCODE_WARNING_MASK) == ERRCODE_WARNING_MASK);
+if ( nError != ERRCODE_IO_BROKENPACKAGE !bSilent )
+{
+// broken package was handled already
+if (
SfxObjectShell::UseInteractionToHandleError(pMedium-GetInteractionHandler(),
nError) !bWarning)
+{
+// abort loading (except for warnings)
+nError = ERRCODE_IO_ABORT;
+}
+}
+
+if ( m_pData-m_pObjectShell-GetMedium() != pMedium )
+{
+
[Libreoffice-commits] core.git: sc/source
sc/source/ui/src/globstr.src |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit d06180200195d4c20a58d989f9d2c16cb1989688
Author: Joren De Cuyper joren.libreoff...@telenet.be
Date: Tue Apr 9 17:17:36 2013 +0200
fdo#63290 UI: Goal Seek - incorrect term current cell
Change-Id: I0542d9918d9dbbfdc002b7fadec1bb461cbd2831
Reviewed-on: https://gerrit.libreoffice.org/3291
Reviewed-by: David Tardon dtar...@redhat.com
Tested-by: David Tardon dtar...@redhat.com
diff --git a/sc/source/ui/src/globstr.src b/sc/source/ui/src/globstr.src
index 036f6a5..2973240 100644
--- a/sc/source/ui/src/globstr.src
+++ b/sc/source/ui/src/globstr.src
@@ -447,11 +447,11 @@ Resource RID_GLOBSTR
};
String STR_MSSG_SOLVE_1
{
-Text [ en-US ] = Insert result ( ;
+Text [ en-US ] = Result ( ;
};
String STR_MSSG_SOLVE_2
{
-Text [ en-US ] = ) into current cell? ;
+Text [ en-US ] = ). Apply setting to spreadsheet? ;
};
String STR_MSSG_SOLVE_3
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/orcus-update' - sfx2/source
sfx2/source/doc/sfxbasemodel.cxx | 188 +++
1 file changed, 94 insertions(+), 94 deletions(-)
New commits:
commit b65a0996a9fa16101ab5584036472cac42d4c088
Author: Kohei Yoshida kohei.yosh...@gmail.com
Date: Thu Apr 11 00:23:45 2013 -0400
Reduce indentation by early bail-out.
Change-Id: Iaf2fed36b33d44f06f2c2750f800da5a6dd454ab
diff --git a/sfx2/source/doc/sfxbasemodel.cxx b/sfx2/source/doc/sfxbasemodel.cxx
index 5b28cc2..84e34e2 100644
--- a/sfx2/source/doc/sfxbasemodel.cxx
+++ b/sfx2/source/doc/sfxbasemodel.cxx
@@ -1843,125 +1843,125 @@ void SAL_CALL SfxBaseModel::load( const Sequence
beans::PropertyValue seqA
// the object shell should exist always
DBG_ASSERT( m_pData-m_pObjectShell.Is(), Model is useless without an
ObjectShell );
-if ( m_pData-m_pObjectShell.Is() )
-{
-if( m_pData-m_pObjectShell-GetMedium() )
-// if a Medium is present, the document is already initialized
-throw frame::DoubleInitializationException();
+if (!m_pData-m_pObjectShell.Is())
+return;
-SfxMedium* pMedium = new SfxMedium( seqArguments );
+if( m_pData-m_pObjectShell-GetMedium() )
+// if a Medium is present, the document is already initialized
+throw frame::DoubleInitializationException();
-sal_uInt32 nError = ERRCODE_NONE;
-OUString aFilterProvider = getFilterProvider(seqArguments);
-if (!aFilterProvider.isEmpty())
-{
-if (!m_pData-m_pObjectShell-DoLoadExternal(pMedium))
-nError = ERRCODE_IO_GENERAL;
+SfxMedium* pMedium = new SfxMedium( seqArguments );
-handleLoadError(nError, pMedium);
-pMedium-SetUpdatePickList(false);
-return;
-}
+sal_uInt32 nError = ERRCODE_NONE;
+OUString aFilterProvider = getFilterProvider(seqArguments);
+if (!aFilterProvider.isEmpty())
+{
+if (!m_pData-m_pObjectShell-DoLoadExternal(pMedium))
+nError = ERRCODE_IO_GENERAL;
-String aFilterName;
-SFX_ITEMSET_ARG( pMedium-GetItemSet(), pFilterNameItem,
SfxStringItem, SID_FILTER_NAME, sal_False );
-if( pFilterNameItem )
-aFilterName = pFilterNameItem-GetValue();
-if(
!m_pData-m_pObjectShell-GetFactory().GetFilterContainer()-GetFilter4FilterName(
aFilterName ) )
-{
-// filtername is not valid
-delete pMedium;
-throw frame::IllegalArgumentIOException();
-}
+handleLoadError(nError, pMedium);
+pMedium-SetUpdatePickList(false);
+return;
+}
-SFX_ITEMSET_ARG( pMedium-GetItemSet(), pSalvageItem, SfxStringItem,
SID_DOC_SALVAGE, sal_False );
-sal_Bool bSalvage = pSalvageItem ? sal_True : sal_False;
+String aFilterName;
+SFX_ITEMSET_ARG( pMedium-GetItemSet(), pFilterNameItem, SfxStringItem,
SID_FILTER_NAME, sal_False );
+if( pFilterNameItem )
+aFilterName = pFilterNameItem-GetValue();
+if(
!m_pData-m_pObjectShell-GetFactory().GetFilterContainer()-GetFilter4FilterName(
aFilterName ) )
+{
+// filtername is not valid
+delete pMedium;
+throw frame::IllegalArgumentIOException();
+}
-// load document
-if ( !m_pData-m_pObjectShell-DoLoad(pMedium) )
-nError=ERRCODE_IO_GENERAL;
+SFX_ITEMSET_ARG( pMedium-GetItemSet(), pSalvageItem, SfxStringItem,
SID_DOC_SALVAGE, sal_False );
+sal_Bool bSalvage = pSalvageItem ? sal_True : sal_False;
-// QUESTION: if the following happens outside of DoLoad, something
important is missing there!
-Reference task::XInteractionHandler xHandler =
pMedium-GetInteractionHandler();
-if( m_pData-m_pObjectShell-GetErrorCode() )
+// load document
+if ( !m_pData-m_pObjectShell-DoLoad(pMedium) )
+nError=ERRCODE_IO_GENERAL;
+
+// QUESTION: if the following happens outside of DoLoad, something
important is missing there!
+Reference task::XInteractionHandler xHandler =
pMedium-GetInteractionHandler();
+if( m_pData-m_pObjectShell-GetErrorCode() )
+{
+nError = m_pData-m_pObjectShell-GetErrorCode();
+if ( nError == ERRCODE_IO_BROKENPACKAGE xHandler.is() )
{
-nError = m_pData-m_pObjectShell-GetErrorCode();
-if ( nError == ERRCODE_IO_BROKENPACKAGE xHandler.is() )
+OUString aDocName = pMedium-GetURLObject().getName(
INetURLObject::LAST_SEGMENT, true, INetURLObject::DECODE_WITH_CHARSET );
+SFX_ITEMSET_ARG( pMedium-GetItemSet(), pRepairItem, SfxBoolItem,
SID_REPAIRPACKAGE, sal_False );
+if ( !pRepairItem || !pRepairItem-GetValue() )
{
-OUString aDocName = pMedium-GetURLObject().getName(
INetURLObject::LAST_SEGMENT, true, INetURLObject::DECODE_WITH_CHARSET );
-SFX_ITEMSET_ARG( pMedium-GetItemSet(), pRepairItem,
SfxBoolItem,
[PUSHED] fdo#63290 UI: Goal Seek - incorrect term current cell
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/3291 Approvals: David Tardon: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/3291 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I0542d9918d9dbbfdc002b7fadec1bb461cbd2831 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Joren De Cuyper joren.libreoff...@telenet.be Gerrit-Reviewer: David Tardon dtar...@redhat.com Gerrit-Reviewer: Joren De Cuyper joren.libreoff...@telenet.be ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - officecfg/registry
officecfg/registry/data/org/openoffice/Office/UI/MathWindowState.xcu |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 032f8845d2242e0e03bf1a4b47898dee51493f56 Author: Thomas Arnhold tho...@arnhold.org Date: Wed Apr 10 04:48:01 2013 +0200 fdo#63350 math: move stardard toolbar to the left Change-Id: Ibadd1dff90383fb0a285a9cb94cc0050906e3f24 Reviewed-on: https://gerrit.libreoffice.org/3324 Reviewed-by: David Tardon dtar...@redhat.com Tested-by: David Tardon dtar...@redhat.com diff --git a/officecfg/registry/data/org/openoffice/Office/UI/MathWindowState.xcu b/officecfg/registry/data/org/openoffice/Office/UI/MathWindowState.xcu index 5333926..4dee141 100644 --- a/officecfg/registry/data/org/openoffice/Office/UI/MathWindowState.xcu +++ b/officecfg/registry/data/org/openoffice/Office/UI/MathWindowState.xcu @@ -43,7 +43,7 @@ /node node oor:name=private:resource/toolbar/toolbar oor:op=replace prop oor:name=DockPos oor:type=xs:string -value0,0/value +value1,0/value /prop prop oor:name=Docked oor:type=xs:boolean valuetrue/value ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/orcus-update' - sfx2/source
sfx2/source/doc/sfxbasemodel.cxx | 19 +++
1 file changed, 7 insertions(+), 12 deletions(-)
New commits:
commit ff58b45466307de627d7732fb08ff8d2b0968d8c
Author: Kohei Yoshida kohei.yosh...@gmail.com
Date: Thu Apr 11 00:31:02 2013 -0400
Get the filter provider name from SfxMedium instead.
This property is now transferred to SfxMedium. Let's get it from there.
Change-Id: Ie0a4680581500135f3b65370ea94946f02c02cb8
diff --git a/sfx2/source/doc/sfxbasemodel.cxx b/sfx2/source/doc/sfxbasemodel.cxx
index 84e34e2..fee8ea7 100644
--- a/sfx2/source/doc/sfxbasemodel.cxx
+++ b/sfx2/source/doc/sfxbasemodel.cxx
@@ -1814,18 +1814,13 @@ void SAL_CALL SfxBaseModel::initNew()
namespace {
-OUString getFilterProvider(const Sequencebeans::PropertyValue rArgs)
+OUString getFilterProvider( SfxMedium rMedium )
{
-OUString aStr;
-for (sal_Int32 i = 0, n = rArgs.getLength(); i n; ++i)
-{
-if (rArgs[i].Name == FilterProvider)
-{
-rArgs[i].Value = aStr;
-return aStr;
-}
-}
-return aStr;
+const SfxFilter* pFilter = rMedium.GetFilter();
+if (!pFilter)
+return OUString();
+
+return pFilter-GetProviderName();
}
}
@@ -1853,7 +1848,7 @@ void SAL_CALL SfxBaseModel::load( const Sequence
beans::PropertyValue seqA
SfxMedium* pMedium = new SfxMedium( seqArguments );
sal_uInt32 nError = ERRCODE_NONE;
-OUString aFilterProvider = getFilterProvider(seqArguments);
+OUString aFilterProvider = getFilterProvider(*pMedium);
if (!aFilterProvider.isEmpty())
{
if (!m_pData-m_pObjectShell-DoLoadExternal(pMedium))
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PUSHED libreoffice-4-0] fdo#63350 math: move stardard toolbar to the left
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/3324 Approvals: David Tardon: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/3324 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ibadd1dff90383fb0a285a9cb94cc0050906e3f24 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: libreoffice-4-0 Gerrit-Owner: Thomas Arnhold tho...@arnhold.org Gerrit-Reviewer: David Tardon dtar...@redhat.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sd/source
sd/source/ui/dlg/PhotoAlbumDialog.cxx | 20
1 file changed, 12 insertions(+), 8 deletions(-)
New commits:
commit 8b1b67db259a5a930555882b44fcac8738f73ca4
Author: Lionel Elie Mamane lio...@mamane.lu
Date: Thu Apr 11 07:03:12 2013 +0200
WaE: unitialised variable
Change-Id: Icda6d87e2bf17e651d2a60c4a024dfaa8ed36a51
diff --git a/sd/source/ui/dlg/PhotoAlbumDialog.cxx
b/sd/source/ui/dlg/PhotoAlbumDialog.cxx
index d844c1c..1d36f38 100644
--- a/sd/source/ui/dlg/PhotoAlbumDialog.cxx
+++ b/sd/source/ui/dlg/PhotoAlbumDialog.cxx
@@ -124,7 +124,7 @@ IMPL_LINK_NOARG(SdPhotoAlbumDialog, CreateHdl)
if ( sOpt == Fit to slide)
{
OUString sUrl;
-OUString* pData;
+OUString* pData = NULL;
for( sal_Int16 i = 0; i pImagesLst-GetEntryCount(); ++i )
{
pData = (OUString*) pImagesLst-GetEntryData(i);
@@ -179,12 +179,13 @@ IMPL_LINK_NOARG(SdPhotoAlbumDialog, CreateHdl)
appendNewSlide(AUTOLAYOUT_ONLY_TEXT, xDrawPages);
}
}
-delete pData;
+if (pData)
+delete pData;
}
else if( sOpt == 1 image with title )
{
OUString sUrl;
-OUString* pData;
+OUString* pData = NULL;
for( sal_Int16 i = 0; i pImagesLst-GetEntryCount(); ++i )
{
pData = (OUString*) pImagesLst-GetEntryData(i);
@@ -221,13 +222,14 @@ IMPL_LINK_NOARG(SdPhotoAlbumDialog, CreateHdl)
appendNewSlide(AUTOLAYOUT_ONLY_TEXT, xDrawPages);
}
}
-delete pData;
+if (pData)
+delete pData;
}
else if( sOpt == 2 images )
{
OUString sUrl1();
OUString sUrl2();
-OUString* pData;
+OUString* pData = NULL;
for( sal_Int32 i = 0; i pImagesLst-GetEntryCount(); i+=2 )
{
@@ -333,7 +335,8 @@ IMPL_LINK_NOARG(SdPhotoAlbumDialog, CreateHdl)
}
}
-delete pData;
+if (pData)
+delete pData;
}
else if( sOpt == 4 images )
{
@@ -341,7 +344,7 @@ IMPL_LINK_NOARG(SdPhotoAlbumDialog, CreateHdl)
OUString sUrl2();
OUString sUrl3();
OUString sUrl4();
-OUString* pData;
+OUString* pData = NULL;
for( sal_Int32 i = 0; i pImagesLst-GetEntryCount(); i+=4 )
{
@@ -539,7 +542,8 @@ IMPL_LINK_NOARG(SdPhotoAlbumDialog, CreateHdl)
xSlide-add(xShape);
}
}
-delete pData;
+if (pData)
+delete pData;
}
else
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-3-6' - sc/source
sc/source/core/tool/interpr1.cxx | 14 ++
sc/source/core/tool/scmatrix.cxx |2 +-
2 files changed, 15 insertions(+), 1 deletion(-)
New commits:
commit 6328c5b5b06f8c065a014b18f3c86fd8c24b91c2
Author: Eike Rathke er...@redhat.com
Date: Thu Apr 11 01:29:22 2013 +0200
resolved fdo#63403 do not create matrix with 0 rows or cols
(cherry picked from commit 7c3ab3bc15cec211767490823539efcada4fe964)
Conflicts:
sc/source/core/tool/scmatrix.cxx
Change-Id: Icbbde3723c1b37713d0f26ef8305c4a199b8
Reviewed-on: https://gerrit.libreoffice.org/3322
Reviewed-by: Fridrich Strba fridr...@documentfoundation.org
Tested-by: Fridrich Strba fridr...@documentfoundation.org
diff --git a/sc/source/core/tool/interpr1.cxx b/sc/source/core/tool/interpr1.cxx
index 42a0825..f645ec7 100644
--- a/sc/source/core/tool/interpr1.cxx
+++ b/sc/source/core/tool/interpr1.cxx
@@ -4304,6 +4304,13 @@ void ScInterpreter::ScColumn()
SCCOL nCols;
SCROW nRows;
pMyFormulaCell-GetMatColsRows( nCols, nRows);
+if (nCols == 0)
+{
+// Happens if called via ScViewFunc::EnterMatrix()
+// ScFormulaCell::GetResultDimensions() as of course a
+// matrix result is not available yet.
+nCols = 1;
+}
ScMatrixRef pResMat = GetNewMat( static_castSCSIZE(nCols),
1);
if (pResMat)
{
@@ -4380,6 +4387,13 @@ void ScInterpreter::ScRow()
SCCOL nCols;
SCROW nRows;
pMyFormulaCell-GetMatColsRows( nCols, nRows);
+if (nRows == 0)
+{
+// Happens if called via ScViewFunc::EnterMatrix()
+// ScFormulaCell::GetResultDimensions() as of course a
+// matrix result is not available yet.
+nRows = 1;
+}
ScMatrixRef pResMat = GetNewMat( 1,
static_castSCSIZE(nRows));
if (pResMat)
{
diff --git a/sc/source/core/tool/scmatrix.cxx b/sc/source/core/tool/scmatrix.cxx
index 47ed6e9..aa11192 100644
--- a/sc/source/core/tool/scmatrix.cxx
+++ b/sc/source/core/tool/scmatrix.cxx
@@ -911,7 +911,7 @@ size_t ScMatrixImpl::Count(bool bCountStrings) const
void ScMatrixImpl::CalcPosition(SCSIZE nIndex, SCSIZE rC, SCSIZE rR) const
{
SCSIZE nRowSize = maCachedSize.first;
-rC = nIndex / nRowSize;
+rC = nRowSize 1 ? nIndex / nRowSize : nIndex;
rR = nIndex - rC*nRowSize;
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - sc/source
sc/source/core/tool/interpr1.cxx | 14 ++
sc/source/core/tool/scmatrix.cxx | 15 ---
2 files changed, 26 insertions(+), 3 deletions(-)
New commits:
commit 92b0c257cbe590d345adbaddbebebe95f977d8d5
Author: Eike Rathke er...@redhat.com
Date: Thu Apr 11 01:29:22 2013 +0200
resolved fdo#63403 do not create matrix with 0 rows or cols
Change-Id: Icbbde3723c1b37713d0f26ef8305c4a199b8
(cherry picked from commit 7c3ab3bc15cec211767490823539efcada4fe964)
Reviewed-on: https://gerrit.libreoffice.org/3321
Reviewed-by: Fridrich Strba fridr...@documentfoundation.org
Tested-by: Fridrich Strba fridr...@documentfoundation.org
diff --git a/sc/source/core/tool/interpr1.cxx b/sc/source/core/tool/interpr1.cxx
index 1553a9b..3ed9189 100644
--- a/sc/source/core/tool/interpr1.cxx
+++ b/sc/source/core/tool/interpr1.cxx
@@ -4591,6 +4591,13 @@ void ScInterpreter::ScColumn()
SCCOL nCols;
SCROW nRows;
pMyFormulaCell-GetMatColsRows( nCols, nRows);
+if (nCols == 0)
+{
+// Happens if called via ScViewFunc::EnterMatrix()
+// ScFormulaCell::GetResultDimensions() as of course a
+// matrix result is not available yet.
+nCols = 1;
+}
ScMatrixRef pResMat = GetNewMat( static_castSCSIZE(nCols),
1);
if (pResMat)
{
@@ -4667,6 +4674,13 @@ void ScInterpreter::ScRow()
SCCOL nCols;
SCROW nRows;
pMyFormulaCell-GetMatColsRows( nCols, nRows);
+if (nRows == 0)
+{
+// Happens if called via ScViewFunc::EnterMatrix()
+// ScFormulaCell::GetResultDimensions() as of course a
+// matrix result is not available yet.
+nRows = 1;
+}
ScMatrixRef pResMat = GetNewMat( 1,
static_castSCSIZE(nRows));
if (pResMat)
{
diff --git a/sc/source/core/tool/scmatrix.cxx b/sc/source/core/tool/scmatrix.cxx
index 0a92ffc..e6c2240 100644
--- a/sc/source/core/tool/scmatrix.cxx
+++ b/sc/source/core/tool/scmatrix.cxx
@@ -1128,17 +1128,26 @@ size_t ScMatrixImpl::Count(bool bCountStrings) const
void ScMatrixImpl::CalcPosition(SCSIZE nIndex, SCSIZE rC, SCSIZE rR) const
{
SCSIZE nRowSize = maMat.size().row;
-rC = nIndex / nRowSize;
+SAL_WARN_IF( !nRowSize, sc, ScMatrixImpl::CalcPosition: 0 rows!);
+rC = nRowSize 1 ? nIndex / nRowSize : nIndex;
rR = nIndex - rC*nRowSize;
}
//
ScMatrix::ScMatrix( SCSIZE nC, SCSIZE nR) :
-pImpl(new ScMatrixImpl(nC, nR)), nRefCnt(0) {}
+pImpl(new ScMatrixImpl(nC, nR)), nRefCnt(0)
+{
+SAL_WARN_IF( !nC, sc, ScMatrix with 0 columns!);
+SAL_WARN_IF( !nR, sc, ScMatrix with 0 rows!);
+}
ScMatrix::ScMatrix(SCSIZE nC, SCSIZE nR, double fInitVal) :
-pImpl(new ScMatrixImpl(nC, nR, fInitVal)), nRefCnt(0) {}
+pImpl(new ScMatrixImpl(nC, nR, fInitVal)), nRefCnt(0)
+{
+SAL_WARN_IF( !nC, sc, ScMatrix with 0 columns!);
+SAL_WARN_IF( !nR, sc, ScMatrix with 0 rows!);
+}
ScMatrix::~ScMatrix()
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-3-6' - odk/pack
odk/pack/copying/makefile.mk |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit e6fd93bdd2d7034f102ef6a80d6cd03461b7d1a9 Author: Michael Stahl mst...@redhat.com Date: Wed Apr 10 14:59:12 2013 +0200 odk: fix packaging of purpenvhelper import lib on WNT This import lib was apparently renamed in LO 3.6 and the crappy dmake build system in odk silently dropped it from the packages. This problem was fixed differently on master by converting the module to gbuild. Change-Id: Ib07e1472815b7d068cd718f6c733630fd59639d2 Reviewed-on: https://gerrit.libreoffice.org/3308 Reviewed-by: Fridrich Strba fridr...@documentfoundation.org Tested-by: Fridrich Strba fridr...@documentfoundation.org diff --git a/odk/pack/copying/makefile.mk b/odk/pack/copying/makefile.mk index 0feafee..948683c 100644 --- a/odk/pack/copying/makefile.mk +++ b/odk/pack/copying/makefile.mk @@ -81,7 +81,7 @@ LIBLIST = \ $(DESTDIRLIB)/icppu.lib\ $(DESTDIRLIB)/icppuhelper.lib \ $(DESTDIRLIB)/irmcxt.lib \ -$(DESTDIRLIB)/ipurpenvhelper3MSC.lib +$(DESTDIRLIB)/ipurpenvhelper.lib .ENDIF .IF $(OS)==LINUX ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - odk/pack
odk/pack/copying/makefile.mk |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit b91daa441cb9607c80ff8eeb48064ed57190c2bd Author: Michael Stahl mst...@redhat.com Date: Wed Apr 10 14:59:12 2013 +0200 odk: fix packaging of purpenvhelper import lib on WNT This import lib was apparently renamed in LO 3.6 and the crappy dmake build system in odk silently dropped it from the packages. This problem was fixed differently on master by converting the module to gbuild. Change-Id: Ib07e1472815b7d068cd718f6c733630fd59639d2 Reviewed-on: https://gerrit.libreoffice.org/3307 Reviewed-by: Fridrich Strba fridr...@documentfoundation.org Tested-by: Fridrich Strba fridr...@documentfoundation.org diff --git a/odk/pack/copying/makefile.mk b/odk/pack/copying/makefile.mk index ec5f172..a786c1f 100644 --- a/odk/pack/copying/makefile.mk +++ b/odk/pack/copying/makefile.mk @@ -76,7 +76,7 @@ LIBLIST = \ $(DESTDIRLIB)/icppu.lib\ $(DESTDIRLIB)/icppuhelper.lib \ $(DESTDIRLIB)/irmcxt.lib \ -$(DESTDIRLIB)/ipurpenvhelper3MSC.lib +$(DESTDIRLIB)/ipurpenvhelper.lib .ENDIF .IF $(OS)==LINUX ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PUSHED libreoffice-3-6] resolved fdo#63403 do not create matrix with 0 rows or cols
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/3322 Approvals: Fridrich Strba: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/3322 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Icbbde3723c1b37713d0f26ef8305c4a199b8 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: libreoffice-3-6 Gerrit-Owner: Eike Rathke er...@redhat.com Gerrit-Reviewer: Fridrich Strba fridr...@documentfoundation.org ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED libreoffice-4-0] resolved fdo#63403 do not create matrix with 0 rows or cols
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/3321 Approvals: Fridrich Strba: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/3321 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Icbbde3723c1b37713d0f26ef8305c4a199b8 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: libreoffice-4-0 Gerrit-Owner: Eike Rathke er...@redhat.com Gerrit-Reviewer: Fridrich Strba fridr...@documentfoundation.org ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED libreoffice-3-6] odk: fix packaging of purpenvhelper import lib on WNT
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/3308 Approvals: Fridrich Strba: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/3308 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ib07e1472815b7d068cd718f6c733630fd59639d2 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: libreoffice-3-6 Gerrit-Owner: Michael Stahl mst...@redhat.com Gerrit-Reviewer: Fridrich Strba fridr...@documentfoundation.org ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED libreoffice-4-0] odk: fix packaging of purpenvhelper import lib on WNT
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/3307 Approvals: Fridrich Strba: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/3307 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ib07e1472815b7d068cd718f6c733630fd59639d2 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: libreoffice-4-0 Gerrit-Owner: Michael Stahl mst...@redhat.com Gerrit-Reviewer: Fridrich Strba fridr...@documentfoundation.org ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - vcl/aqua
vcl/aqua/source/gdi/salvd.cxx | 18 --
1 file changed, 16 insertions(+), 2 deletions(-)
New commits:
commit 1061de77bb8927defb372df31899fddc7ace237d
Author: Caolán McNamara caol...@redhat.com
Date: Wed Jul 11 13:13:24 2012 +
Resolves: fdo#62287 avoid a crash on OSX on reusing a dead AquaSalFrame
part 1 of 3:
Resolves: #i120237# workaround a crash on OSX...
when a VirtualDevice is reused that was created for a now dead window
regression was introduced by the changes for #i116758#
Patch-By: Herbert Duerr
Suggested-By: Herbert Duerr
Found-By: Herbert Duerr
(cherry picked from commit 6550c7c0595670c10e340e2c7b41be7e128af40a)
(cherry picked from commit 5333d295225e4cf961e03ea8bf2fd1e2f9d168bc)
part 2 of 3:
Related: #i120237# cache the updated frame reference in AquaSalGraphics
(cherry picked from commit 6e4214e604f8aa86b08a7fbe315a80d7751ffc2d)
(cherry picked from commit ef4b5aad82da7133e89e37e3e04791398d6fb3a6)
part 3 of 3:
Related: fdo#62287 make it impossible to use a dead AquaSalFrame
(cherry picked from commit 43a23fb3f8f1ffa4937658dd9393d23533b84d18)
d10d49737ba773e95a3198997e25fbfd98708f65
e56a41e901ea26d5ea946260bdf25a903185be99
Change-Id: I1a813f128ad16e6eb840b22fbd14af49b34e11d0
Reviewed-on: https://gerrit.libreoffice.org/3295
Reviewed-by: Fridrich Strba fridr...@documentfoundation.org
Tested-by: Fridrich Strba fridr...@documentfoundation.org
diff --git a/vcl/aqua/source/gdi/salvd.cxx b/vcl/aqua/source/gdi/salvd.cxx
index 9696b9a..b129f06 100644
--- a/vcl/aqua/source/gdi/salvd.cxx
+++ b/vcl/aqua/source/gdi/salvd.cxx
@@ -184,8 +184,22 @@ sal_Bool AquaSalVirtualDevice::SetSize( long nDX, long nDY
)
{
// default to a NSView target context
AquaSalFrame* pSalFrame = mpGraphics-getGraphicsFrame();
-if( !pSalFrame !GetSalData()-maFrames.empty() )
-pSalFrame = *GetSalData()-maFrames.begin();
+if( !pSalFrame || !AquaSalFrame::isAlive( pSalFrame ))
+{
+if( !GetSalData()-maFrames.empty() )
+{
+// get the first matching frame
+pSalFrame = *GetSalData()-maFrames.begin();
+}
+else
+{
+// ensure we don't reuse a dead AquaSalFrame on the very
+// unlikely case of no other frame to use
+pSalFrame = NULL;
+}
+// update the frame reference
+mpGraphics-setGraphicsFrame( pSalFrame );
+}
if( pSalFrame )
{
// #i91990#
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PUSHED libreoffice-4-0] Resolves: fdo#62287 avoid a crash on OSX on reusing a dead A...
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/3295 Approvals: Fridrich Strba: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/3295 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I1a813f128ad16e6eb840b22fbd14af49b34e11d0 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: libreoffice-4-0 Gerrit-Owner: Caolán McNamara caol...@redhat.com Gerrit-Reviewer: Fridrich Strba fridr...@documentfoundation.org ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 44446] LibreOffice 3.6 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=6 Panos Stokas pa...@ekei.com changed: What|Removed |Added Depends on||44617 -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 44446] LibreOffice 3.6 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=6 --- Comment #214 from Panos Stokas pa...@ekei.com --- Bug 44617 causes irreversible problems (undo doesn't work) when resizing a group of shapes that use the resize shape to fit text option. While Drawing is not the most used function in LibreOffice, a bug causing irreversible damage to a document should be corrected in a stable version. -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: 2 commits - sd/source sfx2/source
sd/source/ui/dlg/PhotoAlbumDialog.cxx | 12
sfx2/source/appl/newhelp.cxx |2 --
2 files changed, 4 insertions(+), 10 deletions(-)
New commits:
commit 4a41d3b36b06c6f71fd9a2d742933888980313c5
Author: Tor Lillqvist t...@iki.fi
Date: Thu Apr 11 09:32:01 2013 +0300
Fix warning: unused variable 'PROP_LAYOUT_MANAGER' [loplugin]
Change-Id: Ifd475718766a772504da9e522894b90d7e63347a
diff --git a/sfx2/source/appl/newhelp.cxx b/sfx2/source/appl/newhelp.cxx
index 5078c95..5ccb89b 100644
--- a/sfx2/source/appl/newhelp.cxx
+++ b/sfx2/source/appl/newhelp.cxx
@@ -2006,8 +2006,6 @@ long TextWin_Impl::Notify( NotifyEvent rNEvt )
// remove docking area acceptor from layoutmanager, so it will not layout
anything further .-)
static void lcl_disableLayoutOfFrame(const Reference XFrame2 xFrame)
{
-static const OUString PROP_LAYOUT_MANAGER(LayoutManager);
-
xFrame-setLayoutManager( Reference XLayoutManager () );
}
commit c744ff638f778e641ea7ee37d4700c946af5a45e
Author: Tor Lillqvist t...@iki.fi
Date: Thu Apr 11 09:20:24 2013 +0300
It's fine to delete a NULL pointer
Calling delete on a NULL pointer does nothing. Checking for non-NULL just
clutters the code.
Still, I wonder if this code has some issues with heap corruption and/or
leaks. The pImagesLst-GetEntryData() calls just return a copy of the
OUString
pointers stored in some kind of list, right? So is it correct to call delete
on the copy, but keep the pointer in the list intact, which thus then will
be
pointing to freed memory, won't it? Or will the code automatically work in
such a way that all pointers in the list will be handled exactly once (and
deleted)?
Perhaps running this under valgrind would be a good idea.
Change-Id: Ibf401cc44caaeea6bb46f38cd9851ac14b2d2545
diff --git a/sd/source/ui/dlg/PhotoAlbumDialog.cxx
b/sd/source/ui/dlg/PhotoAlbumDialog.cxx
index 1d36f38..374b305 100644
--- a/sd/source/ui/dlg/PhotoAlbumDialog.cxx
+++ b/sd/source/ui/dlg/PhotoAlbumDialog.cxx
@@ -179,8 +179,7 @@ IMPL_LINK_NOARG(SdPhotoAlbumDialog, CreateHdl)
appendNewSlide(AUTOLAYOUT_ONLY_TEXT, xDrawPages);
}
}
-if (pData)
-delete pData;
+delete pData;
}
else if( sOpt == 1 image with title )
{
@@ -222,8 +221,7 @@ IMPL_LINK_NOARG(SdPhotoAlbumDialog, CreateHdl)
appendNewSlide(AUTOLAYOUT_ONLY_TEXT, xDrawPages);
}
}
-if (pData)
-delete pData;
+delete pData;
}
else if( sOpt == 2 images )
{
@@ -335,8 +333,7 @@ IMPL_LINK_NOARG(SdPhotoAlbumDialog, CreateHdl)
}
}
-if (pData)
-delete pData;
+delete pData;
}
else if( sOpt == 4 images )
{
@@ -542,8 +539,7 @@ IMPL_LINK_NOARG(SdPhotoAlbumDialog, CreateHdl)
xSlide-add(xShape);
}
}
-if (pData)
-delete pData;
+delete pData;
}
else
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: solenv/bin
solenv/bin/modules/installer/simplepackage.pm | 37 ++
1 file changed, 21 insertions(+), 16 deletions(-)
New commits:
commit ca514d35bdb374e62d7bb90e19e55c7cc7a9fab7
Author: Tor Lillqvist t...@iki.fi
Date: Thu Apr 11 10:20:30 2013 +0300
Fix OS X code signing
Use correct path to the app bundle.
Also update the comment about code signing to be more relevant for the
master branch.
Change-Id: I6a357e5cd033afc986fd035f9760c04763b06fc9
diff --git a/solenv/bin/modules/installer/simplepackage.pm
b/solenv/bin/modules/installer/simplepackage.pm
index 58cff7d..3445fe3 100755
--- a/solenv/bin/modules/installer/simplepackage.pm
+++ b/solenv/bin/modules/installer/simplepackage.pm
@@ -415,22 +415,27 @@ sub create_package
if (($volume_name_classic_app eq 'LibreOffice' ||
$volume_name_classic_app eq 'LibreOfficeDev')
defined($ENV{'MACOSX_CODESIGNING_IDENTITY'})
$ENV{'MACOSX_CODESIGNING_IDENTITY'} ne )
{
-# Just sign the .app as a whole, which means signing
-# the CFBundleExecutable from Info.plist,
-# i.e. soffice, plus the contents of the Resources
-# treee (which is not much, far from all of our
-# non-code resources).
-
-# Don't bother here in the 4.0 branch to sign each
-# individual .dylib, or each additional binary. See
-# master for more work plus possibly eventually
-# re-organising the app bundle structure to be more
-# Mac-like (the program symlink, eek!) and actually
-# putting all non-code resources (including extension
-# scripts!) into Resources so that they participate
-# in the signing and their validity can be guaranteed.
-
-$systemcall = codesign --sign
$ENV{'MACOSX_CODESIGNING_IDENTITY'} -v -v -v
$tempdir/$packagename/$volume_name_classic_app.app;
+# Sign the .app as a whole, which means (re-)signing
+# the CFBundleExecutable from Info.plist, i.e.
+# soffice, plus the contents of the Resources tree
+# (which at the moment is not much, far from all of
+# our non-code resources).
+
+# Don't bother yet to sign each individual .dylib. (We
+# do that for make dev-install, but not here.)
+
+# The executables have already been signed by
+# gb_LinkTarget__command_dynamiclink in
+# solenv/gbuild/platform/macosx.mk.
+
+# Eventually it would be a good idea to re-organise
+# the app bundle structure to be more Mac-like and
+# actually put all non-code resources (including
+# extension scripts!) into Resources so that they
+# participate in the signing and their validity can be
+# guaranteed.
+
+$systemcall = codesign --sign
$ENV{'MACOSX_CODESIGNING_IDENTITY'} --force -v -v -v
$localtempdir/$folder/$volume_name_classic_app.app;
print ... $systemcall ...\n;
my $returnvalue = system($systemcall);
$infoline = Systemcall: $systemcall\n;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: vcl/Library_vclplug_gen.mk vcl/Library_vclplug_gtk3.mk vcl/Library_vclplug_gtk.mk vcl/Library_vclplug_kde4.mk vcl/Library_vclplug_kde.mk vcl/Library_vclplug_svp.mk vcl/
vcl/Library_vclplug_gen.mk |3 ++- vcl/Library_vclplug_gtk.mk |3 ++- vcl/Library_vclplug_gtk3.mk |3 ++- vcl/Library_vclplug_kde.mk |3 ++- vcl/Library_vclplug_kde4.mk |3 ++- vcl/Library_vclplug_svp.mk |3 ++- vcl/Library_vclplug_tde.mk |3 ++- 7 files changed, 14 insertions(+), 7 deletions(-) New commits: commit 1b96fbb97c8f0a70c493387984f3b301b4d5378c Author: Andres Gomez ago...@igalia.com Date: Thu Apr 11 00:38:55 2013 +0300 vcl: conditionally link to jvmaccess When SOLAR_JAVA (Java) is not there, vcl plugins will not link against jvmaccess. Change-Id: I13e1ae7d605965b3609c6dfdaa66faa976382e65 Reviewed-on: https://gerrit.libreoffice.org/3320 Reviewed-by: Miklos Vajna vmik...@suse.cz Tested-by: Miklos Vajna vmik...@suse.cz diff --git a/vcl/Library_vclplug_gen.mk b/vcl/Library_vclplug_gen.mk index f3c6d7d..bea09db 100644 --- a/vcl/Library_vclplug_gen.mk +++ b/vcl/Library_vclplug_gen.mk @@ -37,7 +37,8 @@ $(eval $(call gb_Library_use_libraries,vclplug_gen,\ cppuhelper \ i18nlangtag \ i18nutil \ -jvmaccess \ +$(if $(filter TRUE,$(SOLAR_JAVA)), \ +jvmaccess) \ cppu \ sal \ )) diff --git a/vcl/Library_vclplug_gtk.mk b/vcl/Library_vclplug_gtk.mk index 6607d10..8c4d808 100644 --- a/vcl/Library_vclplug_gtk.mk +++ b/vcl/Library_vclplug_gtk.mk @@ -50,7 +50,8 @@ $(eval $(call gb_Library_use_libraries,vclplug_gtk,\ cppuhelper \ i18nlangtag \ i18nutil \ -jvmaccess \ +$(if $(filter TRUE,$(SOLAR_JAVA)), \ +jvmaccess) \ cppu \ sal \ )) diff --git a/vcl/Library_vclplug_gtk3.mk b/vcl/Library_vclplug_gtk3.mk index cd9b63a..948e528 100644 --- a/vcl/Library_vclplug_gtk3.mk +++ b/vcl/Library_vclplug_gtk3.mk @@ -60,7 +60,8 @@ $(eval $(call gb_Library_use_libraries,vclplug_gtk3,\ cppuhelper \ i18nlangtag \ i18nutil \ -jvmaccess \ +$(if $(filter TRUE,$(SOLAR_JAVA)), \ +jvmaccess) \ cppu \ sal \ )) diff --git a/vcl/Library_vclplug_kde.mk b/vcl/Library_vclplug_kde.mk index 5e9c666..1eedaa5 100644 --- a/vcl/Library_vclplug_kde.mk +++ b/vcl/Library_vclplug_kde.mk @@ -46,7 +46,8 @@ $(eval $(call gb_Library_use_libraries,vclplug_kde,\ cppuhelper \ i18nlangtag \ i18nutil \ -jvmaccess \ +$(if $(filter TRUE,$(SOLAR_JAVA)), \ +jvmaccess) \ cppu \ sal \ )) diff --git a/vcl/Library_vclplug_kde4.mk b/vcl/Library_vclplug_kde4.mk index 93f6858..45e1042 100644 --- a/vcl/Library_vclplug_kde4.mk +++ b/vcl/Library_vclplug_kde4.mk @@ -44,7 +44,8 @@ $(eval $(call gb_Library_use_libraries,vclplug_kde4,\ cppuhelper \ i18nlangtag \ i18nutil \ -jvmaccess \ +$(if $(filter TRUE,$(SOLAR_JAVA)), \ +jvmaccess) \ cppu \ sal \ )) diff --git a/vcl/Library_vclplug_svp.mk b/vcl/Library_vclplug_svp.mk index 7d40e5e..32e88dd 100644 --- a/vcl/Library_vclplug_svp.mk +++ b/vcl/Library_vclplug_svp.mk @@ -46,7 +46,8 @@ $(eval $(call gb_Library_use_libraries,vclplug_svp,\ cppuhelper \ i18nlangtag \ i18nutil \ -jvmaccess \ +$(if $(filter TRUE,$(SOLAR_JAVA)), \ +jvmaccess) \ cppu \ sal \ )) diff --git a/vcl/Library_vclplug_tde.mk b/vcl/Library_vclplug_tde.mk index f2c992b..2abfce0 100644 --- a/vcl/Library_vclplug_tde.mk +++ b/vcl/Library_vclplug_tde.mk @@ -68,7 +68,8 @@ $(eval $(call gb_Library_use_libraries,vclplug_tde,\ cppuhelper \ i18nlangtag \ i18nutil \ -jvmaccess \ +$(if $(filter TRUE,$(SOLAR_JAVA)), \ +jvmaccess) \ cppu \ sal \ )) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PUSHED] vcl: conditionally link to jvmaccess
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/3320 Approvals: Miklos Vajna: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/3320 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I13e1ae7d605965b3609c6dfdaa66faa976382e65 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Andres Gomez ago...@igalia.com Gerrit-Reviewer: Miklos Vajna vmik...@suse.cz ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: icon-themes/galaxy icon-themes/human icon-themes/oxygen
dev/null |binary 1 file changed New commits: commit 772747f1c21c6405321736ba8b505126ac571582 Author: Andras Timar ati...@suse.com Date: Thu Apr 11 09:45:57 2013 +0200 remove unused images Change-Id: I720c766aadd3ab64e16c101a1593700719bf0022 diff --git a/icon-themes/galaxy/sd/res/slide_sorter_command1_large.png b/icon-themes/galaxy/sd/res/slide_sorter_command1_large.png deleted file mode 100644 index 83bc671..000 Binary files a/icon-themes/galaxy/sd/res/slide_sorter_command1_large.png and /dev/null differ diff --git a/icon-themes/galaxy/sd/res/slide_sorter_command1_large_hc.png b/icon-themes/galaxy/sd/res/slide_sorter_command1_large_hc.png deleted file mode 100644 index 78023d9..000 Binary files a/icon-themes/galaxy/sd/res/slide_sorter_command1_large_hc.png and /dev/null differ diff --git a/icon-themes/galaxy/sd/res/slide_sorter_command1_large_hover.png b/icon-themes/galaxy/sd/res/slide_sorter_command1_large_hover.png deleted file mode 100644 index cfbcf36..000 Binary files a/icon-themes/galaxy/sd/res/slide_sorter_command1_large_hover.png and /dev/null differ diff --git a/icon-themes/galaxy/sd/res/slide_sorter_command1_large_hover_hc.png b/icon-themes/galaxy/sd/res/slide_sorter_command1_large_hover_hc.png deleted file mode 100644 index 035ca4a..000 Binary files a/icon-themes/galaxy/sd/res/slide_sorter_command1_large_hover_hc.png and /dev/null differ diff --git a/icon-themes/galaxy/sd/res/slide_sorter_command1_medium.png b/icon-themes/galaxy/sd/res/slide_sorter_command1_medium.png deleted file mode 100644 index 9b1cf00..000 Binary files a/icon-themes/galaxy/sd/res/slide_sorter_command1_medium.png and /dev/null differ diff --git a/icon-themes/galaxy/sd/res/slide_sorter_command1_medium_hc.png b/icon-themes/galaxy/sd/res/slide_sorter_command1_medium_hc.png deleted file mode 100644 index 478b78c..000 Binary files a/icon-themes/galaxy/sd/res/slide_sorter_command1_medium_hc.png and /dev/null differ diff --git a/icon-themes/galaxy/sd/res/slide_sorter_command1_medium_hover.png b/icon-themes/galaxy/sd/res/slide_sorter_command1_medium_hover.png deleted file mode 100644 index 4aa4dcd..000 Binary files a/icon-themes/galaxy/sd/res/slide_sorter_command1_medium_hover.png and /dev/null differ diff --git a/icon-themes/galaxy/sd/res/slide_sorter_command1_medium_hover_hc.png b/icon-themes/galaxy/sd/res/slide_sorter_command1_medium_hover_hc.png deleted file mode 100644 index 803fc31..000 Binary files a/icon-themes/galaxy/sd/res/slide_sorter_command1_medium_hover_hc.png and /dev/null differ diff --git a/icon-themes/galaxy/sd/res/slide_sorter_command1_small.png b/icon-themes/galaxy/sd/res/slide_sorter_command1_small.png deleted file mode 100644 index c49b1b2..000 Binary files a/icon-themes/galaxy/sd/res/slide_sorter_command1_small.png and /dev/null differ diff --git a/icon-themes/galaxy/sd/res/slide_sorter_command1_small_hc.png b/icon-themes/galaxy/sd/res/slide_sorter_command1_small_hc.png deleted file mode 100644 index 9b7fa5a..000 Binary files a/icon-themes/galaxy/sd/res/slide_sorter_command1_small_hc.png and /dev/null differ diff --git a/icon-themes/galaxy/sd/res/slide_sorter_command1_small_hover.png b/icon-themes/galaxy/sd/res/slide_sorter_command1_small_hover.png deleted file mode 100644 index e375884..000 Binary files a/icon-themes/galaxy/sd/res/slide_sorter_command1_small_hover.png and /dev/null differ diff --git a/icon-themes/galaxy/sd/res/slide_sorter_command1_small_hover_hc.png b/icon-themes/galaxy/sd/res/slide_sorter_command1_small_hover_hc.png deleted file mode 100644 index 7456e82..000 Binary files a/icon-themes/galaxy/sd/res/slide_sorter_command1_small_hover_hc.png and /dev/null differ diff --git a/icon-themes/galaxy/sd/res/slide_sorter_command2_large.png b/icon-themes/galaxy/sd/res/slide_sorter_command2_large.png deleted file mode 100644 index 13f3d1d..000 Binary files a/icon-themes/galaxy/sd/res/slide_sorter_command2_large.png and /dev/null differ diff --git a/icon-themes/galaxy/sd/res/slide_sorter_command2_large_hc.png b/icon-themes/galaxy/sd/res/slide_sorter_command2_large_hc.png deleted file mode 100644 index 84d4f02..000 Binary files a/icon-themes/galaxy/sd/res/slide_sorter_command2_large_hc.png and /dev/null differ diff --git a/icon-themes/galaxy/sd/res/slide_sorter_command2_large_hover.png b/icon-themes/galaxy/sd/res/slide_sorter_command2_large_hover.png deleted file mode 100644 index f5aebce..000 Binary files a/icon-themes/galaxy/sd/res/slide_sorter_command2_large_hover.png and /dev/null differ diff --git a/icon-themes/galaxy/sd/res/slide_sorter_command2_large_hover_hc.png b/icon-themes/galaxy/sd/res/slide_sorter_command2_large_hover_hc.png deleted file mode 100644 index 7d67118..000 Binary files a/icon-themes/galaxy/sd/res/slide_sorter_command2_large_hover_hc.png and /dev/null differ diff --git a/icon-themes/galaxy/sd/res/slide_sorter_command2_medium.png
[Libreoffice-commits] core.git: solenv/bin
solenv/bin/linkoo | 15 +++
1 file changed, 15 insertions(+)
New commits:
commit 53ac5b9a559f707224465527c46cca0a6023d1b2
Author: Jan Holesovsky ke...@suse.cz
Date: Thu Apr 11 09:53:24 2013 +0200
linkoo: Link .rdb files again.
A stale types.rdb can cause that you spend 2 hours debugging hard core UNO
exception throwing - like me yesterday...
Change-Id: I5eb88a9f1d2c9dd34f1e7945d449b697d3253193
diff --git a/solenv/bin/linkoo b/solenv/bin/linkoo
index 2bf9f7b..2c052e1 100755
--- a/solenv/bin/linkoo
+++ b/solenv/bin/linkoo
@@ -506,6 +506,20 @@ sub link_ui_files()
print \n;
}
+sub link_rdb_files()
+{
+print linking rdb:;
+my $src_prefix = $SOLARVER/$TARGET/;
+my $dest_prefix = $OOO_INSTALL/;
+
+do_link ($src_prefix . xml , $dest_prefix . $brand_program_dir .
/services, services.rdb, services.rdb);
+do_link ($src_prefix . xml/ure , $dest_prefix . ure/share/misc,
services.rdb, services.rdb);
+
+do_link ($src_prefix . bin/ure , $dest_prefix . ure/share/misc,
types.rdb, types.rdb);
+
+print \n;
+}
+
evilness ('undo');
my $installed_files = build_installed_list ($OOO_INSTALL);
@@ -514,6 +528,7 @@ scan_and_link_files ($OOO_BUILD, $installed_files, $TARGET);
link_gdb_py();
link_pagein_files();
link_ui_files();
+link_rdb_files();
if (!-f $OOO_INSTALL/ . $brand_program_dir . /ooenv) {
my $ooenv;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - touch/CustomTarget_touch_javamaker.mk touch/README
touch/CustomTarget_touch_javamaker.mk |2 +- touch/README | 10 ++ 2 files changed, 7 insertions(+), 5 deletions(-) New commits: commit 752d005d85cd269fddf061f5175b3fbab5354e12 Author: Tor Lillqvist t...@iki.fi Date: Thu Apr 11 10:57:44 2013 +0300 Update README Change-Id: I5caa9c10605ff806677958a2d28428a0cab0d906 diff --git a/touch/README b/touch/README index f1be5df..7f05bd2 100644 --- a/touch/README +++ b/touch/README @@ -1,9 +1,11 @@ Library that provides API used by LO-based apps on touch devices -This is all very much a work in progress and the design can change radically -at any moment. The name touch for this module and the library name -libotouch are not fixed and might change if somebody comes up with niftier -names. +This is all very much a work in progress and the design can change +radically at any moment. And actually at the moment it is unclear +whether this will be used or not. + +The name touch for this module and the library name libotouch are +not fixed and might change if somebody comes up with niftier names. This module will contain an UNO API to be called either from Java (for Android), or directly (iOS). (Or, on iOS, possibly through some thin commit 5f8015045cb59ff9574230530d371b6659697881 Author: Tor Lillqvist t...@iki.fi Date: Thu Apr 11 10:57:32 2013 +0300 No -BUCR option to javamaker any more Change-Id: I1b418c563c30be959b771a474ed9c699f71b57e7 diff --git a/touch/CustomTarget_touch_javamaker.mk b/touch/CustomTarget_touch_javamaker.mk index f0537fa..40e6279 100644 --- a/touch/CustomTarget_touch_javamaker.mk +++ b/touch/CustomTarget_touch_javamaker.mk @@ -17,6 +17,6 @@ $(touch_javamaker_DIR)/done : $(call gb_UnoApiTarget_get_target,touch) $(OUTDIR) $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),JVM,1) $(call gb_Helper_abbreviate_dirs, \ rm -r $(touch_javamaker_DIR) \ - $(call gb_Helper_execute,javamaker -BUCR -nD -O$(touch_javamaker_DIR)/class -X$(OUTDIR)/bin/types.rdb $) touch $@) + $(call gb_Helper_execute,javamaker -nD -O$(touch_javamaker_DIR)/class -X$(OUTDIR)/bin/types.rdb $) touch $@) # vim: set noet sw=4 ts=4: ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/source
sc/source/filter/xml/xmlfonte.cxx | 85 +++---
1 file changed, 53 insertions(+), 32 deletions(-)
New commits:
commit 30704655570ea2b4c6943e18de02497284b2174c
Author: Armin Le Grand a...@apache.org
Date: Fri Jun 29 08:28:49 2012 +
Related: #i120077# Added local var for SfxItemPool for EditEngine
to avoid a memory leak.
Found by: Chao Huang
Patch by: Chao Huang, alg
Review by: Chao Huang, alg
(cherry picked from commit e7168710bfd30b5d682d21d81c116cd33cf22505)
Conflicts:
sc/source/filter/xml/xmlfonte.cxx
Change-Id: I75475bb59b3a7040938826d095dcd81e19d61b46
diff --git a/sc/source/filter/xml/xmlfonte.cxx
b/sc/source/filter/xml/xmlfonte.cxx
index 9b0c263..50296ba 100644
--- a/sc/source/filter/xml/xmlfonte.cxx
+++ b/sc/source/filter/xml/xmlfonte.cxx
@@ -32,11 +32,15 @@
class ScXMLFontAutoStylePool_Impl: public XMLFontAutoStylePool
{
+private:
+// #i120077# remember owned pool
+SfxItemPool*mpEditEnginePool;
+
void AddFontItems(sal_uInt16* pWhichIds, sal_uInt8 nIdCount, const
SfxItemPool* pItemPool, const sal_Bool bExportDefaults);
-public:
+public:
ScXMLFontAutoStylePool_Impl( ScXMLExport rExport, bool
bBlockFontEmbedding );
-
+virtual ~ScXMLFontAutoStylePool_Impl();
};
void ScXMLFontAutoStylePool_Impl::AddFontItems(sal_uInt16* pWhichIds,
sal_uInt8 nIdCount, const SfxItemPool* pItemPool, const sal_Bool
bExportDefaults)
@@ -66,9 +70,9 @@ void ScXMLFontAutoStylePool_Impl::AddFontItems(sal_uInt16*
pWhichIds, sal_uInt8
}
}
-ScXMLFontAutoStylePool_Impl::ScXMLFontAutoStylePool_Impl(
-ScXMLExport rExportP, bool bBlockFontEmbedding ) :
-XMLFontAutoStylePool( rExportP, bBlockFontEmbedding )
+ScXMLFontAutoStylePool_Impl::ScXMLFontAutoStylePool_Impl(ScXMLExport
rExportP, bool bBlockFontEmbedding)
+: XMLFontAutoStylePool(rExportP, bBlockFontEmbedding)
+, mpEditEnginePool(NULL)
{
sal_uInt16 aWhichIds[3] = { ATTR_FONT, ATTR_CJK_FONT,
ATTR_CTL_FONT };
@@ -92,46 +96,63 @@ ScXMLFontAutoStylePool_Impl::ScXMLFontAutoStylePool_Impl(
if(pItr)
{
SfxStyleSheetBase* pStyle(pItr-First());
-SfxItemPool* pPageEditPool(EditEngine::CreatePool());
-EditEngine aEditEngine(pPageEditPool);
-while (pStyle)
+
+if(pStyle)
{
-const SfxItemPool rPagePool(pStyle-GetPool().GetPool());
-for (sal_uInt8 j = 0; j 4; ++j)
+// #i120077# remember the SfxItemPool in member variable before
usage. The
+// local EditEngine will not take over ownership of the pool.
+mpEditEnginePool = EditEngine::CreatePool();
+EditEngine aEditEngine(mpEditEnginePool);
+
+while (pStyle)
{
-sal_uInt16 nPageWhichId(aPageWhichIds[j]);
-sal_uInt32 nPageHFItems(rPagePool.GetItemCount2(nPageWhichId));
-const ScPageHFItem* pPageItem;
-for (sal_uInt32 k = 0; k nPageHFItems; ++k)
+const SfxItemPool rPagePool(pStyle-GetPool().GetPool());
+
+for (sal_uInt8 j = 0; j 4; ++j)
{
-if (0 != (pPageItem = static_castconst
ScPageHFItem*(rPagePool.GetItem2(nPageWhichId, k
+sal_uInt16 nPageWhichId(aPageWhichIds[j]);
+sal_uInt32
nPageHFItems(rPagePool.GetItemCount2(nPageWhichId));
+const ScPageHFItem* pPageItem;
+for (sal_uInt32 k = 0; k nPageHFItems; ++k)
{
-const EditTextObject*
pLeftArea(pPageItem-GetLeftArea());
-if (pLeftArea)
-{
-aEditEngine.SetText(*pLeftArea);
-AddFontItems(aEditWhichIds, 3, pPageEditPool,
false);
-}
-const EditTextObject*
pCenterArea(pPageItem-GetCenterArea());
-if (pCenterArea)
+if (0 != (pPageItem = static_castconst
ScPageHFItem*(rPagePool.GetItem2(nPageWhichId, k
{
-aEditEngine.SetText(*pCenterArea);
-AddFontItems(aEditWhichIds, 3, pPageEditPool,
false);
-}
-const EditTextObject*
pRightArea(pPageItem-GetRightArea());
-if (pRightArea)
-{
-aEditEngine.SetText(*pRightArea);
-AddFontItems(aEditWhichIds, 3, pPageEditPool,
false);
+const EditTextObject*
pLeftArea(pPageItem-GetLeftArea());
+if (pLeftArea)
+{
+aEditEngine.SetText(*pLeftArea);
+
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - e7/168710bfd30b5d682d21d81c116cd33cf22505
e7/168710bfd30b5d682d21d81c116cd33cf22505 |1 + 1 file changed, 1 insertion(+) New commits: commit f0c899a1a073f129ba0f89475c57ca6901fff9c8 Author: Caolán McNamara caol...@redhat.com Date: Thu Apr 11 09:36:39 2013 +0100 Notes added by 'git notes add' diff --git a/e7/168710bfd30b5d682d21d81c116cd33cf22505 b/e7/168710bfd30b5d682d21d81c116cd33cf22505 new file mode 100644 index 000..58385c5 --- /dev/null +++ b/e7/168710bfd30b5d682d21d81c116cd33cf22505 @@ -0,0 +1 @@ +merged as: 30704655570ea2b4c6943e18de02497284b2174c ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/source
sw/source/core/layout/laycache.cxx | 16 +---
1 file changed, 5 insertions(+), 11 deletions(-)
New commits:
commit e1695087a3755a80de6a14490b7e4395742cf161
Author: Jan Holesovsky ke...@suse.cz
Date: Thu Apr 11 10:51:19 2013 +0200
i#29679: Return early not to crash on ooo29679-57.odt in dbgutil build.
Change-Id: I467f6383ec469f5719fd49914d81605b2a5679a1
diff --git a/sw/source/core/layout/laycache.cxx
b/sw/source/core/layout/laycache.cxx
index 20f23c1..807a40b 100644
--- a/sw/source/core/layout/laycache.cxx
+++ b/sw/source/core/layout/laycache.cxx
@@ -338,7 +338,6 @@ sal_Bool SwLayoutCache::CompareLayout( const SwDoc rDoc )
const
if( !pImpl )
return sal_True;
const SwRootFrm *pRootFrm = rDoc.GetCurrentLayout();
-sal_Bool bRet = sal_True;
if( pRootFrm )
{
sal_uInt16 nIndex = 0;
@@ -350,11 +349,8 @@ sal_Bool SwLayoutCache::CompareLayout( const SwDoc rDoc )
const
while( pPage )
{
if( nIndex = pImpl-size() )
-{
-if( bRet )
-bRet = sal_False;
-break;
-}
+return sal_False;
+
SwLayoutFrm* pLay = pPage-FindBodyCont();
SwFrm* pTmp = pLay ? pLay-ContainsAny() : NULL;
if( pTmp pTmp-IsSctFrm() )
@@ -374,8 +370,7 @@ sal_Bool SwLayoutCache::CompareLayout( const SwDoc rDoc )
const
( bFollow ? ((SwTxtFrm*)pTmp)-GetOfst()
: STRING_LEN ) != pImpl-GetBreakOfst( nIndex ) )
{
-if( bRet )
-bRet = sal_False;
+return sal_False;
}
++nIndex;
}
@@ -412,8 +407,7 @@ sal_Bool SwLayoutCache::CompareLayout( const SwDoc rDoc )
const
pImpl-GetBreakType( nIndex ) ||
nOfst != pImpl-GetBreakOfst( nIndex ) )
{
-if( bRet )
-bRet = sal_False;
+return sal_False;
}
++nIndex;
}
@@ -446,7 +440,7 @@ sal_Bool SwLayoutCache::CompareLayout( const SwDoc rDoc )
const
pPage = (SwPageFrm*)pPage-GetNext();
}
}
-return bRet;
+return sal_True;
}
#endif
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: plans with libmerged
On 04/10/2013 03:18 PM, Michael Meeks wrote: On Wed, 2013-04-10 at 09:04 +0200, Stephan Bergmann wrote: This is one place where the split into URE and LO directories may become a nuisance. (It was rather harmless for other scenarios, even helps keeping the URE interface well-defined for extensions, so there's never been much incentive in undoing that.) I assume there is ABI impact in unfolding the URE hierarchy out of /ure/lib etc. if so we'd need to keep it as-is. There shouldn't be, at least not for well-behaved clients. See also http://lists.freedesktop.org/archives/libreoffice/2011-September/018479.html [Libreoffice] Undoing basis/brand split in 3.5: There is also a URE/rest split, which I will not touch for now. At least Debian seems to be interested in having a stand alone URE on top of which sits a LibO alongside potentially more apps. ...and response http://lists.freedesktop.org/archives/libreoffice/2011-September/018486.html Re: [Libreoffice] Undoing basis/brand split in 3.5: IMHO, we need to drop the URE too - leaving only a vestigal skeleton of back-compatible ure stub libraries that are linked to the main 'monster' Link Time Optimised library (with them included). Stephan ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: plans with libmerged
On Wed, 2013-04-10 at 17:07 -0400, Peter Foley wrote: And did you get any further with the debugging ? Ok, I'll take a look at adding a mergelibs=all option. Great ! :-) I decided that it would probly be easier to just start over rather than trying to debug the errors I was getting. Hopefully in a deterministic world you'll get to the same problem in the end ;-) and then we can nail it... ATB, Michael. -- michael.me...@suse.com , Pseudo Engineer, itinerant idiot ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: xmloff/source
xmloff/source/text/txtlists.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 5b33bca6cc058fb10ad0eccb229e97cb7faef4a5
Author: Jan Holesovsky ke...@suse.cz
Date: Thu Apr 11 11:31:40 2013 +0200
i#52127: Avoid .back() on an empty vector, fixes ooo52127-1.odt.
Change-Id: I3463b727e024260c13a01c017cfd96109a793cb1
diff --git a/xmloff/source/text/txtlists.cxx b/xmloff/source/text/txtlists.cxx
index cdbb3c5..bba2e71 100644
--- a/xmloff/source/text/txtlists.cxx
+++ b/xmloff/source/text/txtlists.cxx
@@ -379,7 +379,7 @@ XMLTextListsHelper::EnsureNumberedParagraph(
OSL_ENSURE(io_rLevel = 0, invalid Level);
NumParaList_t rNPList( mNPLists[i_ListId] );
const OUString none; // default
-if ( rNPList.empty() (0 != io_rLevel)) {
+if ( rNPList.empty() ) {
// create default list style for top level
sal_Int16 lev(0);
rNPList.push_back(::std::make_pair(none,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: ios/CustomTarget_LibreOffice_app.mk
ios/CustomTarget_LibreOffice_app.mk |3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) New commits: commit e2d31c5e705e6e4d6b0185bebba66a55e77981f4 Author: David Tardon dtar...@redhat.com Date: Thu Apr 11 12:06:48 2013 +0200 fix ios build Change-Id: Id8c405e63abec3d8c1d3c5f8fb7f40ba082c9f47 diff --git a/ios/CustomTarget_LibreOffice_app.mk b/ios/CustomTarget_LibreOffice_app.mk index 581ebb4..da789c8 100644 --- a/ios/CustomTarget_LibreOffice_app.mk +++ b/ios/CustomTarget_LibreOffice_app.mk @@ -81,8 +81,7 @@ $(SCRIPT_OUTPUT_FILE_0) : $(call gb_Executable_get_target,LibreOffice) # # soffice.cfg # - mkdir -p $(appdir)/share/config/soffice.cfg - cp -R $(OUTDIR)/xml/uiconfig/* $(appdir)/share/config/soffice.cfg + cp -R $(INSDIR)/share/config/soffice.cfg $(appdir)/share/config # # registry # ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sd/inc sd/source svx/inc svx/source
sd/inc/app.hrc|1 sd/inc/glob.hrc |2 + sd/source/core/drawdoc.cxx|3 + sd/source/core/drawdoc4.cxx | 12 +++ sd/source/core/glob.src |4 ++ sd/source/core/stlpool.cxx|1 sd/source/ui/func/fuinsert.cxx|1 sd/source/ui/view/sdview4.cxx |1 svx/inc/svx/sdr/primitive2d/sdrattributecreator.hxx |3 + svx/inc/svx/svdmodel.hxx |5 +++ svx/source/sdr/contact/viewcontactofgraphic.cxx | 29 -- svx/source/sdr/contact/viewcontactofsdrcaptionobj.cxx |3 + svx/source/sdr/contact/viewcontactofsdrcircobj.cxx|3 + svx/source/sdr/contact/viewcontactofsdrole2obj.cxx|6 +++ svx/source/sdr/contact/viewcontactofsdrpathobj.cxx|3 + svx/source/sdr/contact/viewcontactofsdrrectobj.cxx|3 + svx/source/sdr/primitive2d/sdrattributecreator.cxx|9 - svx/source/sdr/properties/graphicproperties.cxx |4 -- svx/source/sdr/properties/oleproperties.cxx |4 -- svx/source/svdraw/svdmodel.cxx|1 svx/source/svdraw/svdograf.cxx| 20 svx/source/svdraw/svdoole2.cxx| 22 + 22 files changed, 102 insertions(+), 38 deletions(-) New commits: commit 0a29c5bedda700a86b46e3c3cd9c9e1ce1d4f278 Author: Armin Le Grand a...@apache.org Date: Thu May 31 13:23:45 2012 + Resolves: #i119287# exchanged hard attributes for OLE and GraphicObject ...with new default StyleSheet for these objects (cherry picked from commit 2868ea34151cfb623a6a8bf41862d430205d9784) Conflicts: sd/source/core/drawdoc4.cxx svx/source/sdr/contact/viewcontactofgraphic.cxx Change-Id: I4849101de2ac1da83c8fb0f2d68316774982d197 Resolves: #i119287# Adapted to get the needed style as default style for all SdrGrafObj and SDrOle2Objs. Checked various scenarios, works well. (cherry picked from commit bc85939149f7ae5b65343d7f27bf302a8e31d4b1) Conflicts: sd/source/core/drawdoc.cxx sd/source/ui/func/fuinsert.cxx sd/source/ui/view/sdview4.cxx Change-Id: I40a17216f5c11ebca073026f62f1e9ab9ddfd119 diff --git a/sd/inc/app.hrc b/sd/inc/app.hrc index 5dc3b3d..d421a9b 100644 --- a/sd/inc/app.hrc +++ b/sd/inc/app.hrc @@ -53,6 +53,7 @@ #define HID_PSEUDOSHEET_BACKGROUND (HID_SD_START + 97) #define HID_PSEUDOSHEET_NOTES (HID_SD_START + 98) #define HID_PSEUDOSHEET_SUBTITLE(HID_SD_START + 101) +#define HID_POOLSHEET_OBJNOLINENOFILL (HID_SD_START + 102) #define HID_SD_CELL_STYLE_DEFAULT (HID_SD_START + 194) #define HID_SD_CELL_STYLE_BANDED(HID_SD_START + 195) diff --git a/sd/inc/glob.hrc b/sd/inc/glob.hrc index 009b092..afbb483 100644 --- a/sd/inc/glob.hrc +++ b/sd/inc/glob.hrc @@ -97,6 +97,8 @@ #define STR_POOLSHEET_FIRST_COLUMN RID_GLOB_START+73 #define STR_POOLSHEET_LAST_COLUMN RID_GLOB_START+74 // +#define STR_POOLSHEET_OBJNOLINENOFILL RID_GLOB_START+75 +// #define STR_PSEUDOSHEET_TITLE RID_GLOB_START+80 #define STR_PSEUDOSHEET_OUTLINE RID_GLOB_START+81 #define STR_PSEUDOSHEET_BACKGROUNDOBJECTS RID_GLOB_START+82 diff --git a/sd/source/core/drawdoc.cxx b/sd/source/core/drawdoc.cxx index 844b930..6a283d4 100644 --- a/sd/source/core/drawdoc.cxx +++ b/sd/source/core/drawdoc.cxx @@ -594,6 +594,9 @@ void SdDrawDocument::NewOrLoadCompleted(DocCreationMode eMode) String aName( SdResId(STR_STANDARD_STYLESHEET_NAME)); SetDefaultStyleSheet(static_castSfxStyleSheet*(mxStyleSheetPool-Find(aName, SD_STYLE_FAMILY_GRAPHICS))); +// #i119287# Set default StyleSheet for SdrGrafObj and SdrOle2Obj + SetDefaultStyleSheetForSdrGrafObjAndSdrOle2Obj(static_castSfxStyleSheet*(mxStyleSheetPool-Find(String( SdResId(STR_POOLSHEET_OBJNOLINENOFILL)), SD_STYLE_FAMILY_GRAPHICS))); + // Initialize DrawOutliner and DocumentOutliner, but don't initialize the // global outliner, as it is not document specific like StyleSheetPool and // StyleRequestHandler are. diff --git a/sd/source/core/drawdoc4.cxx b/sd/source/core/drawdoc4.cxx index 3f24709..3cdfe86 100644 --- a/sd/source/core/drawdoc4.cxx +++ b/sd/source/core/drawdoc4.cxx @@ -293,7 +293,19 @@ void SdDrawDocument::CreateLayoutTemplates() pISet-Put(XFillStyleItem(XFILL_NONE)); pISet-Put(XLineColorItem(String(), RGB_Color(COL_BLACK))); +// Object no fill no line + +aName = String(SdResId(STR_POOLSHEET_OBJNOLINENOFILL)); +pSheet = (pSSPool-Make(aName, SD_STYLE_FAMILY_GRAPHICS, nMask)); +pSheet-SetParent(aStdName);
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 2 commits - 28/68ea34151cfb623a6a8bf41862d430205d9784 bc/85939149f7ae5b65343d7f27bf302a8e31d4b1
28/68ea34151cfb623a6a8bf41862d430205d9784 |1 + bc/85939149f7ae5b65343d7f27bf302a8e31d4b1 |1 + 2 files changed, 2 insertions(+) New commits: commit 81d461e8410854086aea6ef3082fea90f0a6f9b6 Author: Caolán McNamara caol...@redhat.com Date: Thu Apr 11 11:23:45 2013 +0100 Notes added by 'git notes add' diff --git a/bc/85939149f7ae5b65343d7f27bf302a8e31d4b1 b/bc/85939149f7ae5b65343d7f27bf302a8e31d4b1 new file mode 100644 index 000..6eb84dc --- /dev/null +++ b/bc/85939149f7ae5b65343d7f27bf302a8e31d4b1 @@ -0,0 +1 @@ +merged as: 0a29c5bedda700a86b46e3c3cd9c9e1ce1d4f278 commit f37ef68210a0947afca9a65cb6a65247abae8286 Author: Caolán McNamara caol...@redhat.com Date: Thu Apr 11 11:23:38 2013 +0100 Notes added by 'git notes add' diff --git a/28/68ea34151cfb623a6a8bf41862d430205d9784 b/28/68ea34151cfb623a6a8bf41862d430205d9784 new file mode 100644 index 000..6eb84dc --- /dev/null +++ b/28/68ea34151cfb623a6a8bf41862d430205d9784 @@ -0,0 +1 @@ +merged as: 0a29c5bedda700a86b46e3c3cd9c9e1ce1d4f278 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: xmlhelp/source
xmlhelp/source/cxxhelp/provider/databases.cxx | 27 ++
1 file changed, 27 insertions(+)
New commits:
commit c9d5cfa194e9e27e144e801ab179a708d77663b9
Author: Andras Timar ati...@suse.com
Date: Thu Apr 11 03:38:38 2013 -0700
detect and apply Windows' high contrast theme to local help
Change-Id: Ibd45773179be334991d0d493324cadaad772ea33
diff --git a/xmlhelp/source/cxxhelp/provider/databases.cxx
b/xmlhelp/source/cxxhelp/provider/databases.cxx
index 2428c66..447d1e0 100644
--- a/xmlhelp/source/cxxhelp/provider/databases.cxx
+++ b/xmlhelp/source/cxxhelp/provider/databases.cxx
@@ -66,6 +66,10 @@
#include databases.hxx
#include urlparameter.hxx
+#ifdef WNT
+#include windows.h
+#endif
+
using namespace chelp;
using namespace com::sun::star;
using namespace com::sun::star::uno;
@@ -1146,7 +1150,30 @@ void Databases::cascadingStylesheet( const OUString
Language,
{
uno::Any aHCMode = xVclWindowPeer-getProperty( OUString(
HighContrastMode ) );
if ( ( aHCMode = bHighContrastMode )
bHighContrastMode )
+{
aCSS = OUString( highcontrastblack );
+#ifdef WNT
+HKEY hKey = NULL;
+LONG lResult = RegOpenKeyExA( HKEY_CURRENT_USER,
Control Panel\\Accessibility\\HighContrast, 0, KEY_QUERY_VALUE, hKey );
+if ( ERROR_SUCCESS == lResult )
+{
+CHAR szBuffer[1024];
+DWORD nSize = sizeof( szBuffer );
+lResult = RegQueryValueExA( hKey, High Contrast
Scheme, NULL, NULL, (LPBYTE)szBuffer, nSize );
+if ( ERROR_SUCCESS == lResult nSize 0 )
+{
+szBuffer[nSize] = '\0';
+if ( strncmp( szBuffer, High Contrast #1,
strlen(High Contrast #1) ) == 0 )
+aCSS = OUString( highcontrast1 );
+if ( strncmp( szBuffer, High Contrast #2,
strlen(High Contrast #2) ) == 0 )
+aCSS = OUString( highcontrast2 );
+if ( strncmp( szBuffer, High Contrast White,
strlen(High Contrast White) ) == 0 )
+aCSS = OUString( highcontrastwhite );
+}
+RegCloseKey( hKey );
+}
+#endif
+}
}
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - android/experimental ios/CustomTarget_LibreOffice_app.mk
android/experimental/DocumentLoader/Makefile |4 ++-- android/experimental/LibreOffice4Android/Makefile |4 ++-- android/experimental/desktop/Makefile |4 ++-- ios/CustomTarget_LibreOffice_app.mk |2 +- 4 files changed, 7 insertions(+), 7 deletions(-) New commits: commit f204dc1f8f386567b0b6bff0c4e39ce211aac793 Author: Tor Lillqvist t...@iki.fi Date: Thu Apr 11 13:37:54 2013 +0300 Get soffice.cfg from its new location for Android, too Change-Id: I2d65b51ec9a223994d39dc9433d1290b44422e1d diff --git a/android/experimental/DocumentLoader/Makefile b/android/experimental/DocumentLoader/Makefile index 9977215..9336ba5 100644 --- a/android/experimental/DocumentLoader/Makefile +++ b/android/experimental/DocumentLoader/Makefile @@ -39,10 +39,10 @@ copy-stuff: assets cp $(WORKDIR)/ComponentTarget/i18npool/util/i18npool.component assets/ComponentTarget/i18npool/util # - mkdir -p assets/ure/share/misc assets/share/registry/res assets/share/config/soffice.cfg + mkdir -p assets/ure/share/misc assets/share/registry/res assets/share/config cp -R $(OUTDIR)/xml/*.xcd assets/share/registry mv assets/share/registry/fcfg_langpack_en-US.xcd assets/share/registry/res - cp -R $(OUTDIR)/xml/uiconfig/* assets/share/config/soffice.cfg + cp -R $(INSTDIR)/share/config/soffice.cfg assets/share/config cp -R $(OUTDIR)/xml/registry/* assets/share/registry # # Set up rc, the inifile. See BootstrapMap::getBaseIni(). As this app diff --git a/android/experimental/LibreOffice4Android/Makefile b/android/experimental/LibreOffice4Android/Makefile index 9b1aaa2..4e63b69 100644 --- a/android/experimental/LibreOffice4Android/Makefile +++ b/android/experimental/LibreOffice4Android/Makefile @@ -39,10 +39,10 @@ copy-stuff: assets cp $(WORKDIR)/ComponentTarget/i18npool/util/i18npool.component assets/ComponentTarget/i18npool/util # - mkdir -p assets/ure/share/misc assets/share/registry/res assets/share/config/soffice.cfg + mkdir -p assets/ure/share/misc assets/share/registry/res assets/share/config cp -R $(OUTDIR)/xml/*.xcd assets/share/registry mv assets/share/registry/fcfg_langpack_en-US.xcd assets/share/registry/res - cp -R $(OUTDIR)/xml/uiconfig/* assets/share/config/soffice.cfg + cp -R $(INSTDIR)/share/config/soffice.cfg assets/share/config cp -R $(OUTDIR)/xml/registry/* assets/share/registry # # Set up rc, the inifile. See BootstrapMap::getBaseIni(). As this app diff --git a/android/experimental/desktop/Makefile b/android/experimental/desktop/Makefile index db35879..f63abc0 100644 --- a/android/experimental/desktop/Makefile +++ b/android/experimental/desktop/Makefile @@ -40,10 +40,10 @@ copy-stuff: assets cp $(WORKDIR)/ComponentTarget/i18npool/util/i18npool.component assets/ComponentTarget/i18npool/util # - mkdir -p assets/ure/share/misc assets/share/registry/res assets/share/config/soffice.cfg + mkdir -p assets/ure/share/misc assets/share/registry/res assets/share/config cp -R $(OUTDIR)/xml/*.xcd assets/share/registry mv assets/share/registry/fcfg_langpack_en-US.xcd assets/share/registry/res - cp -R $(OUTDIR)/xml/uiconfig/* assets/share/config/soffice.cfg + cp -R $(INSTDIR)/share/config/soffice.cfg assets/share/config cp -R $(OUTDIR)/xml/registry/* assets/share/registry # # Set up rc, the inifile. See BootstrapMap::getBaseIni(). As this app commit 25c6386a52209c5b00e1310c0b54df1f51d17bb6 Author: Tor Lillqvist t...@iki.fi Date: Thu Apr 11 13:37:06 2013 +0300 Typo Change-Id: I87c74eb6e4f9aa4f06bfca00817b4d04d7d84b40 diff --git a/ios/CustomTarget_LibreOffice_app.mk b/ios/CustomTarget_LibreOffice_app.mk index da789c8..21a6fac 100644 --- a/ios/CustomTarget_LibreOffice_app.mk +++ b/ios/CustomTarget_LibreOffice_app.mk @@ -81,7 +81,7 @@ $(SCRIPT_OUTPUT_FILE_0) : $(call gb_Executable_get_target,LibreOffice) # # soffice.cfg # - cp -R $(INSDIR)/share/config/soffice.cfg $(appdir)/share/config + cp -R $(INSTDIR)/share/config/soffice.cfg $(appdir)/share/config # # registry # ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PATCH] fdo#63154: Change macros Min/Max for std::min/max
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/3326 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/26/3326/1 fdo#63154: Change macros Min/Max for std::min/max Now all these usages were removed from LO. Change-Id: I8a7233db20abdcdbb18428ad4004c78cc516a0e6 --- M UnoControls/source/controls/progressmonitor.cxx M accessibility/source/standard/vclxaccessiblelist.cxx M basctl/source/basicide/baside2.cxx M basic/source/runtime/methods.cxx M chart2/source/tools/CommonConverters.cxx M connectivity/source/drivers/dbase/DTable.cxx M connectivity/source/drivers/file/FNoException.cxx M connectivity/source/drivers/file/FResultSet.cxx M cui/source/customize/cfg.cxx M cui/source/dialogs/cuigrfflt.cxx M cui/source/options/fontsubs.cxx M cui/source/options/optinet2.cxx M cui/source/tabpages/page.cxx M cui/source/tabpages/swpossizetabpage.cxx M cui/source/tabpages/tpcolor.cxx M dbaccess/source/ui/querydesign/ConnectionLine.cxx M editeng/source/editeng/editdoc.cxx M editeng/source/editeng/impedit.cxx M editeng/source/editeng/impedit2.cxx M editeng/source/editeng/impedit3.cxx M editeng/source/editeng/impedit4.cxx M editeng/source/items/svxfont.cxx M editeng/source/items/textitem.cxx M editeng/source/outliner/outliner.cxx M filter/source/flash/swfwriter1.cxx M filter/source/graphicfilter/itiff/itiff.cxx M filter/source/svg/svgwriter.cxx M forms/source/component/GroupManager.cxx M fpicker/source/office/iodlg.cxx M linguistic/source/dicimp.cxx M linguistic/source/spelldta.cxx M reportdesign/source/ui/report/dlgedfunc.cxx M sc/inc/attarray.hxx M sc/inc/bigrange.hxx M sc/source/core/data/attarray.cxx M sc/source/core/data/column.cxx M sc/source/core/data/column3.cxx M sc/source/core/data/dociter.cxx M sc/source/core/data/documen2.cxx M sc/source/core/data/documen4.cxx M sc/source/core/data/document.cxx M sc/source/core/data/dptabsrc.cxx M sc/source/core/data/drwlayer.cxx M sc/source/core/data/funcdesc.cxx M sc/source/core/data/olinetab.cxx M sc/source/core/data/table1.cxx M sc/source/core/data/table2.cxx M sc/source/core/data/table3.cxx M sc/source/core/data/table4.cxx M sc/source/core/data/table6.cxx M sc/source/core/tool/address.cxx M sc/source/core/tool/compiler.cxx M sc/source/core/tool/consoli.cxx M sc/source/core/tool/interpr1.cxx M sc/source/core/tool/interpr2.cxx M sc/source/filter/excel/excdoc.cxx M sc/source/filter/excel/excform8.cxx M sc/source/filter/excel/excrecds.cxx M sc/source/filter/excel/xetable.cxx M sc/source/filter/excel/xlpage.cxx M sc/source/filter/html/htmlexp.cxx M sc/source/filter/html/htmlpars.cxx M sc/source/filter/starcalc/scflt.cxx M sc/source/filter/xml/XMLCellRangeSourceContext.cxx M sc/source/filter/xml/XMLConsolidationContext.cxx M sc/source/filter/xml/XMLTableSourceContext.cxx M sc/source/filter/xml/xmldrani.cxx M sc/source/ui/app/inputwin.cxx M sc/source/ui/app/scmod.cxx M sc/source/ui/cctrl/tbzoomsliderctrl.cxx M sc/source/ui/dbgui/csvcontrol.cxx M sc/source/ui/dbgui/csvgrid.cxx M sc/source/ui/dbgui/csvruler.cxx M sc/source/ui/dbgui/csvtablebox.cxx M sc/source/ui/docshell/arealink.cxx M sc/source/ui/docshell/dbdocimp.cxx M sc/source/ui/docshell/docsh4.cxx M sc/source/ui/docshell/docsh5.cxx M sc/source/ui/docshell/docsh6.cxx M sc/source/ui/drawfunc/fuconstr.cxx M sc/source/ui/drawfunc/fusel.cxx M sc/source/ui/drawfunc/futext.cxx M sc/source/ui/inc/csvtablebox.hxx M sc/source/ui/miscdlgs/crnrdlg.cxx M sc/source/ui/navipi/navipi.cxx M sc/source/ui/undo/undoblk.cxx M sc/source/ui/undo/undoblk3.cxx M sc/source/ui/unoobj/appluno.cxx M sc/source/ui/unoobj/cellsuno.cxx M sc/source/ui/vba/vbaapplication.cxx M sc/source/ui/view/cellsh3.cxx M sc/source/ui/view/gridwin4.cxx M sc/source/ui/view/hdrcont.cxx M sc/source/ui/view/hintwin.cxx M sc/source/ui/view/olinewin.cxx M sc/source/ui/view/output.cxx M sc/source/ui/view/output2.cxx M sc/source/ui/view/prevwsh.cxx M sc/source/ui/view/printfun.cxx M sc/source/ui/view/tabcont.cxx M sc/source/ui/view/tabview.cxx M sc/source/ui/view/tabview4.cxx M sc/source/ui/view/viewdata.cxx M sc/source/ui/view/viewfunc.cxx M sc/source/ui/view/viewutil.cxx M scaddins/source/analysis/analysishelper.cxx M sd/source/core/drawdoc2.cxx M sd/source/filter/ppt/pptin.cxx M sd/source/ui/dlg/animobjs.cxx M sd/source/ui/docshell/docshel2.cxx M sd/source/ui/docshell/sdclient.cxx M sd/source/ui/func/fuconstr.cxx M sd/source/ui/func/fucopy.cxx M sd/source/ui/func/fuediglu.cxx M sd/source/ui/func/fuinsfil.cxx M sd/source/ui/func/fusel.cxx M sd/source/ui/func/futext.cxx M sd/source/ui/slideshow/showwin.cxx M sd/source/ui/slidesorter/view/SlsInsertionIndicatorOverlay.cxx M sd/source/ui/unoidl/unomodel.cxx M sd/source/ui/view/drtxtob.cxx M sd/source/ui/view/drtxtob1.cxx M sd/source/ui/view/drviews1.cxx M sd/source/ui/view/drviews3.cxx M sd/source/ui/view/drviewsb.cxx M sd/source/ui/view/drviewse.cxx M sd/source/ui/view/grviewsh.cxx M sd/source/ui/view/outlnvs2.cxx M sd/source/ui/view/outlnvsh.cxx M
[Libreoffice-commits] core.git: writerfilter/source
writerfilter/source/dmapper/StyleSheetTable.cxx | 19 ++-
1 file changed, 18 insertions(+), 1 deletion(-)
New commits:
commit acc671ec74c874ffd22803bb2ee54a1f2c027155
Author: Yong Lin Ma mayo...@apache.org
Date: Thu Jun 7 11:25:56 2012 +
Resolves: #i119464# Update default alignment value for docx [Sub]Title
Patch by: Ying Zhang
Review by: mayongl
(cherry picked from commit 22602686933abaa1512ebd3bca77dbb9987b6ad5)
Change-Id: I04cf1bbbeadf23147fa2cbc1c08c850288ef943a
diff --git a/writerfilter/source/dmapper/StyleSheetTable.cxx
b/writerfilter/source/dmapper/StyleSheetTable.cxx
index 8aca45e..8766d73 100644
--- a/writerfilter/source/dmapper/StyleSheetTable.cxx
+++ b/writerfilter/source/dmapper/StyleSheetTable.cxx
@@ -34,6 +34,7 @@
#include com/sun/star/text/XTextDocument.hpp
#include com/sun/star/style/XStyleFamiliesSupplier.hpp
#include com/sun/star/style/XStyle.hpp
+#include com/sun/star/style/ParagraphAdjust.hpp
#include com/sun/star/text/WritingMode.hpp
#include com/sun/star/lang/XMultiServiceFactory.hpp
#include map
@@ -835,7 +836,23 @@ void StyleSheetTable::ApplyStyleSheets( FontTablePtr
rFontTable )
xState-setPropertyToDefault(rPropNameSupplier.GetName( PROP_CHAR_PROP_HEIGHT
));
xState-setPropertyToDefault(rPropNameSupplier.GetName(
PROP_CHAR_PROP_HEIGHT_ASIAN ));
xState-setPropertyToDefault(rPropNameSupplier.GetName(
PROP_CHAR_PROP_HEIGHT_COMPLEX));
-
+}
+else if (sConvertedStyleName == Title ||
sConvertedStyleName == Subtitle)
+{
+//set the default adjust for ParaStyle Title and
Subtitle to left
+try
+{
+uno::Reference beans::XPropertySet xProp(
xStyle, uno::UNO_QUERY );
+if( xProp.is() )
+{
+uno::Any aMSDefaultVal = uno::makeAny(
(sal_Int16)style::ParagraphAdjust_LEFT );
+xProp-setPropertyValue(
rPropNameSupplier.GetName( PROP_PARA_ADJUST), aMSDefaultVal );
+}
+}
+catch(...)
+{
+OSL_ENSURE( false, Default ParaAdjust style
property could not be set);
+}
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 22/602686933abaa1512ebd3bca77dbb9987b6ad5
22/602686933abaa1512ebd3bca77dbb9987b6ad5 |1 + 1 file changed, 1 insertion(+) New commits: commit 5c1da0e9591fc736199cc63314f731be3bdf3ccb Author: Caolán McNamara caol...@redhat.com Date: Thu Apr 11 12:11:04 2013 +0100 Notes added by 'git notes add' diff --git a/22/602686933abaa1512ebd3bca77dbb9987b6ad5 b/22/602686933abaa1512ebd3bca77dbb9987b6ad5 new file mode 100644 index 000..b674f83 --- /dev/null +++ b/22/602686933abaa1512ebd3bca77dbb9987b6ad5 @@ -0,0 +1 @@ +merged as: acc671ec74c874ffd22803bb2ee54a1f2c027155 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - f0/7148ee630bfba64fdc8c622c63b7ef7b8f6206
f0/7148ee630bfba64fdc8c622c63b7ef7b8f6206 |1 + 1 file changed, 1 insertion(+) New commits: commit 8f5fabdc2b17ca02e9f93aaa1e7b47cdc6be8def Author: Caolán McNamara caol...@redhat.com Date: Thu Apr 11 12:12:50 2013 +0100 Notes added by 'git notes add' diff --git a/f0/7148ee630bfba64fdc8c622c63b7ef7b8f6206 b/f0/7148ee630bfba64fdc8c622c63b7ef7b8f6206 new file mode 100644 index 000..85c5394 --- /dev/null +++ b/f0/7148ee630bfba64fdc8c622c63b7ef7b8f6206 @@ -0,0 +1 @@ +prefer: f6f265313f055f3d767060509cbf05442c1bb548 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - ae/3445f7e01496efa88320a487332387bd70c415
ae/3445f7e01496efa88320a487332387bd70c415 |1 + 1 file changed, 1 insertion(+) New commits: commit a75a347584608379e94daf9f6d488ef9f1d5be93 Author: Caolán McNamara caol...@redhat.com Date: Thu Apr 11 12:14:33 2013 +0100 Notes added by 'git notes add' diff --git a/ae/3445f7e01496efa88320a487332387bd70c415 b/ae/3445f7e01496efa88320a487332387bd70c415 new file mode 100644 index 000..aa52216 --- /dev/null +++ b/ae/3445f7e01496efa88320a487332387bd70c415 @@ -0,0 +1 @@ +ignore: vclauto ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Better icon names/ easier icon themes (fdo#30425)
Hi Rodolfo, On Wed, 2013-04-10 at 18:28 -0300, Rodolfo wrote: I'm ok with that. If we can count how many duplicate images (for UNO commands) does exist, we could know it is pointless or not. Previously we just ran: find -name '*.png' | xargs md5sum | sort | uniq -c | sort -n Which gives that reasonably easily. At one stage I tried to keep a list of duplicates in: icon-themes/industrial/duplicates I spent (wasted) a lot of my life digging through a much dirtier icon tree in the deep past here ;-) so I'd love to see it cleaner. In general short filenames have some benefits - they are duplicated twice un-compressed in each .zip file - in the directory and also in the zip pre-amble to each file. Of course, some of our names are quite long anyway; it would be nice to know what the freedesktop ones are like (I forget) are they reasonably terse - if so, there is no problem adopting those. Indeed - if there is a standard, we could (arguably) move them to the top-level, and re-use them in various places via the textual symlinks - and thus save space overall [ without the cmd/ ;-]. In particular, we can't rename UNO commands without breaking backwards compatibility - so IMHO the only really useful approach here is to have a mapping. Hm... I didn't mean to renaming UNO commands, I just said that how it is implemented leads to some duplicates. Sure; currently though the UNO command maps - cmd/lc_filename so - we need the mapping before we can rename the icons - assuming we can't change the UNO commands :-) What about other icons, then ? Anything outside cmd/ can be renamed without breaking anything as far as I'm aware - particularly if the icon is just referenced in a .src file - there is no reason not to do some nice renaming / cleanup. It would also make sense in parallel to see if the icon we include in the .src file is actually used anywhere in the code at all ;-) [ my suspicion is that we still have a number of malingering un-used pieces of artwork there we could well do without ;-] - it's a worthwhile cleanup. That's a way to go. Simple to implement and simple for an artist/designer/themer to do it also. Neato :-) is that something you could hack on ? I hope it's not so hard; I would use: tools/inc/tools/stream.hxx's SvStream since it's already used; use the handy 'ReadLine' and split the string with getToken() into the src dest pieces and whack them into a boost::unordered_map or similar. 2013/4/10 Stefan Knorr heinzless...@gmail.com: I think this might be what you wanted to find on the wiki: https://wiki.documentfoundation.org/Development/Icon_Themes Thanks for that Stefan ! Yes, that's it =) But the concerns about name sizes pointed by Meeks ruin this concept... Unless things like this [2] show duplicate images. Wow - well the scope for cleanup and duplication reduction is rather significant according to the wiki - it'd be wonderful to have that cleaned up and those obsolete names removed. In very many of those cases we can just use a single new icon name instead of several others - so (assuming we get a better sizing scheme worked out than pre-pending lc_ and sc_) there are lots of nice wins there I think. So don't be discouraged; I'd start on the lower hanging fruit of consolidating duplicated 'missing icon' icons, and other bits in .src files, as well as the symlink magic first though. I'm most happy to help out if you need patch review / other pieces. Thanks for working on fixing that mess ! :-) All the best, Michael. -- michael.me...@suse.com , Pseudo Engineer, itinerant idiot ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: moving global headers into one top-level location
Hi, On Wednesday, 2013-04-10 21:52:20 +0200, Bjoern Michaelsen wrote: I was not suggesting git submodules -- keep everything in one repo, but create some ~10 toplevel directories in which you find our current modules. My bad, I misunderstood. I plead for coining unambiguous terms :-/ * submodule := git submodule * nested module := gbuild nested module I think that might be a lot easier to navigate for a newcomer than getting ~200 directories thrown at him on toplevel. May work for the top level applications, but where to draw the line for libraries? Who wants to think about in what subdirectory what library or module lives? Ok, we can solve that and end up with Writer, Calc, Draw, Chart, Base, Math and Stuff [1] ;-) Eike [1] https://www.youtube.com/watch?v=MvgN5gCuLac -- LibreOffice Calc developer. Number formatter stricken i18n transpositionizer. GPG key ID: 0x65632D3A - 2265 D7F3 A7B0 95CC 3918 630B 6A6C D5B7 6563 2D3A For key transition see http://erack.de/key-transition-2013-01-10.txt.asc Support the FSFE, care about Free Software! https://fsfe.org/support/?erack pgpr7LRP1RxhI.pgp Description: PGP signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: moving global headers into one top-level location
On Wed, 2013-04-10 at 19:00 +0200, Eike Rathke wrote: I find submodules a nightmare to handle and the current situation with the three we have (though justified because of their optional character) is already bad enough, we don't want to scare away new developers.. Right. Personally I mostly fail to understand why we can't have many of our reasonably localised, internal headers right next to the modules they relate to; the */source/filters/inc/ is often of annoyance to me in that regard ;-) Heh - bikeshed alert here however; lets discuss at the ESC later ATB, Michael. -- michael.me...@suse.com , Pseudo Engineer, itinerant idiot ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: fdo#61541: Count Number of selected Cells in calc
Hi Prashant, On Wednesday, 2013-04-10 04:40:31 +0530, Prashant Pandey wrote: I was unable to push my commit to gerrit, [since i am having some ipmc and ssh blockage problem], so I hereby attach the patch for review which solves bug#61541-Count-Number-of-selected-Cells-in-calc ? Your patch _is_ on gerrit, https://gerrit.libreoffice.org/3213 Eike -- LibreOffice Calc developer. Number formatter stricken i18n transpositionizer. GPG key ID: 0x65632D3A - 2265 D7F3 A7B0 95CC 3918 630B 6A6C D5B7 6563 2D3A For key transition see http://erack.de/key-transition-2013-01-10.txt.asc Support the FSFE, care about Free Software! https://fsfe.org/support/?erack pgpmnh7019sL1.pgp Description: PGP signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: GSOC 2013
Hi Efe, First - sorry for the slow reply; I guess a number of the SUSE mentors are currently working in SUSE's hack-week - which lets them focus on some new innovation for a week they avoid the time-drain of E-mail; so let me pick this up: On Wed, 2013-04-10 at 01:50 +0300, Efe Gürkan YALAMAN wrote: I want to participate GSOC 2013. I am trying to contributing LO for a while. I was going to try using svg for icons for GSOC but the idea is deleted from the Ideas page. That should be no barrier to you - if you want to do something cool like that, and you're confident enough I don't see why you shouldn't submit a proposal for that. Some large proportion of UI icon loading is localised inside: vcl/source/gdi/impimagetree.cxx And could easily be tweaked for SVG import; of course with SVG we'd need to propagate the desired size around a lot more, and naturally falling-back to non-scalable icons in a partial SVG theme might look poor if the sizes mis-matched; but ... in general it's not so hard I think. More interesting are the startup performance, icon caching etc. issues that are well worth getting right :-) And that would be a little bit hard for me. So I find another and much more suitable idea for me, which is Dialog widget conversion. Sounds great. First of all. Let me introduce myself. :) Great to meet you, and we're excited about getting yo involved. TLDR;My skill set:Python, C , C++,Java,C#. I can read others code. Skill set and aptitude seems a perfect match. I find interesting two ideas. -Dialog Widget Conversion -Implement a about:config functionality I'd submit a proposal for both - simply because we may be able to accept multiple people for Dialog / Widget conversion I think. I don't know what to do about second idea but I tried to draw a very basic road map about the first Idea. Great :-) I think i can automate some part of this conversion. I don't have too much programming experience but I think I have enough knowledge for this idea. Automation sounds good; personally I would recommend trying to use Lubos' Clang work, and poke in the 'compilerplugins/' directory - to automate the C++ conversion piece. My first idea for implementing this work is : If I were you as my easy-hack to get involved I would convert one dialog completely, and see how it goes. - I will have a homework about writing a parser in a few weeks so I will have some information about how parsing works. I think this homework and reading will make my work easier.(Because I think this idea is mostly on parsing .src files and creating .ui files with these data.), We already have a python parser for .src files lying around that Kohei created in order to try to automate this in the past. That could be rather useful for you :-) I would start from: git clone http://cgit.freedesktop.org/libreoffice/build/ git checkout HEAD~1 cd scratch/layout-src2xml have a play in there That has no doubt bit-rotted a little, but no doubt Kohei can give you some ideas on how to improve it. It generates (IIRC) an obsolete XML format - that needs updating to a glad format - and of course, it needs logic / magic to try to build a sensible container / layout tree hierarchy - which is simply not there in the original .src files - which (I guess) is the clever bit ;-) I would like to discuss the possibility of implementing this idea and drawing a more certain road map. Please don't hesitate to comment. :) Sounds good to me. And lastly this e-mail probably have a lot of grammar mistakes. Sorry about that :) No problem whatsoever, I'm English and produce more errors than you I think ;-) Great to have you involved, All the best, Michael. -- michael.me...@suse.com , Pseudo Engineer, itinerant idiot ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: fdo#61541: Count Number of selected Cells in calc
Hi Eike, Yes. Both patches are same. It was three days ago that I had I had certain server issues so I could not send my patch to gerrit directly. I henceforth mailed it, but the day after, I could resolve my server issue so I pushed the same patch [same change-id] and mailed + informed the same on IRC too. Thanks Prashant On Thu, Apr 11, 2013 at 5:12 PM, Eike Rathke er...@redhat.com wrote: Hi Prashant, On Wednesday, 2013-04-10 04:40:31 +0530, Prashant Pandey wrote: I was unable to push my commit to gerrit, [since i am having some ipmc and ssh blockage problem], so I hereby attach the patch for review which solves bug#61541-Count-Number-of-selected-Cells-in-calc ? Your patch _is_ on gerrit, https://gerrit.libreoffice.org/3213 Eike -- LibreOffice Calc developer. Number formatter stricken i18n transpositionizer. GPG key ID: 0x65632D3A - 2265 D7F3 A7B0 95CC 3918 630B 6A6C D5B7 6563 2D3A For key transition see http://erack.de/key-transition-2013-01-10.txt.asc Support the FSFE, care about Free Software! https://fsfe.org/support/?erack ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sw/source sw/uiconfig sw/UIConfig_swriter.mk
sw/UIConfig_swriter.mk|1
sw/source/ui/config/optdlg.src| 164 --
sw/source/ui/config/optpage.cxx | 199 ++--
sw/source/ui/inc/optpage.hxx | 53 +--
sw/uiconfig/swriter/ui/viewoptionspage.ui | 482 ++
5 files changed, 612 insertions(+), 287 deletions(-)
New commits:
commit 56152a8fab12c270d96a8fe5a63928b6e35be49d
Author: Pavel Kacer pka...@suse.com
Date: Thu Apr 11 11:19:01 2013 +0200
Converted Tools-Options-(Web/)Writer-View dialogue.
Change-Id: Ifa11da48867303dbecd2ef104f2c0842aaeb5d72
Reviewed-on: https://gerrit.libreoffice.org/3325
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/sw/UIConfig_swriter.mk b/sw/UIConfig_swriter.mk
index bf47c75..1e7a807 100644
--- a/sw/UIConfig_swriter.mk
+++ b/sw/UIConfig_swriter.mk
@@ -100,6 +100,7 @@ $(eval $(call gb_UIConfig_add_uifiles,modules/swriter,\
sw/uiconfig/swriter/ui/tabletextflowpage \
sw/uiconfig/swriter/ui/textgridpage \
sw/uiconfig/swriter/ui/titlepage \
+ sw/uiconfig/swriter/ui/viewoptionspage \
sw/uiconfig/swriter/ui/wordcount \
))
diff --git a/sw/source/ui/config/optdlg.src b/sw/source/ui/config/optdlg.src
index 9b8cf42..889408f9 100644
--- a/sw/source/ui/config/optdlg.src
+++ b/sw/source/ui/config/optdlg.src
@@ -24,170 +24,6 @@
#include optdlg.hrc
#include helpid.h
-/**/
-/**/
-/* TabPage View/Content */
-/**/
-/**/
-TabPage TP_CONTENT_OPT
-{
-HelpID = HID_CONTENT_OPT ;
-SVLook = TRUE ;
-Size = MAP_APPFONT ( TP_WIDTH , TP_HEIGHT ) ;
-Hide = TRUE ;
-FixedLine FL_LINE
-{
-Pos = MAP_APPFONT ( 6 , 3 ) ;
-Size = MAP_APPFONT ( 118 , 8 ) ;
-Group = TRUE ;
-Text [ en-US ] = Guides;
-};
-CheckBox CB_CROSS
-{
-HelpID = sw:CheckBox:TP_CONTENT_OPT:CB_CROSS;
-Pos = MAP_APPFONT ( 12 , 14 ) ;
-Size = MAP_APPFONT ( 118 , 10 ) ;
-Text [ en-US ] = Helplines ~While Moving;
-};
-FixedLine FL_WINDOW
-{
-Pos = MAP_APPFONT ( 130 , 3 ) ;
-Size = MAP_APPFONT ( 124 , 8 ) ;
-Group = TRUE ;
-Text [ en-US ] = View;
-};
-CheckBox CB_HSCROLL
-{
-HelpID = sw:CheckBox:TP_CONTENT_OPT:CB_HSCROLL;
-Pos = MAP_APPFONT ( 136 , 14 ) ;
-Size = MAP_APPFONT ( 108 , 10 ) ;
-Text [ en-US ] = H~orizontal scrollbar ;
-};
-CheckBox CB_VSCROLL
-{
-HelpID = sw:CheckBox:TP_CONTENT_OPT:CB_VSCROLL;
-Pos = MAP_APPFONT ( 136 , 27 ) ;
-Size = MAP_APPFONT ( 108 , 10 ) ;
-Text [ en-US ] = ~Vertical scrollbar ;
-};
-CheckBox CB_ANY_RULER
-{
-HelpID = sw:CheckBox:TP_CONTENT_OPT:CB_ANY_RULER;
-Pos = MAP_APPFONT ( 136 , 40 ) ;
-Size = MAP_APPFONT ( 65 , 10 ) ;
-Text [ en-US ] = R~uler ;
-};
-CheckBox CB_HRULER
-{
-HelpID = sw:CheckBox:TP_CONTENT_OPT:CB_HRULER;
-Pos = MAP_APPFONT ( 142 , 53 ) ;
-Size = MAP_APPFONT ( 62 , 10 ) ;
-Text [ en-US ] = Hori~zontal ruler ;
-};
-ListBox LB_HMETRIC
-{
-HelpID = sw:ListBox:TP_CONTENT_OPT:LB_HMETRIC;
-Pos = MAP_APPFONT ( 206 , 51 ) ;
-Size = MAP_APPFONT ( 45 , 60 ) ;
-DropDown = TRUE;
-};
-CheckBox CB_VRULER
-{
-HelpID = sw:CheckBox:TP_CONTENT_OPT:CB_VRULER;
-Pos = MAP_APPFONT ( 142 , 66 ) ;
-Size = MAP_APPFONT ( 62 , 10 ) ;
-Text [ en-US ] = Verti~cal ruler ;
-};
-CheckBox CB_VRULER_RIGHT
-{
-HelpID = sw:CheckBox:TP_CONTENT_OPT:CB_VRULER_RIGHT;
-Pos = MAP_APPFONT ( 148 , 79 ) ;
-Size = MAP_APPFONT ( 100 , 10 ) ;
-Text [ en-US ] = Right-aligned;
-};
-ListBox LB_VMETRIC
-{
-HelpID = sw:ListBox:TP_CONTENT_OPT:LB_VMETRIC;
-Pos = MAP_APPFONT ( 206 , 64 ) ;
-Size = MAP_APPFONT ( 45 , 60 ) ;
-DropDown = TRUE;
-};
-CheckBox CB_SMOOTH_SCROLL
-{
-HelpID = sw:CheckBox:TP_CONTENT_OPT:CB_SMOOTH_SCROLL;
-Pos = MAP_APPFONT ( 136 , 79 ) ;
-Size = MAP_APPFONT ( 108 , 10 ) ;
-Text [ en-US ] = S~mooth scroll ;
-};
-FixedLine FL_DISP
-{
-Pos = MAP_APPFONT ( 6 , 30 ) ;
-Size = MAP_APPFONT ( 118 , 8 ) ;
-Text [ en-US ] = Display ;
-Group = TRUE ;
-};
-CheckBox CB_GRF
-{
-HelpID = sw:CheckBox:TP_CONTENT_OPT:CB_GRF;
-Pos = MAP_APPFONT ( 12 , 41 ) ;
-Size = MAP_APPFONT ( 108 , 10 ) ;
-Text [ en-US ] = ~Graphics
[PUSHED] Converted Tools-Options-(Web/)Writer-View dialogue.
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/3325 Approvals: Caolán McNamara: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/3325 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ifa11da48867303dbecd2ef104f2c0842aaeb5d72 Gerrit-PatchSet: 3 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Pavel Kačer pka...@suse.com Gerrit-Reviewer: Caolán McNamara caol...@redhat.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sw/inc sw/source sw/uiconfig
sw/inc/helpid.h |1
sw/source/ui/config/optpage.cxx | 12 --
sw/uiconfig/swriter/ui/viewoptionspage.ui | 174 +++---
3 files changed, 92 insertions(+), 95 deletions(-)
New commits:
commit 9dadd9288d51e092f4b4567b6135ecde1436cce7
Author: Caolán McNamara caol...@redhat.com
Date: Thu Apr 11 12:47:40 2013 +0100
Restore original mnemonics for view page
And remove the remaining SetPosPixel calls of layout controlled elements,
they
are now unnecessary and get overridden by the layout anyway. Including the
ones
left over from the printer options conversion.
Tweak things for 6/12 spacings.
Change-Id: Ifb460fb966452c10a9ac08c6f8cd57b96a2166f0
diff --git a/sw/inc/helpid.h b/sw/inc/helpid.h
index 66574aa..1340e25 100644
--- a/sw/inc/helpid.h
+++ b/sw/inc/helpid.h
@@ -158,7 +158,6 @@
#define HID_ENV_ENV
SW_HID_ENV_ENV
#define HID_ENV_FMT
SW_HID_ENV_FMT
#define HID_FRM_URL
SW_HID_FRM_URL
-#define HID_CONTENT_OPT
SW_HID_CONTENT_OPT
#define HID_STD_FONT
SW_HID_STD_FONT
#define HID_COND_COLL
SW_HID_COND_COLL
#define HID_FRM_ADD
SW_HID_FRM_ADD
diff --git a/sw/source/ui/config/optpage.cxx b/sw/source/ui/config/optpage.cxx
index 82ef3251..055150e 100644
--- a/sw/source/ui/config/optpage.cxx
+++ b/sw/source/ui/config/optpage.cxx
@@ -111,13 +111,7 @@ SwContentOptPage::SwContentOptPage( Window* pParent,
}
SvtCJKOptions aCJKOptions;
-if(aCJKOptions.IsVerticalTextEnabled() )
-{
-Point aSmoothPos(m_pSmoothCBox-GetPosPixel());
-aSmoothPos.Y() += aSmoothPos.Y() - m_pVRulerCBox-GetPosPixel().Y();
-m_pSmoothCBox-SetPosPixel(aSmoothPos);
-}
-else
+if(!aCJKOptions.IsVerticalTextEnabled() )
m_pVRulerRightCBox-Hide();
m_pVRulerCBox-SetClickHdl(LINK(this, SwContentOptPage, VertRulerHdl ));
m_pAnyRulerCB-SetClickHdl(LINK(this, SwContentOptPage, AnyRulerHdl));
@@ -351,10 +345,6 @@ SwAddPrinterTabPage::SwAddPrinterTabPage(Window* pParent,
m_pRightPageCB-Hide();
m_pPrintHiddenTextCB-Hide();
m_pPrintTextPlaceholderCB-Hide();
-m_pProspectCB-SetPosPixel(m_pLeftPageCB-GetPosPixel());
-Point aPt( m_pRightPageCB-GetPosPixel() );
-aPt.setX(aPt.getX() + 15); // indent
-m_pProspectCB_RTL-SetPosPixel(aPt);
// hide m_pPrintEmptyPagesCB
m_pPrintEmptyPagesCB-Hide();
diff --git a/sw/uiconfig/swriter/ui/viewoptionspage.ui
b/sw/uiconfig/swriter/ui/viewoptionspage.ui
index 2283271..6b11ae2 100644
--- a/sw/uiconfig/swriter/ui/viewoptionspage.ui
+++ b/sw/uiconfig/swriter/ui/viewoptionspage.ui
@@ -12,13 +12,14 @@
property name=visibleTrue/property
property name=can_focusFalse/property
property name=row_spacing6/property
-property name=column_spacing6/property
+property name=column_spacing12/property
property name=column_homogeneousTrue/property
child
object class=GtkBox id=box1
property name=visibleTrue/property
property name=can_focusFalse/property
property name=orientationvertical/property
+property name=spacing12/property
child
object class=GtkFrame id=guidesframe
property name=visibleTrue/property
@@ -37,10 +38,11 @@
property name=can_focusFalse/property
child
object class=GtkCheckButton id=helplines
-property name=label
translatable=yesHelplines While Moving/property
+property name=label
translatable=yesHelplines _While Moving/property
property name=visibleTrue/property
property name=can_focusTrue/property
property name=receives_defaultFalse/property
+property name=use_underlineTrue/property
property name=xalign0/property
property name=draw_indicatorTrue/property
/object
@@ -88,12 +90,14 @@
object class=GtkGrid id=grid3
property name=visibleTrue/property
property name=can_focusFalse/property
+property name=row_spacing6/property
child
object class=GtkCheckButton id=graphics
-property name=label translatable=yesGraphics
and objects/property
+property name=label
translatable=yes_Graphics and
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit f0c5f87deb14adeb65848a2d39baefaaa549669b Author: Caolán McNamara caol...@redhat.com Date: Thu Apr 11 13:10:58 2013 +0100 Updated core Project: help c994e4f941a7d5d5c5b1dae8e0c64d8cbe44b7e8 diff --git a/helpcontent2 b/helpcontent2 index 68d0b1b..c994e4f 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 68d0b1b6fc3fe84b2750018fe1c966486499f85c +Subproject commit c994e4f941a7d5d5c5b1dae8e0c64d8cbe44b7e8 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: helpers/help_hid.lst source/text
helpers/help_hid.lst | 17 source/text/shared/optionen/01040200.xhp | 64 +++ 2 files changed, 33 insertions(+), 48 deletions(-) New commits: commit c994e4f941a7d5d5c5b1dae8e0c64d8cbe44b7e8 Author: Caolán McNamara caol...@redhat.com Date: Thu Apr 11 13:10:58 2013 +0100 update help ids for writer view page .ui conversion Change-Id: I6a9679974edb9e0f7de165e41b5cf34cbe6a415f diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst index bd73d52..795eb88 100644 --- a/helpers/help_hid.lst +++ b/helpers/help_hid.lst @@ -1109,7 +1109,6 @@ HID_CONTDLG_SELECT,33920, HID_CONTDLG_TOOLBOX,33979, HID_CONTDLG_UNDO,33929, HID_CONTDLG_WORKPLACE,33919, -HID_CONTENT_OPT,53191, HID_CONTROLS_DATE_N_TIME,38194, HID_CTL_ACTION_DLG_1,59870, HID_CTL_ACTION_DLG_2,59871, @@ -8319,19 +8318,6 @@ sw_CheckBox_DLG_ROW_HEIGHT_CB_AUTOHEIGHT,1425245186, sw_CheckBox_MD_EDIT_REGION_CB_DDE,1405830145, sw_CheckBox_MD_EDIT_REGION_CB_PASSWD,1405830153, sw_CheckBox_TP_CONDCOLL_CB_CONDITION,878445569, -sw_CheckBox_TP_CONTENT_OPT_CB_ANY_RULER,878396428, -sw_CheckBox_TP_CONTENT_OPT_CB_CROSS,878396430, -sw_CheckBox_TP_CONTENT_OPT_CB_DRWFAST,878396419, -sw_CheckBox_TP_CONTENT_OPT_CB_FIELD,878396420, -sw_CheckBox_TP_CONTENT_OPT_CB_GRF,878396417, -sw_CheckBox_TP_CONTENT_OPT_CB_HRULER,878396433, -sw_CheckBox_TP_CONTENT_OPT_CB_HSCROLL,878396431, -sw_CheckBox_TP_CONTENT_OPT_CB_POSTIT,878396439, -sw_CheckBox_TP_CONTENT_OPT_CB_SMOOTH_SCROLL,878396453, -sw_CheckBox_TP_CONTENT_OPT_CB_TBL,878396418, -sw_CheckBox_TP_CONTENT_OPT_CB_VRULER,878396434, -sw_CheckBox_TP_CONTENT_OPT_CB_VRULER_RIGHT,878396440, -sw_CheckBox_TP_CONTENT_OPT_CB_VSCROLL,878396432, sw_CheckBox_TP_DROPCAPS_CB_SWITCH,877822989, sw_CheckBox_TP_DROPCAPS_CB_WORD,877822992, sw_CheckBox_TP_ENV_ENV_BOX_SEND,909640714, @@ -8614,9 +8600,6 @@ sw_ListBox_DLG_NUM_NAMES_LB_FORM,1428754026, sw_ListBox_DLG_SEL_GLOS_LB_GLOS,1436749313, sw_ListBox_TP_CONDCOLL_LB_FILTER,878448136, sw_ListBox_TP_CONDCOLL_LB_STYLE,878448135, -sw_ListBox_TP_CONTENT_OPT_LB_HMETRIC,878399064, -sw_ListBox_TP_CONTENT_OPT_LB_METRIC,878399003, -sw_ListBox_TP_CONTENT_OPT_LB_VMETRIC,878399065, sw_ListBox_TP_DROPCAPS_BOX_TEMPLATE,877825547, sw_ListBox_TP_ENV_ENV_LB_DATABASE,909643268, sw_ListBox_TP_ENV_ENV_LB_DBFIELD,909643273, diff --git a/source/text/shared/optionen/01040200.xhp b/source/text/shared/optionen/01040200.xhp index 6734e54..2062cb1 100644 --- a/source/text/shared/optionen/01040200.xhp +++ b/source/text/shared/optionen/01040200.xhp @@ -48,7 +48,9 @@ bookmark_valuecontrols; showing (Writer)/bookmark_value bookmark_valuefields;displaying field codes (Writer)/bookmark_value bookmark_valuedisplaying; comments in text documents/bookmark_value -/bookmarkcommentmw made field... a two level entry/commentparagraph role=heading id=hd_id3145090 xml-lang=en-US level=1 l10n=U oldref=1link href=text/shared/optionen/01040200.xhp name=ViewView/link/paragraph +/bookmark +bookmark xml-lang=en-US branch=hid/modules/swriter/ui/viewoptionspage/ViewOptionsPage id=bm_id315 localize=false/paragraph role=heading id=hd_id3156346 xml-lang=en-US level=3 l10n=U oldref=9Helplines While Moving/paragraph +paragraph role=heading id=hd_id3145090 xml-lang=en-US level=1 l10n=U oldref=1link href=text/shared/optionen/01040200.xhp name=ViewView/link/paragraph paragraph role=paragraph id=par_id3147088 xml-lang=en-US l10n=U oldref=2ahelp hid=.Defines the default settings for displaying objects in your text documents and also the default settings for the window elements./ahelp/paragraph /section section id=howtoget @@ -56,45 +58,45 @@ /section paragraph role=heading id=hd_id3145072 xml-lang=en-US level=2 l10n=U oldref=3Snap Lines/paragraph paragraph role=paragraph id=par_id3153527 xml-lang=en-US l10n=U oldref=4Specifies settings that refer to the representation of boundaries./paragraph -bookmark xml-lang=en-US branch=hid/sw:CheckBox:TP_CONTENT_OPT:CB_CROSS id=bm_id3151110 localize=false/paragraph role=heading id=hd_id3156346 xml-lang=en-US level=3 l10n=U oldref=9Helplines While Moving/paragraph -paragraph role=paragraph id=par_id3146798 xml-lang=en-US l10n=U oldref=10ahelp hid=SW_CHECKBOX_TP_CONTENT_OPT_CB_CROSSDisplays snap lines around the frames when frames are moved. You can select theemph Helplines While Moving /emphoption to show the exact position of the object using lineal values./ahelp/paragraph +bookmark xml-lang=en-US branch=hid/modules/swriter/ui/viewoptionspage/helplines id=bm_id3151110 localize=false/paragraph role=heading id=hd_id3156346 xml-lang=en-US level=3 l10n=U oldref=9Helplines While Moving/paragraph +paragraph role=paragraph id=par_id3146798 xml-lang=en-US l10n=U oldref=10ahelp hid=modules/swriter/ui/viewoptionspage/helplinesDisplays snap lines around the frames when frames are moved. You can select theemph Helplines While Moving /emphoption to show the exact position of the object using lineal
[Libreoffice-commits] core.git: instsetoo_native/util scp2/source
instsetoo_native/util/openoffice.lst.in |4
scp2/source/ooo/ooo_brand.scp |2 +-
2 files changed, 5 insertions(+), 1 deletion(-)
New commits:
commit ca7cbe24cc497384d9b4f7d19d1fff3c84e3ea19
Author: tinderbox tinder...@mel.suse.cz
Date: Thu Apr 11 14:07:25 2013 +0200
use only major version for the system installation path on Windows
(fdo#62303)
It means the LO-4.1.x will get installed into LibreOffice 4
instead of LibreOffice 4.1
Change-Id: Ideae670437fda9847d4ee3a86c4cab079d8da07a
diff --git a/instsetoo_native/util/openoffice.lst.in
b/instsetoo_native/util/openoffice.lst.in
index 9bf1472..0e0975a 100644
--- a/instsetoo_native/util/openoffice.lst.in
+++ b/instsetoo_native/util/openoffice.lst.in
@@ -7,6 +7,7 @@ Globals
UREPACKAGEVERSION
@LIBO_VERSION_MAJOR@.@LIBO_VERSION_MINOR@.@LIBO_VERSION_MICRO@.@LIBO_VERSION_PATCH@@LIBO_VERSION_SUFFIX@
URELAYERVERSION 1
REFERENCEOOOMAJORMINOR 3.4
+WINDOWSBASISROOTNAME LibreOffice @LIBO_VERSION_MAJOR@
UNIXBASISROOTNAME
libreoffice@LIBO_VERSION_MAJOR@.@LIBO_VERSION_MINOR@
HIDELICENSEDIALOG 1
PACKAGEPREFIX
@@ -96,6 +97,7 @@ LibreOffice_Dev
PRODUCTNAME LibreOfficeDev
PRODUCTVERSION @LIBO_VERSION_MAJOR@.@LIBO_VERSION_MINOR@
PRODUCTEXTENSION
.@LIBO_VERSION_MICRO@.@LIBO_VERSION_PATCH@@LIBO_VERSION_SUFFIX@
+WINDOWSBASISROOTNAME LibreOfficeDev @LIBO_VERSION_MAJOR@
UNIXBASISROOTNAME
libreofficedev@LIBO_VERSION_MAJOR@.@LIBO_VERSION_MINOR@
POSTVERSIONEXTENSION
BUNDLEIDENTIFIER @MACOSX_BUNDLE_IDENTIFIER@
@@ -193,6 +195,7 @@ LibreOffice_Dev_SDK
PRODUCTNAME LibreOfficeDev
PRODUCTVERSION @LIBO_VERSION_MAJOR@.@LIBO_VERSION_MINOR@
PRODUCTEXTENSION
.@LIBO_VERSION_MICRO@.@LIBO_VERSION_PATCH@@LIBO_VERSION_SUFFIX@
+WINDOWSBASISROOTNAME LibreOfficeDev @LIBO_VERSION_MAJOR@
UNIXBASISROOTNAME
libreofficedev@LIBO_VERSION_MAJOR@.@LIBO_VERSION_MINOR@
POSTVERSIONEXTENSION SDK
BUNDLEIDENTIFIER @MACOSX_BUNDLE_IDENTIFIER@.SDK
@@ -277,6 +280,7 @@ LibreOffice_Dev_Test
PRODUCTNAME LibreOfficeDev
PRODUCTVERSION @LIBO_VERSION_MAJOR@.@LIBO_VERSION_MINOR@
PRODUCTEXTENSION
.@LIBO_VERSION_MICRO@.@LIBO_VERSION_PATCH@@LIBO_VERSION_SUFFIX@
+WINDOWSBASISROOTNAME LibreOfficeDev @LIBO_VERSION_MAJOR@
UNIXBASISROOTNAME
libreofficedev@LIBO_VERSION_MAJOR@.@LIBO_VERSION_MINOR@
POSTVERSIONEXTENSION TEST
BUNDLEIDENTIFIER @MACOSX_BUNDLE_IDENTIFIER@.Test
diff --git a/scp2/source/ooo/ooo_brand.scp b/scp2/source/ooo/ooo_brand.scp
index a4106b6..183b8ba 100644
--- a/scp2/source/ooo/ooo_brand.scp
+++ b/scp2/source/ooo/ooo_brand.scp
@@ -31,7 +31,7 @@
Directory gid_Dir_Brand_Root
ParentID = PREDEFINED_PROGDIR;
#ifdef WNT
-HostName = ${PRODUCTNAME} ${BRANDPACKAGEVERSION};
+HostName = ${WINDOWSBASISROOTNAME};
#else
HostName = .;
#endif
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PATCH] build: warn when configure with --with-tls=openssl
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/3327 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/27/3327/1 build: warn when configure with --with-tls=openssl When expliciting openssl as tls implementation to use, show a warning as there are still some pieces of code that may depend on NSS or GNUTLS. Change-Id: I2cfaaf09b5ad83837928f2648975db956b261c19 --- M configure.ac 1 file changed, 4 insertions(+), 0 deletions(-) diff --git a/configure.ac b/configure.ac index 512db80..470ec8d 100644 --- a/configure.ac +++ b/configure.ac @@ -8098,6 +8098,10 @@ openssl) AC_DEFINE(USE_TLS_OPENSSL) TLS=OPENSSL + +# warn that OpenSSL has been selected but not all TLS code has this option +AC_MSG_WARN([TLS/SSL implementation to use is OpenSSL but some code may still be depending on NSS or GNUTLS]) +add_warning TLS/SSL implementation to use is OpenSSL but some code may still be depending on NSS or GNUTLS ;; nss) AC_DEFINE(USE_TLS_NSS) -- To view, visit https://gerrit.libreoffice.org/3327 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I2cfaaf09b5ad83837928f2648975db956b261c19 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Andres Gomez ago...@igalia.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] build: new --disable-openssl flag
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/3328 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/28/3328/1 build: new --disable-openssl flag Most of the components included in LibreOffice already support alternative TLS libraries (e.g. NSS, GnuTLS). Change-Id: If00c348046fdbc88156f3d89c25e874e7e9bd04c --- M config_host.mk.in M configure.ac 2 files changed, 46 insertions(+), 15 deletions(-) diff --git a/config_host.mk.in b/config_host.mk.in index ec1542a..d794d16 100644 --- a/config_host.mk.in +++ b/config_host.mk.in @@ -98,6 +98,7 @@ export DISABLE_EXPORT=@DISABLE_EXPORT@ export DISABLE_LINKOO=@DISABLE_LINKOO@ export DISABLE_NEON=@DISABLE_NEON@ +export DISABLE_OPENSSL=@DISABLE_OPENSSL@ export DISABLE_PYTHON=@DISABLE_PYTHON@ export DISABLE_SCRIPTING=@DISABLE_SCRIPTING@ export DLLTOOL=@DLLTOOL@ diff --git a/configure.ac b/configure.ac index 470ec8d..9c1f2e9 100644 --- a/configure.ac +++ b/configure.ac @@ -1169,6 +1169,13 @@ [MACOSX only: on MacOSX pkg-config can cause trouble. by default if one is found in the PATH, an error is issued. This flag turn that error into a warning.]), ) +AC_ARG_ENABLE(openssl, +AS_HELP_STRING([--disable-openssl], +[Disable using libssl/libcrypto from OpenSSL. If disabled, + components will either use GNUTLS or NSS. Work in progress, + use only if you are hacking on it.]), +,enable_openssl=yes) + dnl === dnl Optional Packages (--with/without-) dnl === @@ -8099,6 +8106,10 @@ AC_DEFINE(USE_TLS_OPENSSL) TLS=OPENSSL +if test $enable_openssl != yes; then +AC_MSG_ERROR([Disabling OpenSSL was requested, but the requested TLS to use is actually OpenSSL.]) +fi + # warn that OpenSSL has been selected but not all TLS code has this option AC_MSG_WARN([TLS/SSL implementation to use is OpenSSL but some code may still be depending on NSS or GNUTLS]) add_warning TLS/SSL implementation to use is OpenSSL but some code may still be depending on NSS or GNUTLS @@ -8115,8 +8126,13 @@ ;; esac else -AC_DEFINE(USE_TLS_OPENSSL) -TLS=OPENSSL +if test $enable_openssl = yes; then +AC_DEFINE(USE_TLS_OPENSSL) +TLS=OPENSSL +else +AC_DEFINE(USE_TLS_NSS) +TLS=NSS +fi fi AC_MSG_RESULT([$TLS]) AC_SUBST(TLS) @@ -8515,21 +8531,35 @@ dnl === dnl Check for system openssl dnl === -if test $_os = Darwin -o $_os = NetBSD -o $_os = OpenBSD -o \ -$_os = DragonFly test $with_system_openssl != no; then -# Mac OS builds should get out without extra stuff is the Mac porters' -# wish. And pkg-config is although Xcode ships a .pc for openssl -with_system_openssl=yes -SYSTEM_OPENSSL=YES -OPENSSL_CFLAGS= -OPENSSL_LIBS=-lssl -lcrypto +DISABLE_OPENSSL=NO +AC_MSG_CHECKING([whether to disable OpenSSL usage]) +if test $enable_openssl = yes; then +AC_MSG_RESULT([no]) +if test $_os = Darwin -o $_os = NetBSD -o $_os = OpenBSD -o \ +$_os = DragonFly test $with_system_openssl != no; then +# Mac OS builds should get out without extra stuff is the Mac porters' +# wish. And pkg-config is although Xcode ships a .pc for openssl +with_system_openssl=yes +SYSTEM_OPENSSL=YES +OPENSSL_CFLAGS= +OPENSSL_LIBS=-lssl -lcrypto +else +libo_CHECK_SYSTEM_MODULE([openssl],[OPENSSL],[openssl]) +fi +if test $with_system_openssl = yes; then +libo_MINGW_CHECK_DLL([SSL], [libssl]) +libo_MINGW_CHECK_DLL([CRYPTO], [libcrypto]) +fi else -libo_CHECK_SYSTEM_MODULE([openssl],[OPENSSL],[openssl]) +AC_MSG_RESULT([yes]) +DISABLE_OPENSSL=YES + +# warn that although OpenSSL is disabled, system libraries may be depending on it +AC_MSG_WARN([OpenSSL has been disabled. No code compiled by LibO will make use of it but system librares may create indirect dependencies]) +add_warning OpenSSL has been disabled. No code compiled by LibO will make use of it but system librares may create indirect dependencies fi -if test $with_system_openssl = yes; then -libo_MINGW_CHECK_DLL([libssl]) -libo_MINGW_CHECK_DLL([libcrypto]) -fi + +AC_SUBST([DISABLE_OPENSSL]) dnl === dnl Check for system redland -- To view, visit https://gerrit.libreoffice.org/3328 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: If00c348046fdbc88156f3d89c25e874e7e9bd04c Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Andres Gomez ago...@igalia.com
[PATCH] xmlsec: honor --disable-openssl and use NSS
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/3329 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/29/3329/1 xmlsec: honor --disable-openssl and use NSS On --disable-openssl, let's avoid linking the bundled libxmlsec to OpenSSL by passing down --without-openssl to its configure script. Change-Id: I04447683adeba4b7059e94579adf43ef788a4916 --- M libxmlsec/ExternalPackage_xmlsec.mk M libxmlsec/ExternalProject_xmlsec.mk 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/libxmlsec/ExternalPackage_xmlsec.mk b/libxmlsec/ExternalPackage_xmlsec.mk index eebc541..a9fa070 100644 --- a/libxmlsec/ExternalPackage_xmlsec.mk +++ b/libxmlsec/ExternalPackage_xmlsec.mk @@ -25,7 +25,9 @@ endif else ifeq ($(OS),ANDROID) $(eval $(call gb_ExternalPackage_add_file,xmlsec,lib/libxmlsec1.a,src/.libs/libxmlsec1.a)) +ifneq ($(DISABLE_OPENSSL),YES) $(eval $(call gb_ExternalPackage_add_file,xmlsec,lib/libxmlsec1-openssl.a,src/openssl/.libs/libxmlsec1-openssl.a)) +endif # DISABLE_OPENSSL else $(eval $(call gb_ExternalPackage_add_file,xmlsec,lib/libxmlsec1.a,src/.libs/libxmlsec1.a)) $(eval $(call gb_ExternalPackage_add_file,xmlsec,lib/libxmlsec1-nss.a,src/nss/.libs/libxmlsec1-nss.a)) diff --git a/libxmlsec/ExternalProject_xmlsec.mk b/libxmlsec/ExternalProject_xmlsec.mk index 6535672..640cdf8 100644 --- a/libxmlsec/ExternalProject_xmlsec.mk +++ b/libxmlsec/ExternalProject_xmlsec.mk @@ -15,7 +15,9 @@ $(eval $(call gb_ExternalProject_use_external,xmlsec,nss3)) +ifneq ($(DISABLE_OPENSSL),YES) $(eval $(call gb_ExternalProject_use_external,xmlsec,openssl)) +endif # DISABLE_OPENSSL $(eval $(call gb_ExternalProject_register_targets,xmlsec,\ build \ @@ -53,7 +55,7 @@ $(if $(filter MACOSX,$(OS)),ACLOCAL=aclocal -I $(SRCDIR)/m4/mac) autoreconf \ ./configure \ --with-pic --disable-shared --disable-crypto-dl --without-libxslt --without-gnutls \ - $(if $(filter ANDROID,$(OS)),--with-openssl=$(OUTDIR),--without-openssl) \ + $(if $(and $(filter ANDROID,$(OS)),$(filter-out YES,$(DISABLE_OPENSSL))),--with-openssl=$(OUTDIR),--without-openssl) \ $(if $(filter MACOSX,$(OS)),--prefix=/@.__OOO) \ $(if $(filter NO,$(SYSTEM_NSS))$(filter MACOSX,$(OS)),--disable-pkgconfig) \ $(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \ -- To view, visit https://gerrit.libreoffice.org/3329 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I04447683adeba4b7059e94579adf43ef788a4916 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Andres Gomez ago...@igalia.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] neon: honor --disable-openssl and use GNUTLS
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/3330 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/30/3330/1 neon: honor --disable-openssl and use GNUTLS On --disable-openssl, the bundled neon library will link against GNUTLS + gcrypt instead of OpenSSL. Change-Id: I5b3f09cd1003aefde0478aaab026536c962212c4 --- M config_host.mk.in M configure.ac M neon/Library_neon.mk M neon/UnpackedTarball_neon.mk M neon/configs/config.h A neon/neon_with_gnutls.patch 6 files changed, 87 insertions(+), 7 deletions(-) diff --git a/config_host.mk.in b/config_host.mk.in index d794d16..a0f4675 100644 --- a/config_host.mk.in +++ b/config_host.mk.in @@ -182,6 +182,8 @@ export GIT_NEEDED_SUBMODULES=@GIT_NEEDED_SUBMODULES@ export GNOMEVFS_CFLAGS=$(gb_SPACE)@GNOMEVFS_CFLAGS@ export GNOMEVFS_LIBS=$(gb_SPACE)@GNOMEVFS_LIBS@ +export GNUTLS_CFLAGS=$(gb_SPACE)@GNUTLS_CFLAGS@ +export GNUTLS_LIBS=$(gb_SPACE)@GNUTLS_LIBS@ export PARALLELISM?=@PARALLELISM@ @x_GNUCP@ export GNUCOPY=@GNUCP@ export GNUMAKE=@GNUMAKE@ @@ -289,6 +291,8 @@ export LIBEXTTEXTCAT_LIBS=$(gb_SPACE)@LIBEXTTEXTCAT_LIBS@ export LIBFONTS_JAR=@LIBFONTS_JAR@ export LIBFORMULA_JAR=@LIBFORMULA_JAR@ +export LIBGCRYPT_CFLAGS=@LIBGCRYPT_CFLAGS@ +export LIBGCRYPT_LIBS=@LIBGCRYPT_LIBS@ export LIBLANGTAG_CFLAGS=$(gb_SPACE)@LIBLANGTAG_CFLAGS@ export LIBLANGTAG_LIBS=$(gb_SPACE)@LIBLANGTAG_LIBS@ export LIBLAYOUT_JAR=@LIBLAYOUT_JAR@ diff --git a/configure.ac b/configure.ac index 9c1f2e9..2c852f2 100644 --- a/configure.ac +++ b/configure.ac @@ -8562,6 +8562,21 @@ AC_SUBST([DISABLE_OPENSSL]) dnl === +dnl Check for building gnutls +dnl === +AC_MSG_CHECKING([whether to use gnutls]) +if test $enable_neon != no test $enable_openssl = no; then +AC_MSG_RESULT([yes]) +AM_PATH_LIBGCRYPT() +PKG_CHECK_MODULES(GNUTLS, [gnutls],, +AC_MSG_ERROR([Disabling OpenSSL was requested, but GNUTLS is not + available in the system to use as replacement.])) +fi + +AC_SUBST([LIBGCRYPT_CFLAGS]) +AC_SUBST([LIBGCRYPT_LIBS]) + +dnl === dnl Check for system redland dnl === dnl versions before 1.0.8 write RDF/XML that is useless for ODF (@xml:base) diff --git a/neon/Library_neon.mk b/neon/Library_neon.mk index bc5fe25..0ea887f 100644 --- a/neon/Library_neon.mk +++ b/neon/Library_neon.mk @@ -13,10 +13,15 @@ $(eval $(call gb_Library_use_externals,neon,\ libxml2 \ - openssl \ - openssl_headers \ zlib \ )) + +ifneq ($(DISABLE_OPENSSL),YES) +$(eval $(call gb_Library_use_externals,neon,\ + openssl \ + openssl_headers \ +)) +endif $(eval $(call gb_Library_set_visibility_default,neon)) @@ -56,8 +61,28 @@ UnpackedTarball/neon/src/ne_utils \ UnpackedTarball/neon/src/ne_xml \ UnpackedTarball/neon/src/ne_xmlreq \ +)) + + +ifneq ($(DISABLE_OPENSSL),YES) +$(eval $(call gb_Library_add_generated_cobjects,neon,\ UnpackedTarball/neon/src/ne_openssl \ )) +else +$(eval $(call gb_Library_add_generated_cobjects,neon,\ + UnpackedTarball/neon/src/ne_gnutls \ +)) +$(eval $(call gb_Library_add_cflags,neon,\ + -DDISABLE_OPENSSL \ + $(LIBGCRYPT_CFLAGS) \ + $(GNUTLS_CFLAGS) \ +)) +$(eval $(call gb_Library_add_libs,neon,\ + $(LIBGCRYPT_LIBS) \ + $(GNUTLS_LIBS) \ +)) +endif + ifeq ($(OS),WNT) $(eval $(call gb_Library_use_system_win32_libs,neon,\ @@ -76,9 +101,11 @@ )) else +ifneq ($(DISABLE_OPENSSL),YES) $(eval $(call gb_Library_add_generated_cobjects,neon,\ UnpackedTarball/neon/src/ne_ntlm \ )) +endif endif diff --git a/neon/UnpackedTarball_neon.mk b/neon/UnpackedTarball_neon.mk index a099718..a6cb87b 100644 --- a/neon/UnpackedTarball_neon.mk +++ b/neon/UnpackedTarball_neon.mk @@ -20,6 +20,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,neon,\ neon/neon.patch \ neon/neon_ne_set_request_flag.patch \ + neon/neon_with_gnutls.patch \ )) # vim: set noet sw=4 ts=4: diff --git a/neon/configs/config.h b/neon/configs/config.h index db68aa2..b0fdf22 100644 --- a/neon/configs/config.h +++ b/neon/configs/config.h @@ -79,23 +79,25 @@ #define HAVE_GETSOCKOPT 1 #endif +#ifdef DISABLE_OPENSSL /* Define if GnuTLS support is enabled */ -/* #undef HAVE_GNUTLS */ +#define HAVE_GNUTLS /* Define to 1 if you have the `gnutls_certificate_get_x509_cas' function. */ /* #undef HAVE_GNUTLS_CERTIFICATE_GET_X509_CAS */ /* Define to 1 if you have the `gnutls_certificate_verify_peers2' function. */ -/* #undef HAVE_GNUTLS_CERTIFICATE_VERIFY_PEERS2 */ +#define HAVE_GNUTLS_CERTIFICATE_VERIFY_PEERS2 /* Define to 1 if you have the `gnutls_session_get_data2' function. */ -/* #undef HAVE_GNUTLS_SESSION_GET_DATA2
[PATCH] ucb: honor --disable-openssl
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/3331 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/31/3331/1 ucb: honor --disable-openssl On --disable-openssl, the bundled neon library will link against GNUTLS + gcrypt instead of OpenSSL. Hence, we don't need to add OpenSSL as external library for ucb either. Change-Id: I76b728ef4f9113e805ede0f50113169f5e89bb0a --- M ucb/Library_ucpdav1.mk 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ucb/Library_ucpdav1.mk b/ucb/Library_ucpdav1.mk index e909447..1f1f51f 100644 --- a/ucb/Library_ucpdav1.mk +++ b/ucb/Library_ucpdav1.mk @@ -45,9 +45,12 @@ boost_headers \ libxml2 \ neon \ - openssl \ )) +ifneq ($(DISABLE_OPENSSL),YES) +$(eval $(call gb_Library_use_externals,ucpdav1,openssl)) +endif # DISABLE_OPENSSL + $(eval $(call gb_Library_add_exception_objects,ucpdav1,\ ucb/source/ucp/webdav-neon/ContentProperties \ ucb/source/ucp/webdav-neon/DateTimeHelper \ -- To view, visit https://gerrit.libreoffice.org/3331 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I76b728ef4f9113e805ede0f50113169f5e89bb0a Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Andres Gomez ago...@igalia.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] python: honor --disable-openssl
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/3332 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/32/3332/1 python: honor --disable-openssl On --disable-openssl, the bundled python library will not build its OpenSSL module. Change-Id: I132663c0160f800411f78e49444fe1c5d9ce9ef9 --- M python3/ExternalPackage_python3.mk M python3/ExternalProject_python3.mk 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/python3/ExternalPackage_python3.mk b/python3/ExternalPackage_python3.mk index fc16d5a..3dc4dfd 100644 --- a/python3/ExternalPackage_python3.mk +++ b/python3/ExternalPackage_python3.mk @@ -76,7 +76,9 @@ LO_lib/_elementtree.cpython-$(PYTHON_VERSION_MAJOR)$(PYTHON_VERSION_MINOR)m.so \ LO_lib/fcntl.cpython-$(PYTHON_VERSION_MAJOR)$(PYTHON_VERSION_MINOR)m.so \ LO_lib/grp.cpython-$(PYTHON_VERSION_MAJOR)$(PYTHON_VERSION_MINOR)m.so \ - LO_lib/_hashlib.cpython-$(PYTHON_VERSION_MAJOR)$(PYTHON_VERSION_MINOR)m.so \ + $(if $(filter-out YES,$(DISABLE_OPENSSL)), \ + LO_lib/_hashlib.cpython-$(PYTHON_VERSION_MAJOR)$(PYTHON_VERSION_MINOR)m.so \ + ) \ LO_lib/_heapq.cpython-$(PYTHON_VERSION_MAJOR)$(PYTHON_VERSION_MINOR)m.so \ LO_lib/_json.cpython-$(PYTHON_VERSION_MAJOR)$(PYTHON_VERSION_MINOR)m.so \ LO_lib/_lsprof.cpython-$(PYTHON_VERSION_MAJOR)$(PYTHON_VERSION_MINOR)m.so \ @@ -95,7 +97,9 @@ LO_lib/select.cpython-$(PYTHON_VERSION_MAJOR)$(PYTHON_VERSION_MINOR)m.so \ LO_lib/_socket.cpython-$(PYTHON_VERSION_MAJOR)$(PYTHON_VERSION_MINOR)m.so \ LO_lib/spwd.cpython-$(PYTHON_VERSION_MAJOR)$(PYTHON_VERSION_MINOR)m.so \ - LO_lib/_ssl.cpython-$(PYTHON_VERSION_MAJOR)$(PYTHON_VERSION_MINOR)m.so \ + $(if $(filter-out YES,$(DISABLE_OPENSSL)), \ + LO_lib/_ssl.cpython-$(PYTHON_VERSION_MAJOR)$(PYTHON_VERSION_MINOR)m.so \ + ) \ LO_lib/_struct.cpython-$(PYTHON_VERSION_MAJOR)$(PYTHON_VERSION_MINOR)m.so \ LO_lib/syslog.cpython-$(PYTHON_VERSION_MAJOR)$(PYTHON_VERSION_MINOR)m.so \ LO_lib/termios.cpython-$(PYTHON_VERSION_MAJOR)$(PYTHON_VERSION_MINOR)m.so \ diff --git a/python3/ExternalProject_python3.mk b/python3/ExternalProject_python3.mk index 506551b..b3c10ec 100644 --- a/python3/ExternalProject_python3.mk +++ b/python3/ExternalProject_python3.mk @@ -13,8 +13,13 @@ $(eval $(call gb_ExternalProject_use_externals,python3,\ expat \ +)) + +ifneq ($(DISABLE_OPENSSL),YES) +$(eval $(call gb_ExternalProject_use_externals,python3,\ openssl \ )) +endif $(eval $(call gb_ExternalProject_register_targets,python3,\ build \ @@ -79,6 +84,7 @@ ) \ CC=$(strip $(CC) \ $(if $(filter NO,$(SYSTEM_OPENSSL)),-I$(call gb_UnpackedTarball_get_dir,openssl)/include) \ + $(if $(and $(filter NO,$(SYSTEM_OPENSSL)), $(filter-out YES,$(DISABLE_OPENSSL))),-I$(call gb_UnpackedTarball_get_dir,openssl)/include) \ $(if $(filter NO,$(SYSTEM_EXPAT)),-I$(OUTDIR)/inc/external/expat) \ $(if $(SYSBASE), -I$(SYSBASE)/usr/include) \ ) \ -- To view, visit https://gerrit.libreoffice.org/3332 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I132663c0160f800411f78e49444fe1c5d9ce9ef9 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Andres Gomez ago...@igalia.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] postgresql: honor --disable-openssl flag
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/ To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/33//1 postgresql: honor --disable-openssl flag On --disable-openssl, let's avoid linking the bundled postgresql to OpenSSL by not passing down --with-openssl to its configure script. Also, configure stage will fail if krb5 or gssapi are enabled as they need OpenSSL and, in any case, --with-krb5 and --with-gssapi will not be passed down to postgresql configure script. Change-Id: Iaf7e944d1d8f6a018e949ece56f6d3881f1e8c46 --- M RepositoryExternal.mk M configure.ac M connectivity/Library_postgresql-sdbc-impl.mk M postgresql/ExternalProject_postgresql.mk 4 files changed, 20 insertions(+), 6 deletions(-) diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index 927a123..078c354 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -2001,7 +2001,9 @@ ) ifeq ($(OS)$(COM),WNTMSC) -$(call gb_LinkTarget_use_external,$(1),openssl) +$(if $(filter-out YES,$(DISABLE_OPENSSL)), \ + $(call gb_LinkTarget_use_external,$(1),openssl) \ +) $(call gb_LinkTarget_use_system_win32_libs,$(1),\ secur32 \ diff --git a/configure.ac b/configure.ac index 2c852f2..1f72396 100644 --- a/configure.ac +++ b/configure.ac @@ -7720,6 +7720,13 @@ if test x$enable_postgresql_sdbc != xno; then SCPDEFS=$SCPDEFS -DWITH_POSTGRESQL_SDBC +if test $with_krb5 = yes -a $enable_openssl = no; then +AC_MSG_ERROR([krb5 needs OpenSSL, but --disable-openssl was given.]) +fi +if test $with_gssapi = yes -a $enable_openssl = no; then +AC_MSG_ERROR([GSSAPI needs OpenSSL, but --disable-openssl was given.]) +fi + AC_MSG_CHECKING([PostgreSQL C interface]) if test $with_system_postgresql = yes; then AC_MSG_RESULT([external PostgreSQL]) diff --git a/connectivity/Library_postgresql-sdbc-impl.mk b/connectivity/Library_postgresql-sdbc-impl.mk index 0a0e893..49a2f22 100644 --- a/connectivity/Library_postgresql-sdbc-impl.mk +++ b/connectivity/Library_postgresql-sdbc-impl.mk @@ -61,7 +61,9 @@ boost_headers \ postgresql \ $(if $(filter-out MSC,$(COM)), \ - openssl \ + $(if $(filter-out YES,$(DISABLE_OPENSSL)), \ + openssl \ + ) \ openldap \ nss3 \ plc4 \ diff --git a/postgresql/ExternalProject_postgresql.mk b/postgresql/ExternalProject_postgresql.mk index 19c10e3..f1b838c 100644 --- a/postgresql/ExternalProject_postgresql.mk +++ b/postgresql/ExternalProject_postgresql.mk @@ -13,7 +13,9 @@ $(eval $(call gb_ExternalProject_use_package,postgresql,openldap)) +ifneq ($(DISABLE_OPENSSL),YES) $(eval $(call gb_ExternalProject_use_external,postgresql,openssl)) +endif # DISABLE_OPENSSL $(eval $(call gb_ExternalProject_register_targets,postgresql,\ build \ @@ -31,13 +33,14 @@ $(call gb_ExternalProject_get_state_target,postgresql,build) : $(call gb_ExternalProject_run,build,\ ./configure \ - --without-readline --disable-shared --with-openssl --with-ldap \ + --without-readline --disable-shared --with-ldap \ + $(if $(filter-out YES,$(DISABLE_OPENSSL)),--with-openssl) \ $(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \ - $(if $(filter YES,$(WITH_KRB5)),--with-krb5) \ - $(if $(filter YES,$(WITH_GSSAPI)),--with-gssapi) \ + $(if $(and $(filter YES,$(WITH_KRB5)), $(filter-out YES,$(DISABLE_OPENSSL))),--with-krb5) \ + $(if $(and $(filter YES,$(WITH_GSSAPI)), $(filter-out YES,$(DISABLE_OPENSSL))),--with-gssapi) \ CPPFLAGS=$(if $(filter NO,$(SYSTEM_OPENLDAP)),\ -I$(call gb_UnpackedTarball_get_dir,openldap/include)) \ - $(if $(filter NO,$(SYSTEM_OPENSSL)),\ + $(if $(and $(filter NO,$(SYSTEM_OPENSSL)), $(filter-out YES,$(DISABLE_OPENSSL))),\ -I$(call gb_UnpackedTarball_get_dir,openssl/include)) \ $(if $(filter NO,$(SYSTEM_OPENLDAP)), \ LDFLAGS=-L$(OUTDIR)/lib \ -- To view, visit https://gerrit.libreoffice.org/ To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Iaf7e944d1d8f6a018e949ece56f6d3881f1e8c46 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Andres Gomez ago...@igalia.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] build: honor --disable-openssl flag final bits
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/3334 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/34/3334/1 build: honor --disable-openssl flag final bits OpenSSL banned completely from the building process when the proper flag has been passed during configure stage. Change-Id: If9a4e7e447ed872af57dd3a5fd6dbf24fb1587d3 --- M RepositoryExternal.mk 1 file changed, 2 insertions(+), 0 deletions(-) diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index 078c354..dc0965e 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -1187,6 +1187,7 @@ endif # SYSTEM_ICU +ifneq ($(DISABLE_OPENSSL),YES) ifeq ($(SYSTEM_OPENSSL),YES) gb_LinkTarget__use_openssl_headers:= @@ -1251,6 +1252,7 @@ endef endif # SYSTEM_OPENSSL +endif # DISABLE_OPENSSL ifeq ($(SYSTEM_CDR),YES) -- To view, visit https://gerrit.libreoffice.org/3334 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: If9a4e7e447ed872af57dd3a5fd6dbf24fb1587d3 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Andres Gomez ago...@igalia.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
anyone else having unit test failures on master
Hi
Until recently (about a week ago) I could do a make check on my
machine and it worked fine.
Now I seem to be having a reproducible failure in
make JunitTest_sw_unoapi
It's trigger an assert in String::Len, see trace below.
Any ideas?
Thread 1 (Thread 0x2b52c695d700 (LWP 27076)):
#0 0x2b52cbab8f5b in String::Len (this=0x2b52c695ae90) at
/home/noel/libo/solver/unxlngx6/inc/tools/strin
g.hxx:216
#1 0x2b52cc1ae94f in SwSubFont::_DrawText (this=0x4653220,
rInf=..., bGrey=0 '\000') at /home/noel/libo/s
w/source/core/txtnode/swfont.cxx:831
#2 0x2b52cc0b95bc in SwFont::_DrawText (this=0x4653220, rInf=...)
at /home/noel/libo/sw/source/core/inc/s
wfont.hxx:344
#3 0x2b52cc0b6b41 in SwExtraPainter::PaintExtra
(this=0x2b52c695b080, nY=2522, nAsc=224, nMax=276, bRed=f
alse) at /home/noel/libo/sw/source/core/text/frmpaint.cxx:246
#4 0x2b52cc0b7652 in SwTxtFrm::PaintExtraData (this=0x4624ec0,
rRect=SwRect = {...}) at /home/noel/libo/s
w/source/core/text/frmpaint.cxx:379
#5 0x2b52cbfd31f9 in SwLayoutFrm::RefreshExtraData (this=0x44b5730,
rRect=SwRect = {...}) at /home/noel/l
ibo/sw/source/core/layout/paintfrm.cxx:6834
#6 0x2b52cbfd2f2a in SwPageFrm::RefreshExtraData (this=0x44b5730,
rRect=SwRect = {...}) at /home/noel/lib
o/sw/source/core/layout/paintfrm.cxx:6799
#7 0x2b52cbfbfdbc in SwRootFrm::Paint (this=0x44a8140, rRect=SwRect
= {...}, pPrintData=0x0) at /home/noe
l/libo/sw/source/core/layout/paintfrm.cxx:3148
#8 0x2b52cc3c37d1 in ViewShell::ImplEndAction (this=0x431d0e0,
bIdleEnd=0 '\000') at /home/noel/libo/sw/s
ource/core/view/viewsh.cxx:358
#9 0x2b52cbb6e2ac in ViewShell::EndAction (this=0x431d0e0,
bIdleEnd=0 '\000') at /home/noel/libo/sw/inc/v
iewsh.hxx:594
#10 0x2b52cbb5e19d in SwCrsrShell::EndAction (this=0x431d0e0,
bIdleEnd=0 '\000') at /home/noel/libo/sw/sou
rce/core/crsr/crsrsh.cxx:257
#11 0x2b52cbfae63a in SwRootFrm::EndAllAction (this=0x44a8140,
bVirDev=0 '\000') at /home/noel/libo/sw/sou
rce/core/layout/pagechg.cxx:1885
#12 0x2b52cbd37132 in SwDoc::SetLineNumberInfo (this=0x453dff0,
rNew=...) at /home/noel/libo/sw/source/cor
e/doc/lineinfo.cxx:41
#13 0x2b52cc34a0d9 in SwXLineNumberingProperties::setPropertyValue
(this=0x463e590, rPropertyName=CountEm
ptyLines, aValue=uno::Any 0 '\000') at
/home/noel/libo/sw/source/core/unocore/unosett.cxx:976
Disclaimer: http://www.peralex.com/disclaimer.html
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: 7 commits - javaunohelper/source odk/config odk/examples odk/settings ure/source
javaunohelper/source/preload.cxx|
22 --
odk/config/setsdkenv_unix.sh.in |
2
odk/examples/DevelopersGuide/Components/CppComponent/Makefile |
2
odk/examples/DevelopersGuide/Components/JavaComponent/Makefile |
2
odk/examples/DevelopersGuide/Components/SimpleLicense/Makefile |
2
odk/examples/DevelopersGuide/Components/Thumbs/org/openoffice/test/Makefile |
2
odk/examples/DevelopersGuide/Components/dialogcomponent/Makefile|
2
odk/examples/DevelopersGuide/Spreadsheet/Makefile |
2
odk/examples/cpp/complextoolbarcontrols/MyProtocolHandler.h |
4 -
odk/examples/cpp/counter/Makefile |
2
odk/examples/java/ConverterServlet/web.xml |
4 -
odk/examples/java/Inspector/Makefile|
2
odk/examples/java/MinimalComponent/BuildMinimalComponent.xml|
4 -
odk/examples/java/MinimalComponent/Makefile |
2
odk/examples/java/Spreadsheet/Makefile |
2
odk/examples/java/ToDo/Makefile |
2
odk/settings/stdtarget.mk |
2
ure/source/uretest/Makefile |
8 +--
ure/source/uretest/Makefile.pln |
9 +---
ure/source/uretest/cppmain.cc |
18 +---
ure/source/uretest/cppserver.cc |
12 ++---
ure/source/uretest/cpptest.cc |
14 +++---
22 files changed, 44 insertions(+), 77 deletions(-)
New commits:
commit f3242bc0f000ce8bef969e05dc0fce1c4927f1e9
Author: Stephan Bergmann sberg...@redhat.com
Date: Thu Apr 11 14:22:22 2013 +0200
Missing rtl:: namespace
Change-Id: Ifc9eda5846558c449c40442016a243872eae2962
diff --git a/odk/examples/cpp/complextoolbarcontrols/MyProtocolHandler.h
b/odk/examples/cpp/complextoolbarcontrols/MyProtocolHandler.h
index dfcd295..98b26e1 100644
--- a/odk/examples/cpp/complextoolbarcontrols/MyProtocolHandler.h
+++ b/odk/examples/cpp/complextoolbarcontrols/MyProtocolHandler.h
@@ -142,7 +142,7 @@ class WriterDispatch : public BaseDispatch
public:
WriterDispatch( const ::com::sun::star::uno::Reference
::com::sun::star::uno::XComponentContext rxContext,
const ::com::sun::star::uno::Reference
::com::sun::star::frame::XFrame xFrame )
-: BaseDispatch( rxContext, xFrame, OUString(
com.sun.star.text.TextDocument ) )
+: BaseDispatch( rxContext, xFrame, rtl::OUString(
com.sun.star.text.TextDocument ) )
{}
};
@@ -151,7 +151,7 @@ class CalcDispatch : public BaseDispatch
public:
CalcDispatch( const ::com::sun::star::uno::Reference
::com::sun::star::uno::XComponentContext rxContext,
const ::com::sun::star::uno::Reference
::com::sun::star::frame::XFrame xFrame )
-: BaseDispatch( rxContext, xFrame, OUString(
com.sun.star.sheet.SpreadSheetDocument ) )
+: BaseDispatch( rxContext, xFrame, rtl::OUString(
com.sun.star.sheet.SpreadSheetDocument ) )
{}
};
commit 14a2413530cd856eb9ce280187d1f32acd358d1d
Author: Stephan Bergmann sberg...@redhat.com
Date: Thu Apr 11 14:05:42 2013 +0200
Adapt SDK to -B removed from cppumaker/javamaker
Change-Id: Ida4d11e0f8dfea201e0456cc54aa7f5af093d2ad
diff --git a/odk/examples/DevelopersGuide/Components/CppComponent/Makefile
b/odk/examples/DevelopersGuide/Components/CppComponent/Makefile
index a681e1b..7fd6965 100644
--- a/odk/examples/DevelopersGuide/Components/CppComponent/Makefile
+++ b/odk/examples/DevelopersGuide/Components/CppComponent/Makefile
@@ -96,7 +96,7 @@ $(SAMPLE_GEN_OUT)/%.rdb : $(GENURDFILES)
$(COMP_TYPEFLAG) : $(COMP_RDB) $(SDKTYPEFLAG)
-$(DEL) $(subst \\,\,$(subst /,$(PS),$@))
-$(MKDIR) $(subst /,$(PS),$(@D))
- $(CPPUMAKER) -Gc -BUCR -O$(SAMPLE_INC_OUT) $(TYPESLIST) $(COMP_RDB)
-X$(URE_TYPES) -X$(OFFICE_TYPES)
+ $(CPPUMAKER) -Gc -O$(SAMPLE_INC_OUT) $(TYPESLIST) $(COMP_RDB)
-X$(URE_TYPES) -X$(OFFICE_TYPES)
echo flagged $@
$(SAMPLE_SLO_OUT)/%.$(OBJ_EXT) : %.cxx $(COMP_TYPEFLAG)
diff --git a/odk/examples/DevelopersGuide/Components/JavaComponent/Makefile
b/odk/examples/DevelopersGuide/Components/JavaComponent/Makefile
index 327d4f2..e532d21 100644
--- a/odk/examples/DevelopersGuide/Components/JavaComponent/Makefile
+++ b/odk/examples/DevelopersGuide/Components/JavaComponent/Makefile
@@ -113,7 +113,7 @@ $(OUT_COMP_GEN)/%.rdb : $(GENURDFILES)
$(OUT_COMP_CLASS)/$(PACKAGE)/%.class : $(COMP_RDB)
-$(MKDIR) $(subst /,$(PS),$(@D))
Need help with LO codebase.
Hello all, My name is Sameer, am a student. I started programming a few months ago. I came in touch with FOSS a while back and have completely switched to FOSS recently. I am a hardcore fan of LibreOffice and use it all my college work. I heard about contributing to the project from a friend and cloned the libreoffice/core/ source into my PC. I'm quite new to programming, I'm decently skilled at C++. I had a few questions regarding the codebase: - Where can I find the code which operates upon the comments system in Writer? Like,..the way comments are associated with the rest of the document. - Where is the code that passes the document to a printer when a print command is issued? Any help would be highly appreciated! Regards, Sameer Deshmukh ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: basegfx/source
basegfx/source/polygon/b2dlinegeometry.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit bed6ac7d1b3e8327fa27091ddde0b515f44875cd
Author: Armin Le Grand a...@apache.org
Date: Wed Dec 5 15:47:22 2012 +
Small vector calculation correction
(cherry picked from commit 18b55ee40a68d46407d1534a6114a30933ba2d9b)
Change-Id: Ia3b07633ffd7fa9d835570fbeed332c02e478bc0
diff --git a/basegfx/source/polygon/b2dlinegeometry.cxx
b/basegfx/source/polygon/b2dlinegeometry.cxx
index 329b486..5c016bb 100644
--- a/basegfx/source/polygon/b2dlinegeometry.cxx
+++ b/basegfx/source/polygon/b2dlinegeometry.cxx
@@ -720,7 +720,7 @@ namespace basegfx
if(0.0 != fCutPos)
{
-const B2DPoint aCutPoint(interpolate(aStartPoint,
aStartPoint + rTangentPrev, fCutPos));
+const B2DPoint aCutPoint(aStartPoint + (rTangentPrev *
fCutPos));
aEdgePolygon.append(aCutPoint);
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - be/d6ac7d1b3e8327fa27091ddde0b515f44875cd
be/d6ac7d1b3e8327fa27091ddde0b515f44875cd |1 + 1 file changed, 1 insertion(+) New commits: commit b4e3bc232ddca140c36811af040f18e750917de3 Author: Caolán McNamara caol...@redhat.com Date: Thu Apr 11 13:39:11 2013 +0100 Notes added by 'git notes add' diff --git a/be/d6ac7d1b3e8327fa27091ddde0b515f44875cd b/be/d6ac7d1b3e8327fa27091ddde0b515f44875cd new file mode 100644 index 000..2c1c68b --- /dev/null +++ b/be/d6ac7d1b3e8327fa27091ddde0b515f44875cd @@ -0,0 +1 @@ +merged as: 18b55ee40a68d46407d1534a6114a30933ba2d9b ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 18/b55ee40a68d46407d1534a6114a30933ba2d9b
18/b55ee40a68d46407d1534a6114a30933ba2d9b |1 + 1 file changed, 1 insertion(+) New commits: commit 3f2d7b84c10911c653d9cb021421dfd412188c72 Author: Caolán McNamara caol...@redhat.com Date: Thu Apr 11 13:40:41 2013 +0100 Notes added by 'git notes add' diff --git a/18/b55ee40a68d46407d1534a6114a30933ba2d9b b/18/b55ee40a68d46407d1534a6114a30933ba2d9b new file mode 100644 index 000..0755962 --- /dev/null +++ b/18/b55ee40a68d46407d1534a6114a30933ba2d9b @@ -0,0 +1 @@ +merged as: bed6ac7d1b3e8327fa27091ddde0b515f44875cd ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] libcdr.git: src/lib
src/lib/CDRCollector.h |2 +-
src/lib/CDRContentCollector.h |2 +-
src/lib/CDRParser.cpp | 17 ++---
src/lib/CDRStylesCollector.cpp | 10 +-
src/lib/CDRStylesCollector.h |2 +-
5 files changed, 18 insertions(+), 15 deletions(-)
New commits:
commit 50d1fe49e22f1a04fa3f32e70e5a58fe56dd7e9f
Author: Fridrich Å trba fridrich.st...@bluewin.ch
Date: Thu Apr 11 14:42:45 2013 +0200
Refactor the character descriptions a bit
diff --git a/src/lib/CDRCollector.h b/src/lib/CDRCollector.h
index 9f9bb74..c17cbb4 100644
--- a/src/lib/CDRCollector.h
+++ b/src/lib/CDRCollector.h
@@ -125,7 +125,7 @@ public:
virtual void collectPaletteEntry(unsigned colorId, unsigned userId, const
CDRColor color) = 0;
virtual void collectFont(unsigned fontId, unsigned short fontEncoding, const
WPXString font) = 0;
virtual void collectText(unsigned textId, unsigned styleId, const
std::vectorunsigned char data,
- const std::vectoruint64_t charDescriptions,
const std::mapunsigned, CDRCharacterStyle styleOverrides) = 0;
+ const std::vectorunsigned char charDescriptions,
const std::mapunsigned, CDRCharacterStyle styleOverrides) = 0;
virtual void collectArtisticText(double x, double y) = 0;
virtual void collectParagraphText(double x, double y, double width, double
height) = 0;
virtual void collectStld(unsigned id, const CDRCharacterStyle charStyle) =
0;
diff --git a/src/lib/CDRContentCollector.h b/src/lib/CDRContentCollector.h
index 1957a17..a1e3e33 100644
--- a/src/lib/CDRContentCollector.h
+++ b/src/lib/CDRContentCollector.h
@@ -88,7 +88,7 @@ public:
void collectPaletteEntry(unsigned, unsigned, const CDRColor ) {}
void collectFont(unsigned, unsigned short, const WPXString ) {}
void collectText(unsigned, unsigned, const std::vectorunsigned char ,
- const std::vectoruint64_t , const std::mapunsigned,
CDRCharacterStyle ) {}
+ const std::vectorunsigned char , const
std::mapunsigned, CDRCharacterStyle ) {}
void collectArtisticText(double x, double y);
void collectParagraphText(double x, double y, double width, double height);
void collectStld(unsigned, const CDRCharacterStyle ) {}
diff --git a/src/lib/CDRParser.cpp b/src/lib/CDRParser.cpp
index 83fe45b..551eec5 100644
--- a/src/lib/CDRParser.cpp
+++ b/src/lib/CDRParser.cpp
@@ -2773,13 +2773,15 @@ void libcdr::CDRParser::readTxsm(WPXInputStream *input,
unsigned length)
charStyles[2*i] = charStyle;
}
unsigned numChars = readU32(input);
- std::vectoruint64_t charDescriptions(numChars);
+ std::vectorunsigned char charDescriptions(numChars);
for (i=0; inumChars; ++i)
{
+unsigned tmpCharDescription = 0;
if (m_version = 1200)
- charDescriptions[i] = readU64(input);
+ tmpCharDescription = readU64(input) 0x;
else
- charDescriptions[i] = readU32(input);
+ tmpCharDescription = readU32(input);
+charDescriptions[i] = (tmpCharDescription 16) | (tmpCharDescription
0x01);
}
unsigned numBytes = numChars;
if (m_version = 1200)
@@ -2793,7 +2795,8 @@ void libcdr::CDRParser::readTxsm(WPXInputStream *input,
unsigned length)
memcpy(textData[0], buffer, numBytesRead);
input-seek(1, WPX_SEEK_CUR); //skip the 0 ending character
- m_collector-collectText(textId, stlId, textData, charDescriptions,
charStyles);
+ if (!textData.empty())
+m_collector-collectText(textId, stlId, textData, charDescriptions,
charStyles);
}
#ifndef DEBUG
}
@@ -2888,7 +2891,7 @@ void libcdr::CDRParser::readTxsm16(WPXInputStream *input)
std::mapunsigned, CDRCharacterStyle charStyles;
unsigned numChars = readU32(input);
-std::vectoruint64_t charDescriptions(numChars);
+std::vectorunsigned char charDescriptions(numChars);
for (i=0; inumChars; ++i)
{
charDescriptions[i] = readU64(input);
@@ -2902,7 +2905,8 @@ void libcdr::CDRParser::readTxsm16(WPXInputStream *input)
if (numBytesRead)
memcpy(textData[0], buffer, numBytesRead);
-m_collector-collectText(textId, stlId, textData, charDescriptions,
charStyles);
+if (!textData.empty())
+ m_collector-collectText(textId, stlId, textData, charDescriptions,
charStyles);
#ifndef DEBUG
}
catch (...)
@@ -2913,7 +2917,6 @@ void libcdr::CDRParser::readTxsm16(WPXInputStream *input)
void libcdr::CDRParser::readTxsm6(WPXInputStream *input)
{
-
input-seek(0x28, WPX_SEEK_CUR);
input-seek(48, WPX_SEEK_CUR);
input-seek(4, WPX_SEEK_CUR);
diff --git a/src/lib/CDRStylesCollector.cpp b/src/lib/CDRStylesCollector.cpp
index 8c05227..7365ebb 100644
--- a/src/lib/CDRStylesCollector.cpp
+++ b/src/lib/CDRStylesCollector.cpp
@@ -252,12 +252,12 @@ void libcdr::CDRStylesCollector::collectFont(unsigned
fontId, unsigned short enc
}
void
[Libreoffice-commits] core.git: sc/uiconfig
sc/uiconfig/scalc/ui/deletecells.ui | 188 1 file changed, 188 insertions(+) New commits: commit 2d98db0da7c07a803595c703b06874b5ee497f30 Author: Alia Almusaireae almusair...@kacst.edu.sa Date: Wed Apr 10 13:10:58 2013 +0300 deletecells.ui widget Change-Id: I93ac358e259a1fb310dfeed75bc60910405e7d48 Reviewed-on: https://gerrit.libreoffice.org/3306 Reviewed-by: Caolán McNamara caol...@redhat.com Tested-by: Caolán McNamara caol...@redhat.com diff --git a/sc/uiconfig/scalc/ui/deletecells.ui b/sc/uiconfig/scalc/ui/deletecells.ui new file mode 100644 index 000..276326f --- /dev/null +++ b/sc/uiconfig/scalc/ui/deletecells.ui @@ -0,0 +1,188 @@ +?xml version=1.0 encoding=UTF-8? +interface + !-- interface-requires gtk+ 3.0 -- + object class=GtkDialog id=deletecells +property name=can_focusFalse/property +property name=border_width5/property +property name=title translatable=yesDelete Cells/property +property name=type_hintdialog/property +child internal-child=vbox + object class=GtkBox id=dialog-vbox1 +property name=can_focusFalse/property +property name=spacing2/property +child internal-child=action_area + object class=GtkButtonBox id=dialog-action_area1 +property name=can_focusFalse/property +property name=orientationvertical/property +property name=layout_stylestart/property +child + object class=GtkButton id=ok1 +property name=labelgtk-ok/property +property name=visibleTrue/property +property name=can_focusTrue/property +property name=has_defaultTrue/property +property name=receives_defaultTrue/property +property name=use_action_appearanceFalse/property +property name=use_stockTrue/property + /object + packing +property name=expandFalse/property +property name=fillTrue/property +property name=position0/property + /packing +/child +child + object class=GtkButton id=cancel1 +property name=labelgtk-cancel/property +property name=visibleTrue/property +property name=can_focusTrue/property +property name=receives_defaultTrue/property +property name=use_action_appearanceFalse/property +property name=use_stockTrue/property + /object + packing +property name=expandFalse/property +property name=fillTrue/property +property name=position1/property + /packing +/child +child + object class=GtkButton id=help1 +property name=labelgtk-help/property +property name=visibleTrue/property +property name=can_focusTrue/property +property name=receives_defaultTrue/property +property name=use_action_appearanceFalse/property +property name=use_stockTrue/property +property name=image_positiontop/property + /object + packing +property name=expandFalse/property +property name=fillTrue/property +property name=position2/property + /packing +/child + /object + packing +property name=expandFalse/property +property name=fillTrue/property +property name=pack_typeend/property +property name=position0/property + /packing +/child +child + object class=GtkFrame id=Selection +property name=visibleTrue/property +property name=can_focusFalse/property +property name=label_xalign0/property +property name=shadow_typenone/property +child + object class=GtkAlignment id=alignment3 +property name=visibleTrue/property +property name=can_focusFalse/property +property name=left_padding12/property +child + object class=GtkBox id=box1 +property name=visibleTrue/property +property name=can_focusFalse/property +property name=orientationvertical/property +child + object class=GtkRadioButton id=radiobutton1 +property name=label translatable=yesShift cells _up/property +property name=visibleTrue/property +property name=can_focusTrue/property +property name=receives_defaultFalse/property +property name=use_action_appearanceFalse/property +
[Libreoffice-commits] core.git: 2 commits - sc/inc sc/source sc/uiconfig sc/UIConfig_scalc.mk unodevtools/Executable_skeletonmaker.mk unodevtools/source
sc/UIConfig_scalc.mk|1
sc/inc/sc.hrc |2
sc/inc/scabstdlg.hxx|2
sc/source/ui/attrdlg/scdlgfact.cxx | 22
sc/source/ui/attrdlg/scdlgfact.hxx |3
sc/source/ui/inc/delcldlg.hxx | 16
sc/source/ui/inc/miscdlgs.hrc |9
sc/source/ui/miscdlgs/delcldlg.cxx | 51 -
sc/source/ui/src/miscdlgs.src | 68 --
sc/source/ui/view/cellsh1.cxx |4
sc/uiconfig/scalc/ui/deletecells.ui | 51 -
unodevtools/Executable_skeletonmaker.mk |1
unodevtools/source/unodevtools/typeblob.cxx | 797
13 files changed, 61 insertions(+), 966 deletions(-)
New commits:
commit 569ef418f5b0ff2d9e2246f2a16d7d7f090ce4d0
Author: Caolán McNamara caol...@redhat.com
Date: Thu Apr 11 13:32:24 2013 +0100
adapt code for delete cells dialog
Change-Id: Ibf587e1ea94765f0322a5b847bcf82d1eabc1b64
diff --git a/sc/UIConfig_scalc.mk b/sc/UIConfig_scalc.mk
index 3ff8973..8f800bf 100644
--- a/sc/UIConfig_scalc.mk
+++ b/sc/UIConfig_scalc.mk
@@ -61,6 +61,7 @@ $(eval $(call gb_UIConfig_add_toolbarfiles,modules/scalc,\
$(eval $(call gb_UIConfig_add_uifiles,modules/scalc,\
sc/uiconfig/scalc/ui/cellprotectionpage \
sc/uiconfig/scalc/ui/definename \
+ sc/uiconfig/scalc/ui/deletecells \
sc/uiconfig/scalc/ui/deletecontents \
sc/uiconfig/scalc/ui/formatcellsdialog \
sc/uiconfig/scalc/ui/insertname \
diff --git a/sc/inc/sc.hrc b/sc/inc/sc.hrc
index 9d85a5a..4749970 100644
--- a/sc/inc/sc.hrc
+++ b/sc/inc/sc.hrc
@@ -951,7 +951,7 @@
#define RID_SCDLG_FILTER(SC_DIALOGS_START + 8)
#define RID_SCDLG_SPEC_FILTER (SC_DIALOGS_START + 9)
-#define RID_SCDLG_DELCELL (SC_DIALOGS_START + 11)
+
#define RID_SCDLG_INSCELL (SC_DIALOGS_START + 12)
#define RID_SCDLG_INSCONT (SC_DIALOGS_START + 14)
diff --git a/sc/inc/scabstdlg.hxx b/sc/inc/scabstdlg.hxx
index 7b6c602..89997d4 100644
--- a/sc/inc/scabstdlg.hxx
+++ b/sc/inc/scabstdlg.hxx
@@ -358,7 +358,7 @@ public:
const
com::sun::star::uno::SequenceOUString rServices,
int
nId ) = 0;
-virtual AbstractScDeleteCellDlg * CreateScDeleteCellDlg( Window* pParent,
int nId, sal_Bool bDisallowCellMove = false ) = 0 ; //add for ScDeleteCellDlg
+virtual AbstractScDeleteCellDlg * CreateScDeleteCellDlg(Window* pParent,
bool bDisallowCellMove = false) = 0 ; //add for ScDeleteCellDlg
//for dataform
virtual AbstractScDataFormDlg * CreateScDataFormDlg( Window* pParent, int
nId, ScTabViewShell* pTabViewShell ) = 0 ; //add for ScDataFormDlg
diff --git a/sc/source/ui/attrdlg/scdlgfact.cxx
b/sc/source/ui/attrdlg/scdlgfact.cxx
index b6ce1f8..98b656f 100644
--- a/sc/source/ui/attrdlg/scdlgfact.cxx
+++ b/sc/source/ui/attrdlg/scdlgfact.cxx
@@ -832,27 +832,13 @@ AbstractScDataPilotServiceDlg*
ScAbstractDialogFactory_Impl::CreateScDataPilotSe
// add for ScDataPilotServiceDlg end
-AbstractScDeleteCellDlg* ScAbstractDialogFactory_Impl::CreateScDeleteCellDlg(
Window* pParent, int nId,
-
sal_Bool bDisallowCellMove )
+AbstractScDeleteCellDlg*
ScAbstractDialogFactory_Impl::CreateScDeleteCellDlg(Window* pParent,
+bool bDisallowCellMove)
{
-ScDeleteCellDlg * pDlg=NULL;
-switch ( nId )
-{
-case RID_SCDLG_DELCELL :
-pDlg = new ScDeleteCellDlg( pParent, bDisallowCellMove );
-break;
-default:
-break;
-}
-
-if ( pDlg )
-return new AbstractScDeleteCellDlg_Impl( pDlg );
-return 0;
+ScDeleteCellDlg * pDlg = new ScDeleteCellDlg(pParent, bDisallowCellMove);
+return new AbstractScDeleteCellDlg_Impl( pDlg );
}
-
-
-
AbstractScDataFormDlg* ScAbstractDialogFactory_Impl::CreateScDataFormDlg(
Window* pParent, int nId, ScTabViewShell* pTabViewShell )
{
ScDataFormDlg * pDlg=NULL;
diff --git a/sc/source/ui/attrdlg/scdlgfact.hxx
b/sc/source/ui/attrdlg/scdlgfact.hxx
index 823eaeb..3383616 100644
--- a/sc/source/ui/attrdlg/scdlgfact.hxx
+++ b/sc/source/ui/attrdlg/scdlgfact.hxx
@@ -424,8 +424,7 @@ public:
virtual AbstractScDataPilotServiceDlg * CreateScDataPilotServiceDlg(
Window* pParent, //add for ScDataPilotServiceDlg
const
com::sun::star::uno::SequenceOUString rServices,
int
nId );
-virtual AbstractScDeleteCellDlg * CreateScDeleteCellDlg( Window* pParent,
int nId,
-sal_Bool
bDisallowCellMove = false ); //add for ScDeleteCellDlg
+virtual AbstractScDeleteCellDlg *
MSVC link /INCREMENTAL - does this actually work?
i've tried to get the MSVC 2008 linker to do incremental linking, see
the attached patch.
the linker is very picky and spits out an error message that it does a
full link if anything touches the .dll or .ilk file and modifies the
timestamp after it was linked.
but with the patch i don't get that error message for DLLs any more, but
still the linking does not seem to happen any faster.
i've tried in vcl and tookit modules, in an --enable-pch
--enable-dbgutil build, touch a single file and rebuild the module,
roughly as fast with incremental as without.
when i add -verbose to the linker options, i see what looks like
something adds additional parameters, among them a /fullbuild that is
documented nowhere apparently. it's a mystery what is going on there.
maybe somebody more familiar with MSVC has some insight into this that
i'm missing (also i haven't got MSVC 2010 or 2012 installed so don't
know what happens there).
From 789f939ca4efea5544ede15667c2e4b4468bf424 Mon Sep 17 00:00:00 2001
From: Michael Stahl mst...@redhat.com
Date: Mon, 8 Apr 2013 13:52:00 +0200
Subject: [PATCH] try -incremental
Change-Id: I5553248530d08af54f3aac4bd881f9c2af6e2a15
---
solenv/gbuild/LinkTarget.mk |2 +-
solenv/gbuild/platform/com_MSC_class.mk |7 +++
2 files changed, 4 insertions(+), 5 deletions(-)
mode change 100644 = 100755 solenv/gbuild/LinkTarget.mk
diff --git a/solenv/gbuild/LinkTarget.mk b/solenv/gbuild/LinkTarget.mk
old mode 100644
new mode 100755
index 46952c8..4825f21
--- a/solenv/gbuild/LinkTarget.mk
+++ b/solenv/gbuild/LinkTarget.mk
@@ -1179,7 +1179,7 @@ endef
# gb_LinkTarget_add_auxtarget linktarget auxtarget
define gb_LinkTarget_add_auxtarget
$(2) : $(call gb_LinkTarget_get_target,$(1))
- touch $$@
+ true
$(call gb_LinkTarget_get_clean_target,$(1)) : AUXTARGETS += $(2)
diff --git a/solenv/gbuild/platform/com_MSC_class.mk b/solenv/gbuild/platform/com_MSC_class.mk
index 55aff01..8c10bf6 100755
--- a/solenv/gbuild/platform/com_MSC_class.mk
+++ b/solenv/gbuild/platform/com_MSC_class.mk
@@ -213,8 +213,6 @@ $(call gb_Helper_abbreviate_dirs,\
$(if $(filter-out StaticLibrary,$(TARGETTYPE)),user32.lib) \
$(if $(DLLTARGET),-out:$(DLLTARGET) -implib:$(1),-out:$(1)); RC=$$?; rm $${RESPONSEFILE} \
$(if $(DLLTARGET),; if [ ! -f $(DLLTARGET) ]; then rm -f $(1) false; fi) \
- $(if $(filter Library,$(TARGETTYPE)),; if [ -f $(DLLTARGET).manifest ]; then mt.exe $(MTFLAGS) -nologo -manifest $(DLLTARGET).manifest -outputresource:$(DLLTARGET)\;2; fi) \
- $(if $(filter Executable,$(TARGETTYPE)),; if [ -f $(1).manifest ]; then mt.exe $(MTFLAGS) -nologo -manifest $(1).manifest -outputresource:$(1)\;1; fi) \
; exit $$RC)
endef
@@ -224,9 +222,10 @@ endef
# Flags common for PE executables (EXEs and DLLs)
gb_Windows_PE_TARGETTYPEFLAGS := \
- -release \
+ $(if $(gb_ENABLE_DBGUTIL),\
+ -incremental,\
+ -release -incremental:no) \
-opt:noref \
- -incremental:no \
-debug \
-nxcompat \
-dynamicbase \
--
1.7.9
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 0b2d290600f545e929820432f12a88b206c1d19b Author: Caolán McNamara caol...@redhat.com Date: Thu Apr 11 13:49:02 2013 +0100 Updated core Project: help fa1f0460e82625309576c81b4edd24638033ef16 diff --git a/helpcontent2 b/helpcontent2 index c994e4f..fa1f046 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit c994e4f941a7d5d5c5b1dae8e0c64d8cbe44b7e8 +Subproject commit fa1f0460e82625309576c81b4edd24638033ef16 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: helpers/help_hid.lst source/text
helpers/help_hid.lst |4 source/text/scalc/01/0216.xhp | 13 +++-- 2 files changed, 7 insertions(+), 10 deletions(-) New commits: commit fa1f0460e82625309576c81b4edd24638033ef16 Author: Caolán McNamara caol...@redhat.com Date: Thu Apr 11 13:49:02 2013 +0100 update help ids for calc delete cells .ui conversion Change-Id: Iab419cfb0747b0a56cdc8bf3bbf5aaae9f54344b diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst index 795eb88..e56087f 100644 --- a/helpers/help_hid.lst +++ b/helpers/help_hid.lst @@ -6839,10 +6839,6 @@ sc_RadioButton_RID_SCDLG_COLROWNAMERANGES_BTN_ROWHEAD,2568782352, sc_RadioButton_RID_SCDLG_DAPITYPE_BTN_DATABASE,1495319045, sc_RadioButton_RID_SCDLG_DAPITYPE_BTN_EXTERNAL,1495319046, sc_RadioButton_RID_SCDLG_DAPITYPE_BTN_SELECTION,1495319044, -sc_RadioButton_RID_SCDLG_DELCELL_BTN_CELLSLEFT,1493385741, -sc_RadioButton_RID_SCDLG_DELCELL_BTN_CELLSUP,1493385738, -sc_RadioButton_RID_SCDLG_DELCELL_BTN_DELCOLS,1493385743, -sc_RadioButton_RID_SCDLG_DELCELL_BTN_DELROWS,1493385742, sc_RadioButton_RID_SCDLG_DPDATEGROUP_RB_AUTOEND,1495433731, sc_RadioButton_RID_SCDLG_DPDATEGROUP_RB_AUTOSTART,1495433729, sc_RadioButton_RID_SCDLG_DPDATEGROUP_RB_MANEND,1495433732, diff --git a/source/text/scalc/01/0216.xhp b/source/text/scalc/01/0216.xhp index c0908f4..249212e 100644 --- a/source/text/scalc/01/0216.xhp +++ b/source/text/scalc/01/0216.xhp @@ -41,6 +41,7 @@ commentMW made one deleting; entry out of 3/comment bookmark xml-lang=en-US branch=hid/.uno:DeleteCell id=bm_id3151115 localize=false/ +bookmark xml-lang=en-US branch=hid/modules/scalc/ui/deletecells/DeleteCellsDialog id=bm_id3151116 localize=false/ paragraph xml-lang=en-US id=hd_id3153726 role=heading level=1 l10n=U oldref=1Delete Cells/paragraph paragraph xml-lang=en-US id=par_id3154490 role=paragraph l10n=U oldref=2variable id=zellenloeschentextahelp hid=.uno:DeleteCellCompletely deletes selected cells, columns or rows. The cells below or to the right of the deleted cells will fill the space./ahelp /variable Note that the selected delete option is stored and reloaded when the dialog is next called./paragraph @@ -52,20 +53,20 @@ paragraph xml-lang=en-US id=hd_id3149121 role=heading level=2 l10n=U oldref=3Selection/paragraph paragraph xml-lang=en-US id=par_id3150751 role=paragraph l10n=U oldref=4This area contains options for specifying how sheets are displayed after deleting cells./paragraph -bookmark xml-lang=en-US branch=hid/sc:RadioButton:RID_SCDLG_DELCELL:BTN_CELLSUP id=bm_id3154755 localize=false/ +bookmark xml-lang=en-US branch=hid/modules/scalc/ui/deletecells/up id=bm_id3154755 localize=false/ paragraph xml-lang=en-US id=hd_id3155767 role=heading level=3 l10n=U oldref=5Shift cells up/paragraph - paragraph xml-lang=en-US id=par_id3153714 role=paragraph l10n=U oldref=6ahelp hid=SC:RADIOBUTTON:RID_SCDLG_DELCELL:BTN_CELLSUPFills the space produced by the deleted cells with the cells underneath it./ahelp/paragraph + paragraph xml-lang=en-US id=par_id3153714 role=paragraph l10n=U oldref=6ahelp hid=modules/scalc/ui/deletecells/upFills the space produced by the deleted cells with the cells underneath it./ahelp/paragraph -bookmark xml-lang=en-US branch=hid/sc:RadioButton:RID_SCDLG_DELCELL:BTN_CELLSLEFT id=bm_id3147346 localize=false/ +bookmark xml-lang=en-US branch=hid/modules/scalc/ui/deletecells/left id=bm_id3147346 localize=false/ paragraph xml-lang=en-US id=hd_id3156382 role=heading level=3 l10n=U oldref=7Shift cells left/paragraph - paragraph xml-lang=en-US id=par_id3154702 role=paragraph l10n=U oldref=8ahelp hid=SC:RADIOBUTTON:RID_SCDLG_DELCELL:BTN_CELLSLEFTFills the resulting space by the cells to the right of the deleted cells./ahelp/paragraph + paragraph xml-lang=en-US id=par_id3154702 role=paragraph l10n=U oldref=8ahelp hid=modules/scalc/ui/deletecells/leftFills the resulting space by the cells to the right of the deleted cells./ahelp/paragraph -bookmark xml-lang=en-US branch=hid/sc:RadioButton:RID_SCDLG_DELCELL:BTN_DELROWS id=bm_id3149566 localize=false/ +bookmark xml-lang=en-US branch=hid/modules/scalc/ui/deletecells/rows id=bm_id3149566 localize=false/ bookmark xml-lang=en-US branch=hid/.uno:DeleteRows id=bm_id3149565 localize=false/ paragraph xml-lang=en-US id=hd_id3146918 role=heading level=3 l10n=U oldref=9Delete entire row(s)/paragraph paragraph xml-lang=en-US id=par_id3148487 role=paragraph l10n=U oldref=10ahelp hid=.uno:DeleteRowsAfter selecting at least one cell, deletes the entire row from the sheet./ahelp/paragraph -bookmark xml-lang=en-US branch=hid/sc:RadioButton:RID_SCDLG_DELCELL:BTN_DELCOLS id=bm_id3150342 localize=false/ +bookmark xml-lang=en-US branch=hid/modules/scalc/ui/deletecells/cols id=bm_id3150342 localize=false/ bookmark xml-lang=en-US branch=hid/.uno:DeleteColumns id=bm_id3159240 localize=false/ paragraph xml-lang=en-US id=hd_id3155114 role=heading
[PUSHED] deletecells.ui widget
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/3306 Approvals: Caolán McNamara: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/3306 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I93ac358e259a1fb310dfeed75bc60910405e7d48 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Aliah Almusaireae almusair...@kacst.edu.sa Gerrit-Reviewer: Caolán McNamara caol...@redhat.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Need help with LO codebase.
Hi Sameer, Op 11-04-13 14:31, Sameer Deshmukh schreef: Hello all, My name is Sameer, am a student. I started programming a few months ago. I came in touch with FOSS a while back and have completely switched to FOSS recently. I am a hardcore fan of LibreOffice and use it all my college work. Welcome! I heard about contributing to the project from a friend and cloned the libreoffice/core/ source into my PC. I'm quite new to programming, I'm decently skilled at C++. I had a few questions regarding the codebase: * Where can I find the code which operates upon the comments system in Writer? Like,..the way comments are associated with the rest of the document. Am I right you are asking this because of following GSoC project: https://wiki.documentfoundation.org/Development/Gsoc/Ideas#Comments_improvements ? I'm not that familiar with the workflow of GSoC, but as far I know you need to send an 'application' to work on particular projects, and that only 1 developer can work on 1 project. Are the projects already distributed among the participants? If not, I recommend to wait start working on this project and have a look at the EasyHacks (https://wiki.documentfoundation.org/Development/Easy_Hacks_by_Difficulty) to get a bit confident with LibreOffice code base. Otherwise there are also some bugs regarding comments which you can find on BugZilla (https://bugs.freedesktop.org/buglist.cgi?list_id=281559short_desc=commentquery_format=advancedbug_status=NEWshort_desc_type=allwordssubstrcomponent=Writerproduct=LibreOffice). Anyhow: Based on my own experience (https://gerrit.libreoffice.org/#/c/2572/) with comments I can redirect you to following folder: sw/source/ui/docvw/ I hope another developer can add some interesting links too :)? * Where is the code that passes the document to a printer when a print command is issued? Any help would be highly appreciated! Kind regards, Joren ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sc/source
sc/source/ui/dbgui/tpsort.cxx | 13 +++--
1 file changed, 11 insertions(+), 2 deletions(-)
New commits:
commit 15e0ef908c9e54527276500cf7a537055c374850
Author: Albert Thuswaldner albert.thuswald...@gmail.com
Date: Sat Apr 6 21:43:48 2013 +0200
fdo#51828 - UI: Sort: can use more than 3 criteria once only
Change-Id: I7480e8d606e1eafde45635e36dfafa4232f529cb
Reviewed-on: https://gerrit.libreoffice.org/3217
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/sc/source/ui/dbgui/tpsort.cxx b/sc/source/ui/dbgui/tpsort.cxx
index 4c56058..6731e71 100644
--- a/sc/source/ui/dbgui/tpsort.cxx
+++ b/sc/source/ui/dbgui/tpsort.cxx
@@ -168,9 +168,19 @@ void ScTabPageSortFields::Reset( const SfxItemSet /*
rArgSet */ )
// ListBox selection:
if ( aSortData.maKeyState[0].bDoSort )
{
+// Make sure that the all sort keys are reset
+for ( sal_uInt16 i=nSortKeyCount; iaSortData.maKeyState.size(); i++ )
+{
+maSortKeyCtrl.AddSortKey(i+1);
+maSortKeyItems[i].m_pLbSort-SetSelectHdl( LINK( this,
+ ScTabPageSortFields, SelectHdl ) );
+}
+nSortKeyCount = aSortData.maKeyState.size();
+FillFieldLists(0);
+
for ( sal_uInt16 i=0; inSortKeyCount; i++ )
{
-if ( i aSortData.maKeyState.size()
aSortData.maKeyState[i].bDoSort )
+if (aSortData.maKeyState[i].bDoSort )
{
maSortKeyItems[i].m_pLbSort-SelectEntryPos( GetFieldSelPos(
aSortData.maKeyState[i].nField ) );
@@ -193,7 +203,6 @@ void ScTabPageSortFields::Reset( const SfxItemSet /*
rArgSet */ )
maSortKeyItems[i].DisableField();
else
maSortKeyItems[i].EnableField();
-
}
else
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit c60afa164c2414d84e50415ce495686ec87b8ddf Author: Caolán McNamara caol...@redhat.com Date: Thu Apr 11 13:57:49 2013 +0100 Updated core Project: help 4fa871622ae5cb247520fc113d2278be758fa62c diff --git a/helpcontent2 b/helpcontent2 index fa1f046..4fa8716 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit fa1f0460e82625309576c81b4edd24638033ef16 +Subproject commit 4fa871622ae5cb247520fc113d2278be758fa62c ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: source/text
source/text/shared/optionen/01040200.xhp |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 4fa871622ae5cb247520fc113d2278be758fa62c Author: Caolán McNamara caol...@redhat.com Date: Thu Apr 11 13:57:49 2013 +0100 fix duplicated id Change-Id: I01c5544db0d07a2e4301bf3b3306e4e8da701571 diff --git a/source/text/shared/optionen/01040200.xhp b/source/text/shared/optionen/01040200.xhp index 2062cb1..a270ef8 100644 --- a/source/text/shared/optionen/01040200.xhp +++ b/source/text/shared/optionen/01040200.xhp @@ -49,7 +49,7 @@ bookmark_valuefields;displaying field codes (Writer)/bookmark_value bookmark_valuedisplaying; comments in text documents/bookmark_value /bookmark -bookmark xml-lang=en-US branch=hid/modules/swriter/ui/viewoptionspage/ViewOptionsPage id=bm_id315 localize=false/paragraph role=heading id=hd_id3156346 xml-lang=en-US level=3 l10n=U oldref=9Helplines While Moving/paragraph +bookmark xml-lang=en-US branch=hid/modules/swriter/ui/viewoptionspage/ViewOptionsPage id=bm_id315 localize=false/ paragraph role=heading id=hd_id3145090 xml-lang=en-US level=1 l10n=U oldref=1link href=text/shared/optionen/01040200.xhp name=ViewView/link/paragraph paragraph role=paragraph id=par_id3147088 xml-lang=en-US l10n=U oldref=2ahelp hid=.Defines the default settings for displaying objects in your text documents and also the default settings for the window elements./ahelp/paragraph /section ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
