[Libreoffice-commits] core.git: solenv/gbuild
solenv/gbuild/LinkTarget.mk |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 80fb8b775c34080b983648a2b596e17ba58850b6 Author: David Tardon Date: Wed Apr 24 08:53:26 2013 +0200 make sure the dir exists I am hitting this problem with libcppunit.so.exports. It happens because libcppunit.so is not built by LinkTarget, so nothing has created $(WORKDIR)/LinkTarget/Library/ yet. Change-Id: Ibdde83c746f02110aab113491a2bf37bf2d417eb diff --git a/solenv/gbuild/LinkTarget.mk b/solenv/gbuild/LinkTarget.mk index 8cad4b2..60747e2 100755 --- a/solenv/gbuild/LinkTarget.mk +++ b/solenv/gbuild/LinkTarget.mk @@ -449,7 +449,7 @@ endef # Put this pattern rule here so it overrides the one below. # (this is rather ugly: because of % the functions cannot be used) $(call gb_LinkTarget_get_target,Library/%.exports) : $(gb_Library_OUTDIRLOCATION)/% - $(if $(wildcard $@),true,touch $@) + $(if $(wildcard $@),true,mkdir -p $(dir $@) && touch $@) $(call gb_LinkTarget_get_target,%) : $(call gb_LinkTarget_get_headers_target,%) $(gb_Helper_MISCDUMMY) $(if $(filter $*,$(foreach lib,$(gb_MERGEDLIBS) $(gb_URELIBS),$(call gb_Library_get_linktargetname,$(lib,\ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PATCH] install gen. IDL docs using filelist
Hello LibreOffice gerrit bot, I'd like you to reexamine a change. Please visit https://gerrit.libreoffice.org/3571 to look at the new patch set (#4). Change subject: install gen. IDL docs using filelist .. install gen. IDL docs using filelist Change-Id: I474f6e7a45d09683eb0dd7172114407c9dca84d7 --- M odk/CustomTarget_autodoc.mk M odk/CustomTarget_check.mk M odk/CustomTarget_odkcommon.mk M odk/Module_odk.mk A odk/PackageSet_autodoc.mk A odk/Package_autodoc.mk M odk/Package_docs.mk M scp2/source/sdkoo/module_sdkoo.scp M scp2/source/sdkoo/sdkoo.scp M solenv/gbuild/UnoApi.mk 10 files changed, 283 insertions(+), 14 deletions(-) git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/71/3571/4 -- To view, visit https://gerrit.libreoffice.org/3571 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newpatchset Gerrit-Change-Id: I474f6e7a45d09683eb0dd7172114407c9dca84d7 Gerrit-PatchSet: 4 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: David Tardon Gerrit-Reviewer: LibreOffice gerrit bot ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] add test for missing module-ix.html
Hello LibreOffice gerrit bot, I'd like you to reexamine a change. Please visit https://gerrit.libreoffice.org/3578 to look at the new patch set (#3). Change subject: add test for missing module-ix.html .. add test for missing module-ix.html Change-Id: Ibdbe04028ad9648af011da51b562cc6aa5e4849b --- M odk/CustomTarget_check.mk 1 file changed, 17 insertions(+), 0 deletions(-) git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/78/3578/3 -- To view, visit https://gerrit.libreoffice.org/3578 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newpatchset Gerrit-Change-Id: Ibdbe04028ad9648af011da51b562cc6aa5e4849b Gerrit-PatchSet: 3 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: David Tardon Gerrit-Reviewer: LibreOffice gerrit bot ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: offapi/Module_offapi.mk offapi/UnoApiMerge_types.mk testtools/CustomTarget_bridgetest_climaker.mk testtools/CustomTarget_bridgetest_javamaker.mk
offapi/Module_offapi.mk|1 offapi/UnoApiMerge_types.mk| 37 - testtools/CustomTarget_bridgetest_climaker.mk |5 ++- testtools/CustomTarget_bridgetest_javamaker.mk |4 +- 4 files changed, 5 insertions(+), 42 deletions(-) New commits: commit 4a0b39f592210b19e4dbf4b8c797969942269d80 Author: Stephan Bergmann Date: Wed Apr 24 00:33:36 2013 +0200 Get rid of UnoApiMerge_types (The "statistic" target in offapi/UnoApiMerge_types.mk appears to have been dead code already for quite a while.) Change-Id: I0852ebf1f765ba881abb6ce4db496e949076fc64 diff --git a/offapi/Module_offapi.mk b/offapi/Module_offapi.mk index ac945b2..63d152e 100644 --- a/offapi/Module_offapi.mk +++ b/offapi/Module_offapi.mk @@ -21,7 +21,6 @@ $(eval $(call gb_Module_Module,offapi)) $(eval $(call gb_Module_add_targets,offapi,\ UnoApi_offapi \ - UnoApiMerge_types \ )) # vim: set noet sw=4 ts=4: diff --git a/offapi/UnoApiMerge_types.mk b/offapi/UnoApiMerge_types.mk deleted file mode 100644 index 9bcc9ef..000 --- a/offapi/UnoApiMerge_types.mk +++ /dev/null @@ -1,37 +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/. -# -# 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 . -# - -$(eval $(call gb_UnoApiMerge_UnoApiMerge,types)) - -$(eval $(call gb_UnoApiMerge_use_api,types,\ -udkapi \ -offapi \ -)) - -$(eval $(call gb_UnoApiMerge_set_reference_rdbfile,types,\ -offapi/type_reference/types \ -)) - -# ugly hack for now! -statistic : $(gb_Helper_MISC)/api_statistic - -$(gb_Helper_MISC)/api_statistic: $(call gb_UnoApiMerge_get_target,types) - $(PERL) util/checknewapi.pl $(call gb_UnoApiMerge_get_target,types) $(UNOAPI_REFERENCE_types) "$(LIBO_VERSION_MAJOR).$(LIBO_VERSION_MINOR).$(LIBO_VERSION_MICRO).$(LIBO_VERSION_PATCH)" "$(gb_UnoApiMerge_REGVIEWTARGET)" > $@ - -# vim: set noet sw=4 ts=4: diff --git a/testtools/CustomTarget_bridgetest_climaker.mk b/testtools/CustomTarget_bridgetest_climaker.mk index 16f606f..19086d2 100644 --- a/testtools/CustomTarget_bridgetest_climaker.mk +++ b/testtools/CustomTarget_bridgetest_climaker.mk @@ -32,7 +32,8 @@ $(call gb_CustomTarget_get_target,testtools/bridgetest_climaker) : \ $(testtools_CLIDIR)/cli_types_bridgetest.dll $(testtools_CLIDIR)/cli_types_bridgetest.dll : \ - $(OUTDIR)/bin/types.rdb $(OUTDIR)/bin/cli_uretypes.dll \ + $(call gb_UnoApiTarget_get_target,udkapi) \ + $(OUTDIR)/bin/cli_uretypes.dll \ $(call gb_Executable_get_runtime_dependencies,climaker) \ | $(testtools_CLIDIR)/.dir $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),CLM,1) @@ -40,7 +41,7 @@ $(testtools_CLIDIR)/cli_types_bridgetest.dll : \ $(call gb_Helper_execute,climaker) \ $(if $(filter -s,$(MAKEFLAGS)),,--verbose) \ --out $@ \ - -X $(OUTDIR)/bin/types.rdb \ + -X $(call gb_UnoApiTarget_get_target,udkapi) \ -r $(OUTDIR)/bin/cli_uretypes.dll \ $< > /dev/null) diff --git a/testtools/CustomTarget_bridgetest_javamaker.mk b/testtools/CustomTarget_bridgetest_javamaker.mk index cf20bc0..90d9956 100644 --- a/testtools/CustomTarget_bridgetest_javamaker.mk +++ b/testtools/CustomTarget_bridgetest_javamaker.mk @@ -32,12 +32,12 @@ $(call gb_CustomTarget_get_target,testtools/bridgetest_javamaker) : $(testtools_ $(testtools_JAVADIR)/done : \ $(call gb_UnoApiTarget_get_target,bridgetest) \ - $(OUTDIR)/bin/types.rdb \ + $(call gb_UnoApiTarget_get_target,udkapi) \ $(call gb_Executable_get_runtime_dependencies,javamaker) \ | $(testtools_JAVADIR)/.dir $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),JVM,1) $(call gb_Helper_abbreviate_dirs, \ rm -r $(testtools_JAVADIR) && \ - $(call gb_Helper_execute,javamaker -nD -O$(testtools_JAVADIR) -X$(OUTDIR)/bin/types.rdb $<) && touch $@) + $(call gb_Helper_execute,javamaker -nD -O$(testtools_JAVADIR) -X$(call gb_UnoApiTarget_get_target,udkapi) $<) && touch $@) # vim:set shif
Re: Different Gerrit workflows -- was Master branch now requires liborcus 0.5.0 or higher.
On Wed, Apr 24, 2013 at 2:02 AM, David Ostrovsky wrote: > On Tue Apr 23 18:19:55 PDT 2013, Norbert Thiebaud wrote: > >>If you think that that list is missing someone(s) that are >>very present on IRC and could help cover the request, I'm all ears. > can you please add Stephan and Lionel? I have no objections adding stephan and lionel, please do. > >>but adding 200 peoples to that list is not something I consider viable >>at this point. > > Committers group has 78 members, given that 14 has the right already, > that would grant the schedule/show queue right to another 64 devs. I counted 13, 4 are sysadm that are there as a 'massive food poisining at a dev conference insurance'... but they usually do not monitory the dev mailing list. but yes indeed coalan, mmeek, thorsten can also schedule things... David. with your new patch having schedule/show queue would not mean having get/put right ? that would be a great step in limiting the clusterfuck potential Norbert ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: cppuhelper/source
cppuhelper/source/shlib.cxx |1 -
1 file changed, 1 deletion(-)
New commits:
commit 6f44df16df03e3775265e370f40ac835ad8170be
Author: Tor Lillqvist
Date: Tue Apr 23 19:39:48 2013 +0300
Avoid (harmless) duplicate entry
Change-Id: Ice43ab89b57f6ddb6b06d2fc5784d438031e864b
diff --git a/cppuhelper/source/shlib.cxx b/cppuhelper/source/shlib.cxx
index ad951cd..7b5dcb2 100644
--- a/cppuhelper/source/shlib.cxx
+++ b/cppuhelper/source/shlib.cxx
@@ -536,7 +536,6 @@ Reference< XInterface > SAL_CALL
loadSharedLibComponentFactory(
// The .uno ones seems to consistently have a "lib" prefix now for
Android,
// but not iOS, hmm.
#ifdef ANDROID
-{ "libcomphelper.a", comphelp_component_getFactory },
{ "libconfigmgr.uno.a", configmgr_component_getFactory },
{ "libexpwrap.uno.a", expwrap_component_getFactory },
{ "libfastsax.uno.a", fastsax_component_getFactory },
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Different Gerrit workflows -- was Master branch now requires liborcus 0.5.0 or higher.
Quoting Norbert Thiebaud : On Wed, Apr 24, 2013 at 2:02 AM, David Ostrovsky wrote: On Tue Apr 23 18:19:55 PDT 2013, Norbert Thiebaud wrote: If you think that that list is missing someone(s) that are very present on IRC and could help cover the request, I'm all ears. can you please add Stephan and Lionel? I have no objections adding stephan and lionel, please do. done. @Stephan, Lionel: you have the right now, don't screw it up ;-) David. with your new patch having schedule/show queue would not mean having get/put right ? exactly! We would need to grant the new ACL to the BuildBots group first... and as i said earlier, until we apply that patch, i do object to grant the right to wider group of people: 15 core devs should do it for now. that would be a great step in limiting the clusterfuck potential definitely. Please note: i've submitted the patch for master-buildbot (upcoming Gerrit 2.6 release) only. David ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: basebmp/StaticLibrary_basebmp.mk basegfx/Library_basegfx.mk canvas/Library_canvasfactory.mk canvas/Library_canvastools.mk canvas/Library_nullcanvas.mk canvas/Library_si
basebmp/StaticLibrary_basebmp.mk |5 - basegfx/Library_basegfx.mk |1 - canvas/Library_canvasfactory.mk |5 - canvas/Library_canvastools.mk|5 - canvas/Library_nullcanvas.mk |5 - canvas/Library_simplecanvas.mk |5 - canvas/Library_vclcanvas.mk |5 - comphelper/Library_comphelper.mk |1 - cppcanvas/Library_cppcanvas.mk |1 - drawinglayer/Library_drawinglayer.mk |5 - i18nlangtag/Library_i18nlangtag.mk |5 - svl/Library_svl.mk |1 - toolkit/Library_tk.mk|1 - unotools/Library_utl.mk |6 -- 14 files changed, 51 deletions(-) New commits: commit e4e9fba5f471141b14cff6d27586d37e28fc38c0 Author: Tor Lillqvist Date: Wed Apr 24 10:52:20 2013 +0300 Don't point to inc directories that don't exist any longer Change-Id: Ia160f0ee3e9480c60056d38bf11a6b139b53424f diff --git a/basebmp/StaticLibrary_basebmp.mk b/basebmp/StaticLibrary_basebmp.mk index 721bee0..c80427f 100644 --- a/basebmp/StaticLibrary_basebmp.mk +++ b/basebmp/StaticLibrary_basebmp.mk @@ -22,11 +22,6 @@ $(eval $(call gb_StaticLibrary_use_libraries,basebmp,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_StaticLibrary_set_include,basebmp,\ --I$(SRCDIR)/basebmp/inc/ \ -$$(INCLUDE) \ -)) - $(eval $(call gb_StaticLibrary_add_defs,basebmp,\ -DBASEBMP_DLLIMPLEMENTATION \ )) diff --git a/basegfx/Library_basegfx.mk b/basegfx/Library_basegfx.mk index 532cc74..892d0a9 100644 --- a/basegfx/Library_basegfx.mk +++ b/basegfx/Library_basegfx.mk @@ -21,7 +21,6 @@ $(eval $(call gb_Library_use_libraries,basegfx,\ )) $(eval $(call gb_Library_set_include,basegfx,\ --I$(SRCDIR)/basegfx/inc \ -I$(SRCDIR)/basegfx/source/inc \ $$(INCLUDE) \ )) diff --git a/canvas/Library_canvasfactory.mk b/canvas/Library_canvasfactory.mk index 2fde4a1..e10fa92 100644 --- a/canvas/Library_canvasfactory.mk +++ b/canvas/Library_canvasfactory.mk @@ -30,11 +30,6 @@ $(eval $(call gb_Library_Library,canvasfactory)) $(eval $(call gb_Library_set_componentfile,canvasfactory,canvas/source/factory/canvasfactory)) -$(eval $(call gb_Library_set_include,canvasfactory,\ - $$(INCLUDE) \ - -I$(SRCDIR)/canvas/inc \ -)) - $(eval $(call gb_Library_use_external,canvasfactory,boost_headers)) $(eval $(call gb_Library_use_sdk_api,canvasfactory)) diff --git a/canvas/Library_canvastools.mk b/canvas/Library_canvastools.mk index 9e1309a..7dccf3a 100644 --- a/canvas/Library_canvastools.mk +++ b/canvas/Library_canvastools.mk @@ -28,11 +28,6 @@ $(eval $(call gb_Library_Library,canvastools)) -$(eval $(call gb_Library_set_include,canvastools,\ - $$(INCLUDE) \ - -I$(SRCDIR)/canvas/inc \ -)) - $(eval $(call gb_Library_use_sdk_api,canvastools)) $(eval $(call gb_Library_add_defs,canvastools,\ diff --git a/canvas/Library_nullcanvas.mk b/canvas/Library_nullcanvas.mk index 5b8c305..863696f 100644 --- a/canvas/Library_nullcanvas.mk +++ b/canvas/Library_nullcanvas.mk @@ -30,11 +30,6 @@ $(eval $(call gb_Library_Library,nullcanvas)) $(eval $(call gb_Library_set_componentfile,nullcanvas,canvas/source/null/nullcanvas)) -$(eval $(call gb_Library_set_include,nullcanvas,\ - $$(INCLUDE) \ - -I$(SRCDIR)/canvas/inc \ -)) - $(eval $(call gb_Library_use_external,nullcanvas,boost_headers)) $(eval $(call gb_Library_use_sdk_api,nullcanvas)) diff --git a/canvas/Library_simplecanvas.mk b/canvas/Library_simplecanvas.mk index c5f5b75..223a215 100644 --- a/canvas/Library_simplecanvas.mk +++ b/canvas/Library_simplecanvas.mk @@ -30,11 +30,6 @@ $(eval $(call gb_Library_Library,simplecanvas)) $(eval $(call gb_Library_set_componentfile,simplecanvas,canvas/source/simplecanvas/simplecanvas)) -$(eval $(call gb_Library_set_include,simplecanvas,\ - $$(INCLUDE) \ - -I$(SRCDIR)/canvas/inc \ -)) - $(eval $(call gb_Library_use_external,simplecanvas,boost_headers)) $(eval $(call gb_Library_use_sdk_api,simplecanvas)) diff --git a/canvas/Library_vclcanvas.mk b/canvas/Library_vclcanvas.mk index a31bf1b..e7e4b36 100644 --- a/canvas/Library_vclcanvas.mk +++ b/canvas/Library_vclcanvas.mk @@ -30,11 +30,6 @@ $(eval $(call gb_Library_Library,vclcanvas)) $(eval $(call gb_Library_set_componentfile,vclcanvas,canvas/source/vcl/vclcanvas)) -$(eval $(call gb_Library_set_include,vclcanvas,\ - $$(INCLUDE) \ - -I$(SRCDIR)/canvas/inc \ -)) - $(eval $(call gb_Library_use_external,vclcanvas,boost_headers)) $(eval $(call gb_Library_use_sdk_api,vclcanvas)) diff --git a/comphelper/Library_comphelper.mk b/comphelper/Library_comphelper.mk index aa3ff00..1402f3c 100644 --- a/comphelper/Library_comphelper.mk +++ b/comphelper/Library_comphelper.mk @@ -27,7 +27,6 @@ $(eval $(call gb_Library_set_componentfile,comphelper,comphelper/util/comphelp)) $(eval $(call gb_Library_set_include,comphelper,\ -I$(SRCDIR)/comphelper/source/inc \ -
[Libreoffice-commits] core.git: Branch 'libreoffice-4-0-3' - cui/source
cui/source/options/personalization.cxx | 34 +++--
1 file changed, 12 insertions(+), 22 deletions(-)
New commits:
commit 86c58a8109ad0695c91f86c3689df9dc01938386
Author: Jan Holesovsky
Date: Fri Apr 19 15:56:38 2013 +0200
Personas: Now they are called 'Themes', and changed location.
Updated the URL's + the code that works with them & parses the page
accordingly.
Change-Id: Iba1414c749bdf227b3945162da83e3d35ce86244
Reviewed-on: https://gerrit.libreoffice.org/3483
Reviewed-by: Fridrich Strba
Reviewed-by: Eike Rathke
Reviewed-by: Miklos Vajna
Tested-by: Miklos Vajna
diff --git a/cui/source/options/personalization.cxx
b/cui/source/options/personalization.cxx
index 10ee48b..0878db4 100644
--- a/cui/source/options/personalization.cxx
+++ b/cui/source/options/personalization.cxx
@@ -33,7 +33,7 @@ using namespace com::sun::star;
/** Dialog that will allow the user to choose a Persona to use.
So far there is no better possibility than just to paste the URL from
-http://www.getpersona.com ...
+https://addons.mozilla.org/firefox/themes ...
*/
class SelectPersonaDialog : public ModalDialog
{
@@ -59,34 +59,24 @@ SelectPersonaDialog::SelectPersonaDialog( Window *pParent )
pButton->SetClickHdl( LINK( this, SelectPersonaDialog, VisitPersonas ) );
get( m_pEdit, "persona_url" );
-m_pEdit->SetPlaceholderText( "http://www.getpersonas.com/persona/"; );
+m_pEdit->SetPlaceholderText( "https://addons.mozilla.org/firefox/themes/";
);
}
OUString SelectPersonaDialog::GetPersonaURL() const
{
OUString aText( m_pEdit->GetText() );
-if ( !aText.startsWith( "http://www.getpersonas.com/"; ) &&
- !aText.startsWith( "https://www.getpersonas.com/"; ) )
-{
-return OUString();
-}
-
-// canonicalize the URL
-OUString aPersona( "persona/" );
-sal_Int32 nPersona = aText.lastIndexOf( aPersona );
-
-if ( nPersona < 0 )
-return OUString();
+if ( aText.startsWith( "https://addons.mozilla.org/"; ) )
+return aText;
-return "http://www.getpersonas.com/persona/"; + aText.copy( nPersona +
aPersona.getLength() );
+return OUString();
}
IMPL_LINK( SelectPersonaDialog, VisitPersonas, PushButton*, /*pButton*/ )
{
uno::Reference< com::sun::star::system::XSystemShellExecute >
xSystemShell( com::sun::star::system::SystemShellExecute::create(
::comphelper::getProcessComponentContext() ) );
-xSystemShell->execute( "http://www.getpersonas.com";, OUString(),
com::sun::star::system::SystemShellExecuteFlags::URIS_ONLY );
+xSystemShell->execute( "https://addons.mozilla.org/firefox/themes/";,
OUString(), com::sun::star::system::SystemShellExecuteFlags::URIS_ONLY );
return 0;
}
@@ -291,7 +281,7 @@ static OUString searchValue( const OString &rBuffer,
sal_Int32 from, const OStri
where += rIdentifier.getLength();
-sal_Int32 end = rBuffer.indexOf( """, where );
+sal_Int32 end = rBuffer.indexOf( """, where );
if ( end < 0 )
return OUString();
@@ -305,24 +295,24 @@ static OUString searchValue( const OString &rBuffer,
sal_Int32 from, const OStri
static bool parsePersonaInfo( const OString &rBuffer, OUString *pHeaderURL,
OUString *pFooterURL, OUString *pTextColor, OUString *pAccentColor )
{
// it is the first attribute that contains "persona="
-sal_Int32 persona = rBuffer.indexOf( "persona=\"{" );
+sal_Int32 persona = rBuffer.indexOf( "data-browsertheme=\"{" );
if ( persona < 0 )
return false;
// now search inside
-*pHeaderURL = searchValue( rBuffer, persona,
""headerURL":"" );
+*pHeaderURL = searchValue( rBuffer, persona, ""headerURL":"" );
if ( pHeaderURL->isEmpty() )
return false;
-*pFooterURL = searchValue( rBuffer, persona,
""footerURL":"" );
+*pFooterURL = searchValue( rBuffer, persona, ""footerURL":"" );
if ( pFooterURL->isEmpty() )
return false;
-*pTextColor = searchValue( rBuffer, persona,
""textcolor":"" );
+*pTextColor = searchValue( rBuffer, persona, ""textcolor":"" );
if ( pTextColor->isEmpty() )
return false;
-*pAccentColor = searchValue( rBuffer, persona,
""accentcolor":"" );
+*pAccentColor = searchValue( rBuffer, persona,
""accentcolor":"" );
if ( pAccentColor->isEmpty() )
return false;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PUSHED libreoffice-4-0-3] Personas: Now they are called 'Themes', and changed location...
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/3483 Approvals: Miklos Vajna: Verified; Looks good to me, approved Eike Rathke: Looks good to me, but someone else must approve Fridrich Strba: Looks good to me, but someone else must approve -- To view, visit https://gerrit.libreoffice.org/3483 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Iba1414c749bdf227b3945162da83e3d35ce86244 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: libreoffice-4-0-3 Gerrit-Owner: Jan Holesovsky Gerrit-Reviewer: Eike Rathke Gerrit-Reviewer: Fridrich Strba Gerrit-Reviewer: Miklos Vajna ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'libreoffice-4-0-3' - scaddins/source
scaddins/source/analysis/analysishelper.cxx | 208 +---
scaddins/source/analysis/analysishelper.hxx |5
2 files changed, 131 insertions(+), 82 deletions(-)
New commits:
commit 73623e57b50c461ab3df95065d56908825144009
Author: Winfried Donkers
Date: Sat Apr 13 19:47:10 2013 +0200
fdo#40100 make function YEARFRAC comply with ODFF Version1.2
Reviewed-on: https://gerrit.libreoffice.org/3375
Reviewed-by: Eike Rathke
Tested-by: Eike Rathke
(cherry picked from commit 275e68d141179272258d03194d799495fa3dec4a)
Conflicts:
scaddins/source/analysis/analysishelper.cxx
scaddins/source/analysis/analysishelper.hxx
Change-Id: Ief5e5c89b7fb69fb9849cf2d6efe2b4c5b7f5391
Signed-off-by: Eike Rathke
(cherry picked from commit bd9238f3fe4bd004cb77e89813eb730e1e865667)
Reviewed-on: https://gerrit.libreoffice.org/3554
Reviewed-by: Fridrich Strba
Reviewed-by: Miklos Vajna
Tested-by: Miklos Vajna
diff --git a/scaddins/source/analysis/analysishelper.cxx
b/scaddins/source/analysis/analysishelper.cxx
index 8fddc7b..b540a88 100644
--- a/scaddins/source/analysis/analysishelper.cxx
+++ b/scaddins/source/analysis/analysishelper.cxx
@@ -333,78 +333,6 @@ sal_Int32 GetDaysInYears( sal_uInt16 nYear1, sal_uInt16
nYear2 )
}
-void GetDiffParam( sal_Int32 nNullDate, sal_Int32 nStartDate, sal_Int32
nEndDate, sal_Int32 nMode,
-sal_uInt16& rYears, sal_Int32& rDayDiffPart, sal_Int32& rDaysInYear )
THROWDEF_RTE_IAE
-{
-if( nStartDate > nEndDate )
-{
-sal_Int32 n = nEndDate;
-nEndDate = nStartDate;
-nStartDate = n;
-}
-
-sal_Int32 nDate1 = nStartDate + nNullDate;
-sal_Int32 nDate2 = nEndDate + nNullDate;
-
-sal_uInt16 nDay1, nDay2;
-sal_uInt16 nMonth1, nMonth2;
-sal_uInt16 nYear1, nYear2;
-
-DaysToDate( nDate1, nDay1, nMonth1, nYear1 );
-DaysToDate( nDate2, nDay2, nMonth2, nYear2 );
-
-sal_uInt16 nYears;
-
-sal_Int32 nDayDiff, nDaysInYear;
-
-switch( nMode )
-{
-case 0: // 0=USA (NASD) 30/360
-case 4: // 4=Europe 30/360
-nDaysInYear = 360;
-nYears = nYear2 - nYear1;
-nDayDiff = GetDiffDate360( nDay1, nMonth1, nYear1, IsLeapYear(
nYear1 ),
-nDay2, nMonth2, nYear2, nMode == 0 ) -
nYears * nDaysInYear;
-break;
-case 1: // 1=exact/exact
-nYears = nYear2 - nYear1;
-
-nDaysInYear = IsLeapYear( nYear1 )? 366 : 365;
-
-if( nYears && ( nMonth1 > nMonth2 || ( nMonth1 == nMonth2 && nDay1
> nDay2 ) ) )
-nYears--;
-
-if( nYears )
-nDayDiff = nDate2 - DateToDays( nDay1, nMonth1, nYear2 );
-else
-nDayDiff = nDate2 - nDate1;
-
-if( nDayDiff < 0 )
-nDayDiff += nDaysInYear;
-
-break;
-case 2: // 2=exact/360
-nDaysInYear = 360;
-nYears = sal_uInt16( ( nDate2 - nDate1 ) / nDaysInYear );
-nDayDiff = nDate2 - nDate1;
-nDayDiff %= nDaysInYear;
-break;
-case 3: //3=exact/365
-nDaysInYear = 365;
-nYears = sal_uInt16( ( nDate2 - nDate1 ) / nDaysInYear );
-nDayDiff = nDate2 - nDate1;
-nDayDiff %= nDaysInYear;
-break;
-default:
-THROW_IAE;
-}
-
-rYears = nYears;
-rDayDiffPart = nDayDiff;
-rDaysInYear = nDaysInYear;
-}
-
-
sal_Int32 GetDiffDate( sal_Int32 nNullDate, sal_Int32 nStartDate, sal_Int32
nEndDate, sal_Int32 nMode,
sal_Int32* pOptDaysIn1stYear ) THROWDEF_RTE_IAE
{
@@ -509,17 +437,143 @@ sal_Int32 GetDaysInYear( sal_Int32 nNullDate, sal_Int32
nDate, sal_Int32 nMode )
}
-double GetYearFrac( sal_Int32 nNullDate, sal_Int32 nStartDate, sal_Int32
nEndDate, sal_Int32 nMode ) THROWDEF_RTE_IAE
+//fdo40100 toDo: make function fully compliant with ODFF1.2
+/**
+ * Function GetYearFrac implements YEARFRAC as defined in:
+ * Open Document Format for Office Applications version 1.2 Part 2, par.
6.10.24
+ * The calculations are defined in:
+ * Open Document Format for Office Applications version 1.2 Part 2, par.
4.11.7
+ */
+double GetYearFrac( sal_Int32 nNullDate, sal_Int32 nStartDate, sal_Int32
nEndDate, sal_Int32 nMode ) throw( uno::RuntimeException,
lang::IllegalArgumentException )
{
if( nStartDate == nEndDate )
return 0.0; // nothing to do...
-sal_uInt16 nYears;
-sal_Int32 nDayDiff, nDaysInYear;
+if( nStartDate > nEndDate )
+{
+sal_Int32 n = nEndDate;
+nEndDate = nStartDate;
+nStartDate = n;
+}
+
+sal_Int32 nDate1 = nStartDate + nNullDate;
+sal_Int32 nDate2 = nEndDate + nNullDate;
+
+sal_uInt16 nDay1, nDay2;
+sal_uInt16 nMonth1, nMonth2;
+sal_uInt16 nYear1, nYear2;
+
+Days
[PUSHED libreoffice-4-0-3] fdo#40100 make function YEARFRAC comply with ODFF Version1.2
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/3554 Approvals: Miklos Vajna: Verified; Looks good to me, approved Fridrich Strba: Looks good to me, but someone else must approve -- To view, visit https://gerrit.libreoffice.org/3554 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ief5e5c89b7fb69fb9849cf2d6efe2b4c5b7f5391 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: libreoffice-4-0-3 Gerrit-Owner: Eike Rathke Gerrit-Reviewer: Fridrich Strba Gerrit-Reviewer: Miklos Vajna Gerrit-Reviewer: Winfried Donkers ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'libreoffice-4-0-3' - svl/source
svl/source/numbers/zformat.cxx | 61 ++---
1 file changed, 40 insertions(+), 21 deletions(-)
New commits:
commit 00609ef4d2ef46700a6411ac0f93114005153a4a
Author: Eike Rathke
Date: Mon Apr 22 23:06:50 2013 +0200
fixed a mess of out of bounds string accesses
(cherry picked from commit 5cd4300f7ffc24d6bc0ed5704f37a04852fd322b)
Conflicts:
svl/source/numbers/zformat.cxx
Change-Id: I800840e1b3c0d97a049b3ceba0ec244365dc8e6b
Reviewed-on: https://gerrit.libreoffice.org/3563
Reviewed-by: Fridrich Strba
Reviewed-by: Andras Timar
Reviewed-by: Miklos Vajna
Tested-by: Miklos Vajna
diff --git a/svl/source/numbers/zformat.cxx b/svl/source/numbers/zformat.cxx
index 1b12669..545d6cc 100644
--- a/svl/source/numbers/zformat.cxx
+++ b/svl/source/numbers/zformat.cxx
@@ -1412,6 +1412,21 @@ SvNumberformat::LocaleType
SvNumberformat::ImpGetLocaleType(const OUString& rStr
return (cToken == ']' || nPos == nLen) ? LocaleType(nNum) : LocaleType();
}
+static bool lcl_matchKeywordAndGetNumber( const OUString & rString, const
sal_Int32 nPos,
+const OUString & rKeyword, sal_Int32 & nNumber )
+{
+if (0 <= nPos && nPos + rKeyword.getLength() < rString.getLength() &&
rString.matchIgnoreAsciiCase( rKeyword, nPos))
+{
+nNumber = rString.copy( nPos + rKeyword.getLength()).toInt32();
+return true;
+}
+else
+{
+nNumber = 0;
+return false;
+}
+}
+
short SvNumberformat::ImpNextSymbol(OUStringBuffer& rString,
sal_Int32& nPos,
OUString& sSymbol)
@@ -1514,43 +1529,47 @@ short SvNumberformat::ImpNextSymbol(OUStringBuffer&
rString,
{
const OUString aNatNum("NATNUM");
const OUString aDBNum("DBNUM");
-OUString aUpperNatNum( rChrCls().uppercase(
rString.toString(), nPos-1, aNatNum.getLength() ) );
-OUString aUpperDBNum( rChrCls().uppercase( rString.toString(),
nPos-1, aDBNum.getLength() ) );
-sal_Unicode cUpper = aUpperNatNum[0];
-sal_Int32 nNatNumNum = rString.toString().copy( nPos - 1 +
aNatNum.getLength() ).toInt32();
-sal_Unicode cDBNum = rString[ nPos - 1 + aDBNum.getLength()];
-if ( aUpperNatNum == aNatNum && 0 <= nNatNumNum && nNatNumNum
<= 19 )
+const OUString aBufStr( rString.toString());
+sal_Int32 nNatNumNum;
+sal_Int32 nDBNum;
+if ( lcl_matchKeywordAndGetNumber( aBufStr, nPos-1, aNatNum,
nNatNumNum) &&
+0 <= nNatNumNum && nNatNumNum <= 19 )
{
sBuffSymbol.stripStart((sal_Unicode)'[');
-sBuffSymbol.append( rString.toString().copy( --nPos,
aNatNum.getLength()+1 ));
+sBuffSymbol.append( aBufStr.copy( --nPos,
aNatNum.getLength()+1 ));
nPos += aNatNum.getLength()+1;
//! SymbolType is negative
eSymbolType = (short) (BRACKET_SYMBOLTYPE_NATNUM0 -
nNatNumNum);
eState = SsGetPrefix;
}
-else if ( aUpperDBNum == aDBNum && '1' <= cDBNum && cDBNum <=
'9' )
+else if ( lcl_matchKeywordAndGetNumber( aBufStr, nPos-1,
aDBNum, nDBNum) &&
+'1' <= nDBNum && nDBNum <= '9' )
{
sBuffSymbol.stripStart((sal_Unicode)'[');
sBuffSymbol.append(rString.toString().copy( --nPos,
aDBNum.getLength()+1 ));
nPos += aDBNum.getLength()+1;
//! SymbolType is negative
-eSymbolType = sal::static_int_cast< short >(
BRACKET_SYMBOLTYPE_DBNUM1 - (cDBNum - '1'));
+eSymbolType = sal::static_int_cast< short >(
BRACKET_SYMBOLTYPE_DBNUM1 - (nDBNum - '1'));
eState = SsGetPrefix;
}
-else if (cUpper == rKeywords[NF_KEY_H][0] || // H
- cUpper == rKeywords[NF_KEY_MI][0] || // M
- cUpper == rKeywords[NF_KEY_S][0] ) // S
-{
-sBuffSymbol.append(cToken);
-eState = SsGetTime;
-cLetter = cToken;
-}
else
{
-sBuffSymbol.stripStart((sal_Unicode)'[');
-sBuffSymbol.append(cToken);
-eSymbolType = BRACKET_SYMBOLTYPE_COLOR;
-eState = SsGetPrefix;
+sal_Unicode cUpper = rChrCls().uppercase( aBufStr, nPos-1,
1)[0];
+if (cUpper == rKeywords[NF_KEY_H][0] || // H
+cUpper == rKeywords[NF_KEY_MI][0] ||// M
+cUpper == rKeywords[NF_KEY_S][0] ) //
[PATCH] make use of pOutWin, which is member of ImpEditView class.
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/3592
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/92/3592/1
make use of pOutWin, which is member of ImpEditView class.
Change-Id: I78218572abe06f189eb20ba341c4de3aced8df61
---
M editeng/source/editeng/impedit.cxx
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/editeng/source/editeng/impedit.cxx
b/editeng/source/editeng/impedit.cxx
index 7525db9..a8a0508 100644
--- a/editeng/source/editeng/impedit.cxx
+++ b/editeng/source/editeng/impedit.cxx
@@ -318,11 +318,9 @@
}
else
{
-Window* pWindow = dynamic_cast< Window* >(_pTarget);
-
-if(pWindow)
+if(pOutWin)
{
-pWindow->Invert( aRect );
+pOutWin->Invert( aRect );
}
else
{
--
To view, visit https://gerrit.libreoffice.org/3592
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I78218572abe06f189eb20ba341c4de3aced8df61
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: navin patidar
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED libreoffice-4-0-3] fixed a mess of out of bounds string accesses
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/3563 Approvals: Andras Timar: Looks good to me, but someone else must approve Miklos Vajna: Verified; Looks good to me, approved Fridrich Strba: Looks good to me, but someone else must approve -- To view, visit https://gerrit.libreoffice.org/3563 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I800840e1b3c0d97a049b3ceba0ec244365dc8e6b Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: libreoffice-4-0-3 Gerrit-Owner: Eike Rathke Gerrit-Reviewer: Andras Timar Gerrit-Reviewer: Fridrich Strba Gerrit-Reviewer: Miklos Vajna ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Problem building Libreoffice4.0.2.2 with enable/disable pdfimport extension on ubuntu
Hi, When I build Libreoffice4.0.2.2 on ubuntu without any build configuration options, the output is displayed as "checking whether to build PDF import...yes". But pdf import extension will not be shown in extension manager. If I build with following build configurations: ./autogen.sh --enable-ext-pdfimport OR ./autogen.sh --disable-ext-pdfimport It is giving following warning and ultimately no effect on the installer: *configure: WARNING: unrecognized options: --enable-ext-pdfimport* I have tries all varient like --enable-pdfimport or --enable-ext-pdf-import or --enable-ext-pdfimport=no/yes, but no success. Thanks, Sudeep ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - sc/Library_scfilt.mk sc/source
sc/Library_scfilt.mk |1 +
sc/source/filter/orcus/xmlcontext.cxx | 34 +-
2 files changed, 30 insertions(+), 5 deletions(-)
New commits:
commit 30d6b1d13da9808eb4544d4bffb0acc49c0e6c5c
Author: Kohei Yoshida
Date: Mon Apr 22 18:05:53 2013 -0400
fdo#61820: Avoid crasher when file URL contains unicode bytes.
This is a cherry-pick of 6374df20c2a8378209cce21c0e9689e65b8bd9a2.
Credit goes to Isamu Mogi for pin-pointing exactly what caused the crash
and which commit fixed it on master.
Change-Id: Ic5653c76c8c7d8eb8798a9c4ae0cbc43f0e946e4
Reviewed-on: https://gerrit.libreoffice.org/3581
Reviewed-by: Eike Rathke
Reviewed-by: Fridrich Strba
Tested-by: Fridrich Strba
diff --git a/sc/Library_scfilt.mk b/sc/Library_scfilt.mk
index bdb99ca..0a849da 100644
--- a/sc/Library_scfilt.mk
+++ b/sc/Library_scfilt.mk
@@ -58,6 +58,7 @@ $(eval $(call gb_Library_use_libraries,scfilt,\
svxcore \
tk \
tl \
+ ucbhelper \
utl \
vcl \
i18nisolang1 \
diff --git a/sc/source/filter/orcus/xmlcontext.cxx
b/sc/source/filter/orcus/xmlcontext.cxx
index ecbf35b..001c8f9 100644
--- a/sc/source/filter/orcus/xmlcontext.cxx
+++ b/sc/source/filter/orcus/xmlcontext.cxx
@@ -14,6 +14,7 @@
#include "svtools/treelistbox.hxx"
#include "svtools/treelistentry.hxx"
+#include "ucbhelper/content.hxx"
#include
#include
@@ -21,7 +22,14 @@
#include
#include
+#include
+
#include
+#include
+
+#define BUFFER_SIZE 4096
+
+using namespace com::sun::star;
namespace {
@@ -143,6 +151,26 @@ public:
}
};
+void loadContentFromURL(const OUString& rURL, std::string& rStrm)
+{
+ucbhelper::Content aContent(
+rURL, uno::Reference(),
comphelper::getProcessComponentContext());
+uno::Reference xStrm = aContent.openStream();
+
+std::ostringstream aStrmBuf;
+uno::Sequence aBytes;
+size_t nBytesRead = 0;
+do
+{
+nBytesRead = xStrm->readBytes(aBytes, BUFFER_SIZE);
+const sal_Int8* p = aBytes.getConstArray();
+aStrmBuf << std::string(p, p + nBytesRead);
+}
+while (nBytesRead == BUFFER_SIZE);
+
+rStrm = aStrmBuf.str();
+}
+
}
ScOrcusXMLContextImpl::ScOrcusXMLContextImpl(ScDocument& rDoc, const OUString&
rPath) :
@@ -154,12 +182,8 @@ bool
ScOrcusXMLContextImpl::loadXMLStructure(SvTreeListBox& rTreeCtrl, ScOrcusXM
{
rParam.maUserDataStore.clear();
-OString aSysPath = ScOrcusFiltersImpl::toSystemPath(maPath);
-const char* path = aSysPath.getStr();
-
-// TODO: Use our own stream loading call instead of one from orcus.
std::string aStrm;
-orcus::load_file_content(path, aStrm);
+loadContentFromURL(maPath, aStrm);
if (aStrm.empty())
return false;
___
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/data/column2.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 1545e404ee0901c861da6e02140a49ebf6b88eec
Author: Eike Rathke
Date: Tue Apr 23 18:09:43 2013 +0200
fixed out of bounds vector access
in ScColumn::FindNextVisibleRowWithContent() if starting from the
position all including the last present cell of a column are blank
Change-Id: I0270331444f1707b6ad413f6127ae4c2cf0b1984
(cherry picked from commit 3874bad70ea48deed91b9966b3d35782b5584f7d)
Reviewed-on: https://gerrit.libreoffice.org/3584
Reviewed-by: Fridrich Strba
Tested-by: Fridrich Strba
diff --git a/sc/source/core/data/column2.cxx b/sc/source/core/data/column2.cxx
index 2bdb401..c782f89 100644
--- a/sc/source/core/data/column2.cxx
+++ b/sc/source/core/data/column2.cxx
@@ -1347,7 +1347,7 @@ SCROW ScColumn::FindNextVisibleRowWithContent(SCROW nRow,
bool bForward) const
bool bThere = Search( nRow, nIndex );
if( bThere && !maItems[nIndex].pCell->IsBlank())
return nRow;
-else if(nIndex >= maItems.size())
+else if((bThere ? nIndex+1 : nIndex) >= maItems.size())
return MAXROW;
else
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/suse/suse-4.0' - instsetoo_native/res instsetoo_native/util
instsetoo_native/res/banner_suse_bw.bmp |binary instsetoo_native/res/install_suse_bw.bmp |binary instsetoo_native/util/makefile.mk| 24 3 files changed, 12 insertions(+), 12 deletions(-) New commits: commit cab42b24aecf2207f6c47f262b5ac5f81a6abb39 Author: Andras Timar Date: Wed Apr 24 00:54:54 2013 -0700 [SUSE only] SUSE artwork for Windows installer Change-Id: I45f869cecc1c904bf0219643a1faaea39bb7f58a diff --git a/instsetoo_native/res/banner_suse_bw.bmp b/instsetoo_native/res/banner_suse_bw.bmp new file mode 100644 index 000..e50ad49 Binary files /dev/null and b/instsetoo_native/res/banner_suse_bw.bmp differ diff --git a/instsetoo_native/res/install_suse_bw.bmp b/instsetoo_native/res/install_suse_bw.bmp new file mode 100644 index 000..93c2312 Binary files /dev/null and b/instsetoo_native/res/install_suse_bw.bmp differ diff --git a/instsetoo_native/util/makefile.mk b/instsetoo_native/util/makefile.mk index e4dd09f..3fd2d3c 100644 --- a/instsetoo_native/util/makefile.mk +++ b/instsetoo_native/util/makefile.mk @@ -356,18 +356,18 @@ hack_msitemplates .PHONY: $(GNUCOPY) -u $(MSICOMMONTEMPLATESOURCE)$/Binary$/*.* $(MSIURETEMPLATEDIR)$/Binary $(GNUCOPY) -u $(MSICOMMONTEMPLATESOURCE)$/Binary$/*.* $(MSISDKOOTEMPLATEDIR)$/Binary $(GNUCOPY) -u $(MSICOMMONTEMPLATESOURCE)$/Binary$/*.* $(MSITESTTEMPLATEDIR)$/Binary -$(COPY) $(PRJ)$/res$/nologoinstall.bmp $(MSIOFFICETEMPLATEDIR)$/Binary$/Image.bmp -$(COPY) $(PRJ)$/res$/nologoinstall.bmp $(MSILANGPACKTEMPLATEDIR)$/Binary$/Image.bmp -$(COPY) $(PRJ)$/res$/nologoinstall.bmp $(MSIHELPPACKTEMPLATEDIR)$/Binary$/Image.bmp -$(COPY) $(PRJ)$/res$/nologoinstall.bmp $(MSIURETEMPLATEDIR)$/Binary$/Image.bmp -$(COPY) $(PRJ)$/res$/nologoinstall.bmp $(MSISDKOOTEMPLATEDIR)$/Binary$/Image.bmp -$(COPY) $(PRJ)$/res$/nologoinstall.bmp $(MSITESTTEMPLATEDIR)$/Binary$/Image.bmp -$(COPY) $(PRJ)$/res$/nologobanner.bmp $(MSIOFFICETEMPLATEDIR)$/Binary$/Banner.bmp -$(COPY) $(PRJ)$/res$/nologobanner.bmp $(MSILANGPACKTEMPLATEDIR)$/Binary$/Banner.bmp -$(COPY) $(PRJ)$/res$/nologobanner.bmp $(MSIHELPPACKTEMPLATEDIR)$/Binary$/Banner.bmp -$(COPY) $(PRJ)$/res$/nologobanner.bmp $(MSIURETEMPLATEDIR)$/Binary$/Banner.bmp -$(COPY) $(PRJ)$/res$/nologobanner.bmp $(MSISDKOOTEMPLATEDIR)$/Binary$/Banner.bmp -$(COPY) $(PRJ)$/res$/nologobanner.bmp $(MSITESTTEMPLATEDIR)$/Binary$/Banner.bmp +$(COPY) $(PRJ)$/res$/install_suse_bw.bmp $(MSIOFFICETEMPLATEDIR)$/Binary$/Image.bmp +$(COPY) $(PRJ)$/res$/install_suse_bw.bmp $(MSILANGPACKTEMPLATEDIR)$/Binary$/Image.bmp +$(COPY) $(PRJ)$/res$/install_suse_bw.bmp $(MSIHELPPACKTEMPLATEDIR)$/Binary$/Image.bmp +$(COPY) $(PRJ)$/res$/install_suse_bw.bmp $(MSIURETEMPLATEDIR)$/Binary$/Image.bmp +$(COPY) $(PRJ)$/res$/install_suse_bw.bmp $(MSISDKOOTEMPLATEDIR)$/Binary$/Image.bmp +$(COPY) $(PRJ)$/res$/install_suse_bw.bmp $(MSITESTTEMPLATEDIR)$/Binary$/Image.bmp +$(COPY) $(PRJ)$/res$/banner_suse_bw.bmp $(MSIOFFICETEMPLATEDIR)$/Binary$/Banner.bmp +$(COPY) $(PRJ)$/res$/banner_suse_bw.bmp $(MSILANGPACKTEMPLATEDIR)$/Binary$/Banner.bmp +$(COPY) $(PRJ)$/res$/banner_suse_bw.bmp $(MSIHELPPACKTEMPLATEDIR)$/Binary$/Banner.bmp +$(COPY) $(PRJ)$/res$/banner_suse_bw.bmp $(MSIURETEMPLATEDIR)$/Binary$/Banner.bmp +$(COPY) $(PRJ)$/res$/banner_suse_bw.bmp $(MSISDKOOTEMPLATEDIR)$/Binary$/Banner.bmp +$(COPY) $(PRJ)$/res$/banner_suse_bw.bmp $(MSITESTTEMPLATEDIR)$/Binary$/Banner.bmp .IF "$(OS)" == "WNT" ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PUSHED libreoffice-4-0] fdo#61820: Avoid crasher when file URL contains unicode byte...
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/3581 Approvals: Eike Rathke: Looks good to me, approved Fridrich Strba: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/3581 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ic5653c76c8c7d8eb8798a9c4ae0cbc43f0e946e4 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: libreoffice-4-0 Gerrit-Owner: Kohei Yoshida Gerrit-Reviewer: Eike Rathke Gerrit-Reviewer: Fridrich Strba ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED libreoffice-4-0] fixed out of bounds vector access
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/3584 Approvals: Fridrich Strba: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/3584 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I0270331444f1707b6ad413f6127ae4c2cf0b1984 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: libreoffice-4-0 Gerrit-Owner: Eike Rathke Gerrit-Reviewer: Fridrich Strba ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - editeng/source
editeng/source/editeng/impedit3.cxx | 49
1 file changed, 28 insertions(+), 21 deletions(-)
New commits:
commit 377e95a33f77dcb7e76c4afc98f9d61465363d75
Author: László Németh
Date: Wed Apr 24 00:21:03 2013 +0200
fdo#63711 Calc: fix Catalan and Hungarian hyphenation
Change-Id: Ib9b3a63ad48ab9a8c109a97f4053c0fc4aca8a28
Reviewed-on: https://gerrit.libreoffice.org/3591
Reviewed-by: Fridrich Strba
Tested-by: Fridrich Strba
diff --git a/editeng/source/editeng/impedit3.cxx
b/editeng/source/editeng/impedit3.cxx
index bcd3695..5fd8362 100644
--- a/editeng/source/editeng/impedit3.cxx
+++ b/editeng/source/editeng/impedit3.cxx
@@ -1748,6 +1748,9 @@ void ImpEditEngine::ImpBreakLine( ParaPortion*
pParaPortion, EditLine* pLine, Te
sal_Bool bHangingPunctuation = sal_False;
sal_Unicode cAlternateReplChar = 0;
sal_Unicode cAlternateExtraChar = 0;
+sal_Bool bAltFullLeft = sal_False;
+sal_Bool bAltFullRight = sal_False;
+sal_uInt32 nAltDelChar = 0;
if ( ( nMaxBreakPos < ( nMax + pLine->GetStart() ) ) && ( pNode->GetChar(
nMaxBreakPos ) == ' ' ) )
{
@@ -1853,29 +1856,38 @@ void ImpEditEngine::ImpBreakLine( ParaPortion*
pParaPortion, EditLine* pLine, Te
}
else
{
-String aAlt( xHyphWord->getHyphenatedWord() );
-
-// We expect the two cases, which might exist now:
+// TODO: handle all alternative hyphenations (see
hyphen-1.2.8/tests/unicode.*)
+OUString aAlt( xHyphWord->getHyphenatedWord() );
+OUString aWord2(aWord);
+OUString aAltLeft(aAlt.copy(0, _nWordLen));
+OUString aAltRight(aAlt.copy(_nWordLen));
+bAltFullLeft = aWord2.startsWith(aAltLeft);
+bAltFullRight = aWord2.endsWith(aAltRight);
+nAltDelChar = aWord2.getLength() -
aAlt.getLength() + (1 - bAltFullLeft) + (1 - bAltFullRight);
+
+// NOTE: improved for other cases, see fdo#63711
+
+// We expect[ed] the two cases:
// 1) packen becomes pak-ken
// 2) Schiffahrt becomes Schiff-fahrt
// In case 1, a character has to be replaced
// in case 2 a character is added.
// The identification is complicated by long
// compound words because the Hyphenator separates
-// all position of the word.
+// all position of the word. [This is not true for
libhyphen.]
// "Schiffahrtsbrennesseln" ->
"Schifffahrtsbrennnesseln"
// We can thus actually not directly connect the index of the
// AlternativeWord to aWord. The whole issue will
be simplified
// by a function in the Hyphenator as soon as AMA
builds this in...
sal_uInt16 nAltStart = _nWordLen - 1;
-sal_uInt16 nTxtStart = nAltStart - (aAlt.Len() -
aWord.Len());
+sal_uInt16 nTxtStart = nAltStart -
(aAlt.getLength() - aWord.Len());
sal_uInt16 nTxtEnd = nTxtStart;
sal_uInt16 nAltEnd = nAltStart;
// The regions between the nStart and nEnd is the
// difference between alternative and original
string.
-while( nTxtEnd < aWord.Len() && nAltEnd <
aAlt.Len() &&
- aWord.GetChar(nTxtEnd) !=
aAlt.GetChar(nAltEnd) )
+while( nTxtEnd < aWord.Len() && nAltEnd <
aAlt.getLength() &&
+ aWord.GetChar(nTxtEnd) != aAlt[nAltEnd] )
{
++nTxtEnd;
++nAltEnd;
@@ -1883,7 +1895,7 @@ void ImpEditEngine::ImpBreakLine( ParaPortion*
pParaPortion, EditLine* pLine, Te
// If a character is added, then we notice it now:
if( nAltEnd > nTxtEnd && nAltStart == nAltEnd &&
-aWord.GetChar( nTxtEnd ) ==
aAlt.GetChar(nAltEnd) )
+aWord.GetChar( nTxtEnd ) == aAlt[nAltEnd] )
{
++nAltEnd;
++nTxtStart;
@@ -1893,13 +1905,13 @@ void ImpEditEngine::ImpBreakLine( ParaPortion*
pParaPortion, EditLine* pLine, Te
DBG_ASSERT( ( nAltEnd - nAltStart ) == 1,
"Alternate: Wrong assump
[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - sw/source
sw/source/core/txtnode/atrftn.cxx | 10 +-
1 file changed, 9 insertions(+), 1 deletion(-)
New commits:
commit 3263ce60c9ccede366ee2e24667ca10a6f823659
Author: László Németh
Date: Tue Apr 16 15:40:24 2013 +0200
fdo#40102 show full footnote text in index tooltip
Change-Id: I35acdaf4f62df7a1d375aed663c270e78ea70779
Reviewed-on: https://gerrit.libreoffice.org/3590
Reviewed-by: Fridrich Strba
Tested-by: Fridrich Strba
diff --git a/sw/source/core/txtnode/atrftn.cxx
b/sw/source/core/txtnode/atrftn.cxx
index 6814ec4..6540e97 100644
--- a/sw/source/core/txtnode/atrftn.cxx
+++ b/sw/source/core/txtnode/atrftn.cxx
@@ -172,8 +172,16 @@ void SwFmtFtn::GetFtnText( XubString& rStr ) const
if( !pCNd )
pCNd = aIdx.GetNodes().GoNext( &aIdx );
-if( pCNd->IsTxtNode() )
+if( pCNd->IsTxtNode() ) {
rStr = ((SwTxtNode*)pCNd)->GetExpandTxt();
+
+++aIdx;
+while ( !aIdx.GetNode().IsEndNode() ) {
+if ( aIdx.GetNode().IsTxtNode() )
+rStr += OUString(" ") +
((SwTxtNode*)(aIdx.GetNode().GetTxtNode()))->GetExpandTxt();
+++aIdx;
+}
+}
}
}
___
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' - sw/source
sw/source/core/doc/notxtfrm.cxx |3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
New commits:
commit f3e8a9649ac653eafaf8c5fa57e20d3dbe90d82c
Author: Michael Stahl
Date: Tue Apr 23 22:27:57 2013 +0200
fdo#60280: sw: restore anti-aliasing for all OLE objects
The OLE case in SwNoTxtFrm::PaintPicture() was mis-merged to modify the
anti-aliasing always but reset it only for Charts.
(regression from 44cfc7cb6533d827fd2d6e586d92c61d7d7f7a70)
Change-Id: I0d740e621c3fd71f308d980581edb3c16308c06e
(cherry picked from commit 954d695827431a5badd1a993d8f364c669ca9c9c)
Reviewed-on: https://gerrit.libreoffice.org/3589
Reviewed-by: Fridrich Strba
Tested-by: Fridrich Strba
diff --git a/sw/source/core/doc/notxtfrm.cxx b/sw/source/core/doc/notxtfrm.cxx
index 914e189..a839420 100644
--- a/sw/source/core/doc/notxtfrm.cxx
+++ b/sw/source/core/doc/notxtfrm.cxx
@@ -1143,8 +1143,7 @@ void SwNoTxtFrm::PaintPicture( OutputDevice* pOut, const
SwRect &rGrfArea ) cons
}
// see #i99665#
-if ( pOLENd->IsChart() &&
-pShell->Imp()->GetDrawView()->IsAntiAliasing() )
+if (pShell->Imp()->GetDrawView()->IsAntiAliasing())
{
pOut->SetAntialiasing( nFormerAntialiasingAtOutput );
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PUSHED libreoffice-4-0] fdo#63711 Calc: fix Catalan and Hungarian hyphenation
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/3591 Approvals: Fridrich Strba: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/3591 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ib9b3a63ad48ab9a8c109a97f4053c0fc4aca8a28 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: libreoffice-4-0 Gerrit-Owner: Németh László Gerrit-Reviewer: Fridrich Strba ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED libreoffice-4-0] fdo#40102 show full footnote text in index tooltip
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/3590 Approvals: Fridrich Strba: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/3590 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I35acdaf4f62df7a1d375aed663c270e78ea70779 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: libreoffice-4-0 Gerrit-Owner: Németh László Gerrit-Reviewer: Fridrich Strba ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED libreoffice-4-0] fdo#60280: sw: restore anti-aliasing for all OLE objects
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/3589 Approvals: Fridrich Strba: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/3589 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I0d740e621c3fd71f308d980581edb3c16308c06e Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: libreoffice-4-0 Gerrit-Owner: Michael Stahl Gerrit-Reviewer: Fridrich Strba ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: compilerplugins/clang solenv/gbuild
compilerplugins/clang/sallogareas.cxx |6 +++---
solenv/gbuild/platform/com_GCC_defs.mk |2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
New commits:
commit 294ad90704b7b19aa64c26bfa83442a96a31e57b
Author: Tor Lillqvist
Date: Wed Apr 24 11:42:09 2013 +0300
Update location of log-areas.dox
Change-Id: If54a3d7047f13ae9c9345c21737a89afee645403
diff --git a/compilerplugins/clang/sallogareas.cxx
b/compilerplugins/clang/sallogareas.cxx
index 7ce64bc..0724ca7 100644
--- a/compilerplugins/clang/sallogareas.cxx
+++ b/compilerplugins/clang/sallogareas.cxx
@@ -20,7 +20,7 @@ namespace loplugin
/*
This is a compile check.
-Check area used in SAL_INFO/SAL_WARN macros against the list in
sal/inc/sal/log-areas.dox and
+Check area used in SAL_INFO/SAL_WARN macros against the list in
include/sal/log-areas.dox and
report if the area is not listed there. The fix is either use a proper area or
add it to the list
if appropriate.
*/
@@ -104,14 +104,14 @@ void SalLogAreas::checkArea( StringRef area,
SourceLocation location )
readLogAreas();
if( !logAreas.count( area ))
{
-report( DiagnosticsEngine::Warning, "unknown log area '%0' (check or
extend sal/inc/sal/log-areas.dox)",
+report( DiagnosticsEngine::Warning, "unknown log area '%0' (check or
extend include/sal/log-areas.dox)",
location ) << area;
}
}
void SalLogAreas::readLogAreas()
{
-ifstream is( SRCDIR "/sal/inc/sal/log-areas.dox" );
+ifstream is( SRCDIR "/include/sal/log-areas.dox" );
while( is.good())
{
string line;
diff --git a/solenv/gbuild/platform/com_GCC_defs.mk
b/solenv/gbuild/platform/com_GCC_defs.mk
index f0c7c44..e6c2ee6 100644
--- a/solenv/gbuild/platform/com_GCC_defs.mk
+++ b/solenv/gbuild/platform/com_GCC_defs.mk
@@ -163,7 +163,7 @@ gb_COMPILER_PLUGINS += -Xclang -plugin-arg-loplugin -Xclang
--scope=$(UPDATE_FIL
endif
endif
# extra EF variable to make the command line shorter (just like is done with
$(SRCDIR) etc.)
-gb_COMPILER_PLUGINS_SETUP := EF=$(SRCDIR)/sal/inc/sal/log-areas.dox &&
ICECC_EXTRAFILES=$$EF CCACHE_EXTRAFILES=$$EF
+gb_COMPILER_PLUGINS_SETUP := EF=$(SRCDIR)/include/sal/log-areas.dox &&
ICECC_EXTRAFILES=$$EF CCACHE_EXTRAFILES=$$EF
else
gb_COMPILER_PLUGINS :=
gb_COMPILER_PLUGINS_SETUP :=
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Problem building Libreoffice4.0.2.2 with enable/disable pdfimport extension on ubuntu
It is not an extension any more. --tml ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: cppuhelper/source RepositoryExternal.mk scp2/source solenv/bin testtools/CustomTarget_uno_test.mk touch/CustomTarget_touch_javamaker.mk udkapi/Module_udkapi.mk udkapi/R
RepositoryExternal.mk | 10 -
cppuhelper/source/unorc |2 -
scp2/source/ooo/ure.scp |5 ++--
solenv/bin/linkoo |2 -
testtools/CustomTarget_uno_test.mk|2 -
touch/CustomTarget_touch_javamaker.mk |4 +--
udkapi/Module_udkapi.mk |1
udkapi/README |3 ++
udkapi/UnoApiMerge_uretypes.mk| 35 --
9 files changed, 16 insertions(+), 48 deletions(-)
New commits:
commit ab149c7e3f9bb4be6f3c7d26401b67a0635c13ab
Author: Stephan Bergmann
Date: Wed Apr 24 10:42:40 2013 +0200
Get rid of UnoApiMerge_uretypes, which is just a duplicate of UnoApi_udkapi
What is a little confusing is that the udkapi.rdb ends up as types.rdb in
the
installation set (in the URE's sub-tree). So all places that reference it
during the build do so as "udkapi" while all places that reference it in an
installation set do so as "types."
Change-Id: I35d0695966b3bd703f5494b636b9782efc0d3fcb
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 15b6948..941554a 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -2810,7 +2810,7 @@ $(call gb_Executable_add_runtime_dependencies,climaker,\
$(call gb_Library_get_target,$(gb_CPPU_ENV)_uno) \
$(call gb_Package_get_target_for_build,cppuhelper_unorc) \
$(call gb_Rdb_get_outdir_target_for_build,ure/services) \
- $(call gb_UnoApiMerge_get_target_for_build,ure/types) \
+ $(call gb_UnoApi_get_target_for_build,udkapi) \
)
endef
@@ -2838,7 +2838,7 @@ $(call gb_Executable_add_runtime_dependencies,localize,\
)
endef
-# The dependencies on ure/services.rdb and ure/types.rdb are implicitly
required
+# The dependencies on ure/services.rdb and udkapi.rdb are implicitly required
# due to the settings for URE_SERVICES and URE_TYPES in
cppuhelper/source/unorc:
# FIXME: the library target should be for build too
define gb_Executable__register_saxparser
@@ -2847,11 +2847,11 @@ $(call
gb_Executable_add_runtime_dependencies,saxparser,\
$(call gb_Library_get_target,$(gb_CPPU_ENV)_uno) \
$(call gb_Package_get_target_for_build,cppuhelper_unorc) \
$(call gb_Rdb_get_outdir_target_for_build,ure/services) \
- $(call gb_UnoApiMerge_get_target_for_build,ure/types) \
+ $(call gb_UnoApi_get_target_for_build,udkapi) \
)
endef
-# NOTE: the dependencies on ure/services.rdb and ure/types.rdb are implicitly
+# NOTE: the dependencies on ure/services.rdb and udkapi.rdb are implicitly
# required due to the settings for URE_SERVICES and URE_TYPES in
# cppuhelper/source/unorc
# FIXME: the library target should be for build too
@@ -2860,7 +2860,7 @@ $(call gb_Executable_add_runtime_dependencies,uno,\
$(call gb_Library_get_target,$(gb_CPPU_ENV)_uno) \
$(call gb_Package_get_target_for_build,cppuhelper_unorc) \
$(call gb_Rdb_get_outdir_target_for_build,ure/services) \
- $(call gb_UnoApiMerge_get_target_for_build,ure/types) \
+ $(call gb_UnoApi_get_target_for_build,udkapi) \
)
endef
diff --git a/cppuhelper/source/unorc b/cppuhelper/source/unorc
index 4fa609a..1700bdd 100644
--- a/cppuhelper/source/unorc
+++ b/cppuhelper/source/unorc
@@ -19,4 +19,4 @@
[Bootstrap]
URE_INTERNAL_LIB_DIR=${ORIGIN}
UNO_SERVICES=${ORIGIN}/../xml/ure/services.rdb ${URE_MORE_SERVICES}
-UNO_TYPES=${ORIGIN}/../bin/ure/types.rdb ${URE_MORE_TYPES}
+UNO_TYPES=${ORIGIN}/../bin/udkapi.rdb ${URE_MORE_TYPES}
diff --git a/scp2/source/ooo/ure.scp b/scp2/source/ooo/ure.scp
index 2b4ac3a..2044a59 100755
--- a/scp2/source/ooo/ure.scp
+++ b/scp2/source/ooo/ure.scp
@@ -603,8 +603,9 @@ End
File gid_File_Misc_TypesRdb
TXT_FILE_BODY;
Dir = gid_Dir_Ure_Misc;
-Name = "/ure/types.rdb";
-Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
+Name = "udkapi.rdb";
+InstallName = "types.rdb";
+Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID, SUBST_FILENAME);
// CompID = "E5086F6A-855B-4CAE-AD3A-A85A21C5AE44";
End
diff --git a/solenv/bin/linkoo b/solenv/bin/linkoo
index 2c052e1..e7c0dca 100755
--- a/solenv/bin/linkoo
+++ b/solenv/bin/linkoo
@@ -515,7 +515,7 @@ sub link_rdb_files()
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");
+do_link ($src_prefix . "bin" , $dest_prefix . "ure/share/misc",
"udkapi.rdb", "types.rdb");
print "\n";
}
diff --git a/testtools/CustomTarget_uno_test.mk
b/testtools/CustomTarget_uno_test.mk
index 205aea1..702fa4d 100644
--- a/testtools/CustomTarget_uno_test.mk
+++ b/testtools/CustomTarget_uno_test.mk
@@ -34,7 +34,7 @@ $(call gb_CustomTarget_get_target,testtools/uno_test) : \
Re: Build LibreOffice on Mac OS X
> 10.6 SDK is from Xcode 4.3.2 dmg. Why do you insist on using that? If you just use the existing stuff in your current Xcode, it should (hopefully) be easier to build. No complex CC, CXX, OBJCFLAGS, OBJCXXFLAGS, CXXCPP etc environment variables should be necessary. (But then, I haven't built on 10.7 sizne 10.8 came out, so I don't have recent personal experience.) Anyway, I think you are complicating things for yourself;) The intent is that the configury finds the ideal compiler and SDK to use. Did you read https://wiki.documentfoundation.org/Development/Setup_OS_X ? --tml ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: android/Bootstrap
android/Bootstrap/Makefile.shared |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit f62324cecd93ff2a6019c54b5cd85c83ff672e04 Author: Tor Lillqvist Date: Wed Apr 24 11:54:47 2013 +0300 Use the newfangled "include" directory Change-Id: I3228ad8277d34454affe71b9cbc9ad7f56326ca9 diff --git a/android/Bootstrap/Makefile.shared b/android/Bootstrap/Makefile.shared index de025c0..5b93eea 100644 --- a/android/Bootstrap/Makefile.shared +++ b/android/Bootstrap/Makefile.shared @@ -88,7 +88,7 @@ WHOLELIBS = \ $(OBJLOCAL)/liblo-native-code.so : $(wildcard $(OUTDIR)/lib/lib*.a) native-code.cxx mkdir -p $(OBJLOCAL) - $(CXX) -Wl,-Map,liblo-native-code.map -Wl,--gc-sections -Wl,--version-script=../../Bootstrap/version.map -Wl,--no-keep-files-mapped -Wl,--no-undefined -DANDROID -DDISABLE_DYNLOADING -shared -o $(OBJLOCAL)/liblo-native-code.so -I$(OUTDIR)/inc native-code.cxx -L$(OUTDIR)/lib $(WHOLELIBS) $(LIBS) -lgnustl_static -landroid -ljnigraphics -llog -lz + $(CXX) -Wl,-Map,liblo-native-code.map -Wl,--gc-sections -Wl,--version-script=../../Bootstrap/version.map -Wl,--no-keep-files-mapped -Wl,--no-undefined -DANDROID -DDISABLE_DYNLOADING -shared -o $(OBJLOCAL)/liblo-native-code.so -I$(SRCDIR)/include -I$(OUTDIR)/inc native-code.cxx -L$(OUTDIR)/lib $(WHOLELIBS) $(LIBS) -lgnustl_static -landroid -ljnigraphics -llog -lz $(SODEST)/liblo-native-code.so : $(OBJLOCAL)/liblo-native-code.so mkdir -p $(SODEST) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: bridges/test extensions/qa forms/qa nlpsolver/ThirdParty odk/examples scripting/workben
bridges/test/java_uno/equals/TestEquals.java
|4
extensions/qa/integration/extensions/MethodHandler.java
|8
forms/qa/integration/forms/TableCellTextBinding.java
|4
nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/global/GlobalString.java
| 295 --
odk/examples/DevelopersGuide/Text/TextDocuments.java
| 51 -
scripting/workben/ifc/scripting/_XScriptInvocation.java
|2
scripting/workben/ifc/scripting/_XScriptNameResolver.java
|2
scripting/workben/mod/_scripting/TestDataLoader.java
|2
8 files changed, 179 insertions(+), 189 deletions(-)
New commits:
commit 0c37eeebb0ecbe68fdf8051f627ef1e4929fc5dd
Author: Noel Grandin
Date: Tue Apr 23 09:30:47 2013 +0200
Java cleanup, use generic containers where possible
Change-Id: Icd830004de3e121f5b96393e7d7b447775833419
Reviewed-on: https://gerrit.libreoffice.org/3569
Reviewed-by: Fridrich Strba
Tested-by: Fridrich Strba
diff --git a/bridges/test/java_uno/equals/TestEquals.java
b/bridges/test/java_uno/equals/TestEquals.java
index bc79835..515c8e4 100644
--- a/bridges/test/java_uno/equals/TestEquals.java
+++ b/bridges/test/java_uno/equals/TestEquals.java
@@ -115,7 +115,7 @@ public final class TestEquals {
}
}
-private final HashMap map = new HashMap();
+private final HashMap map = new
HashMap();
}
private final class Done implements XDone {
@@ -160,7 +160,7 @@ public final class TestEquals {
UnoRuntime.queryInterface(
XDerived.class, test2Aa);
-Hashtable params = new Hashtable();
+Hashtable params = new
Hashtable();
params.put("UNO_TYPES", unoTypes);
params.put("UNO_SERVICES", unoServices);
XComponentContext context = Bootstrap.
diff --git a/extensions/qa/integration/extensions/MethodHandler.java
b/extensions/qa/integration/extensions/MethodHandler.java
index 8508dca..b6259e9 100644
--- a/extensions/qa/integration/extensions/MethodHandler.java
+++ b/extensions/qa/integration/extensions/MethodHandler.java
@@ -31,13 +31,13 @@ public class MethodHandler implements XPropertyHandler
private XIntrospectionAccessm_introspectionAccess;
private XIdlClass m_idlClass;
private XIdlMethod[]m_methods;
-private java.util.HashMap m_methodsHash;
+private java.util.HashMap m_methodsHash;
/** Creates a new instance of MethodHandler */
public MethodHandler( XComponentContext _context )
{
m_context = _context;
-m_methodsHash = new java.util.HashMap();
+m_methodsHash = new java.util.HashMap();
try
{
@@ -169,7 +169,7 @@ public class MethodHandler implements XPropertyHandler
m_introspectionAccess = null;
m_methods = null;
-m_methodsHash = new java.util.HashMap();
+m_methodsHash = new java.util.HashMap();
m_introspectionAccess = m_introspection.inspect( _component );
if ( m_introspectionAccess == null )
@@ -217,7 +217,7 @@ public class MethodHandler implements XPropertyHandler
*/
private XIdlMethod impl_getMethod( String _methodName ) throws
UnknownPropertyException
{
-XIdlMethod method = (XIdlMethod)m_methodsHash.get( _methodName );
+XIdlMethod method = m_methodsHash.get( _methodName );
if ( method == null )
throw new com.sun.star.beans.UnknownPropertyException();
diff --git a/forms/qa/integration/forms/TableCellTextBinding.java
b/forms/qa/integration/forms/TableCellTextBinding.java
index 40a5d69..8a1d1fb 100644
--- a/forms/qa/integration/forms/TableCellTextBinding.java
+++ b/forms/qa/integration/forms/TableCellTextBinding.java
@@ -48,7 +48,7 @@ public class TableCellTextBinding
private String m_newCellText;
private String m_lastKnownCellText;
private boolean m_haveNewCellText;
-private java.util.List m_listeners;
+private java.util.List m_listeners;
/** Creates a new instance of TableCellTextBinding */
public TableCellTextBinding( XCell cell )
@@ -56,7 +56,7 @@ public class TableCellTextBinding
m_cellText = UnoRuntime.queryInterface( XTextRange.class, cell );
m_newCellText = new String();
-m_listeners = new java.util.LinkedList();
+m_listeners = new
java.util.LinkedList();
start();
}
diff --git
a/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/global/GlobalString.java
b/nlpsolver/ThirdP
[PUSHED] Java cleanup, use generic containers where possible
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/3569 Approvals: Fridrich Strba: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/3569 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Icd830004de3e121f5b96393e7d7b447775833419 Gerrit-PatchSet: 3 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Noel Grandin Gerrit-Reviewer: Fridrich Strba ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Makefile.in solenv/gbuild
Makefile.in |1 solenv/gbuild/TargetLocations.mk |3 - solenv/gbuild/UnoApiMerge.mk | 61 --- solenv/gbuild/gbuild.help.txt|1 solenv/gbuild/gbuild.mk |1 5 files changed, 67 deletions(-) New commits: commit bb01340a5ccd07a29cce27c8e6cf0664a34aacfe Author: Stephan Bergmann Date: Wed Apr 24 11:09:32 2013 +0200 UnoApiMerge has become unused now Change-Id: I9e4e153e1a9ac82d4015b73ecf3a9a2429ab346f diff --git a/Makefile.in b/Makefile.in index 6dea2a1..f427136 100644 --- a/Makefile.in +++ b/Makefile.in @@ -124,7 +124,6 @@ gbuild_TARGETS := AllLangHelp \ StaticLibrary \ UIConfig \ UnoApi \ - UnoApiMerge \ UnpackedTarball \ WinResTarget \ Zip \ diff --git a/solenv/gbuild/TargetLocations.mk b/solenv/gbuild/TargetLocations.mk index 71101ca..3c43b36 100644 --- a/solenv/gbuild/TargetLocations.mk +++ b/solenv/gbuild/TargetLocations.mk @@ -56,8 +56,6 @@ gb_ResTarget_get_outdir_target = $(OUTDIR)/bin/$(1).res gb_ResTarget_get_unittest_target = \ $(OUTDIR)/unittest/install/program/resource/$(1).res gb_UnoApi_get_target = $(OUTDIR)/bin/$(1).rdb -gb_UnoApiMerge_get_target = $(OUTDIR)/bin/$(1).rdb -gb_UnoApiMerge_get_target_for_build = $(OUTDIR_FOR_BUILD)/bin/$(1).rdb gb_Jar_get_outdir_target = $(OUTDIR)/bin/$(1).jar gb_Zip_get_outdir_target = $(OUTDIR)/pck/$(1).zip gb_Zip_get_outdir_target_for_build = $(OUTDIR_FOR_BUILD)/pck/$(1).zip @@ -343,7 +341,6 @@ $(eval $(call gb_Helper_make_outdir_clean_targets,\ Library \ StaticLibrary \ UnoApi \ - UnoApiMerge \ )) $(eval $(call gb_Helper_make_dep_targets,\ diff --git a/solenv/gbuild/UnoApiMerge.mk b/solenv/gbuild/UnoApiMerge.mk deleted file mode 100644 index 8d14077..000 --- a/solenv/gbuild/UnoApiMerge.mk +++ /dev/null @@ -1,61 +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/. -# - -# Note: targets for this class are the same as for UnoApi, therefore -# there is no need to define them again (and if we did, they would -# overwrite the UnoApi targets anyway...) - -define gb_UnoApiMerge_UnoApiMerge -$(call gb_UnoApiTarget_UnoApiTarget,$(1)) - -$(call gb_UnoApiTarget_set_root,$(1),/) - -$(call gb_UnoApiMerge_get_target,$(1)) :| $(dir $(call gb_UnoApiMerge_get_target,$(1))).dir -$(call gb_UnoApiMerge_get_target,$(1)) : $(call gb_UnoApiTarget_get_target,$(1)) -$(call gb_UnoApiMerge_get_clean_target,$(1)) : $(call gb_UnoApiTarget_get_clean_target,$(1)) - -$(call gb_UnoApiTarget_get_headers_target,$(1)) : $(gb_Helper_MISCDUMMY) - -$(call gb_Deliver_add_deliverable,$(call gb_UnoApiMerge_get_target,$(1)),$(call gb_UnoApiTarget_get_target,$(1)),$(1)) - -$$(eval $$(call gb_Module_register_target,$(call gb_UnoApiMerge_get_target,$(1)),$(call gb_UnoApiMerge_get_clean_target,$(1 -$(call gb_Helper_make_userfriendly_targets,$(1),UnoApiMerge) - -endef - -define gb_UnoApiMerge_add_rdbfile -$$(call gb_Output_error,gb_UnoApiMerge_add_rdbfile: use gb_UnoApiMerge_use_api instead.) -endef - -define gb_UnoApiMerge__use_api -$(call gb_UnoApiTarget_merge_api,$(1),$(2)) -$(call gb_UnoApiTarget_get_external_headers_target,$(1)) : $(call gb_UnoApiTarget_get_headers_target,$(2)) - -endef - -define gb_UnoApiMerge_add_rdbfiles -$$(call gb_Output_error,gb_UnoApiMerge_add_rdbfiles: use gb_UnoApiMerge_use_api instead.) -endef - -define gb_UnoApiMerge_use_api -$(foreach rdb,$(2),$(call gb_UnoApiMerge__use_api,$(1),$(rdb))) - -endef - -define gb_UnoApiMerge_add_reference_rdbfile -$$(call gb_Output_error,gb_UnoApiMerge_add_reference_rdbfile: use gb_UnoApiMerge_set_reference_rdbfile instead.) - -endef - -define gb_UnoApiMerge_set_reference_rdbfile -$(call gb_UnoApiTarget_set_reference_rdbfile,$(1),$(2)) - -endef - -# vim: set noet sw=4 ts=4: diff --git a/solenv/gbuild/gbuild.help.txt b/solenv/gbuild/gbuild.help.txt index 776aeb1..730b34e 100644 --- a/solenv/gbuild/gbuild.help.txt +++ b/solenv/gbuild/gbuild.help.txt @@ -76,7 +76,6 @@ AVAILABLE TARGETS o StaticLibrary o UI o UnoApi - o UnoApiMerge o UnpackedTarball o WinResTarget o Zip diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk index def5ff8..5e06cbb 100644 --- a/solenv/gbuild/gbuild.mk +++ b/solenv/gbuild/gbuild.mk @@ -322,7 +322,6 @@ include $(foreach class, \ UIConfig \ UnoApiTarget \ UnoApi \ - UnoApiMerge \ UnpackedTarball \ InternalUnoApi \ CliAssembly \ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commi
Re: Build LibreOffice on Mac OS X
10.7 works fine just need command line tools installed only no environmental variables needed either. On Wed, Apr 24, 2013 at 10:51 AM, Tor Lillqvist wrote: > > 10.6 SDK is from Xcode 4.3.2 dmg. > > Why do you insist on using that? If you just use the existing stuff in > your current Xcode, it should (hopefully) be easier to build. No > complex CC, CXX, OBJCFLAGS, OBJCXXFLAGS, CXXCPP etc environment > variables should be necessary. (But then, I haven't built on 10.7 > sizne 10.8 came out, so I don't have recent personal experience.) > Anyway, I think you are complicating things for yourself;) The intent > is that the configury finds the ideal compiler and SDK to use. > > Did you read https://wiki.documentfoundation.org/Development/Setup_OS_X ? > > --tml > ___ > LibreOffice mailing list > LibreOffice@lists.freedesktop.org > http://lists.freedesktop.org/mailman/listinfo/libreoffice > -- Jonathan Aquilina ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Patch] Bug 47302-Adding a new field in "Insert->Fields"
Hi, I am hereby attaching my patch for review. Please guide me, if I have made any mistakes. Also there is new file created @offapi/com/sun/star/text/textfield/SlideName.idl for the patch. So I am attaching that file too. Thanks and Regards, Vishv 1_Bug47302.patch Description: Binary data SlideName.idl Description: Binary data ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'distro/suse/suse-3.6' - sc/source
sc/source/ui/vba/vbapagesetup.cxx |2 --
1 file changed, 2 deletions(-)
New commits:
commit 06732f0437ee4c8eb0c90f60156f0c0f57960757
Author: Noel Power
Date: Wed Apr 24 10:13:53 2013 +0100
follow fix for bnc#813528
Change-Id: Id6c9cd01bc68e13b87c845d9272c7b85756987c5
diff --git a/sc/source/ui/vba/vbapagesetup.cxx
b/sc/source/ui/vba/vbapagesetup.cxx
index 86d09a0..8dd0e86 100644
--- a/sc/source/ui/vba/vbapagesetup.cxx
+++ b/sc/source/ui/vba/vbapagesetup.cxx
@@ -520,8 +520,6 @@ sal_Int32 SAL_CALL ScVbaPageSetup::getFirstPageNumber()
throw (css::uno::Runtime
void SAL_CALL ScVbaPageSetup::setFirstPageNumber( sal_Int32 firstPageNumber)
throw (css::uno::RuntimeException)
{
-if( firstPageNumber < 0 )
-DebugHelper::exception(SbERR_BAD_PARAMETER, rtl::OUString() );
if( firstPageNumber == excel::Constants::xlAutomatic )
firstPageNumber = 0;
___
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/WinResTarget.mk |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit e0c8cfd2ac753a5c557f5960889bf35085747b2e Author: Christian Lohmaier Date: Wed Apr 24 11:26:33 2013 +0200 allow out-of-srctree builds on windows config_host (config_$(gb_Side) dir was included from SRCDIR, but when runing the build in another directory, it is in BUILDDIR WinResTarget.mk was forgotten when the other references were updated in ae4e327739112ba326a2945fc0d5550739f3083d and follow-up ones. Change-Id: I8c5a8edb4a17dd33abdcdb04c3af830cad44e07a Reviewed-on: https://gerrit.libreoffice.org/3593 Reviewed-by: Fridrich Strba Tested-by: Fridrich Strba diff --git a/solenv/gbuild/WinResTarget.mk b/solenv/gbuild/WinResTarget.mk index d88375e..bb59d24 100644 --- a/solenv/gbuild/WinResTarget.mk +++ b/solenv/gbuild/WinResTarget.mk @@ -16,7 +16,7 @@ endef define gb_WinResTarget_WinResTarget_init $(call gb_WinResTarget_get_target,$(1)) : DEFS := $(gb_WinResTarget_DEFAULTDEFS) -$(call gb_WinResTarget_get_target,$(1)) : INCLUDE := $(subst -isystem,-I,$(SOLARINC)) -I$(SRCDIR)/config_$(gb_Side) +$(call gb_WinResTarget_get_target,$(1)) : INCLUDE := $(subst -isystem,-I,$(SOLARINC)) -I$(BUILDDIR)/config_$(gb_Side) $(call gb_WinResTarget_get_clean_target,$(1)) : RCFILE := $(call gb_WinResTarget_get_target,$(1)) : RCFILE := @@ -24,7 +24,7 @@ $(call gb_WinResTarget_WinResTarget_platform,$(1)) ifeq ($(gb_FULLDEPS),$(true)) $(call gb_WinResTarget_get_dep_target,$(1)) : DEFS := $$(gb_WinResTarget_DEFAULTDEFS) -$(call gb_WinResTarget_get_dep_target,$(1)) : INCLUDE := $$(gb_WinResTarget_INCLUDE) -I$(SRCDIR)/config_$(gb_Side) +$(call gb_WinResTarget_get_dep_target,$(1)) : INCLUDE := $$(gb_WinResTarget_INCLUDE) -I$(BUILDDIR)/config_$(gb_Side) $(call gb_WinResTarget_get_dep_target,$(1)) : RCFILE := -include $(call gb_WinResTarget_get_dep_target,$(1)) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PATCH] allow out-of-srctree builds on windows
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/3593 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/93/3593/1 allow out-of-srctree builds on windows config_host (config_$(gb_Side) dir was included from SRCDIR, but when runing the build in another directory, it is in BUILDDIR WinResTarget.mk was forgotten when the other references were updated in ae4e327739112ba326a2945fc0d5550739f3083d and follow-up ones. Change-Id: I8c5a8edb4a17dd33abdcdb04c3af830cad44e07a --- M solenv/gbuild/WinResTarget.mk 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/solenv/gbuild/WinResTarget.mk b/solenv/gbuild/WinResTarget.mk index d88375e..bb59d24 100644 --- a/solenv/gbuild/WinResTarget.mk +++ b/solenv/gbuild/WinResTarget.mk @@ -16,7 +16,7 @@ define gb_WinResTarget_WinResTarget_init $(call gb_WinResTarget_get_target,$(1)) : DEFS := $(gb_WinResTarget_DEFAULTDEFS) -$(call gb_WinResTarget_get_target,$(1)) : INCLUDE := $(subst -isystem,-I,$(SOLARINC)) -I$(SRCDIR)/config_$(gb_Side) +$(call gb_WinResTarget_get_target,$(1)) : INCLUDE := $(subst -isystem,-I,$(SOLARINC)) -I$(BUILDDIR)/config_$(gb_Side) $(call gb_WinResTarget_get_clean_target,$(1)) : RCFILE := $(call gb_WinResTarget_get_target,$(1)) : RCFILE := @@ -24,7 +24,7 @@ ifeq ($(gb_FULLDEPS),$(true)) $(call gb_WinResTarget_get_dep_target,$(1)) : DEFS := $$(gb_WinResTarget_DEFAULTDEFS) -$(call gb_WinResTarget_get_dep_target,$(1)) : INCLUDE := $$(gb_WinResTarget_INCLUDE) -I$(SRCDIR)/config_$(gb_Side) +$(call gb_WinResTarget_get_dep_target,$(1)) : INCLUDE := $$(gb_WinResTarget_INCLUDE) -I$(BUILDDIR)/config_$(gb_Side) $(call gb_WinResTarget_get_dep_target,$(1)) : RCFILE := -include $(call gb_WinResTarget_get_dep_target,$(1)) -- To view, visit https://gerrit.libreoffice.org/3593 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I8c5a8edb4a17dd33abdcdb04c3af830cad44e07a Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Christian Lohmaier ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] allow out-of-srctree builds on windows
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/3593 Approvals: Fridrich Strba: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/3593 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I8c5a8edb4a17dd33abdcdb04c3af830cad44e07a Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Christian Lohmaier Gerrit-Reviewer: Fridrich Strba ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: android/experimental
android/experimental/DocumentLoader/Makefile |5 ++---
android/experimental/LibreOffice4Android/Makefile |5 ++---
android/experimental/desktop/Makefile |5 ++---
3 files changed, 6 insertions(+), 9 deletions(-)
New commits:
commit 5a15474709cb7bc047a9a89d6b5bffa79a45acbe
Author: Tor Lillqvist
Date: Wed Apr 24 12:44:08 2013 +0300
Adapt to changes in type rdb file locations and names
The old bin/ure/types.rdb was just a duplicate of bin/udkapi.rdb. There is
no
bin/types.rdb any more either. We have just udkapi.rdb, offapi.rdb and
oovbaapi.rdb now.
Change-Id: Idd0911f1d4d48f172af159b852918d429f17cc92
diff --git a/android/experimental/DocumentLoader/Makefile
b/android/experimental/DocumentLoader/Makefile
index 123042f..759cf65 100644
--- a/android/experimental/DocumentLoader/Makefile
+++ b/android/experimental/DocumentLoader/Makefile
@@ -25,8 +25,7 @@ copy-stuff:
mkdir -p assets/gz.unpack/program/ure assets/lib assets/program
assets/xml/ure assets/ComponentTarget/i18npool/util
gzip -9 <$(OUTDIR)/bin/offapi.rdb >assets/gz.unpack/program/offapi.rdb
gzip -9 <$(OUTDIR)/bin/oovbaapi.rdb
>assets/gz.unpack/program/oovbaapi.rdb
- gzip -9 <$(OUTDIR)/bin/types.rdb >assets/gz.unpack/program/types.rdb
- gzip -9 <$(OUTDIR)/bin/ure/types.rdb
>assets/gz.unpack/program/ure/types.rdb
+ gzip -9 <$(OUTDIR)/bin/udkapi.rdb >assets/gz.unpack/program/udkapi.rdb
# For some reason the vnd.sun.star.expand:$LO_LIB_DIR doesn't seem to work, it
expands to empty!?
# So just hardcode the known APP_DATA_PATH for now...
for F in xml/services xml/ure/services; do \
@@ -71,7 +70,7 @@ copy-stuff:
# Set up unorc
echo '[Bootstrap]' > assets/program/unorc
echo "URE_INTERNAL_LIB_DIR=file://$(APP_DATA_PATH)/lib/" >>
assets/program/unorc
- echo 'UNO_TYPES=file://$(APP_DATA_PATH)/program/ure/types.rdb
file://$(APP_DATA_PATH)/program/types.rdb $${URE_MORE_TYPES}' >>
assets/program/unorc
+ echo 'UNO_TYPES=file://$(APP_DATA_PATH)/program/udkapi.rdb
$${URE_MORE_TYPES}' >> assets/program/unorc
echo 'UNO_SERVICES=file:///assets/xml/ure/services.rdb
$${URE_MORE_SERVICES}' >> assets/program/unorc
#
# Set up bootstraprc
diff --git a/android/experimental/LibreOffice4Android/Makefile
b/android/experimental/LibreOffice4Android/Makefile
index 598cc6a..e523a4d 100644
--- a/android/experimental/LibreOffice4Android/Makefile
+++ b/android/experimental/LibreOffice4Android/Makefile
@@ -26,8 +26,7 @@ copy-stuff:
mkdir -p assets/gz.unpack/program/ure assets/lib assets/program
assets/xml/ure assets/ComponentTarget/i18npool/util
gzip -9 <$(OUTDIR)/bin/offapi.rdb >assets/gz.unpack/program/offapi.rdb
gzip -9 <$(OUTDIR)/bin/oovbaapi.rdb
>assets/gz.unpack/program/oovbaapi.rdb
- gzip -9 <$(OUTDIR)/bin/types.rdb >assets/gz.unpack/program/types.rdb
- gzip -9 <$(OUTDIR)/bin/ure/types.rdb
>assets/gz.unpack/program/ure/types.rdb
+ gzip -9 <$(OUTDIR)/bin/udkapi.rdb >assets/gz.unpack/program/udkapi.rdb
# For some reason the vnd.sun.star.expand:$LO_LIB_DIR doesn't seem to work, it
expands to empty!?
for F in xml/services xml/ure/services; do \
sed -e
's!uri="vnd.sun.star.expand:$$LO_LIB_DIR/!uri="file://$$APP_DATA_DIR/lib/!g'
<$(OUTDIR)/$$F.rdb >assets/$$F.rdb; \
@@ -69,7 +68,7 @@ copy-stuff:
# Set up unorc
echo '[Bootstrap]' > assets/program/unorc
echo 'URE_INTERNAL_LIB_DIR=file://$$APP_DATA_DIR/lib/' >>
assets/program/unorc
- echo 'UNO_TYPES=file://$$APP_DATA_DIR/program/ure/types.rdb
file://$$APP_DATA_DIR/program/types.rdb
file://$$APP_DATA_DIR/program/offapi.rdb
file://$$APP_DATA_DIR/program/oovbaapi.rdb' >> assets/program/unorc
+ echo 'UNO_TYPES=file://$$APP_DATA_DIR/program/udkapi.rdb
file://$$APP_DATA_DIR/program/offapi.rdb
file://$$APP_DATA_DIR/program/oovbaapi.rdb' >> assets/program/unorc
echo 'UNO_SERVICES=file:///assets/xml/ure/services.rdb
file:///assets/xml/services.rdb <$$BRAND_BASE_DIR/program/services>*' >>
assets/program/unorc
#
# Set up bootstraprc
diff --git a/android/experimental/desktop/Makefile
b/android/experimental/desktop/Makefile
index 86935f3..4993776 100644
--- a/android/experimental/desktop/Makefile
+++ b/android/experimental/desktop/Makefile
@@ -26,8 +26,7 @@ copy-stuff:
mkdir -p assets/gz.unpack/program/ure assets/lib assets/program
assets/xml/ure assets/ComponentTarget/i18npool/util
gzip -9 <$(OUTDIR)/bin/offapi.rdb >assets/gz.unpack/program/offapi.rdb
gzip -9 <$(OUTDIR)/bin/oovbaapi.rdb
>assets/gz.unpack/program/oovbaapi.rdb
- gzip -9 <$(OUTDIR)/bin/types.rdb >assets/gz.unpack/program/types.rdb
- gzip -9 <$(OUTDIR)/bin/ure/types.rdb
>assets/gz.unpack/program/ure/types.rdb
+ gzip -9 <$(OUTDIR)/bin/udkapi.rdb >assets/gz.unpack/program/udkapi.rdb
# For some reason the vnd.sun.star.expand:$LO_LIB_DIR doesn't seem to work, it
ex
[PATCH libreoffice-4-0-3] fdo#60280: sw: restore anti-aliasing for all OLE objects
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/3594
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/94/3594/1
fdo#60280: sw: restore anti-aliasing for all OLE objects
The OLE case in SwNoTxtFrm::PaintPicture() was mis-merged to modify the
anti-aliasing always but reset it only for Charts.
(regression from 44cfc7cb6533d827fd2d6e586d92c61d7d7f7a70)
Change-Id: I0d740e621c3fd71f308d980581edb3c16308c06e
(cherry picked from commit 954d695827431a5badd1a993d8f364c669ca9c9c)
Reviewed-on: https://gerrit.libreoffice.org/3589
Reviewed-by: Fridrich Strba
Tested-by: Fridrich Strba
(cherry picked from commit f3e8a9649ac653eafaf8c5fa57e20d3dbe90d82c)
---
M sw/source/core/doc/notxtfrm.cxx
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/sw/source/core/doc/notxtfrm.cxx b/sw/source/core/doc/notxtfrm.cxx
index 914e189..a839420 100644
--- a/sw/source/core/doc/notxtfrm.cxx
+++ b/sw/source/core/doc/notxtfrm.cxx
@@ -1143,8 +1143,7 @@
}
// see #i99665#
-if ( pOLENd->IsChart() &&
-pShell->Imp()->GetDrawView()->IsAntiAliasing() )
+if (pShell->Imp()->GetDrawView()->IsAntiAliasing())
{
pOut->SetAntialiasing( nFormerAntialiasingAtOutput );
}
--
To view, visit https://gerrit.libreoffice.org/3594
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I0d740e621c3fd71f308d980581edb3c16308c06e
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-0-3
Gerrit-Owner: Michael Stahl
Gerrit-Reviewer: Fridrich Strba
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 54157] LibreOffice 4.0 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=54157 --- Comment #142 from Pedro --- I nominate bug #59608. Although this bug is fixed in Master it should be cherry picked to 4.0.3 ASAP since Marketing made a big deal about this new feature and now it is broken (not LO's fault but still looks bad that it doesn't work at all) -- 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 54157] LibreOffice 4.0 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=54157 Pedro changed: What|Removed |Added Depends on||59608 -- 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: 4 commits - chart2/CppunitTest_chart2_importtest.mk chart2/qa chart2/source xmloff/source
chart2/CppunitTest_chart2_importtest.mk |2
chart2/qa/extras/chart2import.cxx | 131 --
chart2/qa/extras/charttest.hxx | 139
chart2/source/tools/ErrorBar.cxx| 11 ++
xmloff/source/chart/PropertyMap.hxx |2
5 files changed, 153 insertions(+), 132 deletions(-)
New commits:
commit b3bf16a5c4f863798adca8d322d63e9face64686
Author: Markus Mohrhard
Date: Wed Apr 24 12:08:09 2013 +0200
fix a problem with error bar weight
Change-Id: I812bbcdc346bffd2f0c968077a3fe86a241cf231
diff --git a/chart2/source/tools/ErrorBar.cxx b/chart2/source/tools/ErrorBar.cxx
index 92c3265..cb78f8e 100644
--- a/chart2/source/tools/ErrorBar.cxx
+++ b/chart2/source/tools/ErrorBar.cxx
@@ -155,6 +155,10 @@ void ErrorBar::setPropertyValue( const OUString&
rPropName, const uno::Any& rAny
rAny >>= mfPositiveError;
rAny >>= mfNegativeError;
}
+else if(rPropName == "Weight")
+{
+rAny >>= mfWeight;
+}
else if(rPropName == "NegativeError")
rAny >>= mfNegativeError;
else if(rPropName == "ShowPositiveError")
@@ -228,6 +232,8 @@ uno::Any ErrorBar::getPropertyValue(const OUString&
rPropName)
aRet <<= mbShowPositiveError;
else if(rPropName == "ShowNegativeError")
aRet <<= mbShowNegativeError;
+else if(rPropName == "Weight")
+aRet <<= mfWeight;
else if(rPropName == "ErrorBarRangePositive")
{
OUString aRange;
diff --git a/xmloff/source/chart/PropertyMap.hxx
b/xmloff/source/chart/PropertyMap.hxx
index d1ec843..f19b365 100644
--- a/xmloff/source/chart/PropertyMap.hxx
+++ b/xmloff/source/chart/PropertyMap.hxx
@@ -189,7 +189,7 @@ const XMLPropertyMapEntry aXMLChartPropMap[] =
MAP_SPECIAL_ODF12( "ErrorBarRangeNegative", CHART, XML_ERROR_LOWER_RANGE,
XML_TYPE_STRING, XML_SCH_CONTEXT_SPECIAL_ERRORBAR_RANGE ), // export only
// errorbars properties (chart2)
-MAP_ENTRY_ODF_EXT( "Weigth", CHART, XML_ERROR_STANDARD_WEIGHT,
XML_TYPE_DOUBLE),
+MAP_ENTRY_ODF_EXT( "Weight", CHART, XML_ERROR_STANDARD_WEIGHT,
XML_TYPE_DOUBLE),
// series/data-point properties
MAP_SPECIAL( "DataCaption", CHART, XML_DATA_LABEL_NUMBER, XML_TYPE_NUMBER
| MID_FLAG_MERGE_PROPERTY, XML_SCH_CONTEXT_SPECIAL_DATA_LABEL_NUMBER ), //
convert one constant
commit a172ed9837d1c52eebd9336e5262f459920e525b
Author: Markus Mohrhard
Date: Tue Apr 23 07:11:57 2013 +0200
extract common chart test parts into own header
Change-Id: Id41b9c3cd241de9bc5fa1da885bc9a206bca093d
diff --git a/chart2/qa/extras/chart2import.cxx
b/chart2/qa/extras/chart2import.cxx
index b498c69..decd18e 100644
--- a/chart2/qa/extras/chart2import.cxx
+++ b/chart2/qa/extras/chart2import.cxx
@@ -7,45 +7,18 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
-#include
-#include
+#include "charttest.hxx"
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-
-#include
-#include
-#include
-#include
-#include
-#include
#include
#include
-#include
-
-#include
-
-using namespace com::sun::star;
-using namespace com::sun::star::uno;
-class Chart2ImportTest : public test::BootstrapFixture, public
unotest::MacrosTest
+class Chart2ImportTest : public ChartTest
{
public:
void Fdo60083();
void testSteppedLines();
void testErrorBarRange();
-virtual void setUp();
-virtual void tearDown();
-
CPPUNIT_TEST_SUITE(Chart2ImportTest);
CPPUNIT_TEST(Fdo60083);
CPPUNIT_TEST(testSteppedLines);
@@ -53,15 +26,7 @@ public:
CPPUNIT_TEST_SUITE_END();
private:
-void load( const char* pDir, const char* pName );
-
-Reference< chart2::XChartDocument > getChartDocFromSheet( sal_Int32
nSheet, uno::Reference< lang::XComponent > xComponent );
-Reference< chart2::XDataSeries > getDataSeriesFromDoc( Reference<
chart2::XChartDocument > xChartDoc,
-sal_Int32 nDataSeries, sal_Int32 nChartType = 0, sal_Int32 nCooSys
= 0 );
-Reference< chart2::XChartType > getChartTypeFromDoc( Reference<
chart2::XChartDocument > xChartDoc,
-sal_Int32 nChartType, sal_Int32 nCooSys = 0 );
-Reference< lang::XComponent > mxComponent;
};
// error bar import
@@ -186,98 +151,6 @@ void Chart2ImportTest::testSteppedLines()
}
}
-Reference< chart2::XChartDocument > Chart2ImportTest::getChartDocFromSheet(
sal_Int32 nSheet, uno::Reference< lang::XComponent > xComponent )
-{
-// let us assume that we only have one chart per sheet
-
-uno::Reference< sheet::XSpreadsheetDocument > xDoc(xComponent,
UNO_QUERY_THROW);
-CPPUNIT_ASSERT(xDoc.is());
-
-uno::Reference< container::XIndexAccess > xIA(xDoc->getSheets(),
UNO_QUERY_THROW);
-CPPUNIT_ASSERT(xIA.is());
-
-uno::Reference< table::XTableChartsSupplier > xChartSupplier(
xIA->getByIndex(nSheet), UNO_QUERY_THROW);
-CPPUNIT_ASSERT(xChartSupplier.is
[Libreoffice-commits] core.git: offapi/README offapi/type_reference offapi/UnoApi_offapi.mk udkapi/type_reference udkapi/UnoApi_udkapi.mk
dev/null |binary
offapi/README | 15 +--
offapi/UnoApi_offapi.mk |2 ++
offapi/type_reference/offapi.rdb |binary
offapi/type_reference/typelibrary_history.txt |2 +-
offapi/type_reference/update-rdb.sh | 16 +---
udkapi/UnoApi_udkapi.mk |2 ++
udkapi/type_reference/udkapi.rdb |binary
8 files changed, 23 insertions(+), 14 deletions(-)
New commits:
commit 826e787733d1d5e82b8fcc20de9e569c6a0ae5fd
Author: Stephan Bergmann
Date: Wed Apr 24 12:18:54 2013 +0200
Split offapi/type_reference/types.rdb in two
...now that UnoApiMerge_types is gone.
Change-Id: Ie33aeb09692e3b3d851f2278714b037e183b627c
diff --git a/offapi/README b/offapi/README
index a8f3a9b..90c4ee5 100644
--- a/offapi/README
+++ b/offapi/README
@@ -3,9 +3,12 @@ Contains all of the IDL files except those in [[udkapi]]
i.e. the interfaces that are specific to the OppenOffice.org application.
An artificial (?) separation.
-The reference offapi/type_reference/types.rdb, used to detect inadvertent
-incompatible changes, is maintained via offapi/type_reference/update-rdb.sh
(see
-its usage message for details) for cases where we deliberately /do/ become
-incompatible. Old such cases are listed in
-offapi/type_reference/typelibrary_history.txt, new such cases are recorded in
-the git log of offapi/type_reference/types.rdb.
+The reference offapi/type_reference/offapi.rdb and
+udkapi/type_reference/udkapi.rdb (formerly combined into a single
+offapi/type_reference/types.rdb), used to detect inadvertent incompatible
+changes, are maintained via offapi/type_reference/update-rdb.sh (see its usage
+message for details) for cases where we deliberately /do/ become incompatible.
+Old such cases are listed in offapi/type_reference/typelibrary_history.txt,
+newer such cases are recorded in the git log of (now removed)
+offapi/type_reference/types.rdb, new such cases are recorded in the git logs of
+offapi/type_reference/offapi.rdb and udkapi/type_reference/udkapi.rdb.
diff --git a/offapi/UnoApi_offapi.mk b/offapi/UnoApi_offapi.mk
index cae76f6..c2deacc 100644
--- a/offapi/UnoApi_offapi.mk
+++ b/offapi/UnoApi_offapi.mk
@@ -4267,4 +4267,6 @@ $(eval $(call
gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/org/freedesktop/Package
SyncDbusSessionHelper \
))
+$(eval $(call
gb_UnoApi_set_reference_rdbfile,offapi,offapi/type_reference/offapi))
+
# vim: set noet sw=4 ts=4:
diff --git a/offapi/type_reference/types.rdb b/offapi/type_reference/offapi.rdb
similarity index 66%
rename from offapi/type_reference/types.rdb
rename to offapi/type_reference/offapi.rdb
index 097590f..d72a454 100644
Binary files a/offapi/type_reference/types.rdb and
b/offapi/type_reference/offapi.rdb differ
diff --git a/offapi/type_reference/typelibrary_history.txt
b/offapi/type_reference/typelibrary_history.txt
index 1103db8..7bc723f 100644
--- a/offapi/type_reference/typelibrary_history.txt
+++ b/offapi/type_reference/typelibrary_history.txt
@@ -184,4 +184,4 @@
Update css.awt.UnoControlDialog to reflect the supported XDialog2 interface
additionally to XDialog
-For later changes, consult the git log of the accompanying types.rdb file.
+For later changes, see offapi/README.
diff --git a/offapi/type_reference/update-rdb.sh
b/offapi/type_reference/update-rdb.sh
index 79fd29c..cbe33b6 100755
--- a/offapi/type_reference/update-rdb.sh
+++ b/offapi/type_reference/update-rdb.sh
@@ -10,28 +10,30 @@
set -e
# Basic argument checks
-if [ $# -lt 1 ]
+if [ $# -lt 2 ]
then
echo "usage:"
- echo "make cmd cmd='$0 '"
+ echo "make cmd cmd='$0 '"
echo ""
echo "example:"
echo "make cmd cmd='$0"
+ echo " offapi/type_reference/offapi.rdb"
echo " offapi/com/sun/star/auth/SSOManagerFactory.idl"
echo " offapi/com/sun/star/auth/SSOPasswordCache.idl'"
exit 1
fi
+rdb=${1?}
+shift
mkdir tmp
for i in "$@"; do
"${OUTDIR_FOR_BUILD?}"/bin/regmerge -v tmp/out1.rdb /UCR \
"${WORKDIR_FOR_BUILD?}"/UnoApiPartTarget/"${i%.idl}".urd
done
-"${OUTDIR_FOR_BUILD?}"/bin/regmerge -v tmp/out2.rdb / \
- "${SRC_ROOT?}"/offapi/type_reference/types.rdb tmp/out1.rdb
+"${OUTDIR_FOR_BUILD?}"/bin/regmerge -v tmp/out2.rdb / "${SRC_ROOT?}"/"${rdb?}"
\
+ tmp/out1.rdb
echo "sanity check diff:"
-diff <("${OUTDIR_FOR_BUILD?}"/bin/regview \
- "${SRC_ROOT?}"/offapi/type_reference/types.rdb) \
+diff <("${OUTDIR_FOR_BUILD?}"/bin/regview "${SRC_ROOT?}"/"${rdb?}") \
<("${OUTDIR_FOR_BUILD?}"/bin/regview tmp/out2.rdb) && $? -le 1
-mv tmp/out2.rdb "${SRC_ROOT?}"/offapi/type_reference/types.rdb
+mv tmp/out2.rdb "${SRC_ROOT?}"/"${rdb?}"
rm -r tmp
diff --git a/udkapi/UnoApi_udkapi.mk b/udkapi/UnoApi_udkapi.mk
index 0b13cac..011e487 100644
--- a/udkapi/UnoApi_udkapi.mk
+++ b/udkapi/UnoApi_udkapi.mk
@@ -536,4 +536,6 @@ $(eval $(call
gb_UnoApi_add_idlfiles,udkapi,u
[Libreoffice-commits] core.git: i18nlangtag/source
i18nlangtag/source/isolang/langid.pl |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit d81f84a0a40f99316d32b2877ea8b92da3dfc74c
Author: Eike Rathke
Date: Wed Apr 24 12:27:48 2013 +0200
adapt to header move
Change-Id: Ie460c5dbf354f68a21d52bd84b7e95b78fca11be
diff --git a/i18nlangtag/source/isolang/langid.pl
b/i18nlangtag/source/isolang/langid.pl
index 4504f08..16f1b07 100755
--- a/i18nlangtag/source/isolang/langid.pl
+++ b/i18nlangtag/source/isolang/langid.pl
@@ -103,7 +103,7 @@ sub grepFile(@)
# Try module under current working directory first to catch local
# modifications. A Not yet delivered lang.h is a special case.
if ("$path/$module/$name" eq "$SOLENVINC/i18nlangtag/lang.h") {
-$file = "./$module/inc/i18nlangtag/lang.h"; }
+$file = "./include/$module/lang.h"; }
else {
$file = "./$module/$name"; }
if (!($found = open( IN, $file)))
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Build LibreOffice on Mac OS X
Hi, Of course command line tools are installed. And I have read all documentations (each with a different procedure). I tried various env vars because a build with a plain vanilla 10.7/Xcode4.5 failed. If you upgrade Mac OS X, Apple leave most of the "old" toolchain. But from a clean install : - The default compiler is clang, not gcc. - This is not a plain gcc anymore with XCode (only llvm). - Neither /Developer folder or 10.6 SDK are present. This should explain the failures. Anyway, I will remake a clean install from scratch on my Mac Mini and test on an "old" 10.4/10.5 iMac too. And build the UNO SDK as recommended on : https://wiki.documentfoundation.org/Development/Setup_OS_X I may not be the only one with those build errors. Best regards, Raphaël Jonathan Aquilina wrote .. > 10.7 works fine just need command line tools installed only no > environmental variables needed either. > > > On Wed, Apr 24, 2013 at 10:51 AM, Tor Lillqvist wrote: > > > > 10.6 SDK is from Xcode 4.3.2 dmg. > > > > Why do you insist on using that? If you just use the existing stuff in > > your current Xcode, it should (hopefully) be easier to build. No > > complex CC, CXX, OBJCFLAGS, OBJCXXFLAGS, CXXCPP etc environment > > variables should be necessary. (But then, I haven't built on 10.7 > > sizne 10.8 came out, so I don't have recent personal experience.) > > Anyway, I think you are complicating things for yourself;) The intent > > is that the configury finds the ideal compiler and SDK to use. > > > > Did you read https://wiki.documentfoundation.org/Development/Setup_OS_X ? > > > > --tml > > ___ > > LibreOffice mailing list > > LibreOffice@lists.freedesktop.org > > http://lists.freedesktop.org/mailman/listinfo/libreoffice > > > > > > -- > Jonathan Aquilina ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: xmloff/source
xmloff/source/chart/SchXMLExport.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit aee01f809e214090b320b31bdce98dff77208a3b Author: Markus Mohrhard Date: Wed Apr 24 12:21:41 2013 +0200 x error bars are also defined in ODF 1.2 I suppose they were deactivated in ODF 1.2 because of the invalid ODF files produced by the old code Change-Id: I42624a3e0f57405b38110bef86a0aa533f491c6c diff --git a/xmloff/source/chart/SchXMLExport.cxx b/xmloff/source/chart/SchXMLExport.cxx index 0b44488..1200702 100644 --- a/xmloff/source/chart/SchXMLExport.cxx +++ b/xmloff/source/chart/SchXMLExport.cxx @@ -3026,7 +3026,7 @@ void SchXMLExportHelper_Impl::exportErrorBar( const Referencehttp://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - idl/source
idl/source/prj/database.cxx | 62
1 file changed, 17 insertions(+), 45 deletions(-)
New commits:
commit e2013e86594fe49fa1839ddb85fb3eb09bfe6998
Author: Michael Stahl
Date: Wed Apr 24 12:37:14 2013 +0200
svidl: make dependencies: handle removed include files:
Write dummy targets for included files, so the incremental build does
not break with "No rule to make target" if the included file is removed.
Change-Id: I23c4406c4d1db9a8a4a7f0ecfec1cfc9ad05028a
diff --git a/idl/source/prj/database.cxx b/idl/source/prj/database.cxx
index c79318b..091fba3 100644
--- a/idl/source/prj/database.cxx
+++ b/idl/source/prj/database.cxx
@@ -844,12 +844,27 @@ struct WriteDep
}
};
+// write a dummy target for one included file, so the incremental build does
+// not break with "No rule to make target" if the included file is removed
+struct WriteDummy
+{
+SvFileStream & m_rStream;
+explicit WriteDummy(SvFileStream & rStream) : m_rStream(rStream) { }
+void operator() (OUString const& rItem)
+{
+m_rStream << OUStringToOString(rItem, RTL_TEXTENCODING_UTF8).getStr();
+m_rStream << " :\n\n";
+}
+};
+
bool SvIdlDataBase::WriteDepFile(
SvFileStream & rStream, OUString const& rTarget)
{
rStream << OUStringToOString(rTarget, RTL_TEXTENCODING_UTF8).getStr();
rStream << " :";
::std::for_each(m_DepFiles.begin(), m_DepFiles.end(), WriteDep(rStream));
+rStream << "\n\n";
+::std::for_each(m_DepFiles.begin(), m_DepFiles.end(), WriteDummy(rStream));
return rStream.GetError() == SVSTREAM_OK;
}
commit a6ab5fa0e6ae9c8694902977892d7b717766e8af
Author: Michael Stahl
Date: Wed Apr 24 12:29:42 2013 +0200
Revert "svidl: write dependencies with cygwin paths"
This reverts commit a042c2a6ab29011800de55fa382740be56c2d928.
A GNU make that understands native Win32 paths is required now anyway,
so revert this.
Conflicts:
idl/source/prj/database.cxx
Change-Id: I6eb77d4b02728269f8dc48df0cabc8c29b3e
diff --git a/idl/source/prj/database.cxx b/idl/source/prj/database.cxx
index e0c6fe6..c79318b 100644
--- a/idl/source/prj/database.cxx
+++ b/idl/source/prj/database.cxx
@@ -833,49 +833,6 @@ void SvIdlDataBase::AddDepFile(String const& rFileName)
m_DepFiles.insert(rFileName);
}
-#ifdef WNT
-static OString
-lcl_ConvertToCygwin(OString const& rString)
-{
-sal_Int32 i = 0;
-sal_Int32 const len = rString.getLength();
-OStringBuffer buf(len + 16);
-if ((2 <= len) && (':' == rString[1]))
-{
-buf.append("/cygdrive/");
-buf.append(static_cast(tolower(rString[0])));
-i = 2;
-}
-for (; i < len; ++i)
-{
-sal_Char const c(rString[i]);
-switch (c)
-{
-case '\\':
-buf.append('/');
-break;
-case ' ':
-buf.append("\\ ");
-break;
-default:
-buf.append(c);
-break;
-}
-}
-return buf.makeStringAndClear();
-}
-#endif
-
-static OString
-lcl_Convert(OUString const& rString)
-{
-return
-#ifdef WNT
-lcl_ConvertToCygwin
-#endif
-(OUStringToOString(rString, RTL_TEXTENCODING_UTF8));
-}
-
struct WriteDep
{
SvFileStream & m_rStream;
@@ -883,14 +840,14 @@ struct WriteDep
void operator() (OUString const& rItem)
{
m_rStream << " \\\n ";
-m_rStream << lcl_Convert(rItem).getStr();
+m_rStream << OUStringToOString(rItem, RTL_TEXTENCODING_UTF8).getStr();
}
};
bool SvIdlDataBase::WriteDepFile(
SvFileStream & rStream, OUString const& rTarget)
{
-rStream << lcl_Convert(rTarget).getStr();
+rStream << OUStringToOString(rTarget, RTL_TEXTENCODING_UTF8).getStr();
rStream << " :";
::std::for_each(m_DepFiles.begin(), m_DepFiles.end(), WriteDep(rStream));
return rStream.GetError() == SVSTREAM_OK;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - codemaker/source include/codemaker unodevtools/source
codemaker/source/cppumaker/cppumaker.cxx |4 ++--
codemaker/source/javamaker/javamaker.cxx |4 ++--
include/codemaker/options.hxx |2 --
unodevtools/source/skeletonmaker/skeletonmaker.cxx |2 +-
4 files changed, 5 insertions(+), 7 deletions(-)
New commits:
commit bab43b23d5bf70279adbd767f982519d2144e953
Author: Stephan Bergmann
Date: Wed Apr 24 12:41:47 2013 +0200
Allow for (relative) pathname args for codemakers again
Change-Id: I503d88b7d6fc44ef70d5071fddcec465e3fba856
diff --git a/codemaker/source/cppumaker/cppumaker.cxx
b/codemaker/source/cppumaker/cppumaker.cxx
index 8869e87..3f0c665 100644
--- a/codemaker/source/cppumaker/cppumaker.cxx
+++ b/codemaker/source/cppumaker/cppumaker.cxx
@@ -52,13 +52,13 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv) {
options.getExtraInputFiles().begin());
i != options.getExtraInputFiles().end(); ++i)
{
-typeMgr->loadProvider(b2u(*i), false);
+typeMgr->loadProvider(convertToFileUrl(*i), false);
}
for (std::vector< OString >::const_iterator i(
options.getInputFiles().begin());
i != options.getInputFiles().end(); ++i)
{
-typeMgr->loadProvider(b2u(*i), true);
+typeMgr->loadProvider(convertToFileUrl(*i), true);
}
codemaker::GeneratedTypeSet generated;
if (options.isValid("-T")) {
diff --git a/codemaker/source/javamaker/javamaker.cxx
b/codemaker/source/javamaker/javamaker.cxx
index 2b1a9d5..d74aafa 100644
--- a/codemaker/source/javamaker/javamaker.cxx
+++ b/codemaker/source/javamaker/javamaker.cxx
@@ -52,13 +52,13 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv) {
options.getExtraInputFiles().begin());
i != options.getExtraInputFiles().end(); ++i)
{
-typeMgr->loadProvider(b2u(*i), false);
+typeMgr->loadProvider(convertToFileUrl(*i), false);
}
for (std::vector< rtl::OString >::const_iterator i(
options.getInputFiles().begin());
i != options.getInputFiles().end(); ++i)
{
-typeMgr->loadProvider(b2u(*i), true);
+typeMgr->loadProvider(convertToFileUrl(*i), true);
}
codemaker::GeneratedTypeSet generated;
if (options.isValid("-T")) {
diff --git a/unodevtools/source/skeletonmaker/skeletonmaker.cxx
b/unodevtools/source/skeletonmaker/skeletonmaker.cxx
index 98fab21..5904f29 100644
--- a/unodevtools/source/skeletonmaker/skeletonmaker.cxx
+++ b/unodevtools/source/skeletonmaker/skeletonmaker.cxx
@@ -272,7 +272,7 @@ SAL_IMPLEMENT_MAIN()
for (std::vector< OString >::const_iterator i(registries.begin());
i != registries.end(); ++i)
{
-manager->loadProvider(b2u(*i), true);
+manager->loadProvider(convertToFileUrl(*i), true);
}
if ( options.dump ) {
commit 0ce9a16b0c21db203b44c7542c05d51e7e44de03
Author: Stephan Bergmann
Date: Wed Apr 24 12:41:15 2013 +0200
Dead code
Change-Id: Ia0b14d879e0ab22ff2fdeb09af836df4aed82ffb
diff --git a/include/codemaker/options.hxx b/include/codemaker/options.hxx
index 4a33e28..2290d83 100644
--- a/include/codemaker/options.hxx
+++ b/include/codemaker/options.hxx
@@ -59,8 +59,6 @@ public:
const StringVector& getInputFiles();
-inline sal_uInt16 getNumberOfExtraInputFiles() const
-{ return (sal_uInt16)m_extra_input_files.size(); }
inline const StringVector& getExtraInputFiles() const
{ return m_extra_input_files; }
protected:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PATCH] add another filename that shouln't be matched as error
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/3595
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/95/3595/1
add another filename that shouln't be matched as error
This procedure must surely win the prize for the lamest error handling
mechanism ever conceived.
Change-Id: I90d2a1160ff3e1e870e9ca3f03c92436398c3b7f
---
M solenv/bin/modules/installer/control.pm
1 file changed, 1 insertion(+), 0 deletions(-)
diff --git a/solenv/bin/modules/installer/control.pm
b/solenv/bin/modules/installer/control.pm
index 87b9615..7600754 100644
--- a/solenv/bin/modules/installer/control.pm
+++ b/solenv/bin/modules/installer/control.pm
@@ -334,6 +334,7 @@
$compareline =~ s/error\.py//g; # removing all occurrences of
"error.py"
$compareline =~ s/error\.cpython-33\.py[oc]//g; # removing all
occurrences of "error-cpython"
$compareline =~ s/libgpg-error-0.dll//g;
+$compareline =~ s/Error-xref\.html//g;
if ( $compareline =~ /\bError\b/i )
{
--
To view, visit https://gerrit.libreoffice.org/3595
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I90d2a1160ff3e1e870e9ca3f03c92436398c3b7f
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: David Tardon
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] install gen. IDL docs using filelist
Hello LibreOffice gerrit bot, I'd like you to reexamine a change. Please visit https://gerrit.libreoffice.org/3571 to look at the new patch set (#5). Change subject: install gen. IDL docs using filelist .. install gen. IDL docs using filelist Change-Id: I474f6e7a45d09683eb0dd7172114407c9dca84d7 --- M odk/CustomTarget_autodoc.mk M odk/CustomTarget_check.mk M odk/CustomTarget_odkcommon.mk M odk/Module_odk.mk A odk/PackageSet_autodoc.mk A odk/Package_autodoc.mk M odk/Package_docs.mk M scp2/source/sdkoo/module_sdkoo.scp M scp2/source/sdkoo/sdkoo.scp M solenv/gbuild/UnoApi.mk 10 files changed, 283 insertions(+), 14 deletions(-) git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/71/3571/5 -- To view, visit https://gerrit.libreoffice.org/3571 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newpatchset Gerrit-Change-Id: I474f6e7a45d09683eb0dd7172114407c9dca84d7 Gerrit-PatchSet: 5 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: David Tardon Gerrit-Reviewer: LibreOffice gerrit bot ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] add test for missing module-ix.html
Hello LibreOffice gerrit bot, I'd like you to reexamine a change. Please visit https://gerrit.libreoffice.org/3578 to look at the new patch set (#4). Change subject: add test for missing module-ix.html .. add test for missing module-ix.html Change-Id: Ibdbe04028ad9648af011da51b562cc6aa5e4849b --- M odk/CustomTarget_check.mk 1 file changed, 17 insertions(+), 0 deletions(-) git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/78/3578/4 -- To view, visit https://gerrit.libreoffice.org/3578 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newpatchset Gerrit-Change-Id: Ibdbe04028ad9648af011da51b562cc6aa5e4849b Gerrit-PatchSet: 4 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: David Tardon Gerrit-Reviewer: LibreOffice gerrit bot ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: canvas/Library_directx9canvas.mk canvas/Library_gdipluscanvas.mk canvas/StaticLibrary_directxcanvas.mk
canvas/Library_directx9canvas.mk |5 - canvas/Library_gdipluscanvas.mk |5 - canvas/StaticLibrary_directxcanvas.mk |5 - 3 files changed, 15 deletions(-) New commits: commit 067ed7401c8b4822debcea3b097a622e739a9b2b Author: Michael Stahl Date: Wed Apr 24 12:59:14 2013 +0200 canvas: remove obsolete include paths Change-Id: I3d72be674526f4221de452ad4efc1e857bb25dc6 diff --git a/canvas/Library_directx9canvas.mk b/canvas/Library_directx9canvas.mk index 6c29dcf..f3cea09 100644 --- a/canvas/Library_directx9canvas.mk +++ b/canvas/Library_directx9canvas.mk @@ -30,11 +30,6 @@ $(eval $(call gb_Library_Library,directx9canvas)) $(eval $(call gb_Library_set_componentfile,directx9canvas,canvas/source/directx/directx9canvas)) -$(eval $(call gb_Library_set_include,directx9canvas,\ - $$(INCLUDE) \ - -I$(SRCDIR)/canvas/inc \ -)) - $(eval $(call gb_Library_use_sdk_api,directx9canvas)) # clear NOMINMAX because GdiplusTypes.h uses those macros :( diff --git a/canvas/Library_gdipluscanvas.mk b/canvas/Library_gdipluscanvas.mk index 92b1754..857bfa1 100644 --- a/canvas/Library_gdipluscanvas.mk +++ b/canvas/Library_gdipluscanvas.mk @@ -30,11 +30,6 @@ $(eval $(call gb_Library_Library,gdipluscanvas)) $(eval $(call gb_Library_set_componentfile,gdipluscanvas,canvas/source/directx/gdipluscanvas)) -$(eval $(call gb_Library_set_include,gdipluscanvas,\ - $$(INCLUDE) \ - -I$(SRCDIR)/canvas/inc \ -)) - $(eval $(call gb_Library_use_external,gdipluscanvas,boost_headers)) $(eval $(call gb_Library_use_sdk_api,gdipluscanvas)) diff --git a/canvas/StaticLibrary_directxcanvas.mk b/canvas/StaticLibrary_directxcanvas.mk index 34f836d..7258ec2 100644 --- a/canvas/StaticLibrary_directxcanvas.mk +++ b/canvas/StaticLibrary_directxcanvas.mk @@ -10,11 +10,6 @@ $(eval $(call gb_StaticLibrary_StaticLibrary,directxcanvas)) -$(eval $(call gb_StaticLibrary_set_include,directxcanvas,\ - $$(INCLUDE) \ - -I$(SRCDIR)/canvas/inc \ -)) - $(eval $(call gb_StaticLibrary_use_external,directxcanvas,boost_headers)) $(eval $(call gb_StaticLibrary_use_api,directxcanvas,\ ___ 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/UnoApiTarget.mk | 28 ++-- 1 file changed, 2 insertions(+), 26 deletions(-) New commits: commit 4c46c75ecc6764678c68eacb2d84b4f027fc55a4 Author: Stephan Bergmann Date: Wed Apr 24 13:30:16 2013 +0200 Clean up of dead code, now that UnoApiMerge.mk is gone Change-Id: Ib65496c3bd26a55a713717776184441a959e5469 diff --git a/solenv/gbuild/UnoApiTarget.mk b/solenv/gbuild/UnoApiTarget.mk index 63807b8..8beba2d 100644 --- a/solenv/gbuild/UnoApiTarget.mk +++ b/solenv/gbuild/UnoApiTarget.mk @@ -101,7 +101,7 @@ define gb_UnoApiTarget__command $(call gb_Output_announce,$(2),$(true),UNO,4) mkdir -p $(dir $(1)) && \ rm -f $(1) && \ -$(call gb_UnoApiTarget__command_impl,$(1),$(UNOAPI_ROOT),$(if $(UNOAPI_FILES),$(UNOAPI_FILES),$(UNOAPI_MERGE))) \ +$(call gb_UnoApiTarget__command_impl,$(1),$(UNOAPI_ROOT),$(UNOAPI_FILES)) \ $(if $(UNOAPI_REFERENCE), \ $(call gb_Output_announce,$(2),$(true),DBc,3) \ && $(gb_UnoApiTarget_REGCOMPARECOMMAND) \ @@ -111,10 +111,7 @@ $(if $(UNOAPI_REFERENCE), \ endef define gb_UnoApiTarget__check_mode -$(if $(and $(UNOAPI_FILES),$(UNOAPI_MERGE)),\ - $(error Both IDL files and merged RDBs were used: this is not supported)) -$(if $(or $(UNOAPI_FILES),$(UNOAPI_MERGE)),,\ - $(error Neither IDL files nor merged RDBs were used: nothing will be produced)) +$(if $(UNOAPI_FILES),,$(error No IDL files have been set for the rdb file)) $(if $(UNOAPI_ROOT),,$(error No root has been set for the rdb file)) endef @@ -161,7 +158,6 @@ endif define gb_UnoApiTarget_UnoApiTarget $(call gb_UnoApiTarget_get_target,$(1)) : INCLUDE := $(call gb_UnoApiTarget_get_target,$(1)) : UNOAPI_FILES := -$(call gb_UnoApiTarget_get_target,$(1)) : UNOAPI_MERGE := $(call gb_UnoApiTarget_get_target,$(1)) : UNOAPI_REFERENCE := $(call gb_UnoApiTarget_get_target,$(1)) : UNOAPI_ROOT := @@ -215,26 +211,6 @@ $(call gb_UnoApiTarget__add_idlfile,$(1),$(2),$(3)) endef -define gb_UnoApiTarget_merge_rdbfiles -$$(call gb_Output_error,gb_UnoApiTarget_merge_rdbfiles: use gb_UnoApiTarget_merge_api instead.) -endef - -define gb_UnoApiTarget_merge_api -$(foreach rdb,$(2),$(call gb_UnoApiTarget__merge_api,$(1),$(rdb))) -$(call gb_UnoApiTarget_get_target,$(1)) : $(gb_UnoApiTarget_REGMERGEDEPS) - -endef - -define gb_UnoApiTarget_merge_rdbfile -$$(call gb_Output_error,gb_UnoApiTarget_merge_rdbfile: use gb_UnoApiTarget_merge_api instead.) -endef - -define gb_UnoApiTarget__merge_api -$(call gb_UnoApiTarget_get_target,$(1)) : UNOAPI_MERGE += $(call gb_UnoApiTarget_get_target,$(2)) -$(call gb_UnoApiTarget_get_target,$(1)) : $(call gb_UnoApiTarget_get_target,$(2)) - -endef - define gb_UnoApiTarget_add_reference_rdbfile $$(call gb_Output_error,gb_UnoApiTarget_add_reference_rdbfile: use gb_UnoApiTarget_set_reference_rdbfile instead.) endef ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: harfbuzz/harfbuzz.configure.patch.1
harfbuzz/harfbuzz.configure.patch.1 | 81 ++--
1 file changed, 60 insertions(+), 21 deletions(-)
New commits:
commit 4e6033f22aa23a6dd2d2d518264da4e4426eb8e3
Author: Fridrich Å trba
Date: Wed Apr 24 13:39:08 2013 +0200
Trying to fix the harfbuzz build
Change-Id: I7472d6e86cde5459aca4caf21fe7fe4e6ef60ecc
diff --git a/harfbuzz/harfbuzz.configure.patch.1
b/harfbuzz/harfbuzz.configure.patch.1
index 937a06e..79d0953 100644
--- a/harfbuzz/harfbuzz.configure.patch.1
+++ b/harfbuzz/harfbuzz.configure.patch.1
@@ -1,7 +1,7 @@
-diff -ur harfbuzz.org/configure harfbuzz/configure
harfbuzz.org/configure 2013-04-22 20:45:32.738213297 +0200
-+++ harfbuzz/configure 2013-04-22 20:46:56.334209801 +0200
-@@ -16813,7 +16885,7 @@
+diff -urEbwB harfbuzz-0.9.16/configure harfbuzz-0.9.16/configure
+--- harfbuzz-0.9.16/configure 2013-04-19 22:24:01.0 +0200
harfbuzz-0.9.16/configure 2013-04-24 13:06:21.949971349 +0200
+@@ -16813,7 +16813,7 @@
@@ -10,7 +10,7 @@ diff -ur harfbuzz.org/configure harfbuzz/configure
if $have_hb_old; then
$as_echo "#define HAVE_HB_OLD 1" >>confdefs.h
-@@ -16829,7 +16901,7 @@
+@@ -16829,7 +16829,7 @@
@@ -19,7 +19,7 @@ diff -ur harfbuzz.org/configure harfbuzz/configure
if $have_ucdn; then
$as_echo "#define HAVE_UCDN 1" >>confdefs.h
-@@ -16914,7 +16986,7 @@
+@@ -16914,7 +16914,7 @@
GLIB_LIBS=$pkg_cv_GLIB_LIBS
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
@@ -28,7 +28,7 @@ diff -ur harfbuzz.org/configure harfbuzz/configure
fi
if $have_glib; then
-@@ -16999,7 +17071,7 @@
+@@ -16999,7 +16999,7 @@
GOBJECT_LIBS=$pkg_cv_GOBJECT_LIBS
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
@@ -37,7 +37,7 @@ diff -ur harfbuzz.org/configure harfbuzz/configure
fi
if $have_gobject; then
-@@ -17087,7 +17159,7 @@
+@@ -17087,7 +17087,7 @@
CAIRO_LIBS=$pkg_cv_CAIRO_LIBS
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
@@ -46,7 +46,7 @@ diff -ur harfbuzz.org/configure harfbuzz/configure
fi
if $have_cairo; then
-@@ -17172,7 +17244,7 @@
+@@ -17172,7 +17172,7 @@
CAIRO_FT_LIBS=$pkg_cv_CAIRO_FT_LIBS
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
@@ -55,7 +55,31 @@ diff -ur harfbuzz.org/configure harfbuzz/configure
fi
if $have_cairo_ft; then
-@@ -17457,7 +17529,7 @@
+@@ -17353,23 +17353,6 @@
+ ICU_CONFIG="$ac_cv_prog_ICU_CONFIG"
+ fi
+
+- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ICU by using
icu-config fallback" >&5
+-$as_echo_n "checking for ICU by using icu-config fallback... " >&6; }
+- if test "$ICU_CONFIG" != "no" && "$ICU_CONFIG" --version >/dev/null;
then
+- have_icu=true
+- # We don't use --cflags as this gives us a lot of things that
we don't
+- # necessarily want, like debugging and optimization flags
+- # See man (1) icu-config for more info.
+- ICU_CFLAGS=`$ICU_CONFIG --cppflags`
+- ICU_LIBS=`$ICU_CONFIG --ldflags-libsonly`
+-
+-
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+-$as_echo "yes" >&6; }
+- else
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+- fi
+ fi
+
+ if $have_icu; then
+@@ -17457,7 +17440,7 @@
ICU_LE_LIBS=$pkg_cv_ICU_LE_LIBS
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
@@ -64,16 +88,31 @@ diff -ur harfbuzz.org/configure harfbuzz/configure
fi
if test "$have_icu_le" != "true"; then
if test -n "$ac_tool_prefix"; then
-@@ -17555,7 +17555,7 @@
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ICU_LE by using
icu-config fallback" >&5
- $as_echo_n "checking for ICU_LE by using icu-config fallback... " >&6; }
- if test "$ICU_CONFIG" != "no" && "$ICU_CONFIG" --version >/dev/null;
then
+@@ -17552,23 +17535,6 @@
+ ICU_CONFIG="$ac_cv_prog_ICU_CONFIG"
+ fi
+
+- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ICU_LE by using
icu-config fallback" >&5
+-$as_echo_n "checking for ICU_LE by using icu-config fallback... " >&6; }
+- if test "$ICU_CONFIG" != "no" && "$ICU_CONFIG" --version >/dev/null;
then
- have_icu_le=true
-+ have_icu_le=false
- # We don't use --cflags as this gives us a lot of things that
we don't
- # necessarily want, like debugging and optimization flags
- # See man (1) icu-config for more info.
-@@ -17654,7 +17654,7 @@
+- # We don't use --cflags as this gives us a lot of things that
we don't
+- # necessarily want, like debugging and optimization flags
+- # See man (1) icu-config for more info.
+- ICU_LE_CFLAGS=`$ICU_CONFIG --cppflags`
+-
[Bug 54157] LibreOffice 4.0 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=54157 Bug 54157 depends on bug 59608, which changed state. Bug 59608 Summary: Use addons.mozilla.org URL for getting Personas instead of getpersonas.com https://bugs.freedesktop.org/show_bug.cgi?id=59608 What|Removed |Added Status|REOPENED|RESOLVED Resolution|--- |FIXED -- 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: sc/uiconfig
sc/uiconfig/scalc/ui/sharedocumentdlg.ui | 265 +++ 1 file changed, 265 insertions(+) New commits: commit 68b754636647690c704ad2913cf1622b2f83ed56 Author: Abdulelah Alarifi Date: Sat Apr 20 12:42:40 2013 +0300 Converted Tools -> Share Document widget. Change-Id: I081a5b58d8e22e3455a78707a6b16ee85533a5d2 Reviewed-on: https://gerrit.libreoffice.org/3496 Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara diff --git a/sc/uiconfig/scalc/ui/sharedocumentdlg.ui b/sc/uiconfig/scalc/ui/sharedocumentdlg.ui new file mode 100644 index 000..646f079 --- /dev/null +++ b/sc/uiconfig/scalc/ui/sharedocumentdlg.ui @@ -0,0 +1,265 @@ + + + + +False +6 +Share Document +dialog + + +False +vertical +2 + + +False +start + + +True +False +100 + + +gtk-help +True +True +True +True + + +False +True +0 + + + + +True +False +6 + + +gtk-ok +True +True +True +True + + +False +True +0 + + + + +gtk-cancel +True +True +True +True + + +False +True +1 + + + + +False +True +end +1 + + + + +False +True +0 + + + + +False +True +end +0 + + + + +True +False +vertical +10 + + +True +False +vertical +6 + + +_Share this spreadsheet with other users +True +True +False +True +0 +True + + +False +True +0 + + + + +True +False +Note: Changes to formatting attributes like fonts, colors, and number +formats will not be saved and some functionalities like editing charts +and drawing objects are not available in shared mode. Turn off shared +mode to get exclusive access needed for those changes and +functionalities. + + +False +True +1 + + + + +False +True +0 + + + + +True +False +vertical +6 + + +True +False + + +False +True +0 + + + + +True +False +0 +Users currently accessing this spreadsheet + + +False +True +1 + + + + +True +False +vertical + + +True +False +200 + + +True +False +
[Libreoffice-commits] core.git: RepositoryExternal.mk
RepositoryExternal.mk |6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) New commits: commit e4c6fe5d41915560a0438c419577c91d8f866051 Author: Tor Lillqvist Date: Wed Apr 24 15:11:39 2013 +0300 It's gb_UnoApi_get_target that we want here Fixes cross-compilation: Running (the BUILD platform) saxparser in i18npool failed because there was no BUILD udkapi.rdb. No gb_UnoApi_get_target_for_build exists, and anyway, it would not be needed. (Not here at least.) Change-Id: I7bfe34cf339d8a847b76ab29669acc8d458d54e3 diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index 941554a..322e914 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -2810,7 +2810,7 @@ $(call gb_Executable_add_runtime_dependencies,climaker,\ $(call gb_Library_get_target,$(gb_CPPU_ENV)_uno) \ $(call gb_Package_get_target_for_build,cppuhelper_unorc) \ $(call gb_Rdb_get_outdir_target_for_build,ure/services) \ - $(call gb_UnoApi_get_target_for_build,udkapi) \ + $(call gb_UnoApi_get_target,udkapi) \ ) endef @@ -2847,7 +2847,7 @@ $(call gb_Executable_add_runtime_dependencies,saxparser,\ $(call gb_Library_get_target,$(gb_CPPU_ENV)_uno) \ $(call gb_Package_get_target_for_build,cppuhelper_unorc) \ $(call gb_Rdb_get_outdir_target_for_build,ure/services) \ - $(call gb_UnoApi_get_target_for_build,udkapi) \ + $(call gb_UnoApi_get_target,udkapi) \ ) endef @@ -2860,7 +2860,7 @@ $(call gb_Executable_add_runtime_dependencies,uno,\ $(call gb_Library_get_target,$(gb_CPPU_ENV)_uno) \ $(call gb_Package_get_target_for_build,cppuhelper_unorc) \ $(call gb_Rdb_get_outdir_target_for_build,ure/services) \ - $(call gb_UnoApi_get_target_for_build,udkapi) \ + $(call gb_UnoApi_get_target,udkapi) \ ) endef ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PUSHED] Converted Tools -> Share Document 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/3496 Approvals: Caolán McNamara: Verified; Looks good to me, approved Objections: Noel Grandin: This need some tweaks before it is merged -- To view, visit https://gerrit.libreoffice.org/3496 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I081a5b58d8e22e3455a78707a6b16ee85533a5d2 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Abdulelah Alarifi Gerrit-Reviewer: Caolán McNamara Gerrit-Reviewer: Noel Grandin ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: 2 commits - harfbuzz/harfbuzz.configure.patch.1
harfbuzz/harfbuzz.configure.patch.1 | 83 ++--
1 file changed, 25 insertions(+), 58 deletions(-)
New commits:
commit 16385c4d1c24a05a7d364854b0a437006eb1e333
Author: Petr Mladek
Date: Wed Apr 24 14:22:53 2013 +0200
fix harfbuzz build
icu-config could print the list of libraries on more lines. We need
one line for the variable.
Change-Id: I08a0415c2c3baa226e9cd32e0c3da7d384511f87
diff --git a/harfbuzz/harfbuzz.configure.patch.1
b/harfbuzz/harfbuzz.configure.patch.1
index 937a06e..ffabde5 100644
--- a/harfbuzz/harfbuzz.configure.patch.1
+++ b/harfbuzz/harfbuzz.configure.patch.1
@@ -64,7 +64,7 @@ diff -ur harfbuzz.org/configure harfbuzz/configure
fi
if test "$have_icu_le" != "true"; then
if test -n "$ac_tool_prefix"; then
-@@ -17555,7 +17555,7 @@
+@@ -17555,12 +17555,12 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ICU_LE by using
icu-config fallback" >&5
$as_echo_n "checking for ICU_LE by using icu-config fallback... " >&6; }
if test "$ICU_CONFIG" != "no" && "$ICU_CONFIG" --version >/dev/null;
then
@@ -73,6 +73,12 @@ diff -ur harfbuzz.org/configure harfbuzz/configure
# We don't use --cflags as this gives us a lot of things that
we don't
# necessarily want, like debugging and optimization flags
# See man (1) icu-config for more info.
+ ICU_LE_CFLAGS=`$ICU_CONFIG --cppflags`
+- ICU_LE_LIBS=`$ICU_CONFIG --ldflags-libsonly --ldflags-layout`
++ ICU_LE_LIBS=`$ICU_CONFIG --ldflags-libsonly --ldflags-layout |
tr "\n" " "`
+
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
@@ -17654,7 +17654,7 @@
GRAPHITE2_LIBS=$pkg_cv_GRAPHITE2_LIBS
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
commit 59360fa215cf61b0e5f9a36f017e9525546b6044
Author: Petr Mladek
Date: Wed Apr 24 14:21:20 2013 +0200
Revert "Trying to fix the harfbuzz build"
Will use less intrusive solution
This reverts commit 4e6033f22aa23a6dd2d2d518264da4e4426eb8e3.
diff --git a/harfbuzz/harfbuzz.configure.patch.1
b/harfbuzz/harfbuzz.configure.patch.1
index 79d0953..937a06e 100644
--- a/harfbuzz/harfbuzz.configure.patch.1
+++ b/harfbuzz/harfbuzz.configure.patch.1
@@ -1,7 +1,7 @@
-diff -urEbwB harfbuzz-0.9.16/configure harfbuzz-0.9.16/configure
harfbuzz-0.9.16/configure 2013-04-19 22:24:01.0 +0200
-+++ harfbuzz-0.9.16/configure 2013-04-24 13:06:21.949971349 +0200
-@@ -16813,7 +16813,7 @@
+diff -ur harfbuzz.org/configure harfbuzz/configure
+--- harfbuzz.org/configure 2013-04-22 20:45:32.738213297 +0200
harfbuzz/configure 2013-04-22 20:46:56.334209801 +0200
+@@ -16813,7 +16885,7 @@
@@ -10,7 +10,7 @@ diff -urEbwB harfbuzz-0.9.16/configure
harfbuzz-0.9.16/configure
if $have_hb_old; then
$as_echo "#define HAVE_HB_OLD 1" >>confdefs.h
-@@ -16829,7 +16829,7 @@
+@@ -16829,7 +16901,7 @@
@@ -19,7 +19,7 @@ diff -urEbwB harfbuzz-0.9.16/configure
harfbuzz-0.9.16/configure
if $have_ucdn; then
$as_echo "#define HAVE_UCDN 1" >>confdefs.h
-@@ -16914,7 +16914,7 @@
+@@ -16914,7 +16986,7 @@
GLIB_LIBS=$pkg_cv_GLIB_LIBS
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
@@ -28,7 +28,7 @@ diff -urEbwB harfbuzz-0.9.16/configure
harfbuzz-0.9.16/configure
fi
if $have_glib; then
-@@ -16999,7 +16999,7 @@
+@@ -16999,7 +17071,7 @@
GOBJECT_LIBS=$pkg_cv_GOBJECT_LIBS
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
@@ -37,7 +37,7 @@ diff -urEbwB harfbuzz-0.9.16/configure
harfbuzz-0.9.16/configure
fi
if $have_gobject; then
-@@ -17087,7 +17087,7 @@
+@@ -17087,7 +17159,7 @@
CAIRO_LIBS=$pkg_cv_CAIRO_LIBS
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
@@ -46,7 +46,7 @@ diff -urEbwB harfbuzz-0.9.16/configure
harfbuzz-0.9.16/configure
fi
if $have_cairo; then
-@@ -17172,7 +17172,7 @@
+@@ -17172,7 +17244,7 @@
CAIRO_FT_LIBS=$pkg_cv_CAIRO_FT_LIBS
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
@@ -55,31 +55,7 @@ diff -urEbwB harfbuzz-0.9.16/configure
harfbuzz-0.9.16/configure
fi
if $have_cairo_ft; then
-@@ -17353,23 +17353,6 @@
- ICU_CONFIG="$ac_cv_prog_ICU_CONFIG"
- fi
-
-- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ICU by using
icu-config fallback" >&5
--$as_echo_n "checking for ICU by using icu-config fallback... " >&6; }
-- if test "$ICU_CONFIG" != "no" && "$ICU_CONFIG" --version >/dev/null;
then
-- have_icu=true
-- # We don't use --cflags as this gives us a lot of things that
we don't
-- # necessarily want, like debugging and optimization flags
-- # See man (1) icu-config for more info.
-- ICU_CFLAGS=`$ICU_CONFIG --cppflags`
-- ICU
[Libreoffice-commits] core.git: config_host.mk.in configure.ac lotuswordpro/Module_lotuswordpro.mk postprocess/Rdb_services.mk Repository.mk solenv/gbuild
Repository.mk |2 -
config_host.mk.in |2 +
configure.ac | 35 -
lotuswordpro/Module_lotuswordpro.mk|4 ++
postprocess/Rdb_services.mk|4 ++
solenv/gbuild/extensions/pre_MergedLibsList.mk |2 -
6 files changed, 45 insertions(+), 4 deletions(-)
New commits:
commit db52fd7123b35d9c3e0ff5868a58195add2a455e
Author: Michael Meeks
Date: Tue Apr 23 14:18:34 2013 +0100
Add license filtering to configure.
Change-Id: Icd53c6ccfcca25d828d79ad62d1e075869998850
diff --git a/Repository.mk b/Repository.mk
index a709a99..0ccc03d 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -276,7 +276,7 @@ $(eval $(call
gb_Helper_register_libraries_for_install,OOOLIBS,OOO, \
$(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,WRITER, \
hwp \
- lwpft \
+ $(if $(ENABLE_LWP),lwpft) \
msword \
swd \
swui \
diff --git a/config_host.mk.in b/config_host.mk.in
index ad33e7d..82dfd50 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -135,6 +135,7 @@ export ENABLE_KDE=@ENABLE_KDE@
export ENABLE_LIBLANGTAG=@ENABLE_LIBLANGTAG@
export ENABLE_LOCKDOWN=@ENABLE_LOCKDOWN@
export ENABLE_LTO=@ENABLE_LTO@
+export ENABLE_LWP=@ENABLE_LWP@
export ENABLE_MACOSX_SANDBOX=@ENABLE_MACOSX_SANDBOX@
export ENABLE_MEDIAWIKI=@ENABLE_MEDIAWIKI@
export ENABLE_MINIMIZER=@ENABLE_MINIMIZER@
@@ -352,6 +353,7 @@ export MKDEPENDSOLVER=TRUE
export ML_EXE=@ML_EXE@
export MOC4=@MOC4@
export MOC=@MOC@
+export MPL_SUBSET=@MPL_SUBSET@
export MSM_PATH=@MSM_PATH@
export MSPUB_CFLAGS=$(gb_SPACE)@MSPUB_CFLAGS@
export MSPUB_LIBS=$(gb_SPACE)@MSPUB_LIBS@
diff --git a/configure.ac b/configure.ac
index 34cc0b3..a002d93 100644
--- a/configure.ac
+++ b/configure.ac
@@ -747,7 +747,7 @@ AC_ARG_ENABLE(pch,
AC_ARG_ENABLE(win-mozab-driver,
AS_HELP_STRING([--enable-win-mozab-driver],
-[LibreOffice includes a driver to connect to Mozilla
+[LibreOffice includes a driver to connect to Mozilla
address books under Windows, to build with this version, use this
option.])
)
@@ -763,6 +763,11 @@ AC_ARG_ENABLE(odk,
wish to build without.])
)
+AC_ARG_ENABLE(mpl-subset,
+AS_HELP_STRING([--enable-mpl-subset],
+[Don't compile any pieces which are not MPL or more liberrally
licensed])
+)
+
AC_ARG_ENABLE(mathmldtd,
AS_HELP_STRING([--enable-mathmldtd],
[Enable bundling of (modified) MathML 1.01 DTD.])
@@ -1152,6 +1157,11 @@ AC_ARG_ENABLE(postgresql-sdbc,
[Disable the build of the PostgreSQL-SDBC driver.])
)
+AC_ARG_ENABLE(lotuswordpro,
+AS_HELP_STRING([--disable-lotuswordpro],
+[Disable the build of the Lotus Word Pro filter.]),
+,enable_lotuswordpro=yes)
+
AC_ARG_ENABLE(coretext,
AS_HELP_STRING([--enable-coretext],
[Use CoreText framework on Mac (instead of ATSU).
@@ -6923,6 +6933,29 @@ printf ("hello world\n");
fi
AC_SUBST(WINEGCC)
+ENABLE_LWP=
+if test "$enable_lotuswordpro" = "yes"; then
+ ENABLE_LWP="TRUE"
+ SCPDEFS="$SCPDEFS -DDISABLE_LWP"
+fi
+AC_SUBST(ENABLE_LWP)
+
+AC_MSG_CHECKING([MPL subset])
+MPL_SUBSET=
+if test "$enable_mpl_subset" = "yes"; then
+ if test "x$enable_postgresql_sdbc" != "xno"; then
+AC_MSG_ERROR([need to --disable-postgresql-sdbc.])
+ fi
+ if test "$enable_lotuswordpro" = "yes"; then
+AC_MSG_ERROR([need to --disable-lotuswordpro.])
+ fi
+ MPL_SUBSET="TRUE"
+ AC_MSG_RESULT([only])
+else
+ AC_MSG_RESULT([no restrictions])
+fi
+AC_SUBST(MPL_SUBSET)
+
dnl ===
dnl Check for gperf
dnl ===
diff --git a/lotuswordpro/Module_lotuswordpro.mk
b/lotuswordpro/Module_lotuswordpro.mk
index 5dfcc14..538702e 100644
--- a/lotuswordpro/Module_lotuswordpro.mk
+++ b/lotuswordpro/Module_lotuswordpro.mk
@@ -9,6 +9,8 @@
$(eval $(call gb_Module_Module,lotuswordpro))
+ifeq ($(ENABLE_LWP),TRUE)
+
$(eval $(call gb_Module_add_targets,lotuswordpro,\
Library_lwpft \
))
@@ -17,4 +19,6 @@ $(eval $(call gb_Module_add_check_targets,lotuswordpro,\
CppunitTest_lotuswordpro_test_lotuswordpro \
))
+endif
+
# vim: set noet sw=4 ts=4:
diff --git a/postprocess/Rdb_services.mk b/postprocess/Rdb_services.mk
index 62103a0..58bb368 100644
--- a/postprocess/Rdb_services.mk
+++ b/postprocess/Rdb_services.mk
@@ -55,7 +55,9 @@ $(eval $(call gb_Rdb_add_components,services,\
lingucomponent/source/spellcheck/spell/spell \
lingucomponent/source/thesaurus/libnth/lnth \
linguistic/source/lng \
- lotuswordpro/util/lwpfilter \
+ $(if $(ENABLE_LWP), \
+ lotuswordpro/util/lwpfilter \
+ ) \
oox/util/oox \
package/source/xstor/xstor \
package/util/package2 \
diff --git a/solenv/gbuild/extensions/pre_
Re: lots of warnings after header changes
Hi, On Wed, Apr 24, 2013 at 06:49:30AM +0200, Jonathan Aquilina wrote: > Hey guys im building master on mac and im getting alot of warnings > > Jonathan-Aquilinas-iMac:core eagles051387$ time make > /usr/bin/make -j 4 -rs -f /Users/eagles051387/core/Makefile.gbuild > /Users/eagles051387/core/basebmp/Library_basebmp.mk:27: > [WARN ] !!! > [WARN ] !!! gb_LinkTarget_set_include: include paths > /Users/eagles051387/core/basebmp/inc/ do not exist > > are these something to worry about? No, they are harmless. I put that check in so we can find and drop them, to keep the makefiles clean. D. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: 2 commits - sw/qa
sw/qa/extras/inc/swmodeltestbase.hxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 44d012aea378bbea7060100ec74e58423e2f6565
Author: LuboÅ¡ LuÅák
Date: Wed Apr 24 14:47:31 2013 +0200
add comment to the right function (result of mismerge?)
Change-Id: I8574e679f6f4ef252ba0eda025b1991bc3e93df4
diff --git a/sw/qa/extras/inc/swmodeltestbase.hxx
b/sw/qa/extras/inc/swmodeltestbase.hxx
index aa36dde..c367b8f 100644
--- a/sw/qa/extras/inc/swmodeltestbase.hxx
+++ b/sw/qa/extras/inc/swmodeltestbase.hxx
@@ -178,7 +178,6 @@ protected:
return nRet;
}
-// Get paragraph (counted from 1), optionally check it contains the given
text.
uno::Reference getParagraphOrTable(int number,
uno::Reference xText = uno::Reference()) const
{
uno::Reference paraEnumAccess;
@@ -199,6 +198,7 @@ protected:
return xElem;
}
+// Get paragraph (counted from 1), optionally check it contains the given
text.
uno::Reference< text::XTextRange > getParagraph( int number, OUString
content = OUString() ) const
{
uno::Reference const xParagraph(
commit b4c245881a37cb156998a46f1910a49579aab8ed
Author: LuboÅ¡ LuÅák
Date: Mon Apr 22 18:05:13 2013 +0200
remove executable bit
Change-Id: I50ab7a08e680cb5a6354035a058240df15e10bd9
diff --git a/sw/qa/extras/ooxmlimport/data/fdo59638.docx
b/sw/qa/extras/ooxmlimport/data/fdo59638.docx
old mode 100755
new mode 100644
diff --git a/sw/qa/extras/ooxmlimport/data/fdo61343.docx
b/sw/qa/extras/ooxmlimport/data/fdo61343.docx
old mode 100755
new mode 100644
diff --git a/sw/qa/extras/ooxmlimport/data/n780645.docx
b/sw/qa/extras/ooxmlimport/data/n780645.docx
old mode 100755
new mode 100644
diff --git a/sw/qa/extras/ooxmlimport/data/n785767.docx
b/sw/qa/extras/ooxmlimport/data/n785767.docx
old mode 100755
new mode 100644
diff --git a/sw/qa/extras/ooxmlimport/data/n792778.docx
b/sw/qa/extras/ooxmlimport/data/n792778.docx
old mode 100755
new mode 100644
diff --git a/sw/qa/extras/ooxmlimport/data/n793262.docx
b/sw/qa/extras/ooxmlimport/data/n793262.docx
old mode 100755
new mode 100644
diff --git a/sw/qa/extras/ooxmlimport/data/n793998.docx
b/sw/qa/extras/ooxmlimport/data/n793998.docx
old mode 100755
new mode 100644
diff --git a/sw/qa/extras/ooxmlimport/data/tblr-height.docx
b/sw/qa/extras/ooxmlimport/data/tblr-height.docx
old mode 100755
new mode 100644
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: offapi/UnoApi_offapi.mk
offapi/UnoApi_offapi.mk |2 ++ 1 file changed, 2 insertions(+) New commits: commit 6fc496d30815316f994c2f922b0fdd7d52610d24 Author: David Tardon Date: Tue Apr 23 14:51:02 2013 +0200 add missing idl files to the list Change-Id: I4e1cc5ef83b86bdf0da0091a3ffcd912bdc52395 Reviewed-on: https://gerrit.libreoffice.org/3576 Reviewed-by: David Tardon Tested-by: David Tardon diff --git a/offapi/UnoApi_offapi.mk b/offapi/UnoApi_offapi.mk index c2deacc..0331042 100644 --- a/offapi/UnoApi_offapi.mk +++ b/offapi/UnoApi_offapi.mk @@ -928,6 +928,7 @@ $(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/graphic GraphicRasterizer \ GraphicRendererVCL \ MediaProperties \ + Primitive2DTools \ )) $(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/i18n,\ ChapterCollator \ @@ -2198,6 +2199,7 @@ $(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/document,\ XUndoManager \ XUndoManagerListener \ XUndoManagerSupplier \ + XVbaMethodParameter \ XViewDataSupplier \ XXMLBasicExporter \ XXMLOasisBasicImporter \ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: offapi/com offapi/UnoApi_offapi.mk
offapi/UnoApi_offapi.mk|1
offapi/com/sun/star/script/browse/BrowseNodeFactory.idl| 15
offapi/com/sun/star/script/browse/theBrowseNodeFactory.idl | 46 +
3 files changed, 47 insertions(+), 15 deletions(-)
New commits:
commit 4402fd7452b9547dbd942e7eb06d15f19270e658
Author: David Tardon
Date: Tue Apr 23 14:52:40 2013 +0200
put theBrowseNodeFactory singleton into extra file
Change-Id: Icf770c8b9e80e98935ffacf7da79a6c8af6593d9
Reviewed-on: https://gerrit.libreoffice.org/3577
Reviewed-by: David Tardon
Tested-by: David Tardon
diff --git a/offapi/UnoApi_offapi.mk b/offapi/UnoApi_offapi.mk
index 0331042..ef5781a 100644
--- a/offapi/UnoApi_offapi.mk
+++ b/offapi/UnoApi_offapi.mk
@@ -1009,6 +1009,7 @@ $(eval $(call
gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/report/
$(eval $(call
gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/script/browse,\
BrowseNode \
BrowseNodeFactory \
+ theBrowseNodeFactory \
))
$(eval $(call
gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/script/provider,\
LanguageScriptProvider \
diff --git a/offapi/com/sun/star/script/browse/BrowseNodeFactory.idl
b/offapi/com/sun/star/script/browse/BrowseNodeFactory.idl
index f974498..72d2cab 100644
--- a/offapi/com/sun/star/script/browse/BrowseNodeFactory.idl
+++ b/offapi/com/sun/star/script/browse/BrowseNodeFactory.idl
@@ -34,21 +34,6 @@ service BrowseNodeFactory
interface XBrowseNodeFactory;
};
-/**
-The one and only BrowseNodeFactory.
-
-To get the singleton call getValueByName on the component context
-
-/singletons/com.sun.star.script.theBrowseNodeFactory
-
-
-@since OOo 2.0
-*/
-singleton theBrowseNodeFactory
-{
-service BrowseNodeFactory;
-};
-
}; }; }; }; };
#endif
diff --git a/offapi/com/sun/star/script/browse/theBrowseNodeFactory.idl
b/offapi/com/sun/star/script/browse/theBrowseNodeFactory.idl
new file mode 100644
index 000..9cedab8
--- /dev/null
+++ b/offapi/com/sun/star/script/browse/theBrowseNodeFactory.idl
@@ -0,0 +1,46 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed
+ * with this work for additional information regarding copyright
+ * ownership. The ASF licenses this file to you under the Apache
+ * License, Version 2.0 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+
+#ifndef __com_sun_star_script_browse_theBrowseNodeFactory_idl__
+#define __com_sun_star_script_browse_theBrowseNodeFactory_idl__
+
+#include
+
+module com { module sun { module star { module script { module browse {
+
+/**
+The one and only BrowseNodeFactory.
+
+To get the singleton call getValueByName on the component context
+
+/singletons/com.sun.star.script.theBrowseNodeFactory
+
+
+@since OOo 2.0
+*/
+singleton theBrowseNodeFactory
+{
+service BrowseNodeFactory;
+};
+
+}; }; }; }; };
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PUSHED] add missing idl files to the list
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/3576 Approvals: David Tardon: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/3576 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I4e1cc5ef83b86bdf0da0091a3ffcd912bdc52395 Gerrit-PatchSet: 3 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: David Tardon Gerrit-Reviewer: David Tardon ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] put theBrowseNodeFactory singleton into extra file
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/3577 Approvals: David Tardon: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/3577 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Icf770c8b9e80e98935ffacf7da79a6c8af6593d9 Gerrit-PatchSet: 4 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: David Tardon Gerrit-Reviewer: David Tardon ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: solenv/bin
solenv/bin/modules/installer/control.pm |1 +
1 file changed, 1 insertion(+)
New commits:
commit 97ac684062334a1128dd4167f759668113564d97
Author: David Tardon
Date: Wed Apr 24 12:46:41 2013 +0200
add another filename that shouln't be matched as error
This procedure must surely win the prize for the lamest error handling
mechanism ever conceived.
Change-Id: I90d2a1160ff3e1e870e9ca3f03c92436398c3b7f
Reviewed-on: https://gerrit.libreoffice.org/3595
Reviewed-by: David Tardon
Tested-by: David Tardon
diff --git a/solenv/bin/modules/installer/control.pm
b/solenv/bin/modules/installer/control.pm
index 87b9615..7600754 100644
--- a/solenv/bin/modules/installer/control.pm
+++ b/solenv/bin/modules/installer/control.pm
@@ -334,6 +334,7 @@ sub check_logfile
$compareline =~ s/error\.py//g; # removing all occurrences of
"error.py"
$compareline =~ s/error\.cpython-33\.py[oc]//g; # removing all
occurrences of "error-cpython"
$compareline =~ s/libgpg-error-0.dll//g;
+$compareline =~ s/Error-xref\.html//g;
if ( $compareline =~ /\bError\b/i )
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: odk/CustomTarget_autodoc.mk odk/CustomTarget_check.mk odk/CustomTarget_odkcommon.mk odk/Module_odk.mk odk/Package_autodoc.mk odk/Package_docs.mk odk/PackageSet_autodoc.
odk/CustomTarget_autodoc.mk| 27 +++-- odk/CustomTarget_check.mk |1 odk/CustomTarget_odkcommon.mk |1 odk/Module_odk.mk |2 odk/PackageSet_autodoc.mk | 18 +++ odk/Package_autodoc.mk | 175 + odk/Package_docs.mk|4 scp2/source/sdkoo/module_sdkoo.scp |1 scp2/source/sdkoo/sdkoo.scp|7 + solenv/gbuild/UnoApi.mk| 61 10 files changed, 283 insertions(+), 14 deletions(-) New commits: commit 0ea6217986e69612faf314611bf2e8349d78705c Author: David Tardon Date: Tue Apr 23 09:03:24 2013 +0200 install gen. IDL docs using filelist Change-Id: I474f6e7a45d09683eb0dd7172114407c9dca84d7 Reviewed-on: https://gerrit.libreoffice.org/3571 Reviewed-by: David Tardon Tested-by: David Tardon diff --git a/odk/CustomTarget_autodoc.mk b/odk/CustomTarget_autodoc.mk index cf87fcc..126d5e2 100644 --- a/odk/CustomTarget_autodoc.mk +++ b/odk/CustomTarget_autodoc.mk @@ -7,21 +7,28 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. # -$(eval $(call gb_CustomTarget_CustomTarget,odk/odkcommon/docs/common/ref)) +$(eval $(call gb_CustomTarget_CustomTarget,odk/docs/common/ref)) -odkcommon_ZIPLIST += docs/common/ref -odkcommon_ZIPDEPS += $(odk_WORKDIR)/docs/common/ref/module-ix.html +$(eval $(call gb_CustomTarget_register_targets,odk/docs/common/ref,\ + autodoc_log.txt \ +)) -$(eval $(call gb_CustomTarget_register_target,odk/odkcommon/docs/common/ref,module-ix.html)) -$(odk_WORKDIR)/docs/common/ref/module-ix.html: $(SRCDIR)/odk/pack/copying/idl_chapter_refs.txt \ - $(SRCDIR)/odk/docs/common/ref/idl.css $(call gb_UnoApi_get_target,offapi) \ - $(call gb_Executable_get_runtime_dependencies,autodoc) +$(call gb_CustomTarget_get_workdir,odk/docs/common/ref)/%.html : $(call gb_CustomTarget_get_workdir,odk/docs/common/ref)/autodoc_log.txt + touch $@ + +$(call gb_CustomTarget_get_workdir,odk/docs/common/ref)/autodoc_log.txt : \ + $(SRCDIR)/odk/pack/copying/idl_chapter_refs.txt \ + $(SRCDIR)/odk/docs/common/ref/idl.css \ + $(call gb_Executable_get_runtime_dependencies,autodoc) $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),AUD,1) - $(call gb_Helper_execute,autodoc) -html $(dir $@) \ + $(call gb_Executable_get_command,autodoc) \ + -html $(dir $@) \ -dvgroot "http://wiki.services.openoffice.org/wiki"; \ -name "LibreOffice $(PRODUCTVERSION) API" \ - -lg idl -dvgfile $< -t $(SRCDIR)/udkapi $(SRCDIR)/offapi \ - > $(odk_WORKDIR)/autodoc_log.txt + -lg idl \ + -dvgfile $< \ + -t $(SRCDIR)/udkapi $(SRCDIR)/offapi \ + > $@ # vim: set noet sw=4 ts=4: diff --git a/odk/CustomTarget_check.mk b/odk/CustomTarget_check.mk index 3782224..16e50ec 100644 --- a/odk/CustomTarget_check.mk +++ b/odk/CustomTarget_check.mk @@ -43,6 +43,7 @@ $(call gb_CustomTarget_get_workdir,odk/check)/checkbin : \ $(call gb_Package_get_target,odk_settings) \ $(call gb_Package_get_target,odk_settings_generated) \ $(if $(SOLAR_JAVA),$(call gb_Package_get_target,odk_unowinreg)) \ + $(call gb_PackageSet_get_target,odk_autodoc) \ $(call gb_CustomTarget_get_target,odk/odkcommon) $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),CHK,1) $(call gb_Helper_print_on_error,\ diff --git a/odk/CustomTarget_odkcommon.mk b/odk/CustomTarget_odkcommon.mk index 08e1756..c253c2e 100644 --- a/odk/CustomTarget_odkcommon.mk +++ b/odk/CustomTarget_odkcommon.mk @@ -14,7 +14,6 @@ odkcommon_ZIPDEPS := $(eval $(call gb_CustomTarget_CustomTarget,odk/odkcommon)) $(call gb_CustomTarget_get_target,odk/odkcommon): \ - $(call gb_CustomTarget_get_target,odk/odkcommon/docs/common/ref) \ $(call gb_CustomTarget_get_target,odk/odkcommon/classes) \ $(call gb_CustomTarget_get_target,odk/odkcommon/idl) \ $(call gb_CustomTarget_get_target,odk/odkcommon/include) diff --git a/odk/Module_odk.mk b/odk/Module_odk.mk index 5415494..35865e8 100644 --- a/odk/Module_odk.mk +++ b/odk/Module_odk.mk @@ -20,6 +20,7 @@ $(eval $(call gb_Module_add_targets,odk,\ CustomTarget_settings \ CustomTarget_autodoc \ Executable_unoapploader \ + Package_autodoc \ Package_bin \ Package_config \ Package_docs \ @@ -30,6 +31,7 @@ $(eval $(call gb_Module_add_targets,odk,\ Package_odk_headers_generated \ Package_settings \ Package_settings_generated \ + PackageSet_autodoc \ PackageSet_odk_headers \ )) diff --git a/odk/PackageSet_autodoc.mk b/odk/PackageSet_autodoc.mk new file mode 100644 index 000..4e0ea6a --- /dev/null +++ b/odk/PackageSet_autodoc.mk @@ -0,0 +1,18 @@ +# -*-
[Libreoffice-commits] core.git: odk/CustomTarget_check.mk
odk/CustomTarget_check.mk | 17 +
1 file changed, 17 insertions(+)
New commits:
commit ad5c0602ec288290bdfc30cee9f56712101be5a4
Author: David Tardon
Date: Tue Apr 23 14:30:13 2013 +0200
add test for missing module-ix.html
Change-Id: Ibdbe04028ad9648af011da51b562cc6aa5e4849b
Reviewed-on: https://gerrit.libreoffice.org/3578
Tested-by: LibreOffice gerrit bot
Reviewed-by: David Tardon
Tested-by: David Tardon
diff --git a/odk/CustomTarget_check.mk b/odk/CustomTarget_check.mk
index 16e50ec..3f06bd4 100644
--- a/odk/CustomTarget_check.mk
+++ b/odk/CustomTarget_check.mk
@@ -10,6 +10,7 @@
$(eval $(call gb_CustomTarget_CustomTarget,odk/check))
$(eval $(call gb_CustomTarget_register_targets,odk/check,\
+ autodoc \
checkbin \
))
@@ -54,4 +55,20 @@ $(call gb_CustomTarget_get_workdir,odk/check)/checkbin : \
,$@.log \
)
+.PHONY : $(call gb_CustomTarget_get_workdir,odk/check)/autodoc
+$(call gb_CustomTarget_get_workdir,odk/check)/autodoc : $(call
gb_PackageSet_get_target,odk_autodoc)
+ $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),CHK,1)
+ ( \
+ c=0 && \
+ for m in `find $(call
gb_CustomTarget_get_workdir,odk/docs/common/ref) -name module-ix.html`; do \
+ m=`echo $$m | sed -e s@$(call
gb_CustomTarget_get_workdir,odk/docs/common/ref)/@@` && \
+
mm=$(INSTDIR)/$(gb_Package_SDKDIRNAME)/docs/common/ref/$${m} && \
+ if [ ! -e $${mm} ]; then \
+ c=`expr $$c + 1`; \
+ echo "autodoc check: $${mm} not found. Please
update odk/Package_autodoc.mk ."; \
+ fi \
+ done && \
+ if [ $${c} -gt 0 ]; then exit 1; fi \
+ )
+
# vim: set noet sw=4 ts=4:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PUSHED] add another filename that shouln't be matched as error
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/3595 Approvals: David Tardon: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/3595 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I90d2a1160ff3e1e870e9ca3f03c92436398c3b7f Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: David Tardon Gerrit-Reviewer: David Tardon ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] install gen. IDL docs using filelist
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/3571 Approvals: David Tardon: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/3571 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I474f6e7a45d09683eb0dd7172114407c9dca84d7 Gerrit-PatchSet: 6 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: David Tardon Gerrit-Reviewer: David Tardon Gerrit-Reviewer: LibreOffice gerrit bot ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] add test for missing module-ix.html
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/3578 Approvals: LibreOffice gerrit bot: Verified David Tardon: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/3578 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ibdbe04028ad9648af011da51b562cc6aa5e4849b Gerrit-PatchSet: 5 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: David Tardon Gerrit-Reviewer: David Tardon Gerrit-Reviewer: LibreOffice gerrit bot ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: scp2/source
scp2/source/smoketest/smoketest.scp |5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) New commits: commit f0c5abd188641672674563fc8fa755833196bda2 Author: Stephan Bergmann Date: Wed Apr 24 15:14:35 2013 +0200 Blind fix for scp2/source/smoketest/ Change-Id: I3c15ace80e0ce95910a6a256e4a25c4d7859a58c diff --git a/scp2/source/smoketest/smoketest.scp b/scp2/source/smoketest/smoketest.scp index e233a0e..e07fc77 100644 --- a/scp2/source/smoketest/smoketest.scp +++ b/scp2/source/smoketest/smoketest.scp @@ -155,8 +155,9 @@ End File gid_Test_File_Misc_TypesRdb TXT_FILE_BODY; Dir = gid_Test_Dir_Ure_Misc_Test; -Name = "types.rdb"; -Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID); +Name = "udkapi.rdb"; +InstallName = "types.rdb"; +Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID, SUBST_FILENAME); End File gid_Test_File_Bin_LOSmoketest ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: i18npool/source
i18npool/source/localedata/saxparser.cxx | 67 ++-
1 file changed, 32 insertions(+), 35 deletions(-)
New commits:
commit 52b23b98a41aa78afa61c49179d10afee3f37643
Author: Stephan Bergmann
Date: Wed Apr 24 15:16:02 2013 +0200
Print message of uncaught UNO exceptions
Change-Id: I6a716efe28086da983a40c550613e3d8e0bd8283
diff --git a/i18npool/source/localedata/saxparser.cxx
b/i18npool/source/localedata/saxparser.cxx
index 2715867..60ab16b 100644
--- a/i18npool/source/localedata/saxparser.cxx
+++ b/i18npool/source/localedata/saxparser.cxx
@@ -17,7 +17,10 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
+#include "sal/config.h"
+#include
+#include
#include
#include
#include
@@ -296,52 +299,46 @@ public:
SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv)
{
+try {
+if( argc < 4) {
+printf( "usage : %s \n", argv[0] );
+exit( 1 );
+}
+Reference< XComponentContext > xContext(
+defaultBootstrap_InitialComponentContext());
-if( argc < 4) {
-printf( "usage : %s \n",
argv[0] );
-exit( 1 );
-}
-
-Reference< XComponentContext > xContext(
-defaultBootstrap_InitialComponentContext());
-
-//
-// parser demo
-// read xml from a file and count elements
-//
-Reference< XParser > rParser = Parser::create(xContext);
+//
+// parser demo
+// read xml from a file and count elements
+//
+Reference< XParser > rParser = Parser::create(xContext);
-int nError = 0;
-// create and connect the document handler to the parser
-TestDocumentHandler *pDocHandler = new TestDocumentHandler( argv[1],
argv[3]);
+int nError = 0;
+// create and connect the document handler to the parser
+TestDocumentHandler *pDocHandler = new TestDocumentHandler( argv[1],
argv[3]);
-Reference < XDocumentHandler > rDocHandler( (XDocumentHandler *)
pDocHandler );
-Reference< XEntityResolver > rEntityResolver( (XEntityResolver *)
pDocHandler );
+Reference < XDocumentHandler > rDocHandler( (XDocumentHandler *)
pDocHandler );
+Reference< XEntityResolver > rEntityResolver( (XEntityResolver *)
pDocHandler );
-rParser->setDocumentHandler( rDocHandler );
-rParser->setEntityResolver( rEntityResolver );
+rParser->setDocumentHandler( rDocHandler );
+rParser->setEntityResolver( rEntityResolver );
-// create the input stream
-InputSource source;
-source.aInputStream = createStreamFromFile( argv[2] );
-source.sSystemId= OUString::createFromAscii( argv[2] );
+// create the input stream
+InputSource source;
+source.aInputStream = createStreamFromFile( argv[2] );
+source.sSystemId= OUString::createFromAscii( argv[2] );
-try
-{
// start parsing
rParser->parseStream( source );
-}
-catch( const Exception & e )
-{
-OString o1 = OUStringToOString(e.Message, RTL_TEXTENCODING_UTF8 );
-printf( "Exception during parsing : %s\n" , o1.getStr() );
-exit(1);
-}
-nError = pDocHandler->nError;
+nError = pDocHandler->nError;
-return nError;
+return nError;
+} catch (css::uno::Exception & e) {
+std::cerr << "ERROR: " << e.Message << '\n';
+return EXIT_FAILURE;
+}
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: unoidl/source
unoidl/source/reg2unoidl.cxx |8
1 file changed, 4 insertions(+), 4 deletions(-)
New commits:
commit d7186fe43618eeb9082c34a65ccb303f7bbc770d
Author: Stephan Bergmann
Date: Wed Apr 24 15:16:31 2013 +0200
Copy/paste error
Change-Id: I0c6e0ecc5c9e6289a2afe733d4752351416900a8
diff --git a/unoidl/source/reg2unoidl.cxx b/unoidl/source/reg2unoidl.cxx
index 0f0b53e..a311147 100644
--- a/unoidl/source/reg2unoidl.cxx
+++ b/unoidl/source/reg2unoidl.cxx
@@ -150,10 +150,10 @@ void write64(osl::File & file, sal_uInt64 value) {
buf[1] = (value >> 8) & 0xFF;
buf[2] = (value >> 16) & 0xFF;
buf[3] = (value >> 24) & 0xFF;
-buf[3] = (value >> 32) & 0xFF;
-buf[3] = (value >> 40) & 0xFF;
-buf[3] = (value >> 48) & 0xFF;
-buf[3] = (value >> 56) & 0xFF;
+buf[4] = (value >> 32) & 0xFF;
+buf[5] = (value >> 40) & 0xFF;
+buf[6] = (value >> 48) & 0xFF;
+buf[7] = (value >> 56) & 0xFF;
write(file, buf, SAL_N_ELEMENTS(buf));
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Improvements in text formatting inside comments?
On Wed, 2013-04-24 at 00:54 +0530, Sameer Deshmukh wrote: > Hello all, > > I was going through this GSoC idea: > https://wiki.documentfoundation.org/Development/GSoC/Ideas#Comments_improvements > > I completely agree that the printing of comments at the bottom of the > document/page is an issue, since I am also affected by it. > > But can someone please elaborate on 'basic formatting of the text > inside the comment'? I wonder if that is out of date. There was a time that comments were plain text, now they are rich text with plenty of formatting options. I suspect that issue is long fixed. C. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: lots of warnings after header changes
What would be the necessary steps for one to take to remove them and start that cleanup? On Wed, Apr 24, 2013 at 2:47 PM, David Tardon wrote: > Hi, > > On Wed, Apr 24, 2013 at 06:49:30AM +0200, Jonathan Aquilina wrote: > > Hey guys im building master on mac and im getting alot of warnings > > > > Jonathan-Aquilinas-iMac:core eagles051387$ time make > > /usr/bin/make -j 4 -rs -f /Users/eagles051387/core/Makefile.gbuild > > /Users/eagles051387/core/basebmp/Library_basebmp.mk:27: > > [WARN ] !!! > > [WARN ] !!! gb_LinkTarget_set_include: include paths > > /Users/eagles051387/core/basebmp/inc/ do not exist > > > > are these something to worry about? > > No, they are harmless. I put that check in so we can find and drop them, > to keep the makefiles clean. > > D. > ___ > LibreOffice mailing list > LibreOffice@lists.freedesktop.org > http://lists.freedesktop.org/mailman/listinfo/libreoffice > -- Jonathan Aquilina ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: lots of warnings after header changes
Already done. --tml ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: 2 commits - odk/CustomTarget_check.mk odk/CustomTarget_classes.mk odk/CustomTarget_doxygen.mk odk/CustomTarget_odkcommon.mk odk/Module_odk.mk odk/Zip_cppdocs.mk odk/Zip
odk/CustomTarget_check.mk |4 ++-- odk/CustomTarget_classes.mk| 13 ++--- odk/CustomTarget_doxygen.mk| 30 +++--- odk/CustomTarget_odkcommon.mk | 21 - odk/Module_odk.mk |7 --- odk/Zip_cppdocs.mk |2 +- odk/Zip_odkcommon.mk | 23 --- scp2/source/sdkoo/module_sdkoo.scp |4 ++-- scp2/source/sdkoo/sdkoo.scp| 16 +--- 9 files changed, 39 insertions(+), 81 deletions(-) New commits: commit c93a752ae77f5c03b61c29a2b05dd9580f181400 Author: David Tardon Date: Wed Apr 24 15:20:51 2013 +0200 ritually kill odkcommon.zip Change-Id: I0a814e3f5605340f00d4b48e83ce26792abec067 diff --git a/odk/CustomTarget_check.mk b/odk/CustomTarget_check.mk index a5995fc..ab515c9 100644 --- a/odk/CustomTarget_check.mk +++ b/odk/CustomTarget_check.mk @@ -45,8 +45,7 @@ $(call gb_CustomTarget_get_workdir,odk/check)/checkbin : \ $(call gb_Package_get_target,odk_settings) \ $(call gb_Package_get_target,odk_settings_generated) \ $(if $(SOLAR_JAVA),$(call gb_Package_get_target,odk_unowinreg)) \ - $(call gb_PackageSet_get_target,odk_autodoc) \ - $(call gb_CustomTarget_get_target,odk/odkcommon) + $(call gb_PackageSet_get_target,odk_autodoc) $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),CHK,1) $(call gb_Helper_print_on_error,\ $(PERL) $< \ diff --git a/odk/CustomTarget_classes.mk b/odk/CustomTarget_classes.mk index f813bcc..82f5247 100644 --- a/odk/CustomTarget_classes.mk +++ b/odk/CustomTarget_classes.mk @@ -22,7 +22,7 @@ $(eval $(call gb_JavaClassSet_add_sourcefiles,loader,\ odk/source/com/sun/star/lib/loader/WinRegKeyException \ )) -$(odk_WORKDIR)/classes/java.done: $(call gb_JavaClassSet_get_target,loader) +$(call gb_CustomTarget_get_workdir,odk/odkcommon/classes)/java.done: $(call gb_JavaClassSet_get_target,loader) $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),build,CPY,1) cp -a $(call gb_JavaClassSet_get_classdir,loader)/com $(dir $@) && \ touch $@ diff --git a/odk/CustomTarget_doxygen.mk b/odk/CustomTarget_doxygen.mk index e9a33ee..bddb0f3 100644 --- a/odk/CustomTarget_doxygen.mk +++ b/odk/CustomTarget_doxygen.mk @@ -7,7 +7,7 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. # -$(eval $(call gb_CustomTarget_CustomTarget,odk/odkcommon/docs/cpp/ref)) +$(eval $(call gb_CustomTarget_CustomTarget,odk/odkcommon/docs/cpp)) CPPDOCREFNAME := "$(PRODUCTNAME) $(PRODUCTVERSION) SDK C/C++ API Reference" @@ -28,25 +28,33 @@ odk_INCFILELIST := com/sun/star/uno/Any.h \ DOXY_INPUT := $(SRCDIR)/odk/pack/gendocu/main.dox $(SRCDIR)/include/sal/log-areas.dox \ $(addprefix $(INSTDIR)/$(gb_Package_SDKDIRNAME)/include/,$(odk_INCDIRLIST) $(odk_INCFILELIST)) DOXY_INPUT := $(if $(filter WNT,$(OS)),$(shell cygpath -u $(DOXY_INPUT)),$(DOXY_INPUT)) -DOXY_WORKDIR := $(if $(filter WNT,$(OS)),$(shell cygpath -u $(odk_WORKDIR)/docs/cpp/ref),$(odk_WORKDIR)/docs/cpp/ref) +DOXY_WORKDIR := $(if $(filter WNT,$(OS)),\ + $(shell cygpath -u $(call gb_CustomTarget_get_workdir,odk/odkcommon/docs/cpp)/ref),\ + $(call gb_CustomTarget_get_workdir,odk/odkcommon/docs/cpp)/ref) DOXY_STRIP_PATH := $(if $(filter WNT,$(OS)),$(shell cygpath -u $(OUTDIR)/inc),$(OUTDIR)/inc) -DOXY_DEPS := $(SRCDIR)/odk/pack/gendocu/Doxyfile \ - $(SRCDIR)/odk/pack/gendocu/main.dox \ - $(SRCDIR)/include/sal/log-areas.dox \ - $(call gb_PackageSet_get_target,odk_headers) -$(eval $(call gb_CustomTarget_register_target,odk/odkcommon/docs/cpp/ref,index.html)) +$(eval $(call gb_CustomTarget_register_targets,odk/odkcommon/docs/cpp,\ + Doxyfile \ + doxygen.log \ +)) -$(odk_WORKDIR)/docs/cpp/ref/index.html: $(DOXY_DEPS) - $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),GEN,1) +$(call gb_CustomTarget_get_workdir,odk/odkcommon/docs/cpp)/Doxyfile : $(SRCDIR)/odk/pack/gendocu/Doxyfile + $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),SED,1) sed -e 's!^INPUT = %$$!INPUT = $(DOXY_INPUT)!' \ -e 's!^OUTPUT_DIRECTORY = %$$!OUTPUT_DIRECTORY = $(DOXY_WORKDIR)!' \ -e 's!^PROJECT_BRIEF = %$$!PROJECT_BRIEF = $(CPPDOCREFNAME)!' \ -e 's!^PROJECT_NAME = %$$!PROJECT_NAME = $(PRODUCTNAME)!' \ -e 's!^QUIET = %$$!QUIET = $(if $(VERBOSE),NO,YES)!' \ -e 's!^STRIP_FROM_PATH = %$$!STRIP_FROM_PATH = $(DOXY_STRIP_PATH)!' \ - $< > $(odk_WORKDIR)/Doxyfile && \ - $(DOXYGEN) $(odk_WORKDIR)/Doxyfile > $(odk_WORKDIR)/doxygen.log + $< > $@ + +$(call gb_CustomTarget_get_workdir,odk/odkcommon/docs/cpp)/doxygen.log : \ + $(call gb_CustomTarget_get_workdir,odk/odkcommon/docs/cpp)/Doxyfile \ + $(SRCDI
Re: Bugs that need triaged ASAP - Potential Regressions within Release
On 04/23/2013 09:56 PM, Joel Madero wrote: This is a list of bugs that get highest priority for getting triaged[1]. This will help us tremendously. [...] [1] https://bugs.freedesktop.org/report.cgi?x_axis_field=resolution&y_axis_field=version&z_axis_field=&query_format=report-table&short_desc_type=allwordssubstr&short_desc=&product=LibreOffice&bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&bug_status=RESOLVED&bug_status=VERIFIED&bug_status=CLOSED&resolution=---&resolution=FIXED&resolution=INVALID&resolution=WONTFIX&resolution=DUPLICATE&resolution=WORKSFORME&resolution=MOVED&resolution=NOTABUG&resolution=NOTOURBUG&longdesc_type=allwordssubstr&longdesc=&bug_file_loc_type=allwordssubstr&bug_file_loc=&status_whiteboard_type=allwordssubstr&status_whiteboard=&keywords_type=allwords&keywords=regression%2C+&bug_id=&bug_id_type=anyexact&emailtype1=substring&email1=&emailtype2=substring&email2=&emailtype3=substring&email3=&chfieldvalue=&chfieldfrom=&chfieldto=Now&j_top=AND&f1=version&o1=substring&v1=3.6.&f2=version&o2=nowordssubstr&v2=3.6.0&f3=status_whiteboard&o3=notsubstring&v3=&f4=noop&o4=noop&v4=&f5=noop&o5=noop&v5=&format=ta! ble&action =wrap That link leads to some fancy table with numbers, but nothing that can be scanned quickly for bug titles where a developer might say "hm, that sounds like I might know something about it, lets see." Stephan ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: reportdesign/source
reportdesign/source/ui/misc/RptUndo.cxx|4 ++--
reportdesign/source/ui/report/ReportController.cxx |2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
New commits:
commit 10bd0604194db9e42fe76adab4ca17a6c7d0ac7c
Author: Tor Lillqvist
Date: Wed Apr 24 16:41:09 2013 +0300
Fix MSVC build: A ? : operator doesn't automagically construct an OUString
Change-Id: I0bf2dcd24a7b59682c90a8910279117f1bf0467f
diff --git a/reportdesign/source/ui/misc/RptUndo.cxx
b/reportdesign/source/ui/misc/RptUndo.cxx
index 6a28072..82ed522 100644
--- a/reportdesign/source/ui/misc/RptUndo.cxx
+++ b/reportdesign/source/ui/misc/RptUndo.cxx
@@ -299,7 +299,7 @@ void OGroupSectionUndo::implReInsert( )
{
uno::Sequence< beans::PropertyValue > aArgs(2);
-aArgs[0].Name = SID_GROUPHEADER_WITHOUT_UNDO == m_nSlot? PROPERTY_HEADERON
: PROPERTY_FOOTERON;
+aArgs[0].Name = SID_GROUPHEADER_WITHOUT_UNDO == m_nSlot?
OUString(PROPERTY_HEADERON) : OUString(PROPERTY_FOOTERON);
aArgs[0].Value <<= sal_True;
aArgs[1].Name = PROPERTY_GROUP;
aArgs[1].Value <<= m_aGroupHelper.getGroup();
@@ -318,7 +318,7 @@ void OGroupSectionUndo::implReRemove( )
uno::Sequence< beans::PropertyValue > aArgs(2);
-aArgs[0].Name = SID_GROUPHEADER_WITHOUT_UNDO == m_nSlot? PROPERTY_HEADERON
: PROPERTY_FOOTERON;
+aArgs[0].Name = SID_GROUPHEADER_WITHOUT_UNDO == m_nSlot?
OUString(PROPERTY_HEADERON) : OUString(PROPERTY_FOOTERON);
aArgs[0].Value <<= sal_False;
aArgs[1].Name = PROPERTY_GROUP;
aArgs[1].Value <<= m_aGroupHelper.getGroup();
diff --git a/reportdesign/source/ui/report/ReportController.cxx
b/reportdesign/source/ui/report/ReportController.cxx
index bd4fde8..27c76ab 100644
--- a/reportdesign/source/ui/report/ReportController.cxx
+++ b/reportdesign/source/ui/report/ReportController.cxx
@@ -3900,7 +3900,7 @@ void OReportController::createGroupSection(const bool
_bUndo,const bool _bHeader
if ( m_xReportDefinition.is() )
{
const SequenceAsHashMap aMap(_aArgs);
-const sal_Bool bSwitchOn = aMap.getUnpackedValueOrDefault(_bHeader ?
PROPERTY_HEADERON : PROPERTY_FOOTERON,sal_False);
+const sal_Bool bSwitchOn = aMap.getUnpackedValueOrDefault(_bHeader ?
OUString(PROPERTY_HEADERON) : OUString(PROPERTY_FOOTERON), sal_False);
uno::Reference< report::XGroup> xGroup =
aMap.getUnpackedValueOrDefault(PROPERTY_GROUP,uno::Reference<
report::XGroup>());
if ( xGroup.is() )
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/AllLangResTarget_sc.mk sc/source sc/uiconfig sc/UIConfig_scalc.mk
sc/AllLangResTarget_sc.mk|1
sc/UIConfig_scalc.mk |1
sc/source/ui/inc/sharedocdlg.hrc | 38 ---
sc/source/ui/inc/sharedocdlg.hxx | 21 --
sc/source/ui/miscdlgs/sharedocdlg.cxx| 110 +++
sc/source/ui/miscdlgs/sharedocdlg.src| 105 --
sc/uiconfig/scalc/ui/sharedocumentdlg.ui | 301 ---
7 files changed, 243 insertions(+), 334 deletions(-)
New commits:
commit 08cc155303542defc377e714d977c58f30df9a17
Author: Caolán McNamara
Date: Wed Apr 24 13:08:32 2013 +0100
adapt code to use converted share doument widget
Change-Id: Ic553e593890cb3254666e3c27c5d8ca05256687e
diff --git a/sc/AllLangResTarget_sc.mk b/sc/AllLangResTarget_sc.mk
index 9d487f6..c25cc42 100644
--- a/sc/AllLangResTarget_sc.mk
+++ b/sc/AllLangResTarget_sc.mk
@@ -84,7 +84,6 @@ $(eval $(call gb_SrsTarget_add_files,sc/res,\
sc/source/ui/miscdlgs/conflictsdlg.src \
sc/source/ui/miscdlgs/protectiondlg.src \
sc/source/ui/miscdlgs/acredlin.src \
-sc/source/ui/miscdlgs/sharedocdlg.src \
sc/source/ui/formdlg/formdlgs.src \
sc/source/ui/formdlg/dwfunctr.src \
sc/source/core/src/compiler.src \
diff --git a/sc/UIConfig_scalc.mk b/sc/UIConfig_scalc.mk
index ef7e819..89ad302 100644
--- a/sc/UIConfig_scalc.mk
+++ b/sc/UIConfig_scalc.mk
@@ -75,6 +75,7 @@ $(eval $(call gb_UIConfig_add_uifiles,modules/scalc,\
sc/uiconfig/scalc/ui/sheetprintpage \
sc/uiconfig/scalc/ui/selectrange \
sc/uiconfig/scalc/ui/selectsource \
+ sc/uiconfig/scalc/ui/sharedocumentdlg \
sc/uiconfig/scalc/ui/solverdlg \
sc/uiconfig/scalc/ui/sortcriteriapage \
sc/uiconfig/scalc/ui/sortkey \
diff --git a/sc/source/ui/inc/sharedocdlg.hrc b/sc/source/ui/inc/sharedocdlg.hrc
deleted file mode 100644
index 7be210d..000
--- a/sc/source/ui/inc/sharedocdlg.hrc
+++ /dev/null
@@ -1,38 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#include
-
-#define CB_SHARE1
-#define FT_WARNING 2
-#define FL_USERS3
-#define FT_USERS4
-#define LB_USERS5
-#define FL_END 6
-#define BTN_HELP7
-#define BTN_OK 8
-#define BTN_CANCEL 9
-
-#define STR_TITLE_NAME 1
-#define STR_TITLE_ACCESSED 2
-#define STR_NO_USER_DATA3
-#define STR_UNKNOWN_USER4
-#define STR_EXCLUSIVE_ACCESS5
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/ui/inc/sharedocdlg.hxx b/sc/source/ui/inc/sharedocdlg.hxx
index f958c5d..f0760e2 100644
--- a/sc/source/ui/inc/sharedocdlg.hxx
+++ b/sc/source/ui/inc/sharedocdlg.hxx
@@ -36,22 +36,13 @@ class ScDocShell;
class ScShareDocumentDlg : public ModalDialog
{
private:
-CheckBoxmaCbShare;
-FixedText maFtWarning;
-FixedLine maFlUsers;
-FixedText maFtUsers;
-SvxSimpleTableContainer m_aLbUsersContainer;
-SvxSimpleTable maLbUsers;
-FixedLine maFlEnd;
-HelpButton maBtnHelp;
-OKButtonmaBtnOK;
-CancelButtonmaBtnCancel;
+CheckBox* m_pCbShare;
+FixedText* m_pFtWarning;
+SvxSimpleTable* m_pLbUsers;
-String maStrTitleName;
-String maStrTitleAccessed;
-String maStrNoUserData;
-String maStrUnkownUser;
-String maStrExclusiveAccess;
+OUStringm_aStrNoUserData;
+OUStringm_aStrUnknownUser;
+OUStringm_aStrExclusiveAccess;
ScViewData* mpViewData;
ScDocShell* mpDocShell;
diff --git a/sc/source/ui/miscdlgs/sharedocdlg.cxx
b/sc/source/ui/miscdlgs/sharedocdlg.cxx
index 86fc0a5..af56056 100644
--- a/sc/source/ui/miscdlgs/sharedocdlg.cxx
+++ b/sc/source/ui/miscdlgs/sharedocdlg.cxx
@@ -28,7 +28,6 @@
#include "sharedocdlg.hxx"
-#include "sharedocdlg.hrc"
#include "scresid.hxx"
#include "docsh.hxx"
#include "viewdata.hxx"
@@ -36,
[PATCH] fix fdo#60910 FILESAVE loses fontwork/shape objects
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/3596
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/96/3596/1
fix fdo#60910 FILESAVE loses fontwork/shape objects
This reinstates one line of code which was removed by
7fec8dfcaca4efc92516f9af51a3157f1a11ccd7.
Change-Id: Ie2af33914d17a46b7118b8b804aadc0aa3bc5d90
---
M svx/source/svdraw/svdoashp.cxx
1 file changed, 1 insertion(+), 0 deletions(-)
diff --git a/svx/source/svdraw/svdoashp.cxx b/svx/source/svdraw/svdoashp.cxx
index 67bd0a5..fd0c5c8 100644
--- a/svx/source/svdraw/svdoashp.cxx
+++ b/svx/source/svdraw/svdoashp.cxx
@@ -3217,6 +3217,7 @@
void SdrObjCustomShape::InvalidateRenderGeometry()
{
mXRenderedCustomShape = 0L;
+mxCustomShapeEngine = 0L;
SdrObject::Free( mpLastShadowGeometry );
mpLastShadowGeometry = 0L;
}
--
To view, visit https://gerrit.libreoffice.org/3596
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie2af33914d17a46b7118b8b804aadc0aa3bc5d90
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Luke Deller
___
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 24136332e1b6fef3ca63b1e2137e6377ff766638 Author: Caolán McNamara Date: Wed Apr 24 15:12:45 2013 +0100 Updated core Project: help e6fede848bb18f23984d5748954ed0786aa27b1f diff --git a/helpcontent2 b/helpcontent2 index 2057fbe..e6fede8 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 2057fbeeeab78144913ded4b662d14db7e64f8ff +Subproject commit e6fede848bb18f23984d5748954ed0786aa27b1f ___ 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|1 - source/text/shared/guide/collab.xhp |3 ++- 2 files changed, 2 insertions(+), 2 deletions(-) New commits: commit e6fede848bb18f23984d5748954ed0786aa27b1f Author: Caolán McNamara Date: Wed Apr 24 15:12:45 2013 +0100 update help ids for share document ui conversion Change-Id: Ib86dcbb71ed7ff7f62f57a5655c32c6b1f3d47a5 diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst index 07ed438..5b3aeda 100644 --- a/helpers/help_hid.lst +++ b/helpers/help_hid.lst @@ -6500,7 +6500,6 @@ sc_CheckBox_RID_SCDLG_PIVOT_LAYOUT_BTN_TOTALROW,2567504924, sc_CheckBox_RID_SCDLG_RETYPEPASS_INPUT_BTN_MATCH_OLD_PASSWORD,1495680305, sc_CheckBox_RID_SCDLG_ROW_MAN_BTN_DEFVAL,1494942721, sc_CheckBox_RID_SCDLG_ROW_OPT_BTN_DEFVAL,1494959105, -sc_CheckBox_RID_SCDLG_SHAREDOCUMENT_CB_SHARE,1495598081, sc_CheckBox_RID_SCDLG_SPEC_FILTER_BTN_CASE,2567095298, sc_CheckBox_RID_SCDLG_SPEC_FILTER_BTN_COPY_RESULT,2567095301, sc_CheckBox_RID_SCDLG_SPEC_FILTER_BTN_DEST_PERS,2567095308, diff --git a/source/text/shared/guide/collab.xhp b/source/text/shared/guide/collab.xhp index 9504550..accd82f 100644 --- a/source/text/shared/guide/collab.xhp +++ b/source/text/shared/guide/collab.xhp @@ -33,8 +33,9 @@ Collaboration In %PRODUCTNAME Writer, Impress, and Draw, only one user at a time can open any document for writing. In Calc, many users can open the same spreadsheet for writing at the same time.Tools - Share Document menu + Opens the Share Document dialog where you can enable or disable collaborative sharing of the document.Share Document dialog - Share this spreadsheet with other users - + Enable to share the current document with other users. Disable to use the document unshared. This will invalidate the not yet saved edits that other users applied in the time since you last opened or saved this document. Collaboration in Calc In %PRODUCTNAME Calc, document sharing allows simultaneous write access for many users. Every user who wants to collaborate should enter a name on the %PRODUCTNAME - Preferences ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sd/uiconfig
sd/uiconfig/sdraw/ui/inserttable.ui | 174 1 file changed, 174 insertions(+) New commits: commit 7ef4f7fbdcc7c0bdf4e949b4a369d029a3350a85 Author: Alia Almusaireae Date: Sun Apr 21 10:25:03 2013 +0300 inserttable.ui widget Change-Id: I9de1975b5eeda09e3f356d20c05a2d8f6ebdcfc1 Reviewed-on: https://gerrit.libreoffice.org/3513 Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara diff --git a/sd/uiconfig/sdraw/ui/inserttable.ui b/sd/uiconfig/sdraw/ui/inserttable.ui new file mode 100644 index 000..52a7afd --- /dev/null +++ b/sd/uiconfig/sdraw/ui/inserttable.ui @@ -0,0 +1,174 @@ + + + + +False +6 +Insert Table +dialog + + +False +vertical +2 + + +True +False + + +True +False +Number of _rows: +True + + +0 +1 +1 +1 + + + + +True +True +â +True + + +1 +0 +1 +1 + + + + +True +True +â +True + + +1 +1 +1 +1 + + + + +True +False +_Number of columns: +True + + +0 +0 +1 +1 + + + + + + + + + + + + + + + + + + + +False +True +0 + + + + +False +start + + +gtk-help +True +True +True +False +True +top + + +False +True +0 + + + + +gtk-ok +True +True +True +True +False +True + + +False +True +1 + + + + +gtk-cancel +True +True +True +False +True + + +False +True +2 + + + + +False +True +end +0 + + + + +True +False + + +False +True +2 + + + + + + help1 + ok1 + cancel1 + + + ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sd/uiconfig
sd/uiconfig/sdraw/ui/inserttable.ui | 174 1 file changed, 174 deletions(-) New commits: commit cf26e3cec8dd899e60fd52b6f0dadcc8fba91f10 Author: Caolán McNamara Date: Wed Apr 24 15:18:50 2013 +0100 actually insert table is already converted Change-Id: I67e332a3033f142d843e0146aa1ac0b27c8f7db1 diff --git a/sd/uiconfig/sdraw/ui/inserttable.ui b/sd/uiconfig/sdraw/ui/inserttable.ui deleted file mode 100644 index 52a7afd..000 --- a/sd/uiconfig/sdraw/ui/inserttable.ui +++ /dev/null @@ -1,174 +0,0 @@ - - - - -False -6 -Insert Table -dialog - - -False -vertical -2 - - -True -False - - -True -False -Number of _rows: -True - - -0 -1 -1 -1 - - - - -True -True -â -True - - -1 -0 -1 -1 - - - - -True -True -â -True - - -1 -1 -1 -1 - - - - -True -False -_Number of columns: -True - - -0 -0 -1 -1 - - - - - - - - - - - - - - - - - - - -False -True -0 - - - - -False -start - - -gtk-help -True -True -True -False -True -top - - -False -True -0 - - - - -gtk-ok -True -True -True -True -False -True - - -False -True -1 - - - - -gtk-cancel -True -True -True -False -True - - -False -True -2 - - - - -False -True -end -0 - - - - -True -False - - -False -True -2 - - - - - - help1 - ok1 - cancel1 - - - ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PUSHED] inserttable.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/3513 Approvals: Caolán McNamara: Verified; Looks good to me, approved Objections: Noel Grandin: This need some tweaks before it is merged -- To view, visit https://gerrit.libreoffice.org/3513 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I9de1975b5eeda09e3f356d20c05a2d8f6ebdcfc1 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Aliah Almusaireae Gerrit-Reviewer: Caolán McNamara Gerrit-Reviewer: Noel Grandin ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - 2 commits - vcl/source
vcl/source/gdi/outdev.cxx |9 -
vcl/source/gdi/outdev6.cxx |3 +++
2 files changed, 7 insertions(+), 5 deletions(-)
New commits:
commit 1035150cea85678075583deda612dde52867c125
Author: Jan Holesovsky
Date: Wed Apr 24 16:19:56 2013 +0200
More places where we can suppress output.
Change-Id: Ib316bf40bb9b9afeb5fbdf9281f2d3b9539e346f
diff --git a/vcl/source/gdi/outdev.cxx b/vcl/source/gdi/outdev.cxx
index d34cea9..2f4cf0c 100644
--- a/vcl/source/gdi/outdev.cxx
+++ b/vcl/source/gdi/outdev.cxx
@@ -2175,8 +2175,8 @@ void OutputDevice::DrawPolyPolygon( const
basegfx::B2DPolyPolygon& rB2DPolyPoly
void OutputDevice::ImpDrawPolyPolygonWithB2DPolyPolygon(const
basegfx::B2DPolyPolygon& rB2DPolyPoly)
{
-// AW: Do NOT paint empty PolyPolygons
-if(!rB2DPolyPoly.count())
+// Do not paint empty PolyPolygons
+if(!rB2DPolyPoly.count() || !IsDeviceOutputNecessary())
return;
// we need a graphics
@@ -2306,9 +2306,8 @@ void OutputDevice::DrawPolyLine(
mpMetaFile->AddAction( new MetaPolyLineAction( aToolsPolygon,
aLineInfo ) );
}
-
-// AW: Do NOT paint empty PolyPolygons
-if(!rB2DPolygon.count())
+// Do not paint empty PolyPolygons
+if(!rB2DPolygon.count() || !IsDeviceOutputNecessary())
return;
// we need a graphics
commit 0b39358aaf723b26b5effb7245f38ad960cc609a
Author: Jan Holesovsky
Date: Wed Apr 24 16:15:19 2013 +0200
fdo#59259: Suppress the expensive parts when we are only writing to
metafile.
When we are launching the printing dialog, we first draw the page using
drawinglayer to a metafile, and then render the metafile. Unfortunately,
here
we did the real operation of allocating large bitmaps, and destroying them
again; all that just to throw all that away at the end of the operation.
The preview sets the mbOutput to false correctly, so we can just skip the
expensive parts.
Change-Id: Ice77d83100eba339602bbdf374fec8546d4d1e12
diff --git a/vcl/source/gdi/outdev6.cxx b/vcl/source/gdi/outdev6.cxx
index 46eb689..85f6ce5 100644
--- a/vcl/source/gdi/outdev6.cxx
+++ b/vcl/source/gdi/outdev6.cxx
@@ -614,6 +614,9 @@ void OutputDevice::DrawTransparent( const GDIMetaFile&
rMtf, const Point& rPos,
if( mpMetaFile )
mpMetaFile->AddAction( new MetaFloatTransparentAction( rMtf, rPos,
rSize, rTransparenceGradient ) );
+if ( !IsDeviceOutputNecessary() )
+return;
+
if( ( rTransparenceGradient.GetStartColor() == aBlack &&
rTransparenceGradient.GetEndColor() == aBlack ) ||
( mnDrawMode & ( DRAWMODE_NOTRANSPARENCY ) ) )
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Empty Advanced options page on Windows
On 23.04.2013 16:40, Caolán McNamara wrote: On Wed, 2013-04-17 at 08:49 -0400, Kohei Yoshida wrote: Hi there, I just completed my Windows build of the master branch and noticed that, the Advanced options page is for some reason totally blank. If my attachment goes through, you can see it in the attached screenshot. Does this ring any bell to anyone? No, but java options are in there aren't they ? I wonder if the same thing would happen on Linux if no JREs are detected to list in it ? On Linux with no JRE installed it works. The list is just empty. Thomas ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH 4-0] Pushed by mistake, searching for approval now
Hi, By mistake, I have pushed: http://cgit.freedesktop.org/libreoffice/core/commit/?h=libreoffice-4-0&id=0b39358aaf723b26b5effb7245f38ad960cc609a and http://cgit.freedesktop.org/libreoffice/core/commit/?h=libreoffice-4-0&id=1035150cea85678075583deda612dde52867c125 Can anybody here approve it, please? :-) I'll revert if there are any concerns; just prefer to avoid commit - revert - commit if possible... Thank you a lot, Kendy ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sd/uiconfig
sd/uiconfig/sdraw/ui/insertlayer.ui | 269 1 file changed, 269 insertions(+) New commits: commit 5ca26caf2ca723c9857b563568dae8a16c9c5962 Author: Alia Almusaireae Date: Sun Apr 21 10:28:04 2013 +0300 insertlayer.ui widget Change-Id: Ida59f58f6a2c4f65d83ad5ed2375bf934bd81d0c Reviewed-on: https://gerrit.libreoffice.org/3514 Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara diff --git a/sd/uiconfig/sdraw/ui/insertlayer.ui b/sd/uiconfig/sdraw/ui/insertlayer.ui new file mode 100644 index 000..a53d72d --- /dev/null +++ b/sd/uiconfig/sdraw/ui/insertlayer.ui @@ -0,0 +1,269 @@ + + + + +False +6 +Insert Layer +dialog + + +False +vertical +2 + + +False +start + + +gtk-help +True +True +True +False +True +top + + +False +True +0 + + + + +gtk-ok +True +True +True +True +False +True + + +False +True +1 + + + + +gtk-cancel +True +True +True +False +True + + +False +True +2 + + + + +False +True +end +0 + + + + +True +False +0 +none + + +True +False +6 +12 + + +True +True +â +True + + + + + + +True +False +_Name +True +True + + + + +False +True +1 + + + + +True +False +0 +none + + +True +False +6 +12 + + +True +True +â +True + + + + + + +True +False +_Title +True +True + + + + +False +True +2 + + + + +True +False +0 +none + + +True +False +6 +12 + + +True +False + + +True +True +â +True + + +False +True +0 + + + + +True +False +vertical + + +False +True +1 + + + + + + + + +True +False +_Description +True +True + + + + +False +True +3 + + + + +_Visible +True +True +False +False +True +0 +True + + +False +True +4 + + + + +_Printable +True +True +False +False +True +0
[Libreoffice-commits] core.git: 2 commits - vcl/source
vcl/source/gdi/outdev.cxx |9 -
vcl/source/gdi/outdev6.cxx |3 +++
2 files changed, 7 insertions(+), 5 deletions(-)
New commits:
commit f650b3a50c1490f3773003f5bcdf2fdebe0beb12
Author: Jan Holesovsky
Date: Wed Apr 24 16:19:56 2013 +0200
More places where we can suppress output.
Change-Id: Ib316bf40bb9b9afeb5fbdf9281f2d3b9539e346f
diff --git a/vcl/source/gdi/outdev.cxx b/vcl/source/gdi/outdev.cxx
index 2872262..f134388 100644
--- a/vcl/source/gdi/outdev.cxx
+++ b/vcl/source/gdi/outdev.cxx
@@ -2064,8 +2064,8 @@ void OutputDevice::DrawPolyPolygon( const
basegfx::B2DPolyPolygon& rB2DPolyPoly
void OutputDevice::ImpDrawPolyPolygonWithB2DPolyPolygon(const
basegfx::B2DPolyPolygon& rB2DPolyPoly)
{
-// AW: Do NOT paint empty PolyPolygons
-if(!rB2DPolyPoly.count())
+// Do not paint empty PolyPolygons
+if(!rB2DPolyPoly.count() || !IsDeviceOutputNecessary())
return;
// we need a graphics
@@ -2192,9 +2192,8 @@ void OutputDevice::DrawPolyLine(
mpMetaFile->AddAction( new MetaPolyLineAction( aToolsPolygon,
aLineInfo ) );
}
-
-// AW: Do NOT paint empty PolyPolygons
-if(!rB2DPolygon.count())
+// Do not paint empty PolyPolygons
+if(!rB2DPolygon.count() || !IsDeviceOutputNecessary())
return;
// we need a graphics
commit 617a6258d63d7f2307f38322a411670e6ed8
Author: Jan Holesovsky
Date: Wed Apr 24 16:15:19 2013 +0200
fdo#59259: Suppress the expensive parts when we are only writing to
metafile.
When we are launching the printing dialog, we first draw the page using
drawinglayer to a metafile, and then render the metafile. Unfortunately,
here
we did the real operation of allocating large bitmaps, and destroying them
again; all that just to throw all that away at the end of the operation.
The preview sets the mbOutput to false correctly, so we can just skip the
expensive parts.
Change-Id: Ice77d83100eba339602bbdf374fec8546d4d1e12
diff --git a/vcl/source/gdi/outdev6.cxx b/vcl/source/gdi/outdev6.cxx
index 4297e48..c855049 100644
--- a/vcl/source/gdi/outdev6.cxx
+++ b/vcl/source/gdi/outdev6.cxx
@@ -612,6 +612,9 @@ void OutputDevice::DrawTransparent( const GDIMetaFile&
rMtf, const Point& rPos,
mpMetaFile->AddAction( new MetaFloatTransparentAction( rMtf, rPos,
rSize, rTransparenceGradient ) );
}
+if ( !IsDeviceOutputNecessary() )
+return;
+
if( ( rTransparenceGradient.GetStartColor() == aBlack &&
rTransparenceGradient.GetEndColor() == aBlack ) ||
( mnDrawMode & ( DRAWMODE_NOTRANSPARENCY ) ) )
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PUSHED] insertlayer.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/3514 Approvals: Caolán McNamara: Verified; Looks good to me, approved Objections: Noel Grandin: This need some tweaks before it is merged -- To view, visit https://gerrit.libreoffice.org/3514 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ida59f58f6a2c4f65d83ad5ed2375bf934bd81d0c Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Aliah Almusaireae Gerrit-Reviewer: Caolán McNamara Gerrit-Reviewer: Noel Grandin ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 54157] LibreOffice 4.0 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=54157 Bug 54157 depends on bug 59259, which changed state. Bug 59259 Summary: With some master pages, freezes when try to print https://bugs.freedesktop.org/show_bug.cgi?id=59259 What|Removed |Added Status|NEW |RESOLVED Resolution|--- |FIXED -- 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] libmspub.git: 2 commits - src/lib
src/lib/MSPUBCollector.cpp|6 +++---
src/lib/MSPUBSVGGenerator.cpp | 35 +++
2 files changed, 26 insertions(+), 15 deletions(-)
New commits:
commit b4c7fe03433a0db5a625e76fa7fa81e4a41f85c6
Author: Franz Schmid
Date: Fri Apr 19 20:49:01 2013 +0200
First Line left indent is signed not unsigned.
diff --git a/src/lib/MSPUBCollector.cpp b/src/lib/MSPUBCollector.cpp
index 4af4969..a8d55ca 100644
--- a/src/lib/MSPUBCollector.cpp
+++ b/src/lib/MSPUBCollector.cpp
@@ -1167,8 +1167,8 @@ WPXPropertyList
libmspub::MSPUBCollector::getParaStyleProps(const ParagraphStyle
defaultStyle.m_spaceAfterEmu.get_value_or(0));
unsigned spaceBeforeEmu = style.m_spaceBeforeEmu.get_value_or(
defaultStyle.m_spaceBeforeEmu.get_value_or(0));
- unsigned firstLineIndentEmu = style.m_firstLineIndentEmu.get_value_or(
-
defaultStyle.m_firstLineIndentEmu.get_value_or(0));
+ int firstLineIndentEmu = style.m_firstLineIndentEmu.get_value_or(
+
defaultStyle.m_firstLineIndentEmu.get_value_or(0));
unsigned leftIndentEmu = style.m_leftIndentEmu.get_value_or(
defaultStyle.m_leftIndentEmu.get_value_or(0));
unsigned rightIndentEmu = style.m_rightIndentEmu.get_value_or(
commit 826cb95f46f0853bfaec885ca2b9f8b88f036771
Author: Franz Schmid
Date: Wed Apr 17 22:48:01 2013 +0200
Fixed crash when converting files with dashed lines to svg.
diff --git a/src/lib/MSPUBCollector.cpp b/src/lib/MSPUBCollector.cpp
index 895b736..4af4969 100644
--- a/src/lib/MSPUBCollector.cpp
+++ b/src/lib/MSPUBCollector.cpp
@@ -743,7 +743,7 @@ boost::function
libmspub::MSPUBCollector::paintShape(const ShapeInfo
graphicsProps.insert("svg:stroke-linecap", "round");
break;
case RECT_DOT:
- graphicsProps.insert("svg:stroke-linecap", "rect");
+ graphicsProps.insert("svg:stroke-linecap", "butt");
break;
default:
break;
diff --git a/src/lib/MSPUBSVGGenerator.cpp b/src/lib/MSPUBSVGGenerator.cpp
index 7546230..4b5482f 100644
--- a/src/lib/MSPUBSVGGenerator.cpp
+++ b/src/lib/MSPUBSVGGenerator.cpp
@@ -546,9 +546,10 @@ void libmspub::MSPUBSVGGenerator::writeStyle(bool /*
isClosed */)
{
m_outputSink << "style=\"";
+ double width = 1.0 / 72.0;
if (m_style["svg:stroke-width"])
{
-double width = m_style["svg:stroke-width"]->getDouble();
+width = m_style["svg:stroke-width"]->getDouble();
if (width == 0.0 && m_style["draw:stroke"] &&
m_style["draw:stroke"]->getStr() != "none")
width = 0.2 / 72.0; // reasonable hairline
m_outputSink << "stroke-width: " << doubleToString(72*width) << "; ";
@@ -562,29 +563,39 @@ void libmspub::MSPUBSVGGenerator::writeStyle(bool /*
isClosed */)
}
if (m_style["draw:stroke"] && m_style["draw:stroke"]->getStr() == "solid")
-m_outputSink << "stroke-dasharray: solid; ";
- else if (m_style["draw:stroke"] && m_style["draw:stroke"]->getStr() ==
"dash")
+m_outputSink << "stroke-dasharray: none; ";
+ if (m_style["draw:stroke"] && m_style["draw:stroke"]->getStr() == "dash")
{
-int dots1 = m_style["draw:dots1"]->getInt();
-int dots2 = m_style["draw:dots2"]->getInt();
-double dots1len = m_style["draw:dots1-length"]->getDouble();
-double dots2len = m_style["draw:dots2-length"]->getDouble();
-double gap = m_style["draw:distance"]->getDouble();
+int dots1 = 0;
+if (m_style["draw:dots1"])
+ dots1 = m_style["draw:dots1"]->getInt();
+int dots2 = 0;
+if (m_style["draw:dots2"])
+ dots2 = m_style["draw:dots2"]->getInt();
+double dots1len = width * 72.0;
+double dots2len = width * 72.0;
+double gap = width * 72.0;
+if (m_style["draw:dots1-length"])
+ dots1len = m_style["draw:dots1-length"]->getDouble() * 72.0;
+if (m_style["draw:dots2-length"])
+ dots2len = m_style["draw:dots2-length"]->getDouble() * 72.0;
+if (m_style["draw:distance"])
+ gap = m_style["draw:distance"]->getDouble() * 72.0;
m_outputSink << "stroke-dasharray: ";
for (int i = 0; i < dots1; i++)
{
if (i)
m_outputSink << ", ";
- m_outputSink << (int)dots1len;
+ m_outputSink << dots1len;
m_outputSink << ", ";
- m_outputSink << (int)gap;
+ m_outputSink << gap;
}
for (int j = 0; j < dots2; j++)
{
m_outputSink << ", ";
- m_outputSink << (int)dots2len;
+ m_outputSink << dots2len;
m_outputSink << ", ";
- m_outputSink << (int)gap;
+ m_outputSink << gap;
}
m_outputSink << "; ";
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
