Makefile.in | 8 ++++++-- sc/source/filter/excel/xeformula.cxx | 4 ++-- shell/source/win32/shlxthandler/ooofilt/stream_helper.cxx | 3 ++- solenv/gbuild/Module.mk | 4 ++++ 4 files changed, 14 insertions(+), 5 deletions(-)
New commits: commit 6cea76189fb8d9fbb358f757157df66c7ea31c85 Author: Tor Lillqvist <[email protected]> Date: Fri Oct 4 19:36:57 2013 +0200 fdo#67534: try to avoid file locking in Explorer shell extensions Change-Id: I287395f6c25b1bfb9b9482166ae6f34d9af8f455 diff --git a/shell/source/win32/shlxthandler/ooofilt/stream_helper.cxx b/shell/source/win32/shlxthandler/ooofilt/stream_helper.cxx index 3b77d28..f1fb321 100644 --- a/shell/source/win32/shlxthandler/ooofilt/stream_helper.cxx +++ b/shell/source/win32/shlxthandler/ooofilt/stream_helper.cxx @@ -106,7 +106,8 @@ long BufferStream::sseek (long offset, int origin) FileStream::FileStream(const char *filename) : file(0) { - file = fopen(filename, "rb"); + // fdo#67534: avoid locking to not interfere with soffice opening the file + file = _fsopen(filename, "rb", _SH_DENYNO); } FileStream::~FileStream() commit 738ae33f7e1503a72ef6e31318f80257f173042d Author: Michael Stahl <[email protected]> Date: Fri Oct 4 19:36:07 2013 +0200 warning C4701: potentially uninitialized local variables Change-Id: Ia153de4928ff99e8943450be27fa5ddeada8608c diff --git a/sc/source/filter/excel/xeformula.cxx b/sc/source/filter/excel/xeformula.cxx index 7db3bb5..662ae07 100644 --- a/sc/source/filter/excel/xeformula.cxx +++ b/sc/source/filter/excel/xeformula.cxx @@ -1250,7 +1250,7 @@ void XclExpFmlaCompImpl::ProcessDdeLink( const XclExpScToken& rTokData ) if( mxData->mbOk ) mxData->mbOk = aApplic.Len() && aTopic.Len() && aItem.Len(); if( mxData->mbOk ) { - sal_uInt16 nExtSheet, nExtName; + sal_uInt16 nExtSheet(0), nExtName(0); if( mxData->mpLinkMgr && mxData->mpLinkMgr->InsertDde( nExtSheet, nExtName, aApplic, aTopic, aItem ) ) AppendNameXToken( nExtSheet, nExtName, rTokData.mnSpaces ); else @@ -2377,7 +2377,7 @@ void XclExpFmlaCompImpl::AppendAddInCallToken( const XclExpExtFuncData& rExtFunc void XclExpFmlaCompImpl::AppendEuroToolCallToken( const XclExpExtFuncData& rExtFuncData, sal_uInt8 nSpaces ) { - sal_uInt16 nExtSheet, nExtName; + sal_uInt16 nExtSheet(0), nExtName(0); if( mxData->mpLinkMgr && mxData->mpLinkMgr->InsertEuroTool( nExtSheet, nExtName, rExtFuncData.maFuncName ) ) AppendNameXToken( nExtSheet, nExtName, nSpaces ); else commit bbadfca2cad32f1da9cca225df0b12cdde84d593 Author: Michael Stahl <[email protected]> Date: Thu Oct 3 18:49:25 2013 +0200 refactor make check to run subsequentcheck parallel to instset ... which saves 4 minutes on a "make check" here, when configured --with-package-format="archive" Change-Id: I415e0e95ae7f4e289fa4797643f5d744015d80ad diff --git a/Makefile.in b/Makefile.in index 5e46409..a9764bf 100644 --- a/Makefile.in +++ b/Makefile.in @@ -229,8 +229,11 @@ bootstrap: compilerplugins # # Build # +# Note: if invoked as "make check" this will also run subsequentcheck! +# build: bootstrap fetch $(if $(filter $(INPATH),$(INPATH_FOR_BUILD)),,cross-toolset) - $(GNUMAKE) -j $(PARALLELISM) $(GMAKE_OPTIONS) -f $(SRCDIR)/Makefile.gbuild + $(GNUMAKE) -j $(PARALLELISM) $(GMAKE_OPTIONS) -f $(SRCDIR)/Makefile.gbuild \ + all $(if $(filter check,$(MAKECMDGOALS)),subsequentcheck) ifneq ($(filter-out WNT MACOSX IOS ANDROID,$(OS)),) install-gdb-printers -a $(INSTDIR) endif @@ -373,7 +376,8 @@ findunusedcode: | grep -v ^WSObject \ > unusedcode.easy -check: build subsequentcheck +# the actual running of subsequentcheck is now done in "build" target => faster +check: build dump-deps: @$(SRCDIR)/bin/module-deps.pl $(GNUMAKE) $(SRCDIR)/Makefile.gbuild diff --git a/solenv/gbuild/Module.mk b/solenv/gbuild/Module.mk index 7b3aad94..98930ed 100644 --- a/solenv/gbuild/Module.mk +++ b/solenv/gbuild/Module.mk @@ -229,10 +229,14 @@ $(call gb_Module_get_clean_target,$(1)) : $$(gb_Module_CURRENTCLEANTARGET) endef +# has order dependency on AllModulesButInstsetNative to be able to run +# subsequentcheck in the same make process on "make check" define gb_Module_add_subsequentcheck_target $(call gb_Module__read_targetfile,$(1),$(2),subsequentcheck target) $(call gb_Module_get_subsequentcheck_target,$(1)) : $$(gb_Module_CURRENTTARGET) +$$(gb_Module_CURRENTTARGET) :| \ + $(call gb_Postprocess_get_target,AllModulesButInstsetNative) $(call gb_Module_get_clean_target,$(1)) : $$(gb_Module_CURRENTCLEANTARGET) endef _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
