Re: Build Error -1073740940
So digging deeper. make clean in starmath for instance fails... because of an assert in xargs... I strongly suspect that xargs is utterly confused by the fact that our make is running as a dos native app since the same xargs coomand that assert, run just fine inside a cygwin bash session So I downloaded the sources of findutils (where xargs lives) and patched it slightly, built and put the new xargs.exe to $LODE_HOME/opt/bin (which in an LODE env is the top of the PATH food chain :-) ) and make clean in starmath now works That does not solve the initial head corruption in make.. but I strongly suspect that it is related iow a mismatch between what make think his command line max is, vs what it really is... where the cygwin command line is likely in the 128K vs the dos command line that is at 8K Norbert -- Only in findutils-4.4.1.new/lib: .deps diff -ur findutils-4.4.1/lib/buildcmd.c findutils-4.4.1.new/lib/buildcmd.c --- findutils-4.4.1/lib/buildcmd.c 2009-04-21 20:18:14.0 + +++ findutils-4.4.1.new/lib/buildcmd.c 2015-08-09 01:20:29.084155900 + @@ -493,7 +493,7 @@ /* Set the initial value of arg_max to the largest value we can * tolerate. */ - ctl->arg_max = ctl->posix_arg_size_max; + ctl->arg_max = 8192; return BC_INIT_OK; } diff -ur findutils-4.4.1/xargs/xargs.c findutils-4.4.1.new/xargs/xargs.c --- findutils-4.4.1/xargs/xargs.c 2009-04-21 20:18:14.0 + +++ findutils-4.4.1.new/xargs/xargs.c 2015-08-09 01:20:31.284114400 + @@ -490,7 +490,7 @@ * conforms to the POSIX requirement that the default command * line length shall be at least LINE_MAX. */ - assert (bc_ctl.arg_max >= LINE_MAX); + // assert (bc_ctl.arg_max >= LINE_MAX); #endif bc_ctl.exec_callback = xargs_do_exec; ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Build Error -1073740940
--enable-verbose is messed-up in configure.ac it set VERBOSE to --enable-verbose -> YES --disable-verbose -> NO neither -> empty and then VERBOSE is exported via config_host.mk But gmake and most of the rest of the build use verbose=non-empty/empty as a test typically $(if $(verbose)$(VERBOSE),,)) some isolated place have a test of VERBOSE= YES/NO which conflict with the semantic of verbose all that being said... verbose=t make does also fails on Windows when ran at the top level, very early on while processing the Dep targets apparently.. make --debug=all did not provide much more info.. short of building a debug version of make and taking a core, it is hard to guess what is going on, but very likely some buffer overrun bug in make itself So.. don't do that do not use --enable-verbose (for the reason stated at the top of this post.. it is broken) and do not use verbose=t at the top level, it is really not that useful anyway, except to fill you disk with a huge build log) as it drown the ouput in tons of useless details if you need to get the command line, you can do that inside a given module for example if module foo is failing and you need to see the command then at the top level make foo.all this build foo and all the pre-req module for foo then cd foo and make there When one run make directly in a module directory the default is verbose... so no need for verbose=t make in that case Norbert ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
GSOC weekly report #11
This week, I have started working on the writer page tab https://bugs.documentfoundation.org/show_bug.cgi?id=83830&redirected_from=fdo Out of the 5 mentioned sub-tabs, I have created the Margins, header and footer tab and testing them for bug fixes. Future plans - Completing the page tab during the last week of GSoC and adding minor tweaks/bug fixes for my previous patch submissions. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Build Error -1073740940
Hi Regina, > Makefile:250: recipe for target 'build' failed > make: *** [build] Error -1073740940 i just started to build LO 5 on Win7 64Bit with VS2013 and have same build problems first unpacking external source "libreoffice-translations-5.0.0.5.tar" failed with an error "D" could not resolved". i use drive "d" instead of "c" as described at https://wiki.documentfoundation.org/Development/BuildingOnWindows. adding "/cygdrive/d" solved it. but now build will fail constantly with error 2 or error -1073740940 i just restart the build again and again ... my configuration is: /cygdrive/d/sources/libo-core/autogen.sh \ --with-build-version="$(date +"%Y-%m-%d %H:%M:%S %z (%a, %d %b %Y)")" \ --with-vendor="LO Debug Build" \ --with-external-tar=/cygdrive/d/sources/lo-externalsrc \ --with-junit=/cygdrive/d/sources/junit-4.10.jar \ --with-ant-home=/cygdrive/d/sources/apache-ant-1.9.5 \ --disable-ccache \ --with-parallelism \ --enable-pch \ --enable-verbose \ --without-fonts \ --with-lang="de" \ --with-package-format="installed msi" \ --without-junit \ --enable-dbgutil \ --enable-debug \ --enable-crashdump \ --disable-odk \ --disable-online-update mv autogen.lastrun autogen.input -> admin@mypc /cygdrive/d/sources/libo-core $ /opt/lo/bin/make all gb_COLOR=1 D:/cygwin/opt/lo/bin/make -j 4 -r -f D:/sources/libo-core/Makefile.gbuild all Regards Oliver ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Build Error -1073740940
Regina Henschel schrieb: Hi Thorsten, Now building stops. The whole log is >80MB. It is zipped 5,3 MB. May I sent it to you directly. Kind regards Regina ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Build Error -1073740940
Hi Thorsten, Now building stops. The whole log is >80MB. The last part having [build CXX] is: [build CXX] unoxml/source/service/services.cxx The lines before the failure are below. Please tell me, what you need in addition. Kind regards Regina lines immediately above the failure: === [build FIT] fcfg_database_types.xcu FCFGMerge Copyright: 2003 by Red Hat, Inc., based on FCFGMerge.java` by Sun All Rights Reserved. create package "C:/LO_buildDebug/core/workdir/XcuFilterTypesTarget/fcfg_database_types.xcu" ... generate package header ... generate set for types ... merge fragment "C:/LO_buildDebug/core/filter/source/config/fragments/types/..\types\StarBase.xcu" ... generate set for filter ... generate set for frame loader ... generate set for content handler ... generate package footer ... package contains 1 items write temp package "C:/LO_buildDebug/core/workdir/XcuFilterTypesTarget/fcfg_database_types.xcu [42744 refs] [build XCS] org/openoffice/Office/Common.xcs [build XCM] officecfg/registry/data/org/openoffice/Office/Common-base.xcu S=C:/LO_buildDebug/core && I=$S/instdir && W=$S/workdir && mkdir -p $W/XcuModuleTarget/officecfg/registry/data/org/openoffice/Office/ && PATH="C:\LO_buildDebug\core\instdir\program;C:\LO_buildDebug\core\instdir\program;$PATH" $W/UnpackedTarball/xslt/win32/bin.msvc/xsltproc.exe --nonet -o $W/XcuModuleTarget/officecfg/registry/data/org/openoffice/Office/Common-base.xcu --stringparam xcs $W/XcsTarget/org/openoffice/Office/Common.xcs --stringparam schemaRoot $S/officecfg/registry/schema --stringparam module base --stringparam LIBO_SHARE_FOLDER share --stringparam LIBO_SHARE_HELP_FOLDER help $S/officecfg/util/alllang.xsl $S/officecfg/registry/data/org/openoffice/Office/Common.xcu [build XCS] org/openoffice/Office/Embedding.xcs [build XCM] officecfg/registry/data/org/openoffice/Office/Embedding-base.xcu Makefile:250: recipe for target 'build' failed make: *** [build] Error -1073740940 Thorsten Behrens schrieb: Regina Henschel wrote: I think, the log is normal. But I have attached it. It is not long. The problem appears after a short time. Hi Regina, odd indeed. Can you build with make PARALLELISM=1, so it's obvious which is the failing command? Or better even, come to irc for some interactive debugging? Cheers, -- Thorsten ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [GSoC] Improve user experience with CMIS – Weekly report #11
Hey Szymon! Nice to read about your nice progress. 2015-08-07 19:55 GMT+02:00 Szymon Kłos > * I was working also on autocompletion in the file name field. I've used > existing widget from standard file picker and let it autocomplete remote > paths. Unfortunately it doesn't work very well. Getting information from > remote server could take a lot of time and proposals of paths appears > after few seconds. In this state it is unusable feature. Indeed this is bound to fail. What could be done to speed up the interactivity with the user is to add asynchronous api functions to libcmis, and have it use the curl multi api... But I'm not sure this could be done in the remaining time frame for GSoC. However, it may good to start considering the removal of the remote servers feature from the internal file picker as your dialog is getting into shape. -- Cedric ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: external/glm
external/glm/UnpackedTarball_glm.mk |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 05925ef8a49f3ba302140bd37ba9c4848598638d Author: Thomas Klausner Date: Sat Aug 8 17:59:09 2015 +0200 Do not add --binary to patch flags unconditionally. It is only needed for Cygwin, and some patch(1) don't support it, like NetBSD's. Solution suggested by vmiklos on irc. Change-Id: I65a3a82e755167828658218c7d73c4f2294e587f diff --git a/external/glm/UnpackedTarball_glm.mk b/external/glm/UnpackedTarball_glm.mk index 82f4a2c..f593254 100644 --- a/external/glm/UnpackedTarball_glm.mk +++ b/external/glm/UnpackedTarball_glm.mk @@ -11,7 +11,7 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,glm)) $(eval $(call gb_UnpackedTarball_set_tarball,glm,$(GLM_TARBALL))) -$(eval $(call gb_UnpackedTarball_set_patchflags,glm,--binary)) +$(eval $(call gb_UnpackedTarball_set_patchflags,glm,$(if $(filter MSC,$(COM)),--binary))) $(eval $(call gb_UnpackedTarball_set_patchlevel,glm,1)) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Build Error -1073740940
Hi Thorsten, Thorsten Behrens schrieb: Regina Henschel wrote: I think, the log is normal. But I have attached it. It is not long. The problem appears after a short time. Hi Regina, odd indeed. Can you build with make PARALLELISM=1, so it's obvious which is the failing command? Or better even, come to irc for some interactive debugging? I have started the build with make PARALLELISM=1. I'll report back, whether it stops too. At least it is different from last try. Kind regard Regina ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: chart2/source extensions/source slideshow/source sw/source
chart2/source/controller/sidebar/ChartSidebarSelectionListener.cxx |2 +-
extensions/source/logging/logger.cxx |2 +-
slideshow/source/engine/pointersymbol.cxx |2 +-
sw/source/core/doc/docbm.cxx | 10
+-
4 files changed, 8 insertions(+), 8 deletions(-)
New commits:
commit 8a7b4d5bb51b9d3d827bc4d0c8c7861f0935060c
Author: Stephan Bergmann
Date: Sat Aug 8 15:16:34 2015 +0200
Explicit capture annotations
Change-Id: I7be1a36196a07a80a7b7173c3869621f5d707204
diff --git a/chart2/source/controller/sidebar/ChartSidebarSelectionListener.cxx
b/chart2/source/controller/sidebar/ChartSidebarSelectionListener.cxx
index 7f13479..30a2e63 100644
--- a/chart2/source/controller/sidebar/ChartSidebarSelectionListener.cxx
+++ b/chart2/source/controller/sidebar/ChartSidebarSelectionListener.cxx
@@ -57,7 +57,7 @@ void ChartSidebarSelectionListener::selectionChanged(const
css::lang::EventObjec
aAny >>= aCID;
ObjectType eType = ObjectIdentifier::getObjectType(aCID);
bCorrectObjectSelected = std::any_of(maTypes.begin(),
maTypes.end(),
-[=](const ObjectType& eTypeInVector) { return eType ==
eTypeInVector; });
+[eType](const ObjectType& eTypeInVector) { return
eType == eTypeInVector; });
}
}
}
diff --git a/extensions/source/logging/logger.cxx
b/extensions/source/logging/logger.cxx
index 654994e..5a62c89 100644
--- a/extensions/source/logging/logger.cxx
+++ b/extensions/source/logging/logger.cxx
@@ -174,7 +174,7 @@ namespace logging
return;
m_aHandlers.forEach< XLogHandler >(
-[&] (Reference const& rxListener) {
rxListener->publish(_rRecord); } );
+[&_rRecord] (Reference const& rxListener) {
rxListener->publish(_rRecord); } );
m_aHandlers.forEach< XLogHandler >(
[] (Reference const& rxListener) {
rxListener->flush(); } );
}
diff --git a/slideshow/source/engine/pointersymbol.cxx
b/slideshow/source/engine/pointersymbol.cxx
index eed4056..7b3 100644
--- a/slideshow/source/engine/pointersymbol.cxx
+++ b/slideshow/source/engine/pointersymbol.cxx
@@ -66,7 +66,7 @@ PointerSymbol::PointerSymbol(
uno::Reference const & xBitm
{
std::for_each( rViewContainer.begin(),
rViewContainer.end(),
- [&]( const UnoViewSharedPtr& sp )
+ [this]( const UnoViewSharedPtr& sp )
{ this->viewAdded(sp); } );
}
diff --git a/sw/source/core/doc/docbm.cxx b/sw/source/core/doc/docbm.cxx
index 536cd7a..ff66dbf 100644
--- a/sw/source/core/doc/docbm.cxx
+++ b/sw/source/core/doc/docbm.cxx
@@ -166,7 +166,7 @@ namespace
rMarks.begin(),
pCandidatesEnd,
back_inserter(vCandidates),
-[&] (IDocumentMarkAccess::pMark_t const& rpMark) { return
!rpMark->EndsBefore(rPos); } );
+[&rPos] (IDocumentMarkAccess::pMark_t const& rpMark) { return
!rpMark->EndsBefore(rPos); } );
// no candidate left => we are in front of the first mark or there are
none
if(vCandidates.empty()) return NULL;
// return the highest (last) candidate using mark end ordering
@@ -267,7 +267,7 @@ namespace
return find_if(
ppMarksBegin,
ppMarksEnd,
-[&] (IDocumentMarkAccess::pMark_t const& rpMark) { return
rpMark->GetName() == rName; } );
+[&rName] (IDocumentMarkAccess::pMark_t const& rpMark) { return
rpMark->GetName() == rName; } );
}
#if 0
@@ -958,7 +958,7 @@ namespace sw { namespace mark
find_if(
pMarkLow,
pMarkHigh,
-[&] (pMark_t const& rpMark) { return rpMark.get() == pMark; }
);
+[pMark] (pMark_t const& rpMark) { return rpMark.get() ==
pMark; } );
if(pMarkFound != pMarkHigh)
deleteMark(pMarkFound);
}
@@ -1014,7 +1014,7 @@ namespace sw { namespace mark
const_iterator_t pFieldmark = find_if(
m_vFieldmarks.begin(),
m_vFieldmarks.end(),
-[&] (pMark_t const& rpMark) { return
rpMark->IsCoveringPosition(rPos); } );
+[&rPos] (pMark_t const& rpMark) { return
rpMark->IsCoveringPosition(rPos); } );
if(pFieldmark == m_vFieldmarks.end()) return NULL;
return dynamic_cast(pFieldmark->get());
}
@@ -1080,7 +1080,7 @@ namespace sw { namespace mark
const_iterator_t pAnnotationMark = find_if(
m_vAnnotationMarks.begin(),
m_vAnnotationMarks.end(),
-[&] (pMark_t const& rpMark) { return
rpMark->IsCoveringPosition(rPos); } );
+[&rPos] (pMark_t const& rpMark) { return
rpMark->IsCoveringPosition(rPos); } );
if (pAnnotationMark == m_vAnnotationMarks.end())
return NULL;
retu
[Libreoffice-commits] core.git: extensions/source
extensions/source/propctrlr/eformshelper.cxx |5 ++---
extensions/source/propctrlr/eventhandler.cxx |3 +--
extensions/source/propctrlr/genericpropertyhandler.cxx |4 ++--
3 files changed, 5 insertions(+), 7 deletions(-)
New commits:
commit 4ce10ff6ce725212efa91a017a61e1bd781008c1
Author: Daniel Robertson
Date: Fri Aug 7 23:09:04 2015 -0400
tdf#92459 remove compat_functional from extensions
Replace all uses of deprecated features from the o3tl in
compat_functional.hxx with lambda expressions in extensions. There
should be no side effects due to this patch.
Change-Id: Ib9a217c1d61593eaba82431ab047e5b899c74568
Reviewed-on: https://gerrit.libreoffice.org/17587
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens
diff --git a/extensions/source/propctrlr/eformshelper.cxx
b/extensions/source/propctrlr/eformshelper.cxx
index db9dec1..14731e1b 100644
--- a/extensions/source/propctrlr/eformshelper.cxx
+++ b/extensions/source/propctrlr/eformshelper.cxx
@@ -34,8 +34,6 @@
#include
#include
-#include
-
namespace pcr
{
@@ -701,7 +699,8 @@ namespace pcr
}
_rElementNames.resize( rMapUINameToElement.size() );
-::std::transform( rMapUINameToElement.begin(),
rMapUINameToElement.end(), _rElementNames.begin(), ::o3tl::select1st<
MapStringToPropertySet::value_type >() );
+::std::transform( rMapUINameToElement.begin(),
rMapUINameToElement.end(), _rElementNames.begin(),
+[]( const ::std::pair< MapStringToPropertySet::key_type,
MapStringToPropertySet::mapped_type>& cp) { return cp.first; } );
}
diff --git a/extensions/source/propctrlr/eventhandler.cxx
b/extensions/source/propctrlr/eventhandler.cxx
index b521709..6a15c56 100644
--- a/extensions/source/propctrlr/eventhandler.cxx
+++ b/extensions/source/propctrlr/eventhandler.cxx
@@ -68,7 +68,6 @@
#include
#include
-#include
extern "C" void SAL_CALL createRegistryInfo_EventHandler()
{
@@ -776,7 +775,7 @@ namespace pcr
StlSyntaxSequence< Property > aReturn( aOrderedProperties.size() );
::std::transform( aOrderedProperties.begin(),
aOrderedProperties.end(), aReturn.begin(),
-::o3tl::select2nd< ::std::map< EventId, Property >::value_type >()
);
+[]( const ::std::pair< EventId, Property >& cp ) { return
cp.second; } );
return aReturn;
}
diff --git a/extensions/source/propctrlr/genericpropertyhandler.cxx
b/extensions/source/propctrlr/genericpropertyhandler.cxx
index de94363..af489cc 100644
--- a/extensions/source/propctrlr/genericpropertyhandler.cxx
+++ b/extensions/source/propctrlr/genericpropertyhandler.cxx
@@ -41,7 +41,6 @@
#include
#include
-#include
extern "C" void SAL_CALL createRegistryInfo_GenericPropertyHandler()
{
@@ -531,7 +530,8 @@ namespace pcr
Sequence< Property > aReturn( m_aProperties.size() );
::std::transform( m_aProperties.begin(), m_aProperties.end(),
-aReturn.getArray(), ::o3tl::select2nd< PropertyMap::value_type >()
);
+aReturn.getArray(), []( const ::std::pair< PropertyMap::key_type,
PropertyMap::mapped_type >& cp )
+{ return cp.second; } );
return aReturn;
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: slideshow/inc slideshow/source slideshow/test
slideshow/inc/pch/precompiled_slideshow.hxx |1
slideshow/source/engine/pointersymbol.cxx | 23 ++--
slideshow/source/engine/pointersymbol.hxx |1
slideshow/source/engine/rehearsetimingsactivity.cxx | 21 ++
slideshow/source/engine/slide/layermanager.cxx | 15 +
slideshow/source/engine/slide/shapemanagerimpl.cxx | 22 +--
slideshow/source/engine/slide/slideimpl.cxx | 23 ++--
slideshow/source/engine/waitsymbol.cxx | 22 ++-
slideshow/source/engine/waitsymbol.hxx |1
slideshow/test/testshape.cxx| 16 +
10 files changed, 49 insertions(+), 96 deletions(-)
New commits:
commit 717b23ef2765678a5598d652956edd77d2d62fc5
Author: Daniel Robertson
Date: Sat Aug 1 11:27:08 2015 -0400
tdf#92459 replace deprecated o3tl features
Replace deprecated features from the o3tl including select1st and
select2nd with lambda expressions.
Change-Id: I0cb1aedc3e193c52d25e2837a47d9d90c898079e
Reviewed-on: https://gerrit.libreoffice.org/17459
Reviewed-by: Thorsten Behrens
Tested-by: Thorsten Behrens
diff --git a/slideshow/inc/pch/precompiled_slideshow.hxx
b/slideshow/inc/pch/precompiled_slideshow.hxx
index 96a8bb9..e41362e 100644
--- a/slideshow/inc/pch/precompiled_slideshow.hxx
+++ b/slideshow/inc/pch/precompiled_slideshow.hxx
@@ -189,7 +189,6 @@
#include
#include
#include
-#include
#include
#include
#include
diff --git a/slideshow/source/engine/pointersymbol.cxx
b/slideshow/source/engine/pointersymbol.cxx
index 20dd121..eed4056 100644
--- a/slideshow/source/engine/pointersymbol.cxx
+++ b/slideshow/source/engine/pointersymbol.cxx
@@ -18,7 +18,6 @@
*/
-#include
#include
#include
@@ -33,7 +32,6 @@
#include "pointersymbol.hxx"
#include "eventmultiplexer.hxx"
-#include
#include
@@ -68,9 +66,8 @@ PointerSymbol::PointerSymbol(
uno::Reference const & xBitm
{
std::for_each( rViewContainer.begin(),
rViewContainer.end(),
- boost::bind( &PointerSymbol::viewAdded,
-this,
-_1 ));
+ [&]( const UnoViewSharedPtr& sp )
+ { this->viewAdded(sp); } );
}
void PointerSymbol::setVisible( const bool bVisible )
@@ -147,11 +144,9 @@ void PointerSymbol::viewRemoved( const UnoViewSharedPtr&
rView )
maViews.erase(
std::remove_if(
maViews.begin(), maViews.end(),
-boost::bind(
-std::equal_to(),
-rView,
-// select view:
-boost::bind( o3tl::select1st(), _1 ) )
),
+[&rView]
+( const ::std::pair< UnoViewSharedPtr,
cppcanvas::CustomSpriteSharedPtr >& cp )
+{ return rView == cp.first; } ),
maViews.end() );
}
@@ -162,11 +157,9 @@ void PointerSymbol::viewChanged( const UnoViewSharedPtr&
rView )
std::find_if(
maViews.begin(),
maViews.end(),
-boost::bind(
-std::equal_to(),
-rView,
-// select view:
-boost::bind( o3tl::select1st(), _1 ;
+[&rView]
+( const ::std::pair< UnoViewSharedPtr,
cppcanvas::CustomSpriteSharedPtr >& cp )
+{ return rView == cp.first; } ) );
OSL_ASSERT( aModifiedEntry != maViews.end() );
if( aModifiedEntry == maViews.end() )
diff --git a/slideshow/source/engine/pointersymbol.hxx
b/slideshow/source/engine/pointersymbol.hxx
index 4d9a89d..8a7517f 100644
--- a/slideshow/source/engine/pointersymbol.hxx
+++ b/slideshow/source/engine/pointersymbol.hxx
@@ -22,7 +22,6 @@
#include "unoview.hxx"
#include
-#include
#include
#include
diff --git a/slideshow/source/engine/rehearsetimingsactivity.cxx
b/slideshow/source/engine/rehearsetimingsactivity.cxx
index a0c271d..966bfc3 100644
--- a/slideshow/source/engine/rehearsetimingsactivity.cxx
+++ b/slideshow/source/engine/rehearsetimingsactivity.cxx
@@ -46,7 +46,6 @@
#include "rehearsetimingsactivity.hxx"
#include
-#include
#include
using namespace com::sun::star;
@@ -355,13 +354,10 @@ void RehearseTimingsActivity::viewAdded( const
UnoViewSharedPtr& rView )
void RehearseTimingsActivity::viewRemoved( const UnoViewSharedPtr& rView )
{
maViews.erase(
-std::remove_if(
-maViews.begin(), maViews.end(),
-boost::bind(
-std::equal_to(),
-rView,
-// select view:
-boost::bind( o3tl::select1st(), _1 ))),
+std::remove_if( maViews.begin(), maViews.end(),
+[&rView]
+( const ::std::pair< UnoViewSharedPtr,
cppcanvas::CustomSpriteSharedPtr >& cp )
+{ return rView == cp.first; } ),
maViews.end() )
[Libreoffice-commits] online.git: loolwsd/LOOLWSD.cpp
loolwsd/LOOLWSD.cpp |3 +++
1 file changed, 3 insertions(+)
New commits:
commit 7aeca2f92b23cf3c247eaec260a7885c3912ab17
Author: Henry Castro
Date: Sat Aug 8 08:20:16 2015 -0400
loolwsd: destroy LOKit when child finished
diff --git a/loolwsd/LOOLWSD.cpp b/loolwsd/LOOLWSD.cpp
index 6988e11..798428c 100644
--- a/loolwsd/LOOLWSD.cpp
+++ b/loolwsd/LOOLWSD.cpp
@@ -825,6 +825,9 @@ void LOOLWSD::componentMain()
queue.clear();
queue.put("eof");
queueHandlerThread.join();
+
+// Destroy LibreOfficeKit
+loKit->pClass->destroy(loKit);
}
catch (Exception& exc)
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: loolwsd/loolstat
loolwsd/loolstat | 16
1 file changed, 12 insertions(+), 4 deletions(-)
New commits:
commit 41355096dc4b36aecfe9ef63fe96007f66c6682a
Author: Henry Castro
Date: Sat Aug 8 08:09:22 2015 -0400
loolwsd: update loolstat, socket client and ...
prisioner
diff --git a/loolwsd/loolstat b/loolwsd/loolstat
index 09e937b..57d2ba0 100755
--- a/loolwsd/loolstat
+++ b/loolwsd/loolstat
@@ -50,7 +50,7 @@ if ! $PS --version >/dev/null 2>&1; then
fi
# checking ... display Linux processes utility.
-if ! $TOP --v >/dev/null 2>&1; then
+if ! $TOP -v >/dev/null 2>&1; then
log_failure_msg "$0: error: $TOP utility not found."
fi
@@ -73,13 +73,19 @@ fi
$PSTREE -a -c -h -A -p $LOOLWSD_PID;
# get the number of running processes.
-PROCESS=$($PSTREE -a -h -A -p $LOOLWSD_PID | $SED -e "s/\`//g" | $TR -d ' |-'
| $GREP -o '^loolwsd,' | $WC -l);
+PROCESS=$($PSTREE -a -h -A -p $LOOLWSD_PID | $SED -e "s/\`//g" | $TR -d ' |-'
| $GREP -E '^loolwsd|^loolbroker|^libreofficekit' | $WC -l);
# get the number of running threads.
-THREADS=$($PSTREE -a -h -A -p $LOOLWSD_PID | $SED -e "s/\`//g" | $TR -d ' |-'
| $GREP -o '{loolwsd}' | $WC -l);
+THREADS=$($PSTREE -a -h -A -p $LOOLWSD_PID | $GREP -o '{.*}' | $WC -l);
+
+# get the number of running client socket.
+LOOLWSD_CLIENT=$($PSTREE -a -h -A -p $LOOLWSD_PID | $GREP -o '{client_socket}'
| $WC -l);
+
+# get the number of running prision socket.
+LOOLWSD_PRISIONER=$($PSTREE -a -h -A -p $LOOLWSD_PID | $GREP -o
'{prision_socket}' | $WC -l);
# get the number of processes swapped out.
-SWAPPEDOUT=$($PSTREE -a -h -A -p $LOOLWSD_PID | $SED -e "s/\`//g" | $TR -d '
|-' | $GREP -o '(loolwsd,' | $WC -l);
+SWAPPEDOUT=$($PSTREE -a -h -A -p $LOOLWSD_PID | $GREP -o '(.*)' | $WC -l);
# display report stats
printf "\n %-10s\n" "LOOLWSD STATS";
@@ -87,5 +93,7 @@ printf "==\n";
printf " %-10s %d\n" "Running process:" "$PROCESS";
printf " %-10s %d\n" "Running threads:" "$THREADS";
printf " %-10s %d\n" "Process swapped out:" "$SWAPPEDOUT";
+printf " %-10s %d\n" "Socket Client threads:" "$LOOLWSD_CLIENT";
+printf " %-10s %d\n" "Socket Prision threads:" "$LOOLWSD_PRISIONER";
$TOP -bn 1 | $GREP -E 'loolwsd|COMMAND'
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Build Error -1073740940
Regina Henschel wrote: > I think, the log is normal. But I have attached it. It is not long. The > problem appears after a short time. > Hi Regina, odd indeed. Can you build with make PARALLELISM=1, so it's obvious which is the failing command? Or better even, come to irc for some interactive debugging? Cheers, -- Thorsten signature.asc Description: Digital signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] online.git: loolwsd/LOOLWSD.cpp
loolwsd/LOOLWSD.cpp | 27 +++
1 file changed, 27 insertions(+)
New commits:
commit 54b1e1b6120af3c24316c5ac28424456a46bdceb
Author: Henry Castro
Date: Sat Aug 8 07:55:54 2015 -0400
loolwsd: set thread name to debug socket
diff --git a/loolwsd/LOOLWSD.cpp b/loolwsd/LOOLWSD.cpp
index 3d4869e..6988e11 100644
--- a/loolwsd/LOOLWSD.cpp
+++ b/loolwsd/LOOLWSD.cpp
@@ -48,6 +48,7 @@ DEALINGS IN THE SOFTWARE.
#include
#include
#include
+#include
#endif
#include
@@ -154,6 +155,11 @@ public:
void run() override
{
+#ifdef __linux
+if (prctl(PR_SET_NAME, reinterpret_cast("queue_handler"), 0, 0, 0) != 0)
+std::cout << Util::logPrefix() << "Cannot set thread name :" <<
strerror(errno) << std::endl;
+#endif
+
while (true)
{
std::string input = _queue.get();
@@ -179,6 +185,17 @@ public:
void handleRequest(HTTPServerRequest& request, HTTPServerResponse&
response) override
{
+#ifdef __linux
+std::string thread_name;
+if (request.serverAddress().port() == LOOLWSD::MASTER_PORT_NUMBER)
+thread_name = "prision_socket";
+else
+thread_name = "client_socket";
+
+if (prctl(PR_SET_NAME, reinterpret_cast(thread_name.c_str()), 0, 0, 0) != 0)
+std::cout << Util::logPrefix() << "Cannot set thread name :" <<
strerror(errno) << std::endl;
+#endif
+
if(!(request.find("Upgrade") != request.end() &&
Poco::icompare(request["Upgrade"], "websocket") == 0))
{
response.setStatusAndReason(HTTPResponse::HTTP_BAD_REQUEST);
@@ -728,6 +745,11 @@ namespace
// Writer, Impress or Calc
void LOOLWSD::componentMain()
{
+#ifdef __linux
+if (prctl(PR_SET_NAME, reinterpret_cast("libreofficekit"),
0, 0, 0) != 0)
+std::cout << Util::logPrefix() << "Cannot set thread name :" <<
strerror(errno) << std::endl;
+#endif
+
try
{
_namedMutexLOOL.lock();
@@ -847,6 +869,11 @@ void LOOLWSD::startupComponent(int nComponents)
void LOOLWSD::desktopMain()
{
+#ifdef __linux
+if (prctl(PR_SET_NAME, reinterpret_cast("loolbroker"), 0,
0, 0) != 0)
+std::cout << Util::logPrefix() << "Cannot set thread name :" <<
strerror(errno) << std::endl;
+#endif
+
// Initialization
std::unique_lock rngLock(_rngMutex);
_childId = (((Poco::UInt64)_rng.next()) << 32) | _rng.next() | 1;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: vcl/unx
vcl/unx/gtk3/app/gtk3gtkinst.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 0257b5c9edba1fda1c8ada32fc9e2378c3847726
Author: Caolán McNamara
Date: Sat Aug 8 12:39:20 2015 +0100
gtk3: name CLIPBOARD and PRIMARY with different names
Change-Id: I4b8f36931f7ee19fe774a735a6d36ecd91de47ef
diff --git a/vcl/unx/gtk3/app/gtk3gtkinst.cxx b/vcl/unx/gtk3/app/gtk3gtkinst.cxx
index 76b44da..d8c278f 100644
--- a/vcl/unx/gtk3/app/gtk3gtkinst.cxx
+++ b/vcl/unx/gtk3/app/gtk3gtkinst.cxx
@@ -592,7 +592,7 @@ void VclGtkClipboard::setContents(
OUString VclGtkClipboard::getName() throw( RuntimeException, std::exception )
{
-return OUString( "CLIPBOARD" );
+return (m_nSelection == GDK_SELECTION_CLIPBOARD) ? OUString("CLIPBOARD") :
OUString("PRIMARY");
}
sal_Int8 VclGtkClipboard::getRenderingCapabilities() throw( RuntimeException,
std::exception )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/gsoc15-open-remote-files-dialog' - 478 commits - accessibility/inc accessibility/source animations/source avmedia/source basctl/source basic/source bin/
Rebased ref, commits from common ancestor:
commit 797e619962889d3e8bec1673a6a5c50bc2d3ceb4
Author: Szymon KÅos
Date: Fri Aug 7 18:32:32 2015 +0200
added New Folder button
Change-Id: I4b1ef03e707fdfb3d1968dca9f48c548f872612c
diff --git a/fpicker/source/office/RemoteFilesDialog.cxx
b/fpicker/source/office/RemoteFilesDialog.cxx
index 80abcac..20ce343 100644
--- a/fpicker/source/office/RemoteFilesDialog.cxx
+++ b/fpicker/source/office/RemoteFilesDialog.cxx
@@ -183,6 +183,7 @@ RemoteFilesDialog::RemoteFilesDialog( vcl::Window* pParent,
WinBits nBits )
get( m_pServices_lb, "services_lb" );
get( m_pFilter_lb, "filter_lb" );
get( m_pName_ed, "name_ed" );
+get( m_pNewFolder, "new_folder" );
m_eMode = ( nBits & WB_SAVEAS ) ? REMOTEDLG_MODE_SAVE :
REMOTEDLG_MODE_OPEN;
m_eType = ( nBits & WB_PATH ) ? REMOTEDLG_TYPE_PATHDLG :
REMOTEDLG_TYPE_FILEDLG;
@@ -196,10 +197,20 @@ RemoteFilesDialog::RemoteFilesDialog( vcl::Window*
pParent, WinBits nBits )
m_pName_ed->Enable( false );
if( m_eMode == REMOTEDLG_MODE_OPEN )
+{
get( m_pOk_btn, "open" );
+
+m_pNewFolder->Hide();
+}
else
+{
get( m_pOk_btn, "save" );
+m_aImages = ImageList( fpicker::SvtResId( RID_FILEPICKER_IMAGES ) );
+m_pNewFolder->SetModeImage( m_aImages.GetImage(
IMG_FILEDLG_CREATEFOLDER ) );
+m_pNewFolder->SetClickHdl( LINK( this, RemoteFilesDialog, NewFolderHdl
) );
+}
+
m_pOk_btn->Show();
m_pOk_btn->Enable( false );
@@ -324,6 +335,7 @@ void RemoteFilesDialog::dispose()
m_pServices_lb.clear();
m_pFilter_lb.clear();
m_pName_ed.clear();
+m_pNewFolder.clear();
ModalDialog::dispose();
}
@@ -872,6 +884,34 @@ IMPL_LINK ( RemoteFilesDialog, SelectBreadcrumbHdl,
Breadcrumb*, pPtr )
return 1;
}
+IMPL_LINK_NOARG ( RemoteFilesDialog, NewFolderHdl )
+{
+m_pFileView->EndInplaceEditing( false );
+
+SmartContent aContent( m_pFileView->GetViewURL() );
+OUString aTitle;
+aContent.getTitle( aTitle );
+ScopedVclPtrInstance< QueryFolderNameDialog > aDlg( this, aTitle,
fpicker::SVT_RESSTR( STR_SVT_NEW_FOLDER ) );
+bool bHandled = false;
+
+while( !bHandled )
+{
+if( aDlg->Execute() == RET_OK )
+{
+OUString aUrl = aContent.createFolder( aDlg->GetName() );
+if( !aUrl.isEmpty() )
+{
+m_pFileView->CreatedFolder( aUrl, aDlg->GetName() );
+bHandled = true;
+}
+}
+else
+bHandled = true;
+}
+
+return 1;
+}
+
IMPL_LINK_NOARG ( RemoteFilesDialog, OkHdl )
{
// auto extension
diff --git a/fpicker/source/office/RemoteFilesDialog.hxx
b/fpicker/source/office/RemoteFilesDialog.hxx
index 0d61f41..a63bef3 100644
--- a/fpicker/source/office/RemoteFilesDialog.hxx
+++ b/fpicker/source/office/RemoteFilesDialog.hxx
@@ -37,6 +37,9 @@
#include "fpdialogbase.hxx"
#include "fpsofficeResMgr.hxx"
+#include "OfficeFilePicker.hrc"
+#include "QueryFolderName.hxx"
+#include "iodlg.hrc"
using namespace ::com::sun::star::beans;
using namespace ::com::sun::star::uno;
@@ -141,6 +144,7 @@ private:
VclPtr< MenuButton > m_pAddService_btn;
VclPtr< ListBox > m_pServices_lb;
VclPtr< Breadcrumb > m_pPath;
+VclPtr m_pNewFolder;
VclPtr< Splitter > m_pSplitter;
VclPtr< FolderTree > m_pTreeView;
VclPtr< SvtFileView > m_pFileView;
@@ -149,6 +153,8 @@ private:
VclPtr< Edit > m_pName_ed;
PopupMenu* m_pAddMenu;
+ImageList m_aImages;
+
std::vector< ServicePtr > m_aServices;
std::vector< std::pair< OUString, OUString > > m_aFilters;
@@ -184,6 +190,8 @@ private:
DECL_LINK( SelectBreadcrumbHdl, Breadcrumb * );
+DECL_LINK( NewFolderHdl, void * );
+
DECL_LINK( OkHdl, void * );
DECL_LINK( CancelHdl, void * );
};
diff --git a/fpicker/uiconfig/ui/remotefilesdialog.ui
b/fpicker/uiconfig/ui/remotefilesdialog.ui
index 8bf57a3..7c0c923 100644
--- a/fpicker/uiconfig/ui/remotefilesdialog.ui
+++ b/fpicker/uiconfig/ui/remotefilesdialog.ui
@@ -138,12 +138,44 @@
-
+
True
False
-True
+6
-
+
+True
+False
+center
+True
+
+
+
+
+
+False
+True
+0
+
+
+
+
+False
+25
+25
+True
+True
+True
+True
+Create New
Folder
+Create New
Folder
+6
+
+
+False
+True
+1
+
[Libreoffice-commits] core.git: configure.ac
configure.ac |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 29690bee381a9075ffa90a826a2b5a5a94a6673a Author: Thomas Klausner Date: Sat Aug 8 10:33:41 2015 +0200 When looking for tar, accept 'bsdtar'. libarchive installs it under that name at least on FreeBSD, NetBSD, and OpenBSD. Change-Id: I7c4ce8f2dcf59f6d2b23266f450a88f3f2217e4e diff --git a/configure.ac b/configure.ac index 0d45455..7b0f031 100644 --- a/configure.ac +++ b/configure.ac @@ -2465,7 +2465,7 @@ fi AC_SUBST(BASH) AC_MSG_CHECKING([for GNU or BSD tar]) -for a in $GNUTAR gtar gnutar tar /usr/sfw/bin/gtar; do +for a in $GNUTAR gtar gnutar bsdtar tar /usr/sfw/bin/gtar; do $a --version 2> /dev/null | egrep "GNU|bsdtar" 2>&1 > /dev/null if test $? -eq 0; then GNUTAR=$a ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/source
sw/source/filter/ww8/wrtww8.hxx |5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) New commits: commit e4eefdcc0c929cee0b0df95a7eb0d271430496a5 Author: Caolán McNamara Date: Sat Aug 8 09:25:15 2015 +0100 do 'TODO wiz 20150807' Change-Id: I60adb6db2df64f692508ba86c6e87e8e7d0adf4c diff --git a/sw/source/filter/ww8/wrtww8.hxx b/sw/source/filter/ww8/wrtww8.hxx index 917b5f8..365513a 100644 --- a/sw/source/filter/ww8/wrtww8.hxx +++ b/sw/source/filter/ww8/wrtww8.hxx @@ -437,9 +437,8 @@ struct MSWordSaveData bool bOldFlyFrmAttrs : 1; bool bOldStartTOX : 1; bool bOldInWriteTOX : 1; -// bOutPageDesc does not have to be saved, since it is only not modified -// when outputting special texts. -/// TODO wiz 20150807: "not modified" -> "modified"? (translated literally) +// m_bOutPageDescs does not have to be saved in MSWordExportBase::SaveData +// since it is only modified when outputting special texts. }; /// Base class for WW8Export and DocxExport ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/source
sw/source/filter/ww8/ww8scan.cxx |8
1 file changed, 4 insertions(+), 4 deletions(-)
New commits:
commit 2981bcf7e34d9f4c9d1e821045f3f22ddb318339
Author: Thomas Klausner
Date: Sat Aug 8 09:43:02 2015 +0200
Translate two assertions to English, adapt two others for consistency.
diff --git a/sw/source/filter/ww8/ww8scan.cxx b/sw/source/filter/ww8/ww8scan.cxx
index 6c1c600..04e07a1 100644
--- a/sw/source/filter/ww8/ww8scan.cxx
+++ b/sw/source/filter/ww8/ww8scan.cxx
@@ -1716,7 +1716,7 @@ WW8ScannerBase::WW8ScannerBase( SvStream* pSt, SvStream*
pTableSt,
break;
default:
-OSL_ENSURE( false, "Es wurde vergessen, nVersion zu kodieren!" );
+OSL_ENSURE( false, "nVersion not implemented!" );
break;
}
@@ -2842,7 +2842,7 @@ bool WW8PLCFx_Fc_FKP::NewFkp()
break;
default:
// program error!
-OSL_ENSURE( false, "Someone forgot to encode nVersion!" );
+OSL_ENSURE( false, "nVersion not implemented!" );
return false;
}
@@ -5341,7 +5341,7 @@ WW8Fib::WW8Fib(SvStream& rSt, sal_uInt8 nWantedVersion,
sal_uInt32 nOffset)
nFibMin = 0;// programm error!
nFibMax = 0;
nFib= 1;
-OSL_ENSURE( false, "It was forgotten to encode nVersion!" );
+OSL_ENSURE( false, "nVersion not implemented!" );
break;
}
if ( (nFib < nFibMin) || (nFib > nFibMax) )
@@ -6402,7 +6402,7 @@ WW8Fonts::WW8Fonts( SvStream& rSt, WW8Fib& rFib )
// always in ANSI, even if eStructCharSet == CHARSET_MAC !!
if( rFib.lcbSttbfffn <= 2 )
{
-OSL_ENSURE( false, "Fonttabelle kaputt! (rFib.lcbSttbfffn < 2)" );
+OSL_ENSURE( false, "font table is broken! (rFib.lcbSttbfffn < 2)" );
return;
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
