date:20160421

[Libreoffice-commits] core.git: sw/qa writerfilter/source

2016-04-21 Thread Miklos Vajna

 sw/qa/extras/rtfexport/data/pgnlcrm.rtf|   23 +++
 sw/qa/extras/rtfexport/rtfexport.cxx   |6 ++
 writerfilter/source/dmapper/DomainMapper.cxx   |4 
 writerfilter/source/rtftok/rtfdocumentimpl.cxx |7 ++-
 4 files changed, 39 insertions(+), 1 deletion(-)

New commits:
commit 91b18cee97b110fe60391faa945a6fd166f1d8aa
Author: Miklos Vajna 
Date:   Thu Apr 21 08:36:20 2016 +0200

Related: tdf#65642 RTF filter: import \pgnlcrm

This as a side effect also implements support for DOCX .

Change-Id: Ifb524b25236a8bc774690266a4fa205154204109
Reviewed-on: https://gerrit.libreoffice.org/24273
Reviewed-by: Miklos Vajna 
Tested-by: Jenkins 

diff --git a/sw/qa/extras/rtfexport/data/pgnlcrm.rtf 
b/sw/qa/extras/rtfexport/data/pgnlcrm.rtf
new file mode 100644
index 000..4ef9b61
--- /dev/null
+++ b/sw/qa/extras/rtfexport/data/pgnlcrm.rtf
@@ -0,0 +1,23 @@
+{\rtf1
+\pard\plain \ltrpar\ql 
\li0\ri0\sa200\sl276\slmult1\widctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0
 \rtlch\fcs1 \af31507\afs22\alang1025 \ltrch\fcs0
+{\field\fldedit
+{\*\fldinst
+{ PAGE   \\* MERGEFORMAT }
+}
+{\fldrslt
+{1}
+}
+}
+\sect
+\sectd\pgnrestart\pgnlcrm
+{\field\fldedit
+{\*\fldinst
+{\rtlch\fcs1 \af31507 \ltrch\fcs0 \insrsid525329  PAGE   \\* MERGEFORMAT }
+}
+{\fldrslt
+{\rtlch\fcs1 \af31507 \ltrch\fcs0 \lang1024\langfe1024\noproof\insrsid9597790 
i}
+}
+}
+{\rtlch\fcs1 \af31507 \ltrch\fcs0 \insrsid13321744
+\par }
+}
diff --git a/sw/qa/extras/rtfexport/rtfexport.cxx 
b/sw/qa/extras/rtfexport/rtfexport.cxx
index c08735b..58a35c1 100644
--- a/sw/qa/extras/rtfexport/rtfexport.cxx
+++ b/sw/qa/extras/rtfexport/rtfexport.cxx
@@ -1019,6 +1019,12 @@ DECLARE_RTFEXPORT_TEST(testPgnucrm, "pgnucrm.rtf")
 CPPUNIT_ASSERT_EQUAL(style::NumberingType::ROMAN_UPPER, 
getProperty(getStyles("PageStyles")->getByName("Converted1"), 
"NumberingType"));
 }
 
+DECLARE_RTFEXPORT_TEST(testPgnlcrm, "pgnlcrm.rtf")
+{
+// The second page's numbering type: this was style::NumberingType::ARABIC.
+CPPUNIT_ASSERT_EQUAL(style::NumberingType::ROMAN_LOWER, 
getProperty(getStyles("PageStyles")->getByName("Converted1"), 
"NumberingType"));
+}
+
 DECLARE_RTFEXPORT_TEST(testTdf98806, "tdf98806.rtf")
 {
 uno::Reference xBookmarksSupplier(mxComponent, 
uno::UNO_QUERY);
diff --git a/writerfilter/source/dmapper/DomainMapper.cxx 
b/writerfilter/source/dmapper/DomainMapper.cxx
index 784b5c8..3633dbb 100644
--- a/writerfilter/source/dmapper/DomainMapper.cxx
+++ b/writerfilter/source/dmapper/DomainMapper.cxx
@@ -1001,6 +1001,10 @@ void DomainMapper::lcl_attribute(Id nName, Value & val)
 // I, II, ...
 
pSectionContext->SetPageNumberType(style::NumberingType::ROMAN_UPPER);
 break;
+case NS_ooxml::LN_Value_ST_NumberFormat_lowerRoman:
+// i, ii, ...
+
pSectionContext->SetPageNumberType(style::NumberingType::ROMAN_LOWER);
+break;
 }
 }
 break;
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx 
b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index 7ce53d9..0d726f4 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
@@ -3278,7 +3278,6 @@ RTFError RTFDocumentImpl::dispatchFlag(RTFKeyword 
nKeyword)
 }
 break;
 case RTF_PGNDEC:
-case RTF_PGNLCRM:
 case RTF_PGNBIDIA:
 case RTF_PGNBIDIB:
 // These should be mapped to NS_ooxml::LN_EG_SectPrContents_pgNumType, 
but dmapper has no API for that at the moment.
@@ -3614,6 +3613,12 @@ RTFError RTFDocumentImpl::dispatchFlag(RTFKeyword 
nKeyword)
 lcl_putNestedAttribute(m_aStates.top().aSectionSprms, 
NS_ooxml::LN_EG_SectPrContents_pgNumType, NS_ooxml::LN_CT_PageNumber_fmt, 
pIntValue);
 }
 break;
+case RTF_PGNLCRM:
+{
+auto pIntValue = 
std::make_shared(NS_ooxml::LN_Value_ST_NumberFormat_lowerRoman);
+lcl_putNestedAttribute(m_aStates.top().aSectionSprms, 
NS_ooxml::LN_EG_SectPrContents_pgNumType, NS_ooxml::LN_CT_PageNumber_fmt, 
pIntValue);
+}
+break;
 default:
 {
 SAL_INFO("writerfilter", "TODO handle flag '" << 
lcl_RtfToString(nKeyword) << "'");
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 4 commits - dbaccess/source sal/qa

2016-04-21 Thread Stephan Bergmann

 dbaccess/source/ui/querydesign/QueryDesignView.cxx |   15 +--
 dbaccess/source/ui/tabledesign/TableController.cxx |   19 +++
 sal/qa/rtl/strings/test_strings_valuex.cxx |2 --
 3 files changed, 16 insertions(+), 20 deletions(-)

New commits:
commit bc492623ad094197db13cb55c7e6cce35962f860
Author: Stephan Bergmann 
Date:   Thu Apr 21 09:48:00 2016 +0200

Remove redundant checks

(that started to cause loplugin:salbool after
13758a3d154e8e450fdfe8bcdeb6b3a03996c53a 
"SourceManager::isMacroArgExpansion has
only one param in older Clang")

Change-Id: Ibbdf4552d81385cf952e2d47d1fe23daf78824b5

diff --git a/sal/qa/rtl/strings/test_strings_valuex.cxx 
b/sal/qa/rtl/strings/test_strings_valuex.cxx
index 83948ce..95ebb8f 100644
--- a/sal/qa/rtl/strings/test_strings_valuex.cxx
+++ b/sal/qa/rtl/strings/test_strings_valuex.cxx
@@ -43,9 +43,7 @@ namespace {
 template< typename T >
 void testBoolean() {
 CPPUNIT_ASSERT_EQUAL( T( "false" ), T::boolean( false ) );
-CPPUNIT_ASSERT_EQUAL( T( "false" ), T::boolean( sal_False ) );
 CPPUNIT_ASSERT_EQUAL( T( "true" ), T::boolean( true ) );
-CPPUNIT_ASSERT_EQUAL( T( "true" ), T::boolean( sal_True ) );
 }
 
 }
commit 2ee765872f07f1cb0e2c99f22b48808476089cf5
Author: Stephan Bergmann 
Date:   Thu Apr 21 09:42:57 2016 +0200

aColumns is only used as a set

(cf. 40d6b81b9ee0a878d0dadb40941c50aa394a7501 "Replace map to sal_Bool with 
map
to bool")

Change-Id: I04bdd6c33793e277182fa80d187f212ab23c252e

diff --git a/dbaccess/source/ui/tabledesign/TableController.cxx 
b/dbaccess/source/ui/tabledesign/TableController.cxx
index 1f0f3d1..a56e787 100644
--- a/dbaccess/source/ui/tabledesign/TableController.cxx
+++ b/dbaccess/source/ui/tabledesign/TableController.cxx
@@ -989,7 +989,10 @@ void OTableController::alterColumns()
 // contains all columns names which are already handled those which are 
not in the list will be deleted
 Reference< XDatabaseMetaData> xMetaData = getMetaData( );
 
-::std::map< OUString,bool,::comphelper::UStringMixLess> 
aColumns(!xMetaData.is() || xMetaData->supportsMixedCaseQuotedIdentifiers());
+std::set aColumns(
+comphelper::UStringMixLess(
+!xMetaData.is()
+|| xMetaData->supportsMixedCaseQuotedIdentifiers()));
 ::std::vector< std::shared_ptr >::const_iterator aIter = 
m_vRowList.begin();
 ::std::vector< std::shared_ptr >::const_iterator aEnd = 
m_vRowList.end();
 // first look for columns where something other than the name changed
@@ -1002,14 +1005,14 @@ void OTableController::alterColumns()
 continue;
 if ( (*aIter)->IsReadOnly() )
 {
-aColumns[pField->GetName()] = true;
+aColumns.insert(pField->GetName());
 continue;
 }
 
 Reference xColumn;
 if ( xColumns->hasByName(pField->GetName()) )
 {
-aColumns[pField->GetName()] = true;
+aColumns.insert(pField->GetName());
 xColumns->getByName(pField->GetName()) >>= xColumn;
 OSL_ENSURE(xColumn.is(),"Column is null!");
 
@@ -1102,7 +1105,7 @@ void OTableController::alterColumns()
 xAlter->alterColumnByIndex(nPos,xNewColumn);
 if(xColumns->hasByName(pField->GetName()))
 {   // ask for the append by name
-aColumns[pField->GetName()] = true;
+aColumns.insert(pField->GetName());
 xColumns->getByName(pField->GetName()) >>= xColumn;
 if(xColumn.is())
 pField->copyColumnSettingsTo(xColumn);
@@ -1125,8 +1128,8 @@ void OTableController::alterColumns()
 Reference 
xNewColumn(xIdxColumns->getByIndex(nPos),UNO_QUERY_THROW);
 OUString sName;
 xNewColumn->getPropertyValue(PROPERTY_NAME) >>= sName;
-aColumns[sName] = true;
-aColumns[pField->GetName()] = true;
+aColumns.insert(sName);
+aColumns.insert(pField->GetName());
 continue;
 }
 }
@@ -1149,7 +1152,7 @@ void OTableController::alterColumns()
 continue;
 if ( (*aIter)->IsReadOnly() )
 {
-aColumns[pField->GetName()] = true;
+aColumns.insert(pField->GetName());
 continue;
 }
 
@@ -1238,7 +1241,7 @@ void OTableController::alterColumns()
 xAppend->appendByDescriptor(xColumn);
 if(xColumns->hasByName(pField->GetName()))
 {   // ask for the append by name
-aColumns[pField->GetName()] = true;
+aColumns.insert(pField->GetName());
 xColumns->getByName(pField->GetName()) >>= xColumn;
 if(xColumn.is())

[Libreoffice-commits] core.git: compilerplugins/clang

2016-04-21 Thread Noel Grandin

 compilerplugins/clang/store/stylepolice.cxx |   80 
 compilerplugins/clang/stylepolice.cxx   |   80 
 2 files changed, 80 insertions(+), 80 deletions(-)

New commits:
commit 7b65087eabf9bd233a899723f662665ee5867378
Author: Noel Grandin 
Date:   Thu Apr 21 10:04:58 2016 +0200

move stylepolice plugin into store/

seems std::regex is not too well supported yet, at least in
libstdc++-4.8

Change-Id: Ib9feb33d2f197d40fc67dc93468aa2f7dae05bac

diff --git a/compilerplugins/clang/stylepolice.cxx 
b/compilerplugins/clang/store/stylepolice.cxx
similarity index 100%
rename from compilerplugins/clang/stylepolice.cxx
rename to compilerplugins/clang/store/stylepolice.cxx
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: accessibility/source avmedia/source UnoControls/source

2016-04-21 Thread Noel Grandin

 UnoControls/source/controls/progressmonitor.cxx   |   18 +++---
 accessibility/source/extended/accessibletabbar.cxx|4 +-
 accessibility/source/extended/accessibletabbarpagelist.cxx|7 +--
 accessibility/source/standard/accessiblemenubasecomponent.cxx |   14 +++
 accessibility/source/standard/vclxaccessiblestatusbar.cxx |8 ++--
 accessibility/source/standard/vclxaccessibletabcontrol.cxx|   11 ++
 avmedia/source/opengl/oglplayer.cxx   |3 -
 7 files changed, 27 insertions(+), 38 deletions(-)

New commits:
commit b19ac3c4c6b4a41a1f3acac68b299fd676428a87
Author: Noel Grandin 
Date:   Thu Apr 21 10:11:40 2016 +0200

clang-tidy modernize-loop-convert in a*

Change-Id: If8eada464c6dc7350e50fc90eb27aa47bd90e198

diff --git a/UnoControls/source/controls/progressmonitor.cxx 
b/UnoControls/source/controls/progressmonitor.cxx
index 86bf0d8..62446f5 100644
--- a/UnoControls/source/controls/progressmonitor.cxx
+++ b/UnoControls/source/controls/progressmonitor.cxx
@@ -741,9 +741,8 @@ void ProgressMonitor::impl_rebuildFixedText ()
 
 // Collect all topics from list and format text.
 // "\n" MUST BE at the end of line!!! => Else ... topic and his text 
are not in the same line!!!
-for ( size_t n = 0; n < maTextlist_Top.size(); ++n )
+for (IMPL_TextlistItem* pSearchItem : maTextlist_Top)
 {
-IMPL_TextlistItem* pSearchItem = maTextlist_Top[ n ];
 aCollectString  +=  pSearchItem->sTopic;
 aCollectString  +=  "\n";
 }
@@ -758,9 +757,8 @@ void ProgressMonitor::impl_rebuildFixedText ()
 
 // Collect all topics from list and format text.
 // "\n" MUST BE at the end of line!!! => Else ... topic and his text 
are not in the same line!!!
-for ( size_t n = 0; n < maTextlist_Top.size(); ++n )
+for (IMPL_TextlistItem* pSearchItem : maTextlist_Top)
 {
-IMPL_TextlistItem* pSearchItem = maTextlist_Top[ n ];
 aCollectString  +=  pSearchItem->sText;
 aCollectString  +=  "\n";
 }
@@ -777,9 +775,8 @@ void ProgressMonitor::impl_rebuildFixedText ()
 
 // Collect all topics from list and format text.
 // "\n" MUST BE at the end of line!!! => Else ... topic and his text 
are not in the same line!!!
-for ( size_t n = 0; n < maTextlist_Bottom.size(); ++n )
+for (IMPL_TextlistItem* pSearchItem : maTextlist_Bottom)
 {
-IMPL_TextlistItem* pSearchItem = maTextlist_Bottom[ n ];
 aCollectString  +=  pSearchItem->sTopic;
 aCollectString  +=  "\n";
 }
@@ -794,9 +791,8 @@ void ProgressMonitor::impl_rebuildFixedText ()
 
 // Collect all topics from list and format text.
 // "\n" MUST BE at the end of line!!! => Else ... topic and his text 
are not in the same line!!!
-for ( size_t n = 0; n < maTextlist_Bottom.size(); ++n )
+for (IMPL_TextlistItem* pSearchItem : maTextlist_Bottom)
 {
-IMPL_TextlistItem* pSearchItem = maTextlist_Bottom[ n ];
 aCollectString  +=  pSearchItem->sText;
 aCollectString  +=  "\n";
 }
@@ -813,16 +809,14 @@ void ProgressMonitor::impl_cleanMemory ()
 
 // Delete all of lists.
 
-for ( size_t nPosition = 0; nPosition < maTextlist_Top.size(); ++nPosition 
)
+for (IMPL_TextlistItem* pSearchItem : maTextlist_Top)
 {
-IMPL_TextlistItem* pSearchItem = maTextlist_Top[ nPosition ];
 delete pSearchItem;
 }
 maTextlist_Top.clear();
 
-for ( size_t nPosition = 0; nPosition < maTextlist_Bottom.size(); 
++nPosition )
+for (IMPL_TextlistItem* pSearchItem : maTextlist_Bottom)
 {
-IMPL_TextlistItem* pSearchItem = maTextlist_Bottom[ nPosition ];
 delete pSearchItem;
 }
 maTextlist_Bottom.clear();
diff --git a/accessibility/source/extended/accessibletabbar.cxx 
b/accessibility/source/extended/accessibletabbar.cxx
index f35f73f..9b5cd91 100644
--- a/accessibility/source/extended/accessibletabbar.cxx
+++ b/accessibility/source/extended/accessibletabbar.cxx
@@ -175,9 +175,9 @@ namespace accessibility
 AccessibleTabBarBase::disposing();
 
 // dispose all children
-for ( size_t i = 0; i < m_aAccessibleChildren.size(); ++i )
+for (Reference& i : m_aAccessibleChildren)
 {
-Reference< XComponent > xComponent( m_aAccessibleChildren[i], 
UNO_QUERY );
+Reference< XComponent > xComponent( i, UNO_QUERY );
 if ( xComponent.is() )
 xComponent->dispose();
 }
diff --git a/accessibility/source/extended/accessibletabbarpagelist.cxx 
b/accessibility/source/extended/accessibletabbarpagelist.cxx
index d0b89b9..0ef3362 100644
--- a/accessibility/source/extended/accessibletabbarpagelist.cxx
+++ b/accessibility/source/extended/accessibletabbarpagelist.cxx
@@ -60,9 +60,8 @@ names

[Libreoffice-commits] online.git: loolwsd/loolwsd.spec.in

2016-04-21 Thread Andras Timar

 loolwsd/loolwsd.spec.in |   93 +---
 1 file changed, 65 insertions(+), 28 deletions(-)

New commits:
commit 745edddbe8d7336f0e2e65a6feb669fd36bbaed8
Author: Andras Timar 
Date:   Thu Apr 21 10:14:17 2016 +0200

spec file extended for Fedora/CentOS

diff --git a/loolwsd/loolwsd.spec.in b/loolwsd/loolwsd.spec.in
index 2ffafba..abbd07b 100644
--- a/loolwsd/loolwsd.spec.in
+++ b/loolwsd/loolwsd.spec.in
@@ -1,19 +1,10 @@
-#
 # spec file for package loolwsd
 #
 # Copyright (c) 2015 Collabora
 #
-# All modifications and additions to the file contributed by third parties
-# remain the property of their copyright owners, unless otherwise agreed
-# upon. The license for this file, and modifications and additions to the
-# file, is the same license as for the pristine package itself (unless the
-# license for the pristine package is not an Open Source License, in which
-# case the license is the MIT License). An "Open Source License" is a
-# license that conforms to the Open Source Definition (Version 1.9)
-# published by the Open Source Initiative.
-
-
-# See also http://en.opensuse.org/openSUSE:Specfile_guidelines
+# This file 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/.
 
 Name:   loolwsd
 Version:@PACKAGE_VERSION@
@@ -23,17 +14,31 @@ Summary:LibreOffice On-Line WebSocket Daemon
 License:MPL
 Source0:loolwsd-@package_vers...@.tar.gz
 Source1:loleaflet-@package_vers...@.tar.gz
-BuildRequires:  libcap-progs libcap-devel libpng-devel poco-devel >= 1.7.1 
systemd-rpm-macros
-# This works for now only with a CP build of 5.0, I think. The TDF
-# (and thus also CP) packages include the version number in their
-# names. How clever is that? So we need to specify one.
-Requires:   libcap libcap-progs libpng libPocoFoundation42 >= 1.7.1 
libPocoNet42 >= 1.7.1 collaboraoffice5.0 collaboraoffice5.0-en-US 
collaboraoffice5.0-ure collaboraofficebasis5.0-core 
collaboraofficebasis5.0-writer collaboraofficebasis5.0-impress 
collaboraofficebasis5.0-graphicfilter collaboraofficebasis5.0-en-US 
collaboraofficebasis5.0-calc collaboraofficebasis5.0-en-US-res 
collaboraofficebasis5.0-en-US-calc collaboraofficebasis5.0-ooofonts 
collaboraofficebasis5.0-images collaboraofficebasis5.0-filter-data 
collaboraofficebasis5.0-draw collaboraofficebasis5.0-base 
collaboraofficebasis5.0-en-US-writer collaboraofficebasis5.0-en-US-math 
collaboraofficebasis5.0-en-US-base Mesa-libEGL1 Mesa-libGL1 Mesa-libglapi0 
cups-libs dbus-1-glib fontconfig libbz2-1 libcairo2 libdrm2 libexpat1 
libfreetype6 libgbm1 libgio-2_0-0 libglib-2_0-0 libgmodule-2_0-0 
libgobject-2_0-0 libgthread-2_0-0 liblzma5 libpcre1 libpixman-1-0 libpng16-16 
libuuid1 libxml2-2 %{?systemd_requires} %{fillup_prereq}
+BuildRequires:  libcap-devel libpng-devel poco-devel >= 1.7.1
+%if 0%{?fedora} || 0%{?rhel} >= 7
+BuildRequires:  libpcap
+%else
+%if 0%{?suse_version}
+BuildRequires:  libcap-progs systemd-rpm-macros
+%endif
+%endif
+
+Requires:   collaboraoffice5.0 collaboraoffice5.0-en-US 
collaboraoffice5.0-ure collaboraofficebasis5.0-core 
collaboraofficebasis5.0-writer collaboraofficebasis5.0-impress 
collaboraofficebasis5.0-graphicfilter collaboraofficebasis5.0-en-US 
collaboraofficebasis5.0-calc collaboraofficebasis5.0-en-US-res 
collaboraofficebasis5.0-en-US-calc collaboraofficebasis5.0-ooofonts 
collaboraofficebasis5.0-images collaboraofficebasis5.0-filter-data 
collaboraofficebasis5.0-draw collaboraofficebasis5.0-base 
collaboraofficebasis5.0-en-US-writer collaboraofficebasis5.0-en-US-math 
collaboraofficebasis5.0-en-US-base
+Requires:   systemd
+%if 0%{?fedora} || 0%{?rhel} >= 7
+Requires:   expat keyutils-libs krb5-libs libattr libcap libcom_err libgcc 
libpng libselinux openssl-libs pcre xz-libs zlib
+Requires:   poco-crypto >= 1.7.1 poco-foundation >= 1.7.1 poco-json >= 
1.7.1 poco-net >= 1.7.1 poco-netssl >= 1.7.1 poco-util >= 1.7.1 poco-xml >= 
1.7.1
+Requires:   atk avahi-glib avahi-libs bzip2-libs cairo cups-libs dbus-glib 
dbus-libs fontconfig freetype GConf2 gdk-pixbuf2 glib2 gnome-vfs2 graphite2 
gstreamer gstreamer-plugins-base gtk2 harfbuzz libdrm libffi libICE libSM 
libuuid libX11 libXau libxcb libXcomposite libXcursor libXdamage libXext 
libXfixes libXi libXinerama libXrandr libXrender libxshmfence libXt libXxf86vm 
mesa-libEGL mesa-libgbm mesa-libGL mesa-libglapi pango pixman
+%else
+%if 0%{?suse_version}
+Requires:   libcap2 libpng12 libpcre1 libz1 %{?systemd_requires} 
%{fillup_prereq}
+Requires:   libPocoCrypto42 >= 1.7.1 libPocoFoundation42 >= 1.7.1 
libPocoJSON42 >= 1.7.1 libPocoNet42 >= 1.7.1 libPocoNetSSL42 >= 1.7.1 
libPocoUtil42 >= 1.7.1 libPocoXML42 >= 1.7.1
+Requires:   Mesa-libEGL1 Mesa-libGL1 Mesa-libglapi0 cups-libs dbus-1-glib 
fontconfig krb5 libatk libavahi-client3 libavahi-common3 liba

Building LODE on Mac fails with "Too many open files"

2016-04-21 Thread Ralf S .

Hi there,

I'm trying to set up LODE on the latest Mac OS X with newest Xcode, following
the instructions here ("Quick Pre-canned Setup"):
https://wiki.documentfoundation.org/Development/BuildingOnMac

After running "make", the build process fails after a couple of hours with the
following error:

[build DEP] SRS:avmedia/res
[build DEP] SRS:acc/res
[...]/lode/dev/core/external//apache-commons/Module_apache-commons.mk:12: 
[...]/lode/dev/core/external/apache-
commons/ExternalPackage_apache_commons_logging.mk: Too many open files
[...]/lode/dev/core/external//apache-commons/Module_apache-commons.mk:12: ***
No target registered while reading [...]/lode/dev/core/external/apache-
commons/ExternalPackage_apache_commons_logging.mk!.  Stop.
make: *** [build] Error 2

I already increased the ulimit settings to no avail:

$ launchctl limit maxfiles
maxfiles524288 524288 

During the build process, lsof reports an enormous amount of PIPE entries,
here's what I'm getting about an hour after running "make":

$ lsof | grep make | grep PIPE | wc -l
   31933

and it keeps growing.

Any idea how this can be fixed? Thanks

Ralf

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: Broken master and newcomers.

2016-04-21 Thread jan iversen


Just had an interesting IRC chat on the infra channel. 

It seems it would be easy to have our ci system maintain a tag pr. platform.

The idea would be:
   when master compiles on platform Foo, set/move tag "buildable_on_".

Doing that would have a very minimal effect on the build job, but give (at 
least) new contributors a better security, that any build problems are local.

I highly recommend that such a tagging be implemented, and volunteer to update 
our "getInvolved" page to reflect this.

I am aware it does not guarantee that ci can build on all platforms, but it 
gives us a push in the right direction.

thoughts?

rgds
jan I.



___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-5.0' - translations

2016-04-21 Thread Christian Lohmaier

 translations |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit c8ba77475e4a6d67fd8c2b6d70ff23be2ec6d6f4
Author: Christian Lohmaier 
Date:   Wed Apr 13 13:14:46 2016 +0200

Updated core
Project: translations  1b0eee8a87c721f24deb8fb7bb12721b317fd58d

update translations for 5.0.6 rc1

and force-fix errors using pocheck

Change-Id: Id008a6a730afb16bb9dafd099698e1cc1d27eec2

diff --git a/translations b/translations
index 877afd1..1b0eee8 16
--- a/translations
+++ b/translations
@@ -1 +1 @@
-Subproject commit 877afd16029733ee0776eec4546c608a4f4c3ba5
+Subproject commit 1b0eee8a87c721f24deb8fb7bb12721b317fd58d
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] translations.git: Branch 'distro/collabora/cp-5.0' - source/am source/cy source/da source/de source/es source/eu source/fr source/hu source/is source/ja source/lt source/lv sourc

2016-04-21 Thread Christian Lohmaier

 source/am/helpcontent2/source/text/shared/01.po   |  137 
 source/cy/chart2/uiconfig/ui.po   |   16 
 source/cy/cui/source/options.po   |   10 
 source/cy/cui/uiconfig/ui.po  |   24 
 source/cy/editeng/source/items.po |   16 
 source/cy/filter/uiconfig/ui.po   |   14 
 source/cy/officecfg/registry/data/org/openoffice/Office/UI.po |   86 
 source/cy/readlicense_oo/docs.po  |   12 
 source/cy/sc/source/core/src.po   |   13 
 source/cy/sc/source/ui/drawfunc.po|   10 
 source/cy/sc/source/ui/formdlg.po |   12 
 source/cy/sc/source/ui/src.po |  142 
 source/cy/scp2/source/accessories.po  |   12 
 source/cy/scp2/source/ooo.po  |6 
 source/cy/sd/source/ui/app.po |8 
 source/cy/sd/uiconfig/simpress/ui.po  |6 
 source/cy/sfx2/source/view.po |   12 
 source/cy/sfx2/uiconfig/ui.po |   10 
 source/cy/starmath/uiconfig/smath/ui.po   |8 
 source/cy/svtools/source/misc.po  |   14 
 source/cy/svx/inc.po  |   10 
 source/cy/svx/source/dialog.po|   10 
 source/cy/svx/source/engine3d.po  |   10 
 source/cy/svx/source/form.po  |   10 
 source/cy/svx/source/items.po |6 
 source/cy/svx/source/sidebar/area.po  |   14 
 source/cy/svx/source/svdraw.po|   36 
 source/cy/svx/uiconfig/ui.po  |   18 
 source/cy/sw/source/ui/app.po |   14 
 source/cy/sw/source/ui/config.po  |   12 
 source/cy/sw/source/ui/sidebar.po |   12 
 source/cy/sw/source/ui/utlui.po   |   12 
 source/cy/sw/source/uibase/lingu.po   |   12 
 source/cy/sw/source/uibase/utlui.po   |   14 
 source/cy/sw/uiconfig/swriter/ui.po   |   30 
 source/cy/swext/mediawiki/help.po |   12 
 source/cy/vcl/uiconfig/ui.po  |   12 
 source/cy/wizards/source/formwizard.po|   14 
 source/da/filter/uiconfig/ui.po   |8 
 source/da/helpcontent2/source/text/shared/00.po   |   22 
 source/da/helpcontent2/source/text/shared/01.po   |   12 
 source/da/helpcontent2/source/text/shared/02.po   |8 
 source/da/helpcontent2/source/text/shared/guide.po|8 
 source/da/helpcontent2/source/text/swriter/guide.po   |8 
 source/da/officecfg/registry/data/org/openoffice/Office.po|8 
 source/da/readlicense_oo/docs.po  |   14 
 source/da/sc/source/ui/src.po |8 
 source/da/sw/source/ui/app.po |8 
 source/da/sw/source/ui/config.po  |   12 
 source/da/swext/mediawiki/help.po |6 
 source/da/uui/source.po   |   10 
 source/de/officecfg/registry/data/org/openoffice/Office/UI.po |8 
 source/es/cui/source/tabpages.po  |   14 
 source/es/cui/uiconfig/ui.po  |   20 
 source/es/dbaccess/source/ext/macromigration.po   |   12 
 source/es/extensions/source/propctrlr.po  |   12 
 source/es/extras/source/autocorr/emoji.po |8 
 source/es/helpcontent2/source/text/sbasic/guide.po|   26 
 source/es/helpcontent2/source/text/sbasic/shared.po   |   88 
 source/es/helpcontent2/source/text/sbasic/shared/01.po|6 
 source/es/helpcontent2/source/text/sbasic/shared/02.po|   18 
 source/es/helpcontent2/source/text/scalc.po   |6 
 source/es/helpcontent2/source/text/scalc/00.po|6 
 source/es/helpcontent

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-5.0' - dictionaries

2016-04-21 Thread Christian Lohmaier

 dictionaries |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 56239025ae3db59419fe1b4aedace6108da8b93b
Author: Christian Lohmaier 
Date:   Wed Apr 13 13:55:56 2016 +0200

Updated core
Project: dictionaries  d8f3f414b94b7dc1e9289d2a462b016c1e416bf9

Branch libreoffice-5-0-6

This is 'libreoffice-5-0-6' - the stable branch for the 5.0.6 release.
Only very safe changes, reviewed by three people are allowed.

If you want to commit more complicated fix for the next 5.0.x release,
please use the 'libreoffice-5-0' branch.

If you want to build something cool, unstable, and risky, use master.

Change-Id: I7ca3b5860c45c4c1fba328d7b45ef9771d6ec919

diff --git a/dictionaries b/dictionaries
index 2d2df10..d8f3f41 16
--- a/dictionaries
+++ b/dictionaries
@@ -1 +1 @@
-Subproject commit 2d2df105c0ba5b7ac4bf7c95b9ecffb3a2f94121
+Subproject commit d8f3f414b94b7dc1e9289d2a462b016c1e416bf9
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] dictionaries.git: Branch 'distro/collabora/cp-5.0' - 3 commits - hr_HR/description.xml hr_HR/hr_HR.aff hr_HR/hr_HR.dic pt_PT/description.xml pt_PT/pt_PT.dic

2016-04-21 Thread Christian Lohmaier

 hr_HR/description.xml |2 
 hr_HR/hr_HR.aff   |  214 
 hr_HR/hr_HR.dic   |374101 
+-
 pt_PT/description.xml |2 
 pt_PT/pt_PT.dic   |   33 
 5 files changed, 187333 insertions(+), 187019 deletions(-)

New commits:
commit d8f3f414b94b7dc1e9289d2a462b016c1e416bf9
Author: Christian Lohmaier 
Date:   Wed Apr 13 13:55:56 2016 +0200

Branch libreoffice-5-0-6

This is 'libreoffice-5-0-6' - the stable branch for the 5.0.6 release.
Only very safe changes, reviewed by three people are allowed.

If you want to commit more complicated fix for the next 5.0.x release,
please use the 'libreoffice-5-0' branch.

If you want to build something cool, unstable, and risky, use master.

Change-Id: I7ca3b5860c45c4c1fba328d7b45ef9771d6ec919
commit a6d5e4951064e9a1027dd0045da0c49fa04713ef
Author: Krunoslav Å ebetiÄ 
Date:   Thu Mar 10 11:54:00 2016 +0100

tdf#98531 Updated Croatian dictionary

- converted .aff to UTF8 to match .dic encoding
- removed nonsenses like "word1yyyword2" or "wordy."
- added 123 new words
- added some new classes to .aff (just because I could not use default 
ones, nothing fancy)
- tried to improve suggestions by adding a REP section

Change-Id: I002e86fbc1b8e239404220c550e08e12b99e5910
(cherry picked from commit 3bbf614616d6da0c94b8953299c467c1db7b912d)
Reviewed-on: https://gerrit.libreoffice.org/23114
Reviewed-by: CaolÃ¡n McNamara 
Tested-by: CaolÃ¡n McNamara 

diff --git a/hr_HR/description.xml b/hr_HR/description.xml
index 1a8d63c..ef3e474 100644
--- a/hr_HR/description.xml
+++ b/hr_HR/description.xml
@@ -1,6 +1,6 @@
 
 http://openoffice.org/extensions/description/2006"; 
xmlns:d="http://openoffice.org/extensions/description/2006";  
xmlns:xlink="http://www.w3.org/1999/xlink";>
-
+
 
 
 Croatian spelling dictionary, and hyphenation 
rules
diff --git a/hr_HR/hr_HR.aff b/hr_HR/hr_HR.aff
index 3a0dd77..18b0d84 100644
--- a/hr_HR/hr_HR.aff
+++ b/hr_HR/hr_HR.aff
@@ -1,6 +1,46 @@
-SET ISO8859-2
+SET UTF-8
 
-TRY ABCDEFGHIJKLMNOPQRSTUVWXYæÆèÈðÐ¾®abcdefghijklmnopqrstuvwxy
+TRY ABCDEFGHIJKLMNOPQRSTUVWXYÄÄÄÄÄÄÅ¾Å½abcdefghijklmnopqrstuvwxy
+
+NEEDAFFIX Z
+
+REP 33
+REP x ks
+REP xy ksi
+REP c ds
+REP c ts
+REP Ä dÅ¾
+REP dÅ¾ Ä
+REP e ije
+REP iÅ¡$ iÅ¡ta
+REP eÅ¡$ eÅ¡to
+REP aÅ¡$ aÅ¡to
+REP ljnj nj
+REP aÄu$ at_Äu
+REP aÄeÅ¡$ at_ÄeÅ¡
+REP aÄe$ at_Äe
+REP aÄemo$ at_Äemo
+REP aÄete$ at_Äete
+REP iÄu$ it_Äu
+REP iÄeÅ¡$ it_ÄeÅ¡
+REP iÄe$ it_Äe
+REP iÄemo$ it_Äemo
+REP iÄete$ it_Äete
+REP Å¡Äu$ st_Äu
+REP Å¡ÄeÅ¡$ st_ÄeÅ¡
+REP Å¡Äe$ st_Äe
+REP Å¡Äemo$ st_Äemo
+REP Å¡Äete$ st_Äete
+REP eÄu$ et_Äu
+REP eÄeÅ¡$ et_ÄeÅ¡
+REP eÄe$ et_Äe
+REP eÄemo$ et_Äemo
+REP eÄete$ et_Äete
+REP vaoc$ valac
+REP ^apriori$ a_priori
+
+BREAK 1
+BREAK -
 
 SFX A Y 13
 SFX A 0 a [^aeiou]
@@ -17,10 +57,9 @@ SFX A e a e
 SFX A e u e
 SFX A e em e
 
-
 SFX B Y 5
 SFX B ti m ti
-SFX B ti ¹ ti
+SFX B ti Å¡ ti
 SFX B ti mo ti
 SFX B ti te ti
 SFX B ti u ti
@@ -29,11 +68,11 @@ SFX C Y 4
 SFX C ti h ti
 SFX C ti smo ti
 SFX C ti ste ti
-SFX C ti ¹e ti
+SFX C ti Å¡e ti
 
 SFX D Y 5
 SFX D ti h ti
-SFX D ti ¹e ti
+SFX D ti Å¡e ti
 SFX D ti smo ti
 SFX D ti ste ti
 SFX D ti hu ti
@@ -43,24 +82,20 @@ SFX E ti o ti
 SFX E ti li ti
 SFX E ti la ti
 
-
-
 SFX F Y 5
 SFX F ti h ti
-SFX F ti ¹e ti
+SFX F ti Å¡e ti
 SFX F ti smo ti
 SFX F ti ste ti
 SFX F iti hu ti
 
 SFX G Y 5
 SFX G ti m ti
-SFX G ti ¹ ti
+SFX G ti Å¡ ti
 SFX G ti mo ti
 SFX G ti te ti
 SFX G iti e iti
 
-
-
 SFX H Y 6
 SFX H 0 a .
 SFX H 0 u .
@@ -85,7 +120,6 @@ SFX J 0 ih .
 SFX J 0 im .
 SFX J 0 o .
 
-
 SFX K Y 6
 SFX K 0 a .
 SFX K 0 u .
@@ -94,7 +128,6 @@ SFX K 0 ih .
 SFX K 0 ima .
 SFX K 0 o .
 
-
 SFX L Y 2
 SFX L 0 oj .
 SFX L 0 om .
@@ -104,3 +137,156 @@ SFX M a e a
 SFX M a i a
 SFX M a o a
 SFX M a u a
+
+SFX N Y 3
+SFX N 0 a og
+SFX N 0 u om
+SFX N 0 e om
+
+SFX O Y 26
+SFX O i og/N ni
+SFX O i om/N ni
+SFX O i o ni
+SFX O i im ni
+SFX O i a ni
+SFX O i e ni
+SFX O i oj ni
+SFX O 0 h ni
+SFX O i u ni
+SFX O i og/N nji
+SFX O i om/N nji
+SFX O i im nji
+SFX O i a nji
+SFX O i e nji
+SFX O i oj nji
+SFX O 0 h nji
+SFX O i u nji
+SFX O i og/N li
+SFX O i om/N li
+SFX O i o li
+SFX O i im li
+SFX O i a li
+SFX O i e li
+SFX O i oj li
+SFX O 0 h li
+SFX O i u li
+
+SFX P Y 5
+SFX P 0 a .
+SFX P 0 u .
+SFX P 0 om .
+SFX P 0 i .
+SFX P 0 ima .
+
+SFX Q Y 30
+SFX Q ijeti im ijeti
+SFX Q ijeti iÅ¡ ijeti
+SFX Q ijeti i ijeti
+SFX Q ijeti imo ijeti
+SFX Q ijeti ite ijeti
+SFX Q ijeti e ijeti
+SFX Q iti im iti
+SFX Q iti iÅ¡ iti
+SFX Q iti i iti
+SFX Q iti imo iti
+SFX Q iti ite iti
+SFX Q iti e iti
+SFX Q jeti im jeti
+SFX Q jeti iÅ¡ jeti
+SFX Q jeti i jeti
+SFX Q jeti imo jeti
+SFX Q jeti ite jeti
+SFX Q jeti e jeti
+SFX Q zati Å¾em zati
+SFX Q zati Å¾eÅ¡ zati
+SFX Q zati Å¾e zati
+SFX Q zati Å¾emo zati
+SFX Q zati Å¾ete zati
+SFX Q zati Å¾u

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-5.0' - 15 commits - extras/source i18nlangtag/qa i18nlangtag/source include/svx readlicense_oo/license sc/source sd/qa sd/source sw/qa sw/so

2016-04-21 Thread Christian Lohmaier

 extras/source/autocorr/lang/es/DocumentList.xml  |2 
 extras/source/autocorr/lang/hr/DocumentList.xml  |  947 +---
 extras/source/autocorr/lang/hr/SentenceExceptList.xml|  176 
 extras/source/autocorr/lang/nl/DocumentList.xml  |  109 
 extras/source/autocorr/lang/ro/DocumentList.xml  |   24 
 extras/source/autocorr/lang/sv/DocumentList.xml  |   22 
 extras/source/autocorr/lang/zh-CN/DocumentList.xml   | 1283 -
 i18nlangtag/qa/cppunit/test_languagetag.cxx  |2 
 i18nlangtag/source/isolang/isolang.cxx   |6 
 include/svx/pageitem.hxx |4 
 readlicense_oo/license/CREDITS.fodt  | 3395 ---
 sc/source/core/data/document.cxx |   54 
 sc/source/core/tool/compiler.cxx |   14 
 sd/qa/unit/data/odp/tdf99224.odp |binary
 sd/qa/unit/export-tests.cxx  |   12 
 sd/qa/unit/sdmodeltestbase.hxx   |   16 
 sd/source/filter/eppt/pptx-epptooxml.cxx |4 
 sw/qa/extras/ooxmlimport/data/tdf99140.docx  |binary
 sw/qa/extras/ooxmlimport/ooxmlimport.cxx |   15 
 sw/qa/extras/rtfimport/data/tdf65642.rtf |   23 
 sw/qa/extras/rtfimport/rtfimport.cxx |8 
 sw/source/core/layout/sectfrm.cxx|6 
 vcl/win/source/gdi/gdiimpl.cxx   |   44 
 writerfilter/source/dmapper/DomainMapper.cxx |   12 
 writerfilter/source/dmapper/DomainMapperTableHandler.cxx |   13 
 writerfilter/source/dmapper/PropertyMap.cxx  |   82 
 writerfilter/source/dmapper/PropertyMap.hxx  |6 
 writerfilter/source/rtftok/rtfdocumentimpl.cxx   |   10 
 28 files changed, 3849 insertions(+), 2440 deletions(-)

New commits:
commit 57c36d1f43b189466c80305d9b1c32cde3afcbe4
Author: Christian Lohmaier 
Date:   Tue Apr 19 20:44:04 2016 +0200

update credits

Change-Id: I52af3ba76cb6dbd8572eb524ce9d0c0bfb2c0596
(cherry picked from commit f4827e1bba5d6951cfc995531342395f8bc9a630)
(cherry picked from commit 575427348a76c3e6a0cc0c351f7dd8eba0db28dc)

diff --git a/readlicense_oo/license/CREDITS.fodt 
b/readlicense_oo/license/CREDITS.fodt
index 311a36c..5fb9235 100644
--- a/readlicense_oo/license/CREDITS.fodt
+++ b/readlicense_oo/license/CREDITS.fodt
@@ -1,13 +1,13 @@
 
 
 http://www.w3.org/1999/xlink"; 
xmlns:dc="http://purl.org/dc/elements/1.1/"; 
xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" 
xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" 
xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" 
xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" 
xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" 
xmlns:math="http://www.w3.org/1998/Math/MathML"; 
xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" 
xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0" 
xmlns:config="urn:oas
 is:names:tc:opendocument:xmlns:config:1.0" 
xmlns:ooo="http://openoffice.org/2004/office"; 
xmlns:ooow="http://openoffice.org/2004/writer"; 
xmlns:oooc="http://openoffice.org/2004/calc"; 
xmlns:dom="http://www.w3.org/2001/xml-events"; 
xmlns:xforms="http://www.w3.org/2002/xforms"; 
xmlns:xsd="http://www.w3.org/2001/XMLSchema"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xmlns:rpt="http://openoffice.org/2005/report"; 
xmlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2" 
xmlns:xhtml="http://www.w3.org/1999/xhtml"; 
xmlns:grddl="http://www.w3.org/2003/g/data-view#"; 
xmlns:officeooo="http://openoffice.org/2009/office"; 
xmlns:tableooo="http://openoffice.org/2009/table"; 
xmlns:drawooo="http://openoffice.org/2010/draw"; 
xmlns:calcext="urn:org:documentfoundation:names:experimental:calc:xmlns:calcext:1.0"
 
xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0"
 xmlns:field="urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0" 
xmlns:formx="urn:openoffice:names:
 experimental:ooxml-odf-interop:xmlns:form:1.0" 
xmlns:css3t="http://www.w3.org/TR/css3-text/"; office:version="1.2" 
office:mimetype="application/vnd.oasis.opendocument.text">
- Credits Â» 
LibreOfficeCreditscontributorscodersdevelopersCredits
 for the LibreOffice 
development/coding.LibreOffice/5.1.2.2$Linux_X86_64
 
LibreOffice_project/d3bf12ecb743fc0d20e0be0c58ca359301eb705f2012-02-20T22:17:18.06000PT14M12S3JUebjoxEpqXoQcpltWRTwzBZEEHtch3wApdhgiQPFiA
+ Credits Â» 
LibreOfficeCreditscontributorscodersdevelopersCredits
 for the LibreOffice 
development/coding.LibreOffice/5.1.2.2$Linux_X86_64
 
LibreOffice_project/d3bf12ecb743fc0d20e0be0c58ca359301eb705f2012-02-20T22:17:18.06000PT14M12S3JUebjoxEpqXoQcpltWRTwzBZEEHtch3wApdhgiQPFiA
  
   
-   1586
+   607
501
41197
-   22518
+   22412
true
true

@@ -16,9 +16,9 @@

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-5.0' - configure.ac

2016-04-21 Thread Andras Timar

 configure.ac |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit ad752f842b9cba34804bd9cd24c1e995c2456a66
Author: Andras Timar 
Date:   Thu Apr 21 11:02:24 2016 +0200

Bump version to 5.0-31

Change-Id: I6b417668bd5dc7efd17d40d086bced664b22fea4

diff --git a/configure.ac b/configure.ac
index aed60719..f05fce9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,7 +9,7 @@ dnl in order to create a configure script.
 # several non-alphanumeric characters, those are split off and used only for 
the
 # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no 
idea.
 
-AC_INIT([Collabora Office],[5.0.10.30],[],[],[https://CollaboraOffice.com/])
+AC_INIT([Collabora Office],[5.0.10.31],[],[],[https://CollaboraOffice.com/])
 
 AC_PREREQ([2.59])
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] help.git: Changes to 'refs/tags/cp-5.0-31'

2016-04-21 Thread Christian Lohmaier

Tag 'cp-5.0-31' created by Andras Timar  at 
2016-04-21 09:15 +

cp-5.0-31

Changes since cp-5.0-18:
Christian Lohmaier (1):
   should not be empty/self-closing element ()

---
 source/text/shared/01/0222.xhp  |2 +-
 source/text/swriter/01/04020100.xhp |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
---
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Changes to 'refs/tags/cp-5.0-31'

2016-04-21 Thread Andras Timar

Tag 'cp-5.0-31' created by Andras Timar  at 
2016-04-21 09:15 +

cp-5.0-31

Changes since cp-5.0-30-24:
---
 0 files changed
---
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] translations.git: Changes to 'refs/tags/cp-5.0-31'

2016-04-21 Thread Christian Lohmaier

Tag 'cp-5.0-31' created by Andras Timar  at 
2016-04-21 09:15 +

cp-5.0-31

Changes since cp-5.0-30:
Christian Lohmaier (1):
  update translations for 5.0.6 rc1

---
 source/am/helpcontent2/source/text/shared/01.po   |  137 
 source/cy/chart2/uiconfig/ui.po   |   16 
 source/cy/cui/source/options.po   |   10 
 source/cy/cui/uiconfig/ui.po  |   24 
 source/cy/editeng/source/items.po |   16 
 source/cy/filter/uiconfig/ui.po   |   14 
 source/cy/officecfg/registry/data/org/openoffice/Office/UI.po |   86 
 source/cy/readlicense_oo/docs.po  |   12 
 source/cy/sc/source/core/src.po   |   13 
 source/cy/sc/source/ui/drawfunc.po|   10 
 source/cy/sc/source/ui/formdlg.po |   12 
 source/cy/sc/source/ui/src.po |  142 
 source/cy/scp2/source/accessories.po  |   12 
 source/cy/scp2/source/ooo.po  |6 
 source/cy/sd/source/ui/app.po |8 
 source/cy/sd/uiconfig/simpress/ui.po  |6 
 source/cy/sfx2/source/view.po |   12 
 source/cy/sfx2/uiconfig/ui.po |   10 
 source/cy/starmath/uiconfig/smath/ui.po   |8 
 source/cy/svtools/source/misc.po  |   14 
 source/cy/svx/inc.po  |   10 
 source/cy/svx/source/dialog.po|   10 
 source/cy/svx/source/engine3d.po  |   10 
 source/cy/svx/source/form.po  |   10 
 source/cy/svx/source/items.po |6 
 source/cy/svx/source/sidebar/area.po  |   14 
 source/cy/svx/source/svdraw.po|   36 
 source/cy/svx/uiconfig/ui.po  |   18 
 source/cy/sw/source/ui/app.po |   14 
 source/cy/sw/source/ui/config.po  |   12 
 source/cy/sw/source/ui/sidebar.po |   12 
 source/cy/sw/source/ui/utlui.po   |   12 
 source/cy/sw/source/uibase/lingu.po   |   12 
 source/cy/sw/source/uibase/utlui.po   |   14 
 source/cy/sw/uiconfig/swriter/ui.po   |   30 
 source/cy/swext/mediawiki/help.po |   12 
 source/cy/vcl/uiconfig/ui.po  |   12 
 source/cy/wizards/source/formwizard.po|   14 
 source/da/filter/uiconfig/ui.po   |8 
 source/da/helpcontent2/source/text/shared/00.po   |   22 
 source/da/helpcontent2/source/text/shared/01.po   |   12 
 source/da/helpcontent2/source/text/shared/02.po   |8 
 source/da/helpcontent2/source/text/shared/guide.po|8 
 source/da/helpcontent2/source/text/swriter/guide.po   |8 
 source/da/officecfg/registry/data/org/openoffice/Office.po|8 
 source/da/readlicense_oo/docs.po  |   14 
 source/da/sc/source/ui/src.po |8 
 source/da/sw/source/ui/app.po |8 
 source/da/sw/source/ui/config.po  |   12 
 source/da/swext/mediawiki/help.po |6 
 source/da/uui/source.po   |   10 
 source/de/officecfg/registry/data/org/openoffice/Office/UI.po |8 
 source/es/cui/source/tabpages.po  |   14 
 source/es/cui/uiconfig/ui.po  |   20 
 source/es/dbaccess/source/ext/macromigration.po   |   12 
 source/es/extensions/source/propctrlr.po  |   12 
 source/es/extras/source/autocorr/emoji.po |8 
 source/es/helpcontent2/source/text/sbasic/guide.po|   26 
 source/es/helpcontent2/source/text/sbasic/shared.po   |   88 
 source/es/helpcontent2/source/text/sbasic/shared/01.po|6 
 source/es/helpcontent2/source/text/sbasic/shared/02.po|   18 
 sourc

[Libreoffice-commits] dictionaries.git: Changes to 'refs/tags/cp-5.0-31'

2016-04-21 Thread Christian Lohmaier

Tag 'cp-5.0-31' created by Andras Timar  at 
2016-04-21 09:15 +

cp-5.0-31

Changes since cp-5.0-30-2:
---
 0 files changed
---
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 2 commits - basctl/source basegfx/source basic/source bridges/source canvas/source chart2/source comphelper/source configmgr/source connectivity/source cppcanvas/source

2016-04-21 Thread Noel Grandin

 basctl/source/accessibility/accessibledialogwindow.cxx|   20 +-
 basctl/source/basicide/baside2b.cxx   |4 
 basctl/source/basicide/bastype3.cxx   |6 
 basctl/source/basicide/breakpoint.cxx |   13 -
 basctl/source/basicide/doceventnotifier.cxx   |6 
 basegfx/source/polygon/b2dpolygonclipper.cxx  |4 
 basegfx/source/polygon/b2dpolygoncutandtouch.cxx  |3 
 basegfx/source/polygon/b2dpolypolygon.cxx |4 
 basegfx/source/polygon/b2dpolypolygoncutter.cxx   |4 
 basegfx/source/polygon/b2dtrapezoid.cxx   |3 
 basic/source/comp/parser.cxx  |4 
 basic/source/comp/symtbl.cxx  |7 
 basic/source/runtime/ddectrl.cxx  |4 
 basic/source/runtime/iosys.cxx|4 
 bridges/source/cpp_uno/shared/component.cxx   |4 
 canvas/source/cairo/cairo_textlayout.cxx  |6 
 canvas/source/opengl/ogl_canvastools.cxx  |4 
 chart2/source/controller/dialogs/tp_SeriesToAxis.cxx  |3 
 chart2/source/controller/sidebar/ChartAxisPanel.cxx   |   12 -
 chart2/source/controller/sidebar/ChartErrorBarPanel.cxx   |   12 -
 chart2/source/controller/sidebar/ChartSeriesPanel.cxx |   12 -
 chart2/source/model/main/BaseCoordinateSystem.cxx |4 
 chart2/source/tools/InternalDataProvider.cxx  |8 
 chart2/source/view/charttypes/GL3DBarChart.cxx|   18 +-
 chart2/source/view/charttypes/VSeriesPlotter.cxx  |   14 -
 chart2/source/view/main/ChartView.cxx |   45 ++---
 chart2/source/view/main/GL3DRenderer.cxx  |   84 
--
 chart2/source/view/main/OpenGLRender.cxx  |4 
 comphelper/source/misc/threadpool.cxx |8 
 configmgr/source/access.cxx   |   60 
+++
 configmgr/source/writemodfile.cxx |8 
 connectivity/source/drivers/mork/MDatabaseMetaData.cxx|   21 +-
 connectivity/source/drivers/mork/MDatabaseMetaDataHelper.cxx  |3 
 connectivity/source/drivers/mork/MResultSet.cxx   |6 
 connectivity/source/drivers/postgresql/pq_connection.cxx  |6 
 connectivity/source/drivers/postgresql/pq_preparedstatement.cxx   |7 
 connectivity/source/drivers/postgresql/pq_updateableresultset.cxx |6 
 connectivity/source/parse/sqlnode.cxx |8 
 cppcanvas/source/mtfrenderer/implrenderer.cxx |4 
 cppu/source/uno/lbenv.cxx |4 
 cppuhelper/source/bootstrap.cxx   |4 
 cui/source/customize/acccfg.cxx   |4 
 cui/source/dialogs/cuifmsearch.cxx|   28 +--
 cui/source/dialogs/cuigaldlg.cxx  |   14 -
 cui/source/dialogs/cuiimapwnd.cxx |4 
 cui/source/dialogs/iconcdlg.cxx   |   13 -
 cui/source/dialogs/linkdlg.cxx|7 
 cui/source/dialogs/thesdlg.cxx|4 
 cui/source/options/optaboutconfig.cxx |6 
 cui/source/options/optupdt.cxx|6 
 cui/source/options/personalization.cxx|   22 +-
 cui/source/options/treeopt.cxx|   23 +-
 cui/source/tabpages/autocdlg.cxx  |   10 -
 cui/source/tabpages/border.cxx|   12 -
 cui/source/tabpages/labdlg.cxx|8 
 cui/source/tabpages/numpages.cxx  |6 
 cui/source/tabpages/swpossizetabpage.cxx  |   22 +-
 cui/source/tabpages/tpline.cxx|3 
 58 files changed, 300 insertions(+), 353 deletions(-)

New commits:
commit e1af7f0c438bc242e4562aa0286c99787b5ad544
Author: Noel Grandin 
Date:   Thu Apr 21 11:03:55 2016 +0200

clang-tidy modernize-loop-convert in c*

Change-Id: I77d2548f8be97792660761e6156cd24734a95aaf

diff --git a/canvas/source/cairo/cairo_textlayout.cxx 
b/canvas/source/cairo/cairo_textlayout.cxx
index c787f02..fa3d5b1 100644
--- a/canvas/source/cairo/cairo_textlayout.cxx
+++ b/canvas/source/cairo/cairo_textlayout.cxx
@@ -512,10 +512,10 @@ namespace cairocanvas
 // loop to draw the text for eve

[Libreoffice-commits] online.git: loolwsd/loolwsd.service

2016-04-21 Thread Andras Timar

 loolwsd/loolwsd.service |9 +
 1 file changed, 9 insertions(+)

New commits:
commit a6969c88270d9b755f6835889e6e8891ecdb13cc
Author: Andras Timar 
Date:   Thu Apr 21 11:22:22 2016 +0200

document --admincreds and --allowlocalstorage in loolwsd.service

diff --git a/loolwsd/loolwsd.service b/loolwsd/loolwsd.service
index 13107c1..112ea8e 100644
--- a/loolwsd/loolwsd.service
+++ b/loolwsd/loolwsd.service
@@ -4,6 +4,15 @@ After=network.target
 
 [Service]
 EnvironmentFile=-/etc/sysconfig/loolwsd
+#
+# For admin console you have to give admin user name and password
+# with --admincreds=username/password
+#
+# Local Storage is disabled by default. Specify --allowlocalstorage
+# to enable it. Beware! If you specify --allowlocalstorage, all files
+# that can be read by lool user, will be passed to LibreOffice and
+# may be displayed in the browser. This option is only for debugging.
+#
 ExecStart=/usr/bin/loolwsd --version --systemplate=/opt/lool/systemplate 
--lotemplate=/opt/collaboraoffice5.0 --childroot=/opt/lool/child-roots 
--numprespawns=5 --fileserverroot=/usr/share/loolwsd
 User=lool
 KillMode=control-group
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: loolwsd/LOOLSession.hpp

2016-04-21 Thread Jan Holesovsky

 loolwsd/LOOLSession.hpp |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 06366c2e4ca8de7945180c28ab1d9556cbf94985
Author: Jan Holesovsky 
Date:   Thu Apr 21 11:36:47 2016 +0200

Fix build.

diff --git a/loolwsd/LOOLSession.hpp b/loolwsd/LOOLSession.hpp
index 926895b..86d398d 100644
--- a/loolwsd/LOOLSession.hpp
+++ b/loolwsd/LOOLSession.hpp
@@ -56,7 +56,7 @@ public:
 virtual bool handleDisconnect();
 
 bool isActive() const { return _isActive; }
-void setIsActive(bool isActive) { _isActive = isActive; }
+void setIsActive(bool active) { _isActive = active; }
 
 /// Returns the inactivity time of the client in milliseconds.
 double getInactivityMS() const
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: i18nlangtag/source

2016-04-21 Thread Eike Rathke

 i18nlangtag/source/isolang/isolang.cxx |   16 
 1 file changed, 8 insertions(+), 8 deletions(-)

New commits:
commit b481d42e56c9585a3a6018ee851dcca41e89666f
Author: Eike Rathke 
Date:   Thu Apr 21 11:46:51 2016 +0200

also exclude the "specific English" table from mapping to LanguageTag

... otherwise entering a tag for such combination would result in a
different locale instead of an on-the-fly assignment.

Change-Id: I0c1b2005298cb39f98cf816d4765ce21a5cbc9bc

diff --git a/i18nlangtag/source/isolang/isolang.cxx 
b/i18nlangtag/source/isolang/isolang.cxx
index 6add6e3..09d1b87 100644
--- a/i18nlangtag/source/isolang/isolang.cxx
+++ b/i18nlangtag/source/isolang/isolang.cxx
@@ -1285,16 +1285,16 @@ LanguageType 
MsLangId::Conversion::convertIsoNamesToLanguage( const OUString& rL
 pFirstLang = pEntry;
 }
 }
-}
 
-// some eng countries should be mapped to a specific english language
-if ( aLowerLang == "en" )
-{
-for (const IsoLangEngEntry* pEngEntry = aImplIsoLangEngEntries;
-pEngEntry->mnLang != LANGUAGE_DONTKNOW; ++pEngEntry)
+// some eng countries should be mapped to a specific english language
+if ( aLowerLang == "en" )
 {
-if ( aUpperCountry.equalsAscii( pEngEntry->maCountry ) )
-return pEngEntry->mnLang;
+for (const IsoLangEngEntry* pEngEntry = aImplIsoLangEngEntries;
+pEngEntry->mnLang != LANGUAGE_DONTKNOW; ++pEngEntry)
+{
+if ( aUpperCountry.equalsAscii( pEngEntry->maCountry ) )
+return pEngEntry->mnLang;
+}
 }
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: 3 commits - loolwsd/MasterProcessSession.cpp loolwsd/test loolwsd/TileCache.cpp

2016-04-21 Thread Tor Lillqvist

 loolwsd/MasterProcessSession.cpp |   19 +++-
 loolwsd/TileCache.cpp|3 ++
 loolwsd/test/httpwstest.cpp  |   45 +++
 3 files changed, 61 insertions(+), 6 deletions(-)

New commits:
commit 232499f542341168a8f5b3efb62610ffc1ec8223
Author: Tor Lillqvist 
Date:   Thu Apr 21 12:34:30 2016 +0300

Add test that simultaneously requested tiles indeed were rendered just once

This test requires the renderid parameter to be present in the 'tile:'
response messages, and that is the case only when ENABLE_DEBUG, so we
can run the test only in a debug build.

diff --git a/loolwsd/test/httpwstest.cpp b/loolwsd/test/httpwstest.cpp
index 59dfda4..f915d79 100644
--- a/loolwsd/test/httpwstest.cpp
+++ b/loolwsd/test/httpwstest.cpp
@@ -68,6 +68,9 @@ class HTTPWSTest : public CPPUNIT_NS::TestFixture
 CPPUNIT_TEST(testPasswordProtectedDocumentWithCorrectPassword);
 CPPUNIT_TEST(testPasswordProtectedDocumentWithCorrectPasswordAgain);
 CPPUNIT_TEST(testImpressPartCountChanged);
+#if ENABLE_DEBUG
+CPPUNIT_TEST(testSimultaneousTilesRenderedJustOnce);
+#endif
 
 // This should be the last test:
 CPPUNIT_TEST(testNoExtraLoolKitsLeft);
@@ -92,6 +95,7 @@ class HTTPWSTest : public CPPUNIT_NS::TestFixture
 void testPasswordProtectedDocumentWithCorrectPassword();
 void testPasswordProtectedDocumentWithCorrectPasswordAgain();
 void testImpressPartCountChanged();
+void testSimultaneousTilesRenderedJustOnce();
 void testNoExtraLoolKitsLeft();
 
 void loadDoc(const std::string& documentURL);
@@ -995,6 +999,47 @@ void HTTPWSTest::testImpressPartCountChanged()
 }
 }
 
+void HTTPWSTest::testSimultaneousTilesRenderedJustOnce()
+{
+const std::string documentPath = Util::getTempFilePath(TDOC, 
"hello.odt");
+const std::string documentURL = "file://" + 
Poco::Path(documentPath).makeAbsolute().toString();
+
+Poco::Net::HTTPRequest request(Poco::Net::HTTPRequest::HTTP_GET, 
documentURL);
+Poco::Net::WebSocket socket1 = *connectLOKit(request, _response);
+sendTextFrame(socket1, "load url=" + documentURL);
+
+Poco::Net::WebSocket socket2 = *connectLOKit(request, _response);
+sendTextFrame(socket2, "load url=" + documentURL);
+
+sendTextFrame(socket1, "tile part=42 width=400 height=400 
tileposx=1000 tileposy=2000 tilewidth=3000 tileheight=3000");
+sendTextFrame(socket2, "tile part=42 width=400 height=400 
tileposx=1000 tileposy=2000 tilewidth=3000 tileheight=3000");
+
+std::string response1;
+getResponseMessage(socket1, "tile:", response1, true);
+CPPUNIT_ASSERT_MESSAGE("did not receive a tile: message as expected", 
!response1.empty());
+
+std::string response2;
+getResponseMessage(socket2, "tile:", response2, true);
+CPPUNIT_ASSERT_MESSAGE("did not receive a tile: message as expected", 
!response2.empty());
+
+if (!response1.empty() && !response2.empty())
+{
+Poco::StringTokenizer tokens1(response1, " ");
+std::string renderId1;
+LOOLProtocol::getTokenString(tokens1, "renderid", renderId1);
+Poco::StringTokenizer tokens2(response2, " ");
+std::string renderId2;
+LOOLProtocol::getTokenString(tokens2, "renderid", renderId2);
+
+CPPUNIT_ASSERT(renderId1 == renderId2 ||
+   (renderId1 == "cached" && renderId2 != "cached") ||
+   (renderId1 != "cached" && renderId2 == "cached"));
+}
+
+socket1.shutdown();
+socket2.shutdown();
+}
+
 void HTTPWSTest::testNoExtraLoolKitsLeft()
 {
 int countNow = countLoolKitProcesses();
commit 95278b8643031e3c826a0bc712166d6dd3e741fc
Author: Tor Lillqvist 
Date:   Thu Apr 21 12:23:57 2016 +0300

Don't just re-use the 'tile:' response as a 'tile' request

In a debug build it contains also the parameter renderid. (And in the
future, might be extended in other ways, too.) Construct a new request
message that has exactly and only the parameters we want.

diff --git a/loolwsd/MasterProcessSession.cpp b/loolwsd/MasterProcessSession.cpp
index b7ae049..1fa0a03 100644
--- a/loolwsd/MasterProcessSession.cpp
+++ b/loolwsd/MasterProcessSession.cpp
@@ -196,14 +196,21 @@ bool MasterProcessSession::_handleInput(const char 
*buffer, int length)
 Log::debug("Sending tile message also to 
subscriber " + subscriber->getName() + " line: '" + firstLine + "'");
 std::shared_ptr queue;
 queue = subscriber->getQueue();
-// re-emit the tile command in the other thread
-// to re-check and hit the cache. NB. it needs to 
be
-// 'tile' and not 'tile:'
+// Re-emit the tile command in the other thread(s) 
to re-check a

[Libreoffice-commits] core.git: compilerplugins/clang

2016-04-21 Thread Stephan Bergmann

 compilerplugins/clang/compat.hxx  |   18 ++
 compilerplugins/clang/salbool.cxx |8 
 2 files changed, 22 insertions(+), 4 deletions(-)

New commits:
commit 8d934b73ccac14c76f6596c33b087e22ba82be09
Author: Stephan Bergmann 
Date:   Thu Apr 21 12:05:48 2016 +0200

Better fix for 13758a3d154e8e450fdfe8bcdeb6b3a03996c53a

"SourceManager::isMacroArgExpansion has only one param in older Clang", 
which
caused false positives like warning about sal_False in

  CPPUNIT_ASSERT_EQUAL(guard.p->m1, sal_False);

in cppu/qa/cppumaker/test_cppumaker.cxx

Change-Id: I1c5a67527aef381e336d71cb8fefbb87961bbf96

diff --git a/compilerplugins/clang/compat.hxx b/compilerplugins/clang/compat.hxx
index 6c1152c..cd3cb3a 100644
--- a/compilerplugins/clang/compat.hxx
+++ b/compilerplugins/clang/compat.hxx
@@ -256,6 +256,24 @@ inline void addPPCallbacks(
 #endif
 }
 
+inline bool isMacroArgExpansion(
+clang::CompilerInstance& compiler, clang::SourceLocation location,
+clang::SourceLocation * startLocation)
+{
+#if CLANG_VERSION >= 30900
+return compiler.getSourceManager().isMacroArgExpansion(
+location, startLocation);
+#else
+bool b = compiler.getSourceManager().isMacroArgExpansion(location);
+if (b) {
+startLocation* = compiler.getSourceManager()
+.getSLocEntry(compiler.getSourceManager().getFileID(location))
+.getExpansion().getExpansionLocStart();
+}
+return b;
+#endif
+}
+
 inline bool isMacroBodyExpansion(clang::CompilerInstance& compiler, 
clang::SourceLocation location)
 {
 #if CLANG_VERSION >= 30300
diff --git a/compilerplugins/clang/salbool.cxx 
b/compilerplugins/clang/salbool.cxx
index ed61b2d..6b3d8df 100644
--- a/compilerplugins/clang/salbool.cxx
+++ b/compilerplugins/clang/salbool.cxx
@@ -284,12 +284,12 @@ bool SalBool::VisitCStyleCastExpr(CStyleCastExpr * expr) {
 compiler.getSourceManager().getImmediateMacroCallerLoc(
 loc));
 if (!isFromCIncludeFile(callLoc)) {
-if (compiler.getSourceManager().isMacroArgExpansion(
-expr->getLocStart())
+SourceLocation argLoc;
+if (compat::isMacroArgExpansion(
+compiler, expr->getLocStart(), &argLoc)
 //TODO: check its the complete (first) arg to the macro
 && (Lexer::getImmediateMacroName(
-expr->getLocStart(),
-compiler.getSourceManager(),
+argLoc, compiler.getSourceManager(),
 compiler.getLangOpts())
 == "CPPUNIT_ASSERT_EQUAL"))
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Building LODE on Mac fails with "Too many open files"

2016-04-21 Thread Norbert Thiebaud

On Thu, Apr 21, 2016 at 3:11 AM, Ralf S.  wrote:
> Hi there,
>
> I'm trying to set up LODE on the latest Mac OS X with newest Xcode, following
> the instructions here ("Quick Pre-canned Setup"):
> https://wiki.documentfoundation.org/Development/BuildingOnMac
>
> After running "make", the build process fails after a couple of hours with the
> following error:
>
> [build DEP] SRS:avmedia/res
> [build DEP] SRS:acc/res
> [...]/lode/dev/core/external//apache-commons/Module_apache-commons.mk:12:
> [...]/lode/dev/core/external/apache-
> commons/ExternalPackage_apache_commons_logging.mk: Too many open files
> [...]/lode/dev/core/external//apache-commons/Module_apache-commons.mk:12: ***
> No target registered while reading [...]/lode/dev/core/external/apache-
> commons/ExternalPackage_apache_commons_logging.mk!.  Stop.
> make: *** [build] Error 2

There is something fundamentally wrong if after a couple of hours you
are still in the [build Dep]
section.

iow the too many files is the symptom of something else going wrong
and increasing the file limit won't help

note that the mac build bot run with a vanilla config wrt to open files...

tb66:~ tdf$ launchctl limit maxfiles
maxfiles256unlimited

tb66:~ tdf$ ulimit -a
core file size  (blocks, -c) 0
data seg size   (kbytes, -d) unlimited
file size   (blocks, -f) unlimited
max locked memory   (kbytes, -l) unlimited
max memory size (kbytes, -m) unlimited
open files  (-n) 256
pipe size(512 bytes, -p) 1
stack size  (kbytes, -s) 8192
cpu time   (seconds, -t) unlimited
max user processes  (-u) 709
virtual memory  (kbytes, -v) unlimited


how do you start the build.. did you add $LODE_HOME/opt/bin in the
path (iow do you use the gnu-make setup by lode or accidentally use
Apple's provided one ?

also check you TEMP directory... sometimes there a serious leak of tempfiles...

Norbert
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] online.git: 5 commits - loleaflet/src

2016-04-21 Thread Jan Holesovsky

 loleaflet/src/layer/tile/GridLayer.js |  238 +-
 loleaflet/src/layer/tile/TileLayer.js |1 
 2 files changed, 153 insertions(+), 86 deletions(-)

New commits:
commit 22e8f8b1fefc2cbb50c4be27d3a04df0604d8859
Author: Jan Holesovsky 
Date:   Thu Apr 21 11:31:32 2016 +0200

loleaflet: Group tile requests into rectangular areas, and call tilecombine.

Instead of asking for individual tiles, try to find rectangular areas in the
tile requests, and ask for the large rectangles using tilecombine, instead 
of
asking for individual tiles.

diff --git a/loleaflet/src/layer/tile/GridLayer.js 
b/loleaflet/src/layer/tile/GridLayer.js
index 2954ed0..fad90c0 100644
--- a/loleaflet/src/layer/tile/GridLayer.js
+++ b/loleaflet/src/layer/tile/GridLayer.js
@@ -779,7 +779,7 @@ L.GridLayer = L.Layer.extend({
 
_addTiles: function (coordsQueue, fragment) {
// first take care of the DOM
-   for (i = 0; i < coordsQueue.length; i++) {
+   for (var i = 0; i < coordsQueue.length; i++) {
var coords = coordsQueue[i];
 
var tilePos = this._getTilePos(coords),
@@ -821,25 +821,124 @@ L.GridLayer = L.Layer.extend({
}
}
 
-   // then ask for the actual tiles
-   for (i = 0; i < coordsQueue.length; i++) {
-   var coords = coordsQueue[i];
+   // sort the tiles by the rows
+   coordsQueue.sort(function(a, b){
+   if (a.y != b.y ) {
+   return a.y-b.y;
+   } else {
+   return a.x-b.x;
+   }
+   });
+
+   // try group the tiles into rectangular areas
+   var rectangles = [];
+   while (coordsQueue.length > 0) {
+   var coords = coordsQueue[0];
 
+   // tiles that do not interest us
var key = this._tileCoordsToKey(coords);
+   if (this._tileCache[key] || coords.part !== 
this._selectedPart) {
+   coordsQueue.splice(0, 1);
+   continue;
+   }
 
-   if (!this._tileCache[key]) {
-   if (coords.part === this._selectedPart) {
+   var rectQueue = [ coords ];
+   var bound = new L.Point(coords.x, coords.y);
+
+   // remove it
+   coordsQueue.splice(0, 1);
+
+   // find the close ones
+   var rowLocked = false;
+   var hasHole = false
+   var i = 0;
+   while (i < coordsQueue.length) {
+   var current = coordsQueue[i];
+
+   // extend the bound vertically if possible (so 
far it was
+   // continous)
+   if (!hasHole && (current.y == bound.y + 1)) {
+   rowLocked = true;
+   ++bound.y;
+   }
+
+   if (current.y > bound.y) {
+   break;
+   }
+
+   if (!rowLocked) {
+   if (current.y == bound.y && current.x 
== bound.x + 1) {
+   // extend the bound horizontally
+   ++bound.x;
+   rectQueue.push(current);
+   coordsQueue.splice(i, 1);
+   } else {
+   // ignore the rest of the row
+   rowLocked = true;
+   ++i;
+   }
+   } else if (current.x <= bound.x && current.y <= 
bound.y) {
+   // we are inside the bound
+   rectQueue.push(current);
+   coordsQueue.splice(i, 1);
+   } else {
+   // ignore this one, but there still may 
be other tiles
+   hasHole = true;
+   ++i;
+   }
+   }
+
+   rectangles.push(rectQueue);
+   }
+
+   for (var r = 0; r < rectangles.length; ++r) {
+   var rectQueue = rectangles[r];
+
+   if (rectQueue.length =

[Libreoffice-commits] core.git: vcl/source

2016-04-21 Thread Tor Lillqvist

 vcl/source/outdev/bitmap.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 6dd392621891e159e2ccbc96453028f3b8ff2b7e
Author: Tor Lillqvist 
Date:   Thu Apr 21 13:49:27 2016 +0300

Make the OSL_ENSURE message match reality

Change-Id: Id006ebb6138d8cb1ec6f2242527e550674ab523a

diff --git a/vcl/source/outdev/bitmap.cxx b/vcl/source/outdev/bitmap.cxx
index e0e953f..f538ca0 100644
--- a/vcl/source/outdev/bitmap.cxx
+++ b/vcl/source/outdev/bitmap.cxx
@@ -447,7 +447,7 @@ Bitmap OutputDevice::GetBitmap( const Point& rSrcPt, const 
Size& rSize ) const
 }
 else
 {
-OSL_ENSURE(false, "CopyBits with negative width or 
height (!)");
+OSL_ENSURE(false, "CopyBits with zero or negative 
width or height");
 }
 
 aBmp = aVDev->GetBitmap( Point(), 
aVDev->GetOutputSizePixel() );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Broken master and newcomers.

2016-04-21 Thread jan iversen

Sorry for double mail, to this theme, but speaking with a good friend of mine 
(who runs a very big ci system), I got an idea, which might solve the problem 
for good.

Whenever jenkins builds a gerrit job, jenkins master knows when all platforms 
for that patch is compiled, so it should be possible to have a post-script on 
jenkins master (for gerrit builds) that does:
1) check if all platforms build
2) get the master commit the patch is based on
3) if the commit is higher than tag "buildable_master", move tag

I am no ci expert, so I leave it to Norbert to tell if the assumptions is wrong 
for our setup (I was told that jenkins master can be setup very differently).

This will allow contributors to build their first patch on a commit that are 
buildable on all platforms. Outstanding is to refine it, by including the 
result from our tinderboxes, which seems more difficult.

thoughts?

rgds
jan i.


> On 21 Apr 2016, at 10:25, jan iversen  wrote:
> 
> 
> Just had an interesting IRC chat on the infra channel. 
> 
> It seems it would be easy to have our ci system maintain a tag pr. platform.
> 
> The idea would be:
>   when master compiles on platform Foo, set/move tag "buildable_on_".
> 
> Doing that would have a very minimal effect on the build job, but give (at 
> least) new contributors a better security, that any build problems are local.
> 
> I highly recommend that such a tagging be implemented, and volunteer to 
> update our "getInvolved" page to reflect this.
> 
> I am aware it does not guarantee that ci can build on all platforms, but it 
> gives us a push in the right direction.
> 
> thoughts?
> 
> rgds
> jan I.
> 
> 
> 
> ___
> LibreOffice mailing list
> LibreOffice@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/libreoffice

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: cui/source

2016-04-21 Thread Noel Grandin

 cui/source/dialogs/cuifmsearch.cxx |4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit ca771c7e27ddcc5406dbee781f72ad1d7e213b29
Author: Noel Grandin 
Date:   Thu Apr 21 13:20:34 2016 +0200

fix windows build

after my commit
e1af7f0c438bc242e4562aa0286c99787b5ad544
"clang-tidy modernize-loop-convert in c*"

Change-Id: Icbc8c30186b0ea33933365951718dfad3fd7c4e2

diff --git a/cui/source/dialogs/cuifmsearch.cxx 
b/cui/source/dialogs/cuifmsearch.cxx
index e7d30c6..77905dd 100644
--- a/cui/source/dialogs/cuifmsearch.cxx
+++ b/cui/source/dialogs/cuifmsearch.cxx
@@ -120,8 +120,10 @@ FmSearchDialog::FmSearchDialog(vcl::Window* pParent, const 
OUString& sInitialTex
 DBG_ASSERT(comphelper::string::getTokenCount(fmscInitial.strUsedFields, 
';') == (sal_Int32)fmscInitial.arrFields.size(),
 "FmSearchDialog::FmSearchDialog : invalid data supplied by 
ContextSupplied !");
 #if (OSL_DEBUG_LEVEL > 1) || defined DBG_UTIL
-for (Reference & arrField : fmscInitial.arrFields)
+for (const Reference & arrField : fmscInitial.arrFields)
+{
 DBG_ASSERT(arrField.is(), "FmSearchDialog::FmSearchDialog : invalid 
data supplied by ContextSupplier !");
+}
 #endif // (OSL_DEBUG_LEVEL > 1) || DBG_UTIL
 
 for (   ::std::vector< OUString >::const_iterator context = 
_rContexts.begin();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: translations

2016-04-21 Thread Christian Lohmaier

 translations |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 824898e9106bc2b079dccc0f321fc5ca506e45a7
Author: Christian Lohmaier 
Date:   Thu Apr 21 12:58:09 2016 +0200

Updated core
Project: translations  0732bbfc5365529452255fc0263416c0455b127b

update translations for 5.2.0 alpha1

and force-fix errors using pocheck

Change-Id: I75bca3b0cc002eac4d11c98ad26dfdc35fd6

diff --git a/translations b/translations
index b0a83a0..0732bbf 16
--- a/translations
+++ b/translations
@@ -1 +1 @@
-Subproject commit b0a83a046ece7e828d6a7a2d1304661a8367012c
+Subproject commit 0732bbfc5365529452255fc0263416c0455b127b
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Broken master and newcomers.

2016-04-21 Thread Norbert Thiebaud

On Thu, Apr 21, 2016 at 6:14 AM, jan iversen
 wrote:
> Sorry for double mail, to this theme, but speaking with a good friend of mine 
> (who runs a very big ci system), I got an idea, which might solve the problem 
> for good.
>
> Whenever jenkins builds a gerrit job, jenkins master knows when all platforms 
> for that patch is compiled

Nope.

as I explained earlier.. tb job are per platform/config and are not
linked... so there is no garanteed that a given commit will get a tb
build on every config

one reason among other is the huge disparity in build time... so the
setup favor quick turn around per platform/config and maximal coverage
rather than big blocking check-all on the same commit setup

But ultimately the solution is to concentrate on gerrit build
verificatio, ot add the same coverage than tb there.. and leave the tb
as they are..
that way if something pass gerrit build verification it _will_ pass tb
so always green tb become a 'always gerrit workflow'

Norbert
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: extras/source

2016-04-21 Thread Christian Lohmaier

 extras/source/autocorr/lang/bg/DocumentList.xml|2 +-
 extras/source/autocorr/lang/ca/DocumentList.xml|2 +-
 extras/source/autocorr/lang/cs/DocumentList.xml|2 +-
 extras/source/autocorr/lang/da/DocumentList.xml|2 +-
 extras/source/autocorr/lang/de/DocumentList.xml|2 +-
 extras/source/autocorr/lang/en-AU/DocumentList.xml |2 +-
 extras/source/autocorr/lang/en-US/DocumentList.xml |2 +-
 extras/source/autocorr/lang/es/DocumentList.xml|2 +-
 extras/source/autocorr/lang/fi/DocumentList.xml|2 +-
 extras/source/autocorr/lang/fr/DocumentList.xml|2 +-
 extras/source/autocorr/lang/hr/DocumentList.xml|2 +-
 extras/source/autocorr/lang/hu/DocumentList.xml|2 +-
 extras/source/autocorr/lang/is/DocumentList.xml|2 +-
 extras/source/autocorr/lang/it/DocumentList.xml|2 +-
 extras/source/autocorr/lang/ja/DocumentList.xml|2 +-
 extras/source/autocorr/lang/ko/DocumentList.xml|2 +-
 extras/source/autocorr/lang/lt/DocumentList.xml|5 +++--
 extras/source/autocorr/lang/nl/DocumentList.xml|2 +-
 extras/source/autocorr/lang/pl/DocumentList.xml|2 +-
 extras/source/autocorr/lang/pt-BR/DocumentList.xml |2 +-
 extras/source/autocorr/lang/pt/DocumentList.xml|2 +-
 extras/source/autocorr/lang/ro/DocumentList.xml|2 +-
 extras/source/autocorr/lang/ru/DocumentList.xml|2 +-
 extras/source/autocorr/lang/sk/DocumentList.xml|2 +-
 extras/source/autocorr/lang/sl/DocumentList.xml|2 +-
 extras/source/autocorr/lang/sv/DocumentList.xml|2 +-
 extras/source/autocorr/lang/tr/DocumentList.xml|2 +-
 extras/source/autocorr/lang/zh-CN/DocumentList.xml |2 +-
 extras/source/autocorr/lang/zh-TW/DocumentList.xml |6 --
 29 files changed, 34 insertions(+), 31 deletions(-)

New commits:
commit bc8bb13f11a306fb12b1ac5dcf0e3d1c8d59388b
Author: Christian Lohmaier 
Date:   Thu Apr 21 13:47:57 2016 +0200

update emoji autocorrect files from po-files

Change-Id: Ie1209b68ab4d420934e8cdbc7ad7be5f0190f20c

diff --git a/extras/source/autocorr/lang/bg/DocumentList.xml 
b/extras/source/autocorr/lang/bg/DocumentList.xml
index 37c30f6..6ae6d3a 100644
--- a/extras/source/autocorr/lang/bg/DocumentList.xml
+++ b/extras/source/autocorr/lang/bg/DocumentList.xml
@@ -16,6 +16,7 @@
   
   
   
+  
   
   
   
@@ -102,7 +103,6 @@
   
   
   
-  
   
   
   
diff --git a/extras/source/autocorr/lang/ca/DocumentList.xml 
b/extras/source/autocorr/lang/ca/DocumentList.xml
index 4085133..1221a9a 100644
--- a/extras/source/autocorr/lang/ca/DocumentList.xml
+++ b/extras/source/autocorr/lang/ca/DocumentList.xml
@@ -356,6 +356,7 @@
   
   
   
+  
   
   
   
@@ -606,7 +607,6 @@
   
   
   
-  
   
   
   
diff --git a/extras/source/autocorr/lang/cs/DocumentList.xml 
b/extras/source/autocorr/lang/cs/DocumentList.xml
index 7d04405..5c5c6e5 100644
--- a/extras/source/autocorr/lang/cs/DocumentList.xml
+++ b/extras/source/autocorr/lang/cs/DocumentList.xml
@@ -730,7 +730,6 @@
   
   
   
-  
   
   
   
@@ -780,6 +779,7 @@
   
   
   
+  
   
   
   
diff --git a/extras/source/autocorr/lang/da/DocumentList.xml 
b/extras/source/autocorr/lang/da/DocumentList.xml
index cfbf795..ecfb8ae 100644
--- a/extras/source/autocorr/lang/da/DocumentList.xml
+++ b/extras/source/autocorr/lang/da/DocumentList.xml
@@ -821,7 +821,6 @@
   
   
   
-  
   
   
   
@@ -849,6 +848,7 @@
   
   
   
+  
   
   
   
diff --git a/extras/source/autocorr/lang/de/DocumentList.xml 
b/extras/source/autocorr/lang/de/DocumentList.xml
index b324447..0ee0004 100644
--- a/extras/source/autocorr/lang/de/DocumentList.xml
+++ b/extras/source/autocorr/lang/de/DocumentList.xml
@@ -420,7 +420,6 @@
   
   
   
-  
   
   
   
@@ -448,6 +447,7 @@
   
   
   
+  
   
   
   
diff --git a/extras/source/autocorr/lang/en-AU/DocumentList.xml 
b/extras/source/autocorr/lang/en-AU/DocumentList.xml
index f58f114..b8568d6 100644
--- a/extras/source/autocorr/lang/en-AU/DocumentList.xml
+++ b/extras/source/autocorr/lang/en-AU/DocumentList.xml
@@ -1043,7 +1043,6 @@
   
   
   
-  
   
   
   
@@ -1131,6 +1130,7 @@
   
   
   
+  
   
   
   
diff --git a/extras/source/autocorr/lang/en-US/DocumentList.xml 
b/extras/source/autocorr/lang/en-US/DocumentList.xml
index 2c829be..19e9f25 100644
--- a/extras/source/autocorr/lang/en-US/DocumentList.xml
+++ b/extras/source/autocorr/lang/en-US/DocumentList.xml
@@ -1048,7 +1048,6 @@
   
   
   
-  
   
   
   
@@ -1136,6 +1135,7 @@
   
   
   
+  
   
   
   
diff --git a/extras/source/autocorr/lang/es/DocumentList.xml 
b/extras/source/autocorr/lang/es/DocumentList.xml
index b115866..935362f 100644
--- a/extras/source/autocorr/lang/es/DocumentList.xml
+++ b/extras/source/autocorr/lang/es/DocumentList.xml
@@ -772,7 +772,6 @@
   
   
   
-  
   
   
   
@@ -879,6 +878,7 @@
   
   
   
+  
   
   
   
diff --git a/extras/source/autocorr/lang/fi/DocumentList.xml 
b/extras/source/autocorr/lang/fi/Docume

[Libreoffice-commits] core.git: compilerplugins/clang

2016-04-21 Thread Stephan Bergmann

 compilerplugins/clang/compat.hxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit cad49138dadc9e226950bb7b6a939a60408ea6f6
Author: Stephan Bergmann 
Date:   Thu Apr 21 13:52:23 2016 +0200

typo

Change-Id: I67721e86073bd2f67bee3ffbbb81fd5d143997d8

diff --git a/compilerplugins/clang/compat.hxx b/compilerplugins/clang/compat.hxx
index cd3cb3a..db573f5 100644
--- a/compilerplugins/clang/compat.hxx
+++ b/compilerplugins/clang/compat.hxx
@@ -266,7 +266,7 @@ inline bool isMacroArgExpansion(
 #else
 bool b = compiler.getSourceManager().isMacroArgExpansion(location);
 if (b) {
-startLocation* = compiler.getSourceManager()
+*startLocation = compiler.getSourceManager()
 .getSLocEntry(compiler.getSourceManager().getFileID(location))
 .getExpansion().getExpansionLocStart();
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Changes to 'refs/tags/libreoffice-5.2.0.0.alpha1'

2016-04-21 Thread Christian Lohmaier

Tag 'libreoffice-5.2.0.0.alpha1' created by Christian Lohmaier 
 at 2016-04-21 12:10 +

Tag libreoffice-5.2.0.0.alpha1
-BEGIN PGP SIGNATURE-
Version: GnuPG v1

iQIcBAABAgAGBQJXGMM3AAoJEPQ0oe+v7q6jecIP/0TxCN3GnJm2ht5nvEcMHrWZ
oPSTtyqNdP5251HuxM15fxCkyXAygsSf4j7d5IugiInYglMk9Ff1fBU7U8X2dU6J
R88quhzLxknEo9LFwPRQ7f8ZcvhqmC/9Rr3BsCtdmjL3Q2YuMLsdUuiKffwKptdo
WuJ/bGaT1dyTClpImDWpKb2WVviOcLyLWPUzuwYEbLJ/6mfOam5Sk7RY0Qr8RuiF
B/kTDaztwxgetSuGJu1KBZv1HRC4yMTeru7njuo+oc2E1vJQfBoj6yKKTa7mIjSi
dzzevg6Yx426yT1OXY8xLddX3763mr3Dlvao3wsGKqk/iLWFYcFvoIMUhrAkyaXY
3JIYdhC/z6C9xM+8JI5NkMh+LqPJEfwxEO7muFxmGWjVqf/HxZ7ljVKXfS/GWUfX
L+kQ895IjS21EM3HWU0+y+utJjDG5XJMIOPu4WC/N3xvHMjQlyAfxH4lucZ35vxM
+gmrzhIW932o57Bru0fr7iDwtYKRJMV5OjhZE5goZjwMXRtUIsmKfovVbxmCKzuc
tduoJL0tNIE/v96hgdDwd8l/0ArWHa+ZIBfzkghEYBriWAI2Ja5LBscTy25DUWS5
j/5snv2zDc6xUV85gObeKKx2PkhF3SX5uXvMzaqNw224xEINHwUmJGdB2O8CE9uN
IaBzsdANlA9yBF5SHWHR
=f6IM
-END PGP SIGNATURE-

Changes since libreoffice-5-1-branch-point-6628:
---
 0 files changed
---
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] dictionaries.git: Changes to 'refs/tags/libreoffice-5.2.0.0.alpha1'

2016-04-21 Thread Christian Lohmaier

Tag 'libreoffice-5.2.0.0.alpha1' created by Christian Lohmaier 
 at 2016-04-21 12:10 +

Tag libreoffice-5.2.0.0.alpha1
-BEGIN PGP SIGNATURE-
Version: GnuPG v1

iQIcBAABAgAGBQJXGMMuAAoJEPQ0oe+v7q6jK+MP+QGVadfzEp8bJv8OeMr2aDQB
DP1gLAh/sLJwn+5qJ/79dzpoiNxadP4kkOQ38P1fkfwt5hHCeqHRbTTKuO5nZ9P7
TimGcmVAYPF1dm/YEH3xntxbpwMD7X6yz3a11LEOkHo4d5e7F8R07/B9/brrUa//
dG6s7fL+KZByIlHCBN/jw62FjLGHqCpXMvvNozVOMsNY9OR8UY6DmHdgHC4EIYrk
urBhceucPbq+uFj9hF+2JGuVKtNekLdHP49D0YjvZChpugwt3bgLlTJsiJPTVsSg
Kf3EN2FP/c1n4+Be6urjJ2nWr5/WSIGMG1z7N11EiEVBanG8stL2AjpLhTFCVyWW
XpkB0ROCjTu1r2INRKciADCUAqLWru5fCoTC2xL86rzvLxt6CzdAIt+wcvOtJEID
kgXaoZdMuaIa8j8hFkASQmiTdL5FEf6bQVByODzGCxLL/vSiqN5Oe7CEeaWlz2wN
3BWALlMo6it2NJdF8Y/nLiYCi+ZFLFtxBkUriC74igmceewABaZy9zjj69bt+/Dn
LEHaAHGfib28WfzgGvR0rQLNk4xTVrUNPyjb3lmgKoba1nCSnF+Zz/083BtEtln2
KoLlgqyFV+4MAYAUD6YP/H/t+OplmoUmWmMF2jAHKT2D9Lp6wzmHhJemUGSAZYo9
F48pF0OaB+VUfhKl36mG
=dNl3
-END PGP SIGNATURE-

Changes since libreoffice-5-1-branch-point-21:
---
 0 files changed
---
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] translations.git: Changes to 'refs/tags/libreoffice-5.2.0.0.alpha1'

2016-04-21 Thread Christian Lohmaier

Tag 'libreoffice-5.2.0.0.alpha1' created by Christian Lohmaier 
 at 2016-04-21 12:10 +

Tag libreoffice-5.2.0.0.alpha1
-BEGIN PGP SIGNATURE-
Version: GnuPG v1

iQIcBAABAgAGBQJXGMM0AAoJEPQ0oe+v7q6jkloP/3crvWrqLgSiZsu1L1xXKt5U
QC2I/CQyHnsmWWLofAehIG+QGq9DmgG114+1QNwDFxHWI+WKvBa3CFdq/XY7/qIZ
uI/cdRDFrSIvrKWzc3fZGAj0GOtCxXJpNiL+qfzgOzXMsAsCdVHFEAe4uSL+9lFP
S5qAQRevuejIb5bV/0pSB2SVHR64nG8Q+riYAQZUFhGIwGQQc24efj2uvrKopf2r
IbgNiYoqIdUV12xkg8B7bS7jEO+w2CXHHA4bawCDyW5/UnecCcjeDMgL1VmpO9OV
9+6p+LEEx6Szwl0dcTiWRH4Nxl81LgKVRztbZB/YRFgZWt8oWdKMWd1i08Sh0TWF
AKJM9aeumO30r3EmJj1vW0SKr2k88oPmDsknAWYHv729yEOSEn89tfeFlYpGZEtY
iVIinsO7QPIjwiYjoX7n1z4x3FLbqhD5klGQgrxVMSnD6xlue1yAKtmYgBLkL16X
RzohY4aW+hCx6eqt/7eAzc0Ane02W0MiYsNNSgBFT49NLmlY4wAYme/zjBhA957v
n1m34h5b/fOT80EPI8UnWeqL+zQ9d3L2WNU9OCRE4pFPB8EqSR2d5QWBMh8MMTY7
FdvxefIk0Z0XVNz8TMM08l0kieZHKySoAkX164exvszUCc3GR1eOxU9TYuDA/+9+
9PBIn34uOwHrUxKsnBgn
=EMXB
-END PGP SIGNATURE-

Changes since libreoffice-5-1-branch-point-15:
---
 0 files changed
---
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] help.git: Changes to 'refs/tags/libreoffice-5.2.0.0.alpha1'

2016-04-21 Thread Christian Lohmaier

Tag 'libreoffice-5.2.0.0.alpha1' created by Christian Lohmaier 
 at 2016-04-21 12:10 +

Tag libreoffice-5.2.0.0.alpha1
-BEGIN PGP SIGNATURE-
Version: GnuPG v1

iQIcBAABAgAGBQJXGMMxAAoJEPQ0oe+v7q6jbikP/06pnQ+d9GurQGJxSs41SYYQ
4F0i2+u3kKDUufcZvyjQoWyIUvmeOm7Az3qdaFGDAcyAoXxFYE2OWaE54JrV/aJg
hgqRn09CtREYGClEjWJ+eI2U43+iu8P2MjZp0T/dR/8SLkp8XEJY+MEbfz/Ttyit
JqC/jKCD1tbFsM6Vd1u0zDEGDaal5tOmIwyFaBNh+fVWzxaETcAF4rhNJY3m5SDL
SdoVqLcBXxzyVTRM+8opKtYRWVLunKVXKzp67QNJtTPA+3ZitJTuHDHVikuzTM72
GSv69EHfevhDVpBj+fjffi+dk98pZ5m/8GOcgtt0kxXJ1gwkGeX3XzTzAkc6Mnsc
qBylrrClTekTtfCxYW7JhHkv9tz0lzTxsjZVG0x/W/bJlcqeKV2a5jFMzcefrFH4
gB4+40gBmTyohcPC2YvUgMCilmlIehlGz/tBuS3+qA0jtSLQb0HOEYAtXpUbDjcg
1jZaIK4IIuvI3Fs/A6vDWwkE9U2uxmiUMvU2xqcFCBELz2oF+QmGFsGJnbV6XDHS
KhCCcBnQHFLDO4+0XN448XgCvKSCzRrrr/6feiFFaqpYMqouElf61CMqcOFkvnrd
p0VAjCnUUyKez1eLCY0pAvpkNZXB7WPizcMNBRGuDlBoFYVTW4UMj++WXRCupA1w
Zi29cskaME1vIlzjgu/i
=pB6y
-END PGP SIGNATURE-

Changes since libreoffice-5-1-branch-point-121:
---
 0 files changed
---
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: configure.ac

2016-04-21 Thread Christian Lohmaier

 configure.ac |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 4779f443e9a58e3bd9ec7668796a877ef2362d99
Author: Christian Lohmaier 
Date:   Thu Apr 21 14:10:58 2016 +0200

bump product version to 5.2.0.0.alpha1+

Change-Id: I92ac49c3d59b6b1517edd9884e85e67e017cfd63

diff --git a/configure.ac b/configure.ac
index 6e80a96..ae441cb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,7 +9,7 @@ dnl in order to create a configure script.
 # several non-alphanumeric characters, those are split off and used only for 
the
 # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no 
idea.
 
-AC_INIT([LibreOffice],[5.2.0.0.alpha0+],[],[],[http://documentfoundation.org/])
+AC_INIT([LibreOffice],[5.2.0.0.alpha1+],[],[],[http://documentfoundation.org/])
 
 AC_PREREQ([2.59])
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: loolwsd/protocol.txt

2016-04-21 Thread Ashod Nakashian

 loolwsd/protocol.txt |   15 +++
 1 file changed, 15 insertions(+)

New commits:
commit f83cc22db97714bd83ce2e26d865a7bb03617237
Author: Ashod Nakashian 
Date:   Thu Apr 21 09:02:34 2016 -0400

Documentation update for 'useractive' and 'userinactive'.

Change-Id: I4e2f0923aa5d0f35c29c752b144e23b365e73bb0
Reviewed-on: https://gerrit.libreoffice.org/24279
Reviewed-by: Ashod Nakashian 
Tested-by: Ashod Nakashian 

diff --git a/loolwsd/protocol.txt b/loolwsd/protocol.txt
index 1d2324d..ce45761 100644
--- a/loolwsd/protocol.txt
+++ b/loolwsd/protocol.txt
@@ -133,6 +133,21 @@ takeedit
 
 See 'editlock:' message in server -> client.
 
+useractive
+
+Sent when the user regains focus or clicks within the active area to
+disable the inactive state.
+Will send invalidation and update notifications to force refreshing the 
screen.
+
+See 'userinactive'.
+
+userinactive
+
+Sent when the user has switched tabs or away from the Browser altogether.
+It should throttle updates until the user is active again.
+
+See 'useractive'.
+
 server -> client
 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: include/LibreOfficeKit include/vcl sc/inc sc/qa sc/source sd/inc sd/qa sd/source sw/inc sw/qa sw/source

2016-04-21 Thread Henry Castro

 include/LibreOfficeKit/LibreOfficeKit.h|4 
 include/LibreOfficeKit/LibreOfficeKit.hxx  |6 ++
 include/vcl/ITiledRenderable.hxx   |6 ++
 sc/inc/document.hxx|1 +
 sc/inc/docuno.hxx  |3 +++
 sc/inc/table.hxx   |2 ++
 sc/qa/unit/tiledrendering/tiledrendering.cxx   |   18 ++
 sc/source/core/data/document.cxx   |   13 +
 sc/source/core/data/table1.cxx |5 +
 sc/source/ui/unoobj/docuno.cxx |7 +++
 sd/inc/sdpage.hxx  |1 +
 sd/qa/unit/tiledrendering/tiledrendering.cxx   |   18 ++
 sd/source/core/sdpage.cxx  |5 +
 sd/source/ui/inc/unomodel.hxx  |2 ++
 sd/source/ui/unoidl/unomodel.cxx   |   12 
 sw/inc/unotxdoc.hxx|2 ++
 sw/qa/extras/tiledrendering/tiledrendering.cxx |   16 
 sw/source/uibase/uno/unotxdoc.cxx  |8 
 18 files changed, 129 insertions(+)

New commits:
commit 1a74c6333a79ccf0579b33ebc42ce2ccc23ccadb
Author: Henry Castro 
Date:   Wed Apr 20 13:52:31 2016 -0400

lokit: add getPartHash

In the tiled rendering case, the slides, no matter
if it is inserted or deleted, the part names always return
sequential names i.e. Slide 1, Slide 2, ..., Slide N.

However the client side needs to know what slides had been
deleted or inserted, so it is necessary to send the hash codes.

Change-Id: I0e9caeec660c3e42dd9f751bdce7690f9ad365a1
Reviewed-on: https://gerrit.libreoffice.org/24267
Tested-by: Jenkins 
Reviewed-by: Miklos Vajna 

diff --git a/include/LibreOfficeKit/LibreOfficeKit.h 
b/include/LibreOfficeKit/LibreOfficeKit.h
index c98dd1f..863e377 100644
--- a/include/LibreOfficeKit/LibreOfficeKit.h
+++ b/include/LibreOfficeKit/LibreOfficeKit.h
@@ -118,6 +118,10 @@ struct _LibreOfficeKitDocumentClass
 char* (*getPartName) (LibreOfficeKitDocument* pThis,
   int nPart);
 
+/// @see lok::Document::getPartHash().
+char* (*getPartHash) (LibreOfficeKitDocument* pThis,
+  int nPart);
+
 /// @see lok::Document::setPartMode().
 void (*setPartMode) (LibreOfficeKitDocument* pThis,
  int nMode);
diff --git a/include/LibreOfficeKit/LibreOfficeKit.hxx 
b/include/LibreOfficeKit/LibreOfficeKit.hxx
index 44e321f..3e3a0e1 100644
--- a/include/LibreOfficeKit/LibreOfficeKit.hxx
+++ b/include/LibreOfficeKit/LibreOfficeKit.hxx
@@ -116,6 +116,12 @@ public:
 return mpDoc->pClass->getPartName(mpDoc, nPart);
 }
 
+/// Get the current part's hash.
+inline char* getPartHash(int nPart)
+{
+return mpDoc->pClass->getPartHash(mpDoc, nPart);
+}
+
 inline void setPartMode(int nMode)
 {
 mpDoc->pClass->setPartMode(mpDoc, nMode);
diff --git a/include/vcl/ITiledRenderable.hxx b/include/vcl/ITiledRenderable.hxx
index d9cd347..9c82ba8 100644
--- a/include/vcl/ITiledRenderable.hxx
+++ b/include/vcl/ITiledRenderable.hxx
@@ -83,6 +83,12 @@ public:
 return OUString("");
 }
 
+/**
+ * Get the hash of the currently displayed part, i.e. sheet in a 
spreadsheet
+ * or slide in a presentation.
+ */
+virtual OUString getPartHash(int nPart) = 0;
+
 /// @see lok::Document::setPartMode().
 virtual void setPartMode(int nPartMode)
 {
diff --git a/sc/inc/document.hxx b/sc/inc/document.hxx
index c0eeb18..958ffc4 100644
--- a/sc/inc/document.hxx
+++ b/sc/inc/document.hxx
@@ -638,6 +638,7 @@ public:
 SC_DLLPUBLIC void   SetVisibleTab(SCTAB nTab)   { nVisibleTab = 
nTab; }
 
 SC_DLLPUBLIC bool HasTable( SCTAB nTab ) const;
+SC_DLLPUBLIC bool GetHashCode( SCTAB nTab, sal_Int64& rHashCode) const;
 SC_DLLPUBLIC bool GetName( SCTAB nTab, OUString& rName ) const;
 SC_DLLPUBLIC bool GetCodeName( SCTAB nTab, OUString& rName ) const;
 SC_DLLPUBLIC bool SetCodeName( SCTAB nTab, const OUString& rName );
diff --git a/sc/inc/docuno.hxx b/sc/inc/docuno.hxx
index f0ac91e..80ab14d 100644
--- a/sc/inc/docuno.hxx
+++ b/sc/inc/docuno.hxx
@@ -375,6 +375,9 @@ public:
 /// @see vcl::ITiledRenderable::getPartName().
 virtual OUString getPartName(int nPart) override;
 
+/// @see vcl::ITiledRenderable::getPartHash().
+virtual OUString getPartHash( int nPart ) override;
+
 /// @see vcl::ITiledRenderable::initializeForTiledRendering().
 virtual void initializeForTiledRendering(const 
css::uno::Sequence& rArguments) override;
 
diff --git a/sc/inc/table.hxx b/sc/inc/table.hxx
index 57075d8..f9fff87 100644
--- a/sc/inc/table.hxx
+++ b/sc/inc/table.hxx
@@ -295,6 +295,8 @@ public:
 voidSetLink( ScLinkMode nMode, const OUString& rDoc, const 
OUString& rFlt,
 const OUS

[Libreoffice-commits] core.git: Branch 'libreoffice-5-1' - basctl/source

2016-04-21 Thread Julien Nabet

 basctl/source/basicide/baside3.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit e1dde79a11f85bdde52e8b4c319140234f250aad
Author: Julien Nabet 
Date:   Sat Apr 16 23:42:56 2016 +0200

tdf#97380: don't destroy completely window when replace dialog

0x2aaaf64ff222 in basctl::ScriptDocument::Impl::isApplication 
(this=0x) at 
/home/julien/lo/libreoffice/basctl/source/basicide/scriptdocument.cxx:210
210 inline  boolisApplication() const   { return m_bValid && 
m_bIsApplication; }
(gdb) bt
0  0x2aaaf64ff222 in basctl::ScriptDocument::Impl::isApplication 
(this=0x) at 
/home/julien/lo/libreoffice/basctl/source/basicide/scriptdocument.cxx:210
1  0x2aaaf64fa12e in basctl::ScriptDocument::isApplication 
(this=0x576b458) at 
/home/julien/lo/libreoffice/basctl/source/basicide/scriptdocument.cxx:1311
2  0x2aaaf648f6d7 in basctl::MarkDocumentModified (rDocument=...) at 
/home/julien/lo/libreoffice/basctl/source/basicide/basobj3.cxx:256
3  0x2aaaf645e2a9 in basctl::implImportDialog (pWin=0x576b210, 
rCurPath=, rDocument=...,
aLibName="Standard") at 
/home/julien/lo/libreoffice/basctl/source/basicide/baside3.cxx:1154
4  0x2aaaf645eda9 in basctl::DialogWindow::ImportDialog 
(this=0x576b210) at 
/home/julien/lo/libreoffice/basctl/source/basicide/baside3.cxx:1213

Change-Id: I7365b2cacc8a3783fdc8e573bbc10ff574d9c4ed
Reviewed-on: https://gerrit.libreoffice.org/24139
Tested-by: Jenkins 
Reviewed-by: Julien Nabet 
(cherry picked from commit 60b61b7859ca357e0a2b6953888954a46d64999d)
Reviewed-on: https://gerrit.libreoffice.org/24140
Reviewed-by: Samuel Mehrbrodt 

diff --git a/basctl/source/basicide/baside3.cxx 
b/basctl/source/basicide/baside3.cxx
index 09e3c87..1bef09d 100644
--- a/basctl/source/basicide/baside3.cxx
+++ b/basctl/source/basicide/baside3.cxx
@@ -1155,7 +1155,7 @@ bool implImportDialog( vcl::Window* pWin, const OUString& 
rCurPath, const Script
 {
 BaseWindow* pDlgWin = pShell->FindDlgWin( rDocument, 
aLibName, aNewDlgName, false, true );
 if( pDlgWin != nullptr )
-pShell->RemoveWindow( pDlgWin, true );
+pShell->RemoveWindow( pDlgWin, false );
 MarkDocumentModified( rDocument );
 }
 else
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-5-0-6' - sc/source

2016-04-21 Thread Eike Rathke

 sc/source/core/data/document.cxx |8 
 1 file changed, 8 insertions(+)

New commits:
commit dc5d3edc893ad3fcd555f28c0b1eaed3607df810
Author: Eike Rathke 
Date:   Mon Apr 18 22:03:07 2016 +0200

Resolves: tdf#99322 re-establish group area listeners after update reference

Change-Id: If2ec5f938c7278ce817de3d89dc84cc0584507ac
(cherry picked from commit 44e2da58226448c5617eac08ca2ae3d9a9ad2afa)
Reviewed-on: https://gerrit.libreoffice.org/24227
Reviewed-by: Markus Mohrhard 
Reviewed-by: Miklos Vajna 
Reviewed-by: CaolÃ¡n McNamara 
Tested-by: CaolÃ¡n McNamara 

diff --git a/sc/source/core/data/document.cxx b/sc/source/core/data/document.cxx
index 8e57020..16be98b 100644
--- a/sc/source/core/data/document.cxx
+++ b/sc/source/core/data/document.cxx
@@ -2596,6 +2596,14 @@ void ScDocument::CopyBlockFromClip(
 SetInsertingFromOtherDoc( true);
 aRefCxt.meMode = URM_MOVE;
 UpdateReference(aRefCxt, rCxt.getUndoDoc(), false);
+
+// For URM_MOVE group listeners may have been removed,
+// re-establish them.
+/* TODO: actually only those in
+ * sc::RefUpdateContext::maRegroupCols are affected,
+ * come up with a start listeners that takes such. */
+StartNeededListeners();
+
 SetInsertingFromOtherDoc( bOldInserting);
 }
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: cui/source

2016-04-21 Thread Stephan Bergmann

 cui/source/tabpages/border.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit a1236528795739ce7eb8ac1206f33a1f1ad2c209
Author: Stephan Bergmann 
Date:   Thu Apr 21 16:13:21 2016 +0200

loplugin:rangedforcopy

Change-Id: I227aa955417385da7cd43cc3641342e66e62ed96

diff --git a/cui/source/tabpages/border.cxx b/cui/source/tabpages/border.cxx
index 69c4adb..c999db8 100644
--- a/cui/source/tabpages/border.cxx
+++ b/cui/source/tabpages/border.cxx
@@ -665,7 +665,7 @@ bool SvxBorderTabPage::FillItemSet( SfxItemSet* rCoreAttrs )
 { svx::FRAMEBORDER_RIGHT,SvxBoxItemLine::RIGHT 
},
 };
 
-for (std::pair i : eTypes1)
+for (std::pair const & i : eTypes1)
 aBoxItem.SetLine( m_pFrameSel->GetFrameBorderStyle( i.first ), 
i.second );
 
 
@@ -676,7 +676,7 @@ bool SvxBorderTabPage::FillItemSet( SfxItemSet* rCoreAttrs )
 { 
svx::FRAMEBORDER_HOR,SvxBoxInfoItemLine::HORI },
 { 
svx::FRAMEBORDER_VER,SvxBoxInfoItemLine::VERT }
 };
-for (std::pair j : eTypes2)
+for (std::pair const & j : 
eTypes2)
 aBoxInfoItem.SetLine( m_pFrameSel->GetFrameBorderStyle( j.first ), 
j.second );
 
 aBoxInfoItem.EnableHor( mbHorEnabled );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: basctl/source

2016-04-21 Thread Caolán McNamara

 basctl/source/basicide/objdlg.cxx |5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

New commits:
commit 4f92eb777ab17e0a2ee478572a46d060742902e1
Author: CaolÃ¡n McNamara 
Date:   Thu Apr 21 16:09:37 2016 +0100

Resolves: tdf#99425 crash when closing dialog editor

with undocked "Object Catalog" toolbar

Change-Id: I70d51cec699333c5cfc1461d61734c1bbb5323da

diff --git a/basctl/source/basicide/objdlg.cxx 
b/basctl/source/basicide/objdlg.cxx
index d8b9538..2371c3f 100644
--- a/basctl/source/basicide/objdlg.cxx
+++ b/basctl/source/basicide/objdlg.cxx
@@ -98,8 +98,11 @@ void ObjectCatalog::ToggleFloatingMode ()
 }
 
 // ArrangeWindows() -- arranges the controls to the size of the ObjectCatalog
-void ObjectCatalog::ArrangeWindows ()
+void ObjectCatalog::ArrangeWindows()
 {
+if (!aTitle || !aTree)
+return;
+
 Size const aSize = GetOutputSizePixel();
 bool const bFloating = IsFloatingMode();
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: compilerplugins/clang testtools/source

2016-04-21 Thread Stephan Bergmann

 compilerplugins/clang/implicitboolconversion.cxx |   39 +++
 testtools/source/bridgetest/bridgetest.cxx   |   47 ---
 2 files changed, 57 insertions(+), 29 deletions(-)

New commits:
commit 8c423eeb49606087243fb6bbf31c0981c55dc773
Author: Stephan Bergmann 
Date:   Thu Apr 21 17:27:43 2016 +0200

Use Sequence ctor taking initializer_list

needed adapting loplugin:implicitboolconversion to not warn about

  Sequence arBool({true, false, true});

Change-Id: I971918aab7c958ef8f1e4e0548a84314e95f8325

diff --git a/compilerplugins/clang/implicitboolconversion.cxx 
b/compilerplugins/clang/implicitboolconversion.cxx
index 9fa073c..226f49d 100644
--- a/compilerplugins/clang/implicitboolconversion.cxx
+++ b/compilerplugins/clang/implicitboolconversion.cxx
@@ -293,6 +293,8 @@ public:
 
 bool TraverseBinXorAssign(CompoundAssignOperator * expr);
 
+bool TraverseCXXStdInitializerListExpr(CXXStdInitializerListExpr * expr);
+
 bool TraverseReturnStmt(ReturnStmt * stmt);
 
 bool TraverseFunctionDecl(FunctionDecl * decl);
@@ -766,6 +768,43 @@ bool 
ImplicitBoolConversion::TraverseBinXorAssign(CompoundAssignOperator * expr)
 return bRet;
 }
 
+bool ImplicitBoolConversion::TraverseCXXStdInitializerListExpr(
+CXXStdInitializerListExpr * expr)
+{
+// Must be some std::initializer_list; check whether T is sal_Bool 
(i.e.,
+// unsigned char) [TODO: check for real sal_Bool instead]:
+auto t = expr->getType();
+if (auto et = dyn_cast(t)) {
+t = et->desugar();
+}
+auto ts = t->getAs();
+if (ts == nullptr
+|| !ts->getArg(0).getAsType()->isSpecificBuiltinType(
+clang::BuiltinType::UChar))
+{
+return RecursiveASTVisitor::TraverseCXXStdInitializerListExpr(expr);
+}
+// Avoid warnings for code like
+//
+//  Sequence arBool({true, false, true});
+//
+auto e = dyn_cast(
+ignoreParenAndTemporaryMaterialization(expr->getSubExpr()));
+if (e == nullptr) {
+return RecursiveASTVisitor::TraverseCXXStdInitializerListExpr(expr);
+}
+nested.push(std::vector());
+bool ret = RecursiveASTVisitor::TraverseCXXStdInitializerListExpr(expr);
+assert(!nested.empty());
+for (auto i: nested.top()) {
+if (!std::find(e->begin(), e->end(), i)) {
+reportWarning(i);
+}
+}
+nested.pop();
+return ret;
+}
+
 bool ImplicitBoolConversion::TraverseReturnStmt(ReturnStmt * stmt) {
 nested.push(std::vector());
 bool bRet = RecursiveASTVisitor::TraverseReturnStmt(stmt);
diff --git a/testtools/source/bridgetest/bridgetest.cxx 
b/testtools/source/bridgetest/bridgetest.cxx
index bde1492..df7e87a 100644
--- a/testtools/source/bridgetest/bridgetest.cxx
+++ b/testtools/source/bridgetest/bridgetest.cxx
@@ -641,22 +641,8 @@ static bool performTest(
 }
 // Perform sequence tests (XBridgeTest2); create the sequence which is
 // compared with the results:
-sal_Bool _arBool[] = { true, false, true };
-sal_Unicode _arChar[] = { 0x0065, 0x0066, 0x0067 };
-sal_Int8 _arByte[] = { 1, 2, -1 };
-sal_Int16 _arShort[] = { -0x8000, 1, 0x7FFF };
-sal_uInt16 _arUShort[] = { 0 , 1, 0x };
 sal_Int32 _arLong[] = {
 static_cast< sal_Int32 >(0x8000), 1, 0x7FFF };
-sal_uInt32 _arULong[] = { 0, 1, 0x };
-sal_Int64 _arHyper[] = {
-static_cast< sal_Int64 >(SAL_CONST_INT64(0x8000)), 1,
-SAL_CONST_INT64(0x7FFF) };
-sal_uInt64 _arUHyper[] = { 0, 1, SAL_CONST_UINT64(0x) 
};
-OUString _arString[] = {
-OUString("String 1"),
-OUString("String 2"),
-OUString("String 3") };
 sal_Bool _aBool = true;
 sal_Int32 _aInt = 0xBABEBABE;
 float _aFloat = 3.14f;
@@ -668,7 +654,6 @@ static bool performTest(
 _arObj[0] = new OWeakObject();
 _arObj[1] = new OWeakObject();
 _arObj[2] = new OWeakObject();
-TestEnum _arEnum[] = { TestEnum_ONE, TestEnum_TWO, TestEnum_CHECK };
 TestElement _arStruct[3];
 assign(
 _arStruct[0], true, '@', 17, 0x1234, 0xFEDC, 0x12345678, 
0xFEDCBA98,
@@ -689,23 +674,27 @@ static bool performTest(
 TestEnum_CHECK, STRING_TEST_CONSTANT, _arObj[2],
 Any(&_arObj[2], cppu::UnoType::get()));
 {
-float _arFloat[] = { 1.1f, 2.2f, 3.3f };
-double _arDouble[] = { 1.11, 2.22, 3.33 };
-Sequence arBool(_arBool, 3);
-Sequence arChar( _arChar, 3);
-Sequence arByte(_arByte, 3);
-Sequence arShort(_arShort, 3);
-Sequence arUShort(_arUShort, 3);
+Sequence arBool({true, false, true});
+Sequence arChar({0x0065, 0x0066, 0x0067});
+Sequence arByte({1, 2, -1});
+Sequence arShort({-0x

[Libreoffice-commits] core.git: compilerplugins/clang cppu/source cui/source i18npool/source sax/source sc/source sd/source stoc/source svx/source xmloff/source

2016-04-21 Thread Stephan Bergmann

 compilerplugins/clang/salbool.cxx|   89 +--
 cppu/source/typelib/typelib.cxx  |   26 ++--
 cui/source/options/optsave.cxx   |2 
 i18npool/source/inputchecker/inputsequencechecker_hi.cxx |2 
 i18npool/source/inputchecker/inputsequencechecker_th.cxx |2 
 sax/source/expatwrap/saxwriter.cxx   |   12 +-
 sc/source/filter/inc/tool.h  |4 
 sd/source/ui/table/TableDesignPane.cxx   |2 
 stoc/source/corereflection/crbase.cxx|   26 ++--
 svx/source/fmcomp/fmgridif.cxx   |2 
 xmloff/source/draw/ximpshap.hxx  |2 
 xmloff/source/forms/elementexport.cxx|2 
 xmloff/source/text/XMLIndexTemplateContext.cxx   |   12 +-
 xmloff/source/text/XMLIndexTemplateContext.hxx   |   14 +-
 14 files changed, 132 insertions(+), 65 deletions(-)

New commits:
commit 783419657cda0565716d363928c8cf5ac5035f8c
Author: Stephan Bergmann 
Date:   Thu Apr 21 17:29:40 2016 +0200

loplugin:salbool: sal_Bool[] -> bool[]

Change-Id: I3c5bf7a53c9ae173f8fce885ecf022f092aa43a9

diff --git a/compilerplugins/clang/salbool.cxx 
b/compilerplugins/clang/salbool.cxx
index 6b3d8df..f701358 100644
--- a/compilerplugins/clang/salbool.cxx
+++ b/compilerplugins/clang/salbool.cxx
@@ -24,6 +24,13 @@ bool isSalBool(QualType type) {
 return t != nullptr && t->getDecl()->getNameAsString() == "sal_Bool";
 }
 
+bool isSalBoolArray(QualType type) {
+auto t = type->getAsArrayTypeUnsafe();
+return t != nullptr
+&& (isSalBool(t->getElementType())
+|| isSalBoolArray(t->getElementType()));
+}
+
 // Clang 3.2 FunctionDecl::isInlined doesn't work as advertised ("Determine
 // whether this function should be inlined, because it is either marked 
'inline'
 // or 'constexpr' or is a member function of a class that was defined in the
@@ -136,6 +143,8 @@ public:
 
 bool VisitCXXFunctionalCastExpr(CXXFunctionalCastExpr * expr);
 
+bool VisitReturnStmt(ReturnStmt const * stmt);
+
 bool WalkUpFromParmVarDecl(ParmVarDecl const * decl);
 bool VisitParmVarDecl(ParmVarDecl const * decl);
 
@@ -248,17 +257,27 @@ bool SalBool::VisitCallExpr(CallExpr * expr) {
 if (ft != nullptr) {
 for (unsigned i = 0; i != compat::getNumParams(*ft); ++i) {
 QualType t(compat::getParamType(*ft, i));
+bool b = false;
 if (t->isLValueReferenceType()) {
 t = t.getNonReferenceType();
-if (!t.isConstQualified() && isSalBool(t)
-&& i < expr->getNumArgs())
-{
-DeclRefExpr * ref = dyn_cast(expr->getArg(i));
-if (ref != nullptr) {
-VarDecl const * d = dyn_cast(ref->getDecl());
-if (d != nullptr) {
-varDecls_.erase(d);
-}
+b = !t.isConstQualified() && isSalBool(t);
+} else if (t->isPointerType()) {
+for (;;) {
+auto t2 = t->getAs();
+if (t2 == nullptr) {
+break;
+}
+t = t2->getPointeeType();
+}
+b = isSalBool(t);
+}
+if (b && i < expr->getNumArgs()) {
+DeclRefExpr * ref = dyn_cast(
+expr->getArg(i)->IgnoreParenImpCasts());
+if (ref != nullptr) {
+VarDecl const * d = dyn_cast(ref->getDecl());
+if (d != nullptr) {
+varDecls_.erase(d);
 }
 }
 }
@@ -363,6 +382,53 @@ bool 
SalBool::VisitCXXFunctionalCastExpr(CXXFunctionalCastExpr * expr) {
 return true;
 }
 
+bool SalBool::VisitReturnStmt(ReturnStmt const * stmt) {
+// Just enough to avoid warnings in rtl_getUriCharClass (sal/rtl/uri.cxx),
+// which has
+//
+//  static sal_Bool const aCharClass[][nCharClassSize] = ...;
+//
+// and
+//
+//  return aCharClass[eCharClass];
+//
+if (ignoreLocation(stmt)) {
+return true;
+}
+auto e = stmt->getRetValue();
+if (e == nullptr) {
+return true;
+}
+auto t = e->getType();
+if (!t->isPointerType()) {
+return true;
+}
+for (;;) {
+auto t2 = t->getAs();
+if (t2 == nullptr) {
+break;
+}
+t = t2->getPointeeType();
+}
+if (!isSalBool(t)) {
+return true;
+}
+auto e2 = dyn_cast(e->IgnoreParenImpCasts());
+if (e2 == nullptr) {
+return true;
+}
+auto e3 = dyn_cast(e2->getBase()->IgnoreParenImpCasts());
+if (e3 == nullptr) {
+return true;
+}
+auto d = dyn_cast(e3->getDecl());
+if (d == nul

[Libreoffice-commits] core.git: sc/source

2016-04-21 Thread Caolán McNamara

 sc/source/ui/dbgui/sfiltdlg.cxx |3 +++
 1 file changed, 3 insertions(+)

New commits:
commit db279db13286653bff269f8ae7471b22498be319
Author: CaolÃ¡n McNamara 
Date:   Thu Apr 21 16:36:46 2016 +0100

Resolves: tdf#99360 can't select filter criteria with mouse

regression since

commit 6610ad9aee0c8299880cd1da6cd6a756860ccad9
Author: Jaskaran 
Date:   Wed Mar 2 07:51:40 2016 +0530

original body of this method were protected by "if (IsActive())" before
conversion, adding that back into the new version makes things apparently 
work
again

Change-Id: Id7e89c7724ed804d0330645c4e05dee113ce2079

diff --git a/sc/source/ui/dbgui/sfiltdlg.cxx b/sc/source/ui/dbgui/sfiltdlg.cxx
index b29e082..c78040f 100644
--- a/sc/source/ui/dbgui/sfiltdlg.cxx
+++ b/sc/source/ui/dbgui/sfiltdlg.cxx
@@ -392,6 +392,9 @@ IMPL_LINK_TYPED( ScSpecialFilterDlg, EndDlgHdl, Button*, 
pBtn, void )
 
 void ScSpecialFilterDlg::SyncFocusState()
 {
+if (!IsActive())
+return;
+
 if( pEdCopyArea->HasFocus() || pRbCopyArea->HasFocus() )
 {
 pRefInputEdit = pEdCopyArea;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-5-1' - sw/inc sw/qa sw/source

2016-04-21 Thread Miklos Vajna

 sw/inc/fesh.hxx |2 ++
 sw/qa/extras/uiwriter/data/tdf84695.odt |binary
 sw/qa/extras/uiwriter/uiwriter.cxx  |   25 +
 sw/source/core/frmedt/feshview.cxx  |   25 ++---
 sw/source/uibase/docvw/edtwin.cxx   |   28 
 5 files changed, 69 insertions(+), 11 deletions(-)

New commits:
commit 79509573b8666c18027f1e642d9bdadd88c3fcc6
Author: Miklos Vajna 
Date:   Tue Apr 5 09:45:21 2016 +0200

tdf#84695 sw: make TextBox in shape accessible without mouse

F2 or Enter can now switch to text edit mode.

Change-Id: I1aea09bd2fc4fa64db49b2037894082fe33af934
Reviewed-on: https://gerrit.libreoffice.org/23836
Reviewed-by: Miklos Vajna 
Tested-by: Jenkins 
(cherry picked from commit ab450ee1ca2bee69cba752045781a3298311b181)
Reviewed-on: https://gerrit.libreoffice.org/24080
Reviewed-by: Michael Stahl 

diff --git a/sw/inc/fesh.hxx b/sw/inc/fesh.hxx
index f036728..5821cb1 100644
--- a/sw/inc/fesh.hxx
+++ b/sw/inc/fesh.hxx
@@ -171,6 +171,8 @@ enum class SwPasteSdr
 #define SW_ADD_SELECT   1
 #define SW_ENTER_GROUP  2
 #define SW_LEAVE_FRAME  4
+/// Allow SwFEShell::SelectObj() to select the TextBox of a shape.
+#define SW_ALLOW_TEXTBOX  8
 
 enum class SwMove
 {
diff --git a/sw/qa/extras/uiwriter/data/tdf84695.odt 
b/sw/qa/extras/uiwriter/data/tdf84695.odt
new file mode 100644
index 000..f8c3b01
Binary files /dev/null and b/sw/qa/extras/uiwriter/data/tdf84695.odt differ
diff --git a/sw/qa/extras/uiwriter/uiwriter.cxx 
b/sw/qa/extras/uiwriter/uiwriter.cxx
index 246201e..c4adc56 100644
--- a/sw/qa/extras/uiwriter/uiwriter.cxx
+++ b/sw/qa/extras/uiwriter/uiwriter.cxx
@@ -184,6 +184,7 @@ public:
 void testTdf88453Table();
 void testTdf98987();
 void testTdf99004();
+void testTdf84695();
 
 CPPUNIT_TEST_SUITE(SwUiWriterTest);
 CPPUNIT_TEST(testReplaceForward);
@@ -274,6 +275,7 @@ public:
 CPPUNIT_TEST(testTdf88453Table);
 CPPUNIT_TEST(testTdf98987);
 CPPUNIT_TEST(testTdf99004);
+CPPUNIT_TEST(testTdf84695);
 CPPUNIT_TEST_SUITE_END();
 
 private:
@@ -3159,6 +3161,29 @@ void SwUiWriterTest::testTdf99004()
 CPPUNIT_ASSERT(nTextBox1Bottom < nRectangle2Top);
 }
 
+void SwUiWriterTest::testTdf84695()
+{
+SwDoc* pDoc = createDoc("tdf84695.odt");
+SwWrtShell* pWrtShell = pDoc->GetDocShell()->GetWrtShell();
+SdrPage* pPage = 
pDoc->getIDocumentDrawModelAccess().GetDrawModel()->GetPage(0);
+SdrObject* pObject = pPage->GetObj(1);
+SwContact* pTextBox = static_cast(pObject->GetUserCall());
+// First, make sure that pTextBox is a fly frame (textbox of a shape).
+CPPUNIT_ASSERT_EQUAL(RES_FLYFRMFMT, 
static_cast(pTextBox->GetFormat()->Which()));
+
+// Then select it.
+pWrtShell->SelectObj(Point(), 0, pObject);
+
+// Now Enter + a key should add some text.
+SwXTextDocument* pXTextDocument = dynamic_cast(mxComponent.get());
+pXTextDocument->postKeyEvent(LOK_KEYEVENT_KEYINPUT, 0, KEY_RETURN);
+pXTextDocument->postKeyEvent(LOK_KEYEVENT_KEYINPUT, 'a', 0);
+
+uno::Reference xShape(getShape(1), uno::UNO_QUERY);
+// This was empty, Enter did not start the fly frame edit mode.
+CPPUNIT_ASSERT_EQUAL(OUString("a"), xShape->getString());
+}
+
 CPPUNIT_TEST_SUITE_REGISTRATION(SwUiWriterTest);
 CPPUNIT_PLUGIN_IMPLEMENT();
 
diff --git a/sw/source/core/frmedt/feshview.cxx 
b/sw/source/core/frmedt/feshview.cxx
index 4526f4e..6e2917e 100644
--- a/sw/source/core/frmedt/feshview.cxx
+++ b/sw/source/core/frmedt/feshview.cxx
@@ -228,19 +228,22 @@ bool SwFEShell::SelectObj( const Point& rPt, sal_uInt8 
nFlag, SdrObject *pObj )
 }
 }
 
-// If the fly frame is a textbox of a shape, then select the shape instead.
-std::map aTextBoxShapes = 
SwTextBoxHelper::findShapes(mpDoc);
-for (size_t i = 0; i < rMrkList.GetMarkCount(); ++i)
+if (!(nFlag & SW_ALLOW_TEXTBOX))
 {
-SdrObject* pObject = rMrkList.GetMark(i)->GetMarkedSdrObj();
-SwContact* pDrawContact = 
static_cast(GetUserCall(pObject));
-SwFrameFormat* pFormat = pDrawContact->GetFormat();
-if (aTextBoxShapes.find(pFormat) != aTextBoxShapes.end())
+// If the fly frame is a textbox of a shape, then select the shape 
instead.
+std::map aTextBoxShapes = 
SwTextBoxHelper::findShapes(mpDoc);
+for (size_t i = 0; i < rMrkList.GetMarkCount(); ++i)
 {
-SdrObject* pShape = aTextBoxShapes[pFormat]->FindSdrObject();
-pDView->UnmarkAll();
-pDView->MarkObj(pShape, Imp()->GetPageView(), bAddSelect, 
bEnterGroup);
-break;
+SdrObject* pObject = rMrkList.GetMark(i)->GetMarkedSdrObj();
+SwContact* pDrawContact = 
static_cast(GetUserCall(pObject));
+SwFrameFormat* pFormat = pDrawContact->GetFormat();
+if (aTextBoxShapes.find(pFormat) != aTextBoxShapes.end())
+{
+

minutes of ESC call ...

2016-04-21 Thread Michael Meeks

* Present:
+ jan i, Lionel, Kendy, Michael M, Stephan, Armin, Miklos, Andras, Bubli
  Caolan, Christian, Sophie, Bjoern, Muthu, Norbert, Michael S
 
* Completed Action Items:
 
* Pending Action Items:
+ poke again at the lcov problem on tb31 ? (Bjoern)
+ poke at hack-fest candidate list (Bjoern)
+ investigate clobberring glew instead of lots of #ifdefs: (Marco, Oliver)
 [ Working on getting this up-stream ]
+ tweak UI and get LiveConnect API key / build case for board (Christian)
+ ask QA to re-test http://tdf.io/mmregressions (Robinson)
 [ testing underway ]
+ attempt to re-build a recent gstreamer 1.0 / core spec file
  on our CentOS6 base (tdf#94508) (Christian)
+ script XML / l10n string translation changes (Christian)
 [ have a partial script - but - waiting for pootle migration to
   finish -> next week. ]
 
* Release Engineering update (Christian)
+ 5.0.6 RC2 - due for tagging next Tues -April 26th
+ still patches needing tripple review
 
https://gerrit.libreoffice.org/#/q/status:open+project:core+branch:libreoffice-5-0
 
 → don't forget to also cherry-pick for libreoffice-5-0-6 branch
+ 5.1.3 RC1
+ on the mirrors, can be announced later this week
+ Linux build ran out of space had to be cleaned up
+ 5.2 Alpha 1
+ tagged earlier today, builds are done
+ ready for bug-hunting session *tomorrow*
+ a milestone for early testing.
+ Android & iOS Remote
+ expect Viewer update after Alpha a tagging
+ Aleksandar working on theming for Android remote.

 
* ESC composition
+ Slightly nominal position:
+ https://wiki.documentfoundation.org/Development/ESC
+ https://wiki.documentfoundation.org/TDF/Engineering_Steering_Committee
AI: + build a proposal & reach-out for up/down next time (Michael)
+ mail me privately / ESC list if you have concerns.
 
* Documentation (Olivier)
+ Working on update for Chapt. 4 of book Getting Started - Writer
+ worked on XSLT transformations for online help.
+ http://vm173.documentfoundation.org
+ goal for publishing it ? (Michael)
+ need help from a skilled HTML developer
AI: + good to have a plan of when this is published (Olivier, Kendy)
 + does it go live with 5.2 ?
 + tender for editing XML on the side (Olivier)
 + would be really nice.
 + lots of budget commitments currently (Kendy)
 
* l10n (Sophie)
+ all pending migration
+ a number of fixes, and a security update coming to pootle
 
* GSoC 2016 (Bubli)
+ Tomorrow results announced.
   + community bonding period until May, 22nd
+ still need back-up mentors for some tasks
 
* UX Update (Kendy/Bubli)
+ Sidebar feedback write-up / blog-post ~finished
+ how should we handle ux-advice in bugzilla ?
+ currently a separate component
+ doesn't work so well; moving from Draw -> ux-advice etc.
+ reset from darw -> UX advice & then can't be filtered.
+ in BZ - can we bind a keyword to automatic adding of CC ?
+ would be lovely to have a keyword instead.
+ could we add a trigger for this somehow ?
   + it can be done (JanI)
   + seen it in a newer version.
AI: + look into it (JanI)
   + not terribly urgent, but good mess to fix (Kendy)
   + also for easyHacks (jani)
 
* Crashtest update (Caolan)
+ 0 import failures, 0 export failures, 0 coverity
   + excellent numbers
   + some random fluctuation suspected
   + will re-sync. with BZ - and up the numbers.
 
* Hackfests (Bjoern)
+ next hackfests:
+ Ankara, Turkey
+ April 30th - May 1st.
+ https://wiki.documentfoundation.org/Hackfest/Ankara2016
+ plan do an overview talk on Friday with Markus & any interest 
(Michael)
+ next weekend - should be fun !
+ Germany, Munich, LiMux; End of May 2016 (Jan-Marek)
+ Orga: https://wiki.debian.org/BSP/2016/05/de/Munich
+ 27-29 May (parallel to the Debian Sun Camp)
+ next venues / suggestions
+ https://www.froscon.de/en/home/Flosscon in Bonn, Germany
   + August - 2 weeks before LibreOffice conference ?
  + perhaps piggy-back on their rooms.
  + like FOSDEM at a university etc.

* LibreOffice Conference in Brno - CfP open (Sophie)
+ Kendy & Thorsten on program committee:
+ 
https://blog.documentfoundation.org/blog/2016/04/08/libreoffice-brno-conference-call-for-paper/
+ deadline is mid July.

* mentoring/easyhack update (janI)
+ contributor means a not-yet-committer.
+ statistics, numbers in () are +/- compared to last week
+ gerrit:   committer open  64(-9)  contributor open  59(-4)
up

[Libreoffice-commits] core.git: 2 commits - i18nlangtag/qa i18nlangtag/source

2016-04-21 Thread Eike Rathke

 i18nlangtag/qa/cppunit/test_languagetag.cxx|   24 +
 i18nlangtag/source/languagetag/languagetag.cxx |   28 ++---
 2 files changed, 49 insertions(+), 3 deletions(-)

New commits:
commit 74e9456c6d7c43739c3e57640e52b3f851c4f558
Author: Eike Rathke 
Date:   Thu Apr 21 19:02:48 2016 +0200

unit test 'C' locale shall map to 'en-US'

Change-Id: Id4772b087add703537b588c961283466436f10c1

diff --git a/i18nlangtag/qa/cppunit/test_languagetag.cxx 
b/i18nlangtag/qa/cppunit/test_languagetag.cxx
index 766de5a..a5d40f9 100644
--- a/i18nlangtag/qa/cppunit/test_languagetag.cxx
+++ b/i18nlangtag/qa/cppunit/test_languagetag.cxx
@@ -562,6 +562,30 @@ void TestLanguageTag::testAllTags()
 CPPUNIT_ASSERT( joker.getLanguageType() == LANGUAGE_USER_PRIV_JOKER );
 }
 
+// 'C' locale shall map to 'en-US'
+{
+LanguageTag aTag( "C" );
+CPPUNIT_ASSERT( aTag.getLanguage() == "en" );
+CPPUNIT_ASSERT( aTag.getCountry() == "US" );
+lang::Locale aLocale = aTag.getLocale();
+CPPUNIT_ASSERT( aTag.getBcp47() == "en-US" );
+CPPUNIT_ASSERT( aLocale.Language == "en" );
+CPPUNIT_ASSERT( aLocale.Country == "US" );
+CPPUNIT_ASSERT( aLocale.Variant.isEmpty() );
+CPPUNIT_ASSERT( aTag.getLanguageType() == LANGUAGE_ENGLISH_US );
+}
+{
+LanguageTag aTag( lang::Locale("C","","") );
+CPPUNIT_ASSERT( aTag.getLanguage() == "en" );
+CPPUNIT_ASSERT( aTag.getCountry() == "US" );
+lang::Locale aLocale = aTag.getLocale();
+CPPUNIT_ASSERT( aTag.getBcp47() == "en-US" );
+CPPUNIT_ASSERT( aLocale.Language == "en" );
+CPPUNIT_ASSERT( aLocale.Country == "US" );
+CPPUNIT_ASSERT( aLocale.Variant.isEmpty() );
+CPPUNIT_ASSERT( aTag.getLanguageType() == LANGUAGE_ENGLISH_US );
+}
+
 // test reset() methods
 {
 LanguageTag aTag( LANGUAGE_DONTKNOW );
commit 600c2ca58bf7c2a38d4a41a80bdc1ad8373a9ff0
Author: Eike Rathke 
Date:   Thu Apr 21 18:52:10 2016 +0200

handle 'C' locale in simpleExtract()

... so liblangtag isn't called and we explicitly have it known from
there on as well.

Also, don't set mbInitializedLocale=true in the LanguageTag ctor with
Locale anymore as we don't know there if a semantically correct Locale
was passed (which technically the 'C' locale is not). Instead, set it
centrally in LanguageTag::registerImpl() where conversion to maBcp47
string takes place.

Change-Id: I71551bd4b59d896c0674286edee816e05081ecd4

diff --git a/i18nlangtag/source/languagetag/languagetag.cxx 
b/i18nlangtag/source/languagetag/languagetag.cxx
index fe0e2cf..7a5a56c 100644
--- a/i18nlangtag/source/languagetag/languagetag.cxx
+++ b/i18nlangtag/source/languagetag/languagetag.cxx
@@ -328,7 +328,7 @@ private:
 /** Obtain Language, Script, Country and Variants via simpleExtract() and
 assign them to the cached variables if successful.
 
-@return return of simpleExtract()
+@return simpleExtract() successfully extracted and cached.
  */
 boolcacheSimpleLSCV();
 
@@ -337,6 +337,7 @@ private:
 EXTRACTED_NONE,
 EXTRACTED_LSC,
 EXTRACTED_LV,
+EXTRACTED_C_LOCALE,
 EXTRACTED_X,
 EXTRACTED_X_JOKER
 };
@@ -349,6 +350,7 @@ private:
 @return EXTRACTED_LSC if simple tag was detected (i.e. one that
 would fulfill the isIsoODF() condition),
 EXTRACTED_LV if a tag with variant was detected,
+EXTRACTED_C_LOCALE if a 'C' locale was detected,
 EXTRACTED_X if x-... privateuse tag was detected,
 EXTRACTED_X_JOKER if "*" joker was detected,
 EXTRACTED_NONE else.
@@ -486,7 +488,7 @@ LanguageTag::LanguageTag( const css::lang::Locale & rLocale 
)
 mnLangID( LANGUAGE_DONTKNOW),
 mbSystemLocale( rLocale.Language.isEmpty()),
 mbInitializedBcp47( false),
-mbInitializedLocale( !mbSystemLocale),
+mbInitializedLocale( false),// we do not know which mess we got 
passed in
 mbInitializedLangID( false),
 mbIsFallback( false)
 {
@@ -799,8 +801,15 @@ LanguageTag::ImplPtr LanguageTag::registerImpl() const
 }
 
 // Force Bcp47 if not LangID.
-if (!mbInitializedLangID && !mbInitializedBcp47 && mbInitializedLocale)
+if (!mbInitializedLangID && !mbInitializedBcp47)
 {
+// The one central point to set mbInitializedLocale=true if a
+// LanguageTag was initialized with a Locale. We will now convert and
+// possibly later resolve it.
+if (!mbInitializedLocale && (mbSystemLocale || 
!maLocale.Language.isEmpty()))
+mbInitializedLocale = true;
+SAL_WARN_IF( !mbInitializedLocale, "i18nlangtag", 
"LanguageTag::registerImpl: still not mbInitializedLocale");
+
 maBcp47 = LanguageTagImpl::convertToBcp47( maLoca

[Libreoffice-commits] core.git: desktop/source include/LibreOfficeKit

2016-04-21 Thread Jan Holesovsky

 desktop/source/lib/init.cxx |   22 +-
 include/LibreOfficeKit/LibreOfficeKit.h |8 
 2 files changed, 25 insertions(+), 5 deletions(-)

New commits:
commit b74163742ff1288ad9ea1ec8e83ac08faf686893
Author: Jan Holesovsky 
Date:   Thu Apr 21 19:04:58 2016 +0200

lok: getPartHash should be at the end, it is a new API call.

Also add it to the init.cxx so that it is actually used.

Change-Id: I255411158d0822718116ac05aad1ee925a9a7a9a

diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index d74ae31..ceb7f90 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -367,6 +367,7 @@ static unsigned char* 
doc_renderFont(LibreOfficeKitDocument* pThis,
   const char *pFontName,
   int* pFontWidth,
   int* pFontHeight);
+static char* doc_getPartHash(LibreOfficeKitDocument* pThis, int nPart);
 
 LibLODocument_Impl::LibLODocument_Impl(const uno::Reference 
 &xComponent)
 : mxComponent(xComponent)
@@ -388,7 +389,6 @@ LibLODocument_Impl::LibLODocument_Impl(const uno::Reference 
setPart = doc_setPart;
 m_pDocumentClass->getPartName = doc_getPartName;
 m_pDocumentClass->setPartMode = doc_setPartMode;
-m_pDocumentClass->renderFont = doc_renderFont;
 m_pDocumentClass->paintTile = doc_paintTile;
 m_pDocumentClass->getTileMode = doc_getTileMode;
 m_pDocumentClass->getDocumentSize = doc_getDocumentSize;
@@ -412,6 +412,9 @@ LibLODocument_Impl::LibLODocument_Impl(const uno::Reference 
getView = doc_getView;
 m_pDocumentClass->getViews = doc_getViews;
 
+m_pDocumentClass->renderFont = doc_renderFont;
+m_pDocumentClass->getPartHash = doc_getPartHash;
+
 gDocumentClass = m_pDocumentClass;
 }
 pClass = m_pDocumentClass.get();
@@ -905,6 +908,23 @@ static char* doc_getPartName(LibreOfficeKitDocument* 
pThis, int nPart)
 
 }
 
+static char* doc_getPartHash(LibreOfficeKitDocument* pThis, int nPart)
+{
+ITiledRenderable* pDoc = getTiledRenderable(pThis);
+if (!pDoc)
+{
+gImpl->maLastExceptionMsg = "Document doesn't support tiled rendering";
+return nullptr;
+}
+
+OUString sHash = pDoc->getPartHash(nPart);
+OString aString = OUStringToOString(sHash, RTL_TEXTENCODING_UTF8);
+char* pMemory = static_cast(malloc(aString.getLength() + 1));
+strcpy(pMemory, aString.getStr());
+return pMemory;
+
+}
+
 static void doc_setPartMode(LibreOfficeKitDocument* pThis,
 int nPartMode)
 {
diff --git a/include/LibreOfficeKit/LibreOfficeKit.h 
b/include/LibreOfficeKit/LibreOfficeKit.h
index 863e377..1281a21 100644
--- a/include/LibreOfficeKit/LibreOfficeKit.h
+++ b/include/LibreOfficeKit/LibreOfficeKit.h
@@ -118,10 +118,6 @@ struct _LibreOfficeKitDocumentClass
 char* (*getPartName) (LibreOfficeKitDocument* pThis,
   int nPart);
 
-/// @see lok::Document::getPartHash().
-char* (*getPartHash) (LibreOfficeKitDocument* pThis,
-  int nPart);
-
 /// @see lok::Document::setPartMode().
 void (*setPartMode) (LibreOfficeKitDocument* pThis,
  int nMode);
@@ -228,6 +224,10 @@ struct _LibreOfficeKitDocumentClass
const char* pFontName,
int* pFontWidth,
int* pFontHeight);
+
+/// @see lok::Document::getPartHash().
+char* (*getPartHash) (LibreOfficeKitDocument* pThis,
+  int nPart);
 #endif // defined LOK_USE_UNSTABLE_API || defined LIBO_INTERNAL_ONLY
 };
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: embedserv/source extensions/source filter/qa filter/source framework/source include/vcl odk/examples package/source sd/source svl/source svx/source sw/qa

2016-04-21 Thread Andrea Gelmini

 embedserv/source/embed/docholder.cxx |2 +-
 extensions/source/propctrlr/eventhandler.cxx |2 +-
 filter/qa/complex/filter/detection/typeDetection/Helper.java |2 +-
 filter/source/config/cache/typedetection.hxx |2 +-
 filter/source/msfilter/msdffimp.cxx  |4 ++--
 framework/source/inc/accelerators/acceleratorcache.hxx   |2 +-
 framework/source/inc/loadenv/loadenv.hxx |2 +-
 include/vcl/fontcharmap.hxx  |2 +-
 odk/examples/DevelopersGuide/Components/Thumbs/Makefile  |4 ++--
 package/source/zippackage/ZipPackageStream.cxx   |2 +-
 sd/source/ui/dlg/dlgass.cxx  |2 +-
 sd/source/ui/view/tabcontr.cxx   |2 +-
 svl/source/numbers/zformat.cxx   |2 +-
 svx/source/form/fmsrcimp.cxx |2 +-
 sw/qa/extras/uiwriter/uiwriter.cxx   |2 +-
 15 files changed, 17 insertions(+), 17 deletions(-)

New commits:
commit 20f23c1a2838f0dc3c8ff37bf90b9ebe1d278772
Author: Andrea Gelmini 
Date:   Wed Apr 20 17:46:54 2016 +0200

Fix typos

Change-Id: Ic4fbc8e7220eb4641f67ef4f85d4853608a369f4
Reviewed-on: https://gerrit.libreoffice.org/24257
Tested-by: Jenkins 
Reviewed-by: Eike Rathke 
Tested-by: Eike Rathke 

diff --git a/embedserv/source/embed/docholder.cxx 
b/embedserv/source/embed/docholder.cxx
index b432ab8..97f3ffa 100644
--- a/embedserv/source/embed/docholder.cxx
+++ b/embedserv/source/embed/docholder.cxx
@@ -364,7 +364,7 @@ HRESULT DocumentHolder::InPlaceActivate(
 uno::Reference< frame::XDesktop2 > xDesktop = 
frame::Desktop::create(comphelper::getComponentContext(m_xFactory));
 xDesktop->getFrames()->append(m_xFrame);
 
-// determine the menuhandle to get menutitems.
+// determine the menuhandle to get menuitems.
 if(m_xLayoutManager.is()) {
 uno::Reference< css::ui::XUIElement > xUIEl(
 m_xLayoutManager->getElement(
diff --git a/extensions/source/propctrlr/eventhandler.cxx 
b/extensions/source/propctrlr/eventhandler.cxx
index ea90ad8..d51301b 100644
--- a/extensions/source/propctrlr/eventhandler.cxx
+++ b/extensions/source/propctrlr/eventhandler.cxx
@@ -1142,7 +1142,7 @@ namespace pcr
 bool EventHandler::impl_filterMethod_nothrow( const EventDescription& 
_rEvent ) const
 {
 // some (control-triggered) events do not make sense for certain grid 
control columns. However,
-// our mechnism to retrieve control-triggered events does not know 
about this, so we do some
+// our mechanism to retrieve control-triggered events does not know 
about this, so we do some
 // late filtering here.
 switch ( m_nGridColumnType )
 {
diff --git a/filter/qa/complex/filter/detection/typeDetection/Helper.java 
b/filter/qa/complex/filter/detection/typeDetection/Helper.java
index c51e2c8..4cb767e0 100644
--- a/filter/qa/complex/filter/detection/typeDetection/Helper.java
+++ b/filter/qa/complex/filter/detection/typeDetection/Helper.java
@@ -298,7 +298,7 @@ public class Helper  {
 return newContent;
 }
 
-/** returns a MediaDescripto filled with given properties and
+/** returns a MediaDescriptor filled with given properties and
  * values.
  * @param propNames String Array of property names
  * @param values Object Array of property values
diff --git a/filter/source/config/cache/typedetection.hxx 
b/filter/source/config/cache/typedetection.hxx
index af9f692..548a143 100644
--- a/filter/source/config/cache/typedetection.hxx
+++ b/filter/source/config/cache/typedetection.hxx
@@ -181,7 +181,7 @@ private:
 
 
 /** @short  check if an input stream is already part of the
-given MediaDesciptor and creates a new one if necessary.
+given MediaDescriptor and creates a new one if necessary.
 
 @attention  This method does further something special!
 
diff --git a/filter/source/msfilter/msdffimp.cxx 
b/filter/source/msfilter/msdffimp.cxx
index 8b2c1c3..c4b3670 100644
--- a/filter/source/msfilter/msdffimp.cxx
+++ b/filter/source/msfilter/msdffimp.cxx
@@ -2643,8 +2643,8 @@ void DffPropertyReader::ApplyAttributes( SvStream& rIn, 
SfxItemSet& rSet, DffObj
 static bool bCheckShadow(false);
 
 // #i124477# Found no reason not to set shadow, esp. since it is 
applied to evtl. existing text
-// and will lead to an error of in PPT someone used text and added the 
object shadow to the
-// object carryintg that text. I found no cases where this leads to 
problems (the old bugtracker
+// and will lead to an error if in PPT someone used text and added the 
object shadow to the
+// object carrying that

[Libreoffice-commits] core.git: starmath/inc starmath/source

2016-04-21 Thread Takeshi Abe

 starmath/inc/parse.hxx|5 +
 starmath/source/parse.cxx |3 ---
 2 files changed, 1 insertion(+), 7 deletions(-)

New commits:
commit 11f13f55b7e76811946979f363638597d882b88b
Author: Takeshi Abe 
Date:   Thu Apr 21 17:31:18 2016 +0900

starmath: Drop member variable set but not used

Its usage was gone with 9adcd261054a0e99ae032be5e7428e28a6663975.

Change-Id: Ibd322531365c2e0ccad85d553781611dfe96d54e
Reviewed-on: https://gerrit.libreoffice.org/24277
Tested-by: Jenkins 
Reviewed-by: Takeshi Abe 

diff --git a/starmath/inc/parse.hxx b/starmath/inc/parse.hxx
index 7dbd397..34194de 100644
--- a/starmath/inc/parse.hxx
+++ b/starmath/inc/parse.hxx
@@ -19,7 +19,7 @@
 #ifndef INCLUDED_STARMATH_INC_PARSE_HXX
 #define INCLUDED_STARMATH_INC_PARSE_HXX
 
-#include 
+#include 
 #include 
 #include 
 #include 
@@ -36,7 +36,6 @@ class SmParser
 SmNodeStack m_aNodeStack;
 std::vector> m_aErrDescList;
 int m_nCurError;
-LanguageTypem_nLang;
 sal_Int32   m_nBufferIndex,
 m_nTokenIndex;
 sal_Int32   m_Row,
@@ -91,8 +90,6 @@ class SmParser
 voidDoGlyphSpecial();
 // end of grammar
 
-voidSetLanguage( LanguageType nNewLang ) { m_nLang = nNewLang; 
}
-
 voidError(SmParseError Error);
 
 voidClearUsedSymbols()  { 
m_aUsedSymbols.clear(); }
diff --git a/starmath/source/parse.cxx b/starmath/source/parse.cxx
index b998f25..955e3e1 100644
--- a/starmath/source/parse.cxx
+++ b/starmath/source/parse.cxx
@@ -2344,7 +2344,6 @@ void SmParser::Error(SmParseError eError)
 
 SmParser::SmParser()
 : m_nCurError( 0 )
-, m_nLang( Application::GetSettings().GetUILanguageTag().getLanguageType() 
)
 , m_nBufferIndex( 0 )
 , m_nTokenIndex( 0 )
 , m_Row( 0 )
@@ -2370,7 +2369,6 @@ SmNode *SmParser::Parse(const OUString &rBuffer)
 
 m_aNodeStack.clear();
 
-SetLanguage( 
Application::GetSettings().GetUILanguageTag().getLanguageType() );
 NextToken();
 DoTable();
 
@@ -2391,7 +2389,6 @@ SmNode *SmParser::ParseExpression(const OUString &rBuffer)
 
 m_aNodeStack.clear();
 
-SetLanguage( 
Application::GetSettings().GetUILanguageTag().getLanguageType() );
 NextToken();
 DoExpression();
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: starmath/source

2016-04-21 Thread Takeshi Abe

 starmath/source/parse.cxx |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit cd6ec105eb154b5f839b1ed27d30f3ee52ae0e6d
Author: Takeshi Abe 
Date:   Sat Apr 16 19:24:37 2016 +0900

starmath: Make coUserDefinedCharContFlags more readable

No bits changed because:
((KParseTokens::ANY_LETTER_OR_NUMBER | KParseTokens::IGNORE_LEADING_WS | 
KParseTokens::ASC_DOT)
 & ~KParseTokens::IGNORE_LEADING_WS)
== KParseTokens::ANY_LETTER_OR_NUMBER | KParseTokens::ASC_DOT

Change-Id: I1e00d0cdb07a1450f98655ec3cc8483e4d348b74
Reviewed-on: https://gerrit.libreoffice.org/24122
Tested-by: Jenkins 
Reviewed-by: Takeshi Abe 

diff --git a/starmath/source/parse.cxx b/starmath/source/parse.cxx
index 9b3a785..b998f25 100644
--- a/starmath/source/parse.cxx
+++ b/starmath/source/parse.cxx
@@ -370,9 +370,9 @@ void SmParser::NextToken()
 
 // user-defined char continuing characters may be any alphanumeric or dot.
 static const sal_Int32 coUserDefinedCharContFlags =
-((KParseTokens::ANY_LETTER_OR_NUMBER | KParseTokens::IGNORE_LEADING_WS 
| KParseTokens::ASC_DOT)
- & ~KParseTokens::IGNORE_LEADING_WS)
-| KParseTokens::TWO_DOUBLE_QUOTES_BREAK_STRING;
+KParseTokens::ANY_LETTER_OR_NUMBER |
+KParseTokens::ASC_DOT |
+KParseTokens::TWO_DOUBLE_QUOTES_BREAK_STRING;
 
 // First character for numbers, may be any numeric or dot
 static const sal_Int32 coNumStartFlags =
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: starmath/source

2016-04-21 Thread Takeshi Abe

 starmath/source/parse.cxx |   15 +--
 1 file changed, 5 insertions(+), 10 deletions(-)

New commits:
commit ebc76403c4acb8fc176dd1239b930c1e7529bde7
Author: Takeshi Abe 
Date:   Tue Apr 19 18:52:49 2016 +0900

starmath: Simplify SmParser::DoTable()

yet doing the same.

Change-Id: I2ebdcb96179830eb02af8ed12dd27c69a78ed276
Reviewed-on: https://gerrit.libreoffice.org/24240
Tested-by: Jenkins 
Reviewed-by: Takeshi Abe 

diff --git a/starmath/source/parse.cxx b/starmath/source/parse.cxx
index 955e3e1..ada838a 100644
--- a/starmath/source/parse.cxx
+++ b/starmath/source/parse.cxx
@@ -948,8 +948,6 @@ void SmParser::NextToken()
 
 void SmParser::DoTable()
 {
-SmNodeArray  LineArray;
-
 DoLine();
 while (m_aCurToken.eType == TNEWLINE)
 {
@@ -960,15 +958,12 @@ void SmParser::DoTable()
 if (m_aCurToken.eType != TEND)
 Error(PE_UNEXPECTED_CHAR);
 
-auto n = m_aNodeStack.size();
-
-LineArray.resize(n);
-
-for (size_t i = 0; i < n; i++)
+SmNodeArray  LineArray;
+while (!m_aNodeStack.empty())
 {
-auto pNode = std::move(m_aNodeStack.front());
-m_aNodeStack.pop_front();
-LineArray[n - (i + 1)] = pNode.release();
+auto pNode = std::move(m_aNodeStack.back());
+m_aNodeStack.pop_back();
+LineArray.push_back(pNode.release());
 }
 
 std::unique_ptr pSNode(new SmTableNode(m_aCurToken));
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: loolwsd/DocumentBroker.cpp loolwsd/DocumentBroker.hpp loolwsd/LOOLWSD.cpp loolwsd/MasterProcessSession.cpp

2016-04-21 Thread Ashod Nakashian

 loolwsd/DocumentBroker.cpp   |4 +++-
 loolwsd/DocumentBroker.hpp   |3 +++
 loolwsd/LOOLWSD.cpp  |5 -
 loolwsd/MasterProcessSession.cpp |   11 +++
 4 files changed, 21 insertions(+), 2 deletions(-)

New commits:
commit bde67c99344751702116e3409d96b52db07b15e8
Author: Ashod Nakashian 
Date:   Fri Apr 22 00:11:24 2016 -0400

loolwsd: track document modified state to avoid unnecessary auto-saving

This also avoids the feedback loop that results from the kit
thinking the previously inactive client is now active and
sending commands (.uno:Save).

Change-Id: I47074b35a922da15592d550032d494ba1efab83e
Reviewed-on: https://gerrit.libreoffice.org/24287
Reviewed-by: Ashod Nakashian 
Tested-by: Ashod Nakashian 

diff --git a/loolwsd/DocumentBroker.cpp b/loolwsd/DocumentBroker.cpp
index 10776b3..5a21bad 100644
--- a/loolwsd/DocumentBroker.cpp
+++ b/loolwsd/DocumentBroker.cpp
@@ -73,7 +73,8 @@ DocumentBroker::DocumentBroker(const Poco::URI& uriPublic,
 _cacheRoot(getCachePath(uriPublic.toString())),
 _lastSaveTime(std::chrono::steady_clock::now()),
 _childProcess(childProcess),
-_markToDestroy(false)
+_markToDestroy(false),
+_isModified(false)
 {
 assert(!_docKey.empty());
 assert(!_childRoot.empty());
@@ -153,6 +154,7 @@ bool DocumentBroker::save()
 assert(_storage && _tileCache);
 if (_storage->saveLocalFileToStorage())
 {
+_isModified = false;
 _lastSaveTime = std::chrono::steady_clock::now();
 _tileCache->documentSaved();
 Log::debug("Saved to URI [" + uri + "] and updated tile cache.");
diff --git a/loolwsd/DocumentBroker.hpp b/loolwsd/DocumentBroker.hpp
index 2a1e73d..b696a65 100644
--- a/loolwsd/DocumentBroker.hpp
+++ b/loolwsd/DocumentBroker.hpp
@@ -177,6 +177,8 @@ public:
 // Called when the last view is going out.
 bool canDestroy();
 bool isMarkedToDestroy() const { return _markToDestroy; }
+bool isModified() const { return _isModified; }
+void setModified(const bool value) { _isModified = value; }
 
 private:
 const Poco::URI _uriPublic;
@@ -192,6 +194,7 @@ private:
 std::unique_ptr _tileCache;
 std::shared_ptr _childProcess;
 bool _markToDestroy;
+bool _isModified;
 mutable std::mutex _mutex;
 std::condition_variable _saveCV;
 std::mutex _saveMutex;
diff --git a/loolwsd/LOOLWSD.cpp b/loolwsd/LOOLWSD.cpp
index e6886a4..6a377fc 100644
--- a/loolwsd/LOOLWSD.cpp
+++ b/loolwsd/LOOLWSD.cpp
@@ -1594,7 +1594,10 @@ int LOOLWSD::main(const std::vector& 
/*args*/)
 std::unique_lock 
docBrokersLock(docBrokersMutex);
 for (auto& brokerIt : docBrokers)
 {
-brokerIt.second->autoSave(false);
+if (brokerIt.second->isModified())
+{
+brokerIt.second->autoSave(false);
+}
 }
 }
 catch (const std::exception& exc)
diff --git a/loolwsd/MasterProcessSession.cpp b/loolwsd/MasterProcessSession.cpp
index 1fa0a03..99f143e 100644
--- a/loolwsd/MasterProcessSession.cpp
+++ b/loolwsd/MasterProcessSession.cpp
@@ -164,6 +164,17 @@ bool MasterProcessSession::_handleInput(const char 
*buffer, int length)
 
 return true;
 }
+else if (tokens.count() == 2 && tokens[0] == "statechanged:")
+{
+StringTokenizer stateTokens(tokens[1], "=", 
StringTokenizer::TOK_IGNORE_EMPTY | StringTokenizer::TOK_TRIM);
+if (stateTokens.count() == 2 && stateTokens[0] == 
".uno:ModifiedStatus")
+{
+if (_docBroker)
+{
+_docBroker->setModified(stateTokens[1] == "true");
+}
+}
+}
 }
 
 if (peer && !_isDocPasswordProtected)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: loolwsd/ChildProcessSession.cpp loolwsd/ChildProcessSession.hpp

2016-04-21 Thread Ashod Nakashian

 loolwsd/ChildProcessSession.cpp |   47 
 loolwsd/ChildProcessSession.hpp |5 
 2 files changed, 48 insertions(+), 4 deletions(-)

New commits:
commit 3a4c02b71d4666e83bba141954fcfaa288b4b59b
Author: Ashod Nakashian 
Date:   Fri Apr 22 00:28:52 2016 -0400

loolwsd: track important notifications not sent to inactive clients

These notifications are important to be sent once the user
becomes active again to sync their view with the latest.

Change-Id: Id8f9fff83eea888cdcc8d6ed1d4f12111de39a6e
Reviewed-on: https://gerrit.libreoffice.org/24288
Reviewed-by: Ashod Nakashian 
Tested-by: Ashod Nakashian 

diff --git a/loolwsd/ChildProcessSession.cpp b/loolwsd/ChildProcessSession.cpp
index a5529d7..ec9448a 100644
--- a/loolwsd/ChildProcessSession.cpp
+++ b/loolwsd/ChildProcessSession.cpp
@@ -90,8 +90,22 @@ public:
 }
 else if (!_session.isActive())
 {
-Log::trace("Skipping callback on inactive session " + 
_session.getName());
-return;
+// Pass save notifications through.
+if (nType != LOK_CALLBACK_UNO_COMMAND_RESULT || 
rPayload.find(".uno:Save") == std::string::npos)
+{
+Log::trace("Skipping callback on inactive session " + 
_session.getName());
+_session.setMissedUpdates();
+if (nType == LOK_CALLBACK_INVALIDATE_VISIBLE_CURSOR ||
+nType == LOK_CALLBACK_TEXT_SELECTION ||
+nType == LOK_CALLBACK_TEXT_SELECTION_START ||
+nType == LOK_CALLBACK_TEXT_SELECTION_END ||
+nType == LOK_CALLBACK_DOCUMENT_SIZE_CHANGED)
+{
+_session.setMissedNotif(nType, rPayload);
+}
+
+return;
+}
 }
 
 switch (nType)
@@ -269,6 +283,7 @@ ChildProcessSession::ChildProcessSession(const std::string& 
id,
 _jailId(jailId),
 _viewId(0),
 _clientPart(0),
+_missedUpdates(false),
 _onLoad(onLoad),
 _onUnload(onUnload),
 _callbackWorker(new CallbackWorker(_callbackQueue, *this))
@@ -307,8 +322,9 @@ void ChildProcessSession::disconnect()
 
 bool ChildProcessSession::_handleInput(const char *buffer, int length)
 {
-if (!isActive() && _loKitDocument != nullptr)
+if (_missedUpdates && _loKitDocument != nullptr)
 {
+_missedUpdates = false;
 Log::debug("Handling message after inactivity of " + 
std::to_string(getInactivityMS()) + "ms.");
 
 // Client is getting active again.
@@ -331,7 +347,30 @@ bool ChildProcessSession::_handleInput(const char *buffer, 
int length)
" width=" + std::to_string(INT_MAX) +
" height=" + std::to_string(INT_MAX));
 
-//TODO: Sync cursor.
+for (const auto& pair : _missedNotif)
+{
+switch (pair.first)
+{
+case LOK_CALLBACK_INVALIDATE_VISIBLE_CURSOR:
+sendTextFrame("invalidatecursor: " + pair.second);
+break;
+case LOK_CALLBACK_TEXT_SELECTION:
+sendTextFrame("textselection: " + pair.second);
+break;
+case LOK_CALLBACK_TEXT_SELECTION_START:
+sendTextFrame("textselectionstart: " + pair.second);
+break;
+case LOK_CALLBACK_TEXT_SELECTION_END:
+sendTextFrame("textselectionend: " + pair.second);
+break;
+case LOK_CALLBACK_DOCUMENT_SIZE_CHANGED:
+getStatus("", 0);
+getPartPageRectangles("", 0);
+break;
+}
+}
+
+_missedNotif.clear();
 }
 
 const std::string firstLine = getFirstLine(buffer, length);
diff --git a/loolwsd/ChildProcessSession.hpp b/loolwsd/ChildProcessSession.hpp
index b7e0af6..6e4a233 100644
--- a/loolwsd/ChildProcessSession.hpp
+++ b/loolwsd/ChildProcessSession.hpp
@@ -60,6 +60,9 @@ public:
 
 std::unique_lock getLock() { return 
std::unique_lock(Mutex); }
 
+void setMissedUpdates() { _missedUpdates = true; }
+void setMissedNotif(const int type, const std::string& payload) { 
_missedNotif.emplace(type, payload); }
+
  protected:
 virtual bool loadDocument(const char *buffer, int length, 
Poco::StringTokenizer& tokens) override;
 
@@ -98,6 +101,8 @@ private:
 /// View ID, returned by createView() or 0 by default.
 int _viewId;
 int _clientPart;
+bool _missedUpdates;
+std::map _missedNotif;
 std::function _onLoad;
 std::function _onUnload;
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: loleaflet/src

2016-04-21 Thread Ashod Nakashian

 loleaflet/src/core/Socket.js |   13 +
 1 file changed, 13 insertions(+)

New commits:
commit 9e64efe78bb85af5176d6b655acfdd6349c064bb
Author: Ashod Nakashian 
Date:   Fri Apr 22 00:30:15 2016 -0400

loleaflet: don't communicate with WSD when inactive to avoid confusing it

Change-Id: I4c7f252264fba4a46c6be9e9592a2aec165813bd
Reviewed-on: https://gerrit.libreoffice.org/24289
Reviewed-by: Ashod Nakashian 
Tested-by: Ashod Nakashian 

diff --git a/loleaflet/src/core/Socket.js b/loleaflet/src/core/Socket.js
index 3b6ad4b..b8886d3 100644
--- a/loleaflet/src/core/Socket.js
+++ b/loleaflet/src/core/Socket.js
@@ -8,6 +8,7 @@ L.Socket = L.Class.extend({
 
initialize: function (map) {
this._map = map;
+   this._active = true;
try {
this.socket = new WebSocket(map.options.server + '/' + 
map.options.doc);
} catch (e) {
@@ -30,6 +31,18 @@ L.Socket = L.Class.extend({
},
 
sendMessage: function (msg, coords) {
+   if (!msg.startsWith('useractive') && 
!msg.startsWith('userinactive') && !this._active) {
+   // Avoid communicating when we're inactive.
+   return;
+   }
+
+   if (msg.startsWith('useractive')) {
+   this._active = true;
+   }
+   else if (msg.startsWith('userinactive')) {
+   this._active = false;
+   }
+
var socketState = this.socket.readyState;
if (socketState === 2 || socketState === 3) {
this.initialize(this._map);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-5.0' - desktop/inc

2016-04-21 Thread Ashod Nakashian

 desktop/inc/lib/init.hxx |   50 +++
 1 file changed, 33 insertions(+), 17 deletions(-)

New commits:
commit 1f278848117080cd6e819f04ba428be52416af7c
Author: Ashod Nakashian 
Date:   Fri Apr 22 00:32:31 2016 -0400

Timer based LOKit callbacks and smart status tracking

The timer-based callback groups notifications together
and minimizes roundtrip overheads with clients.

A new status tracking for select notification types
eliminates duplicates and superfluous messages.

Change-Id: I5d27096d51e71afda22ecd71edf6b5735dee7852
Reviewed-on: https://gerrit.libreoffice.org/24290
Reviewed-by: Ashod Nakashian 
Tested-by: Ashod Nakashian 

diff --git a/desktop/inc/lib/init.hxx b/desktop/inc/lib/init.hxx
index f65c216..4827316 100644
--- a/desktop/inc/lib/init.hxx
+++ b/desktop/inc/lib/init.hxx
@@ -13,7 +13,7 @@
 #include 
 
 #include 
-#include 
+#include 
 #include 
 #include 
 #include 
@@ -27,15 +27,23 @@ class LOKInteractionHandler;
 
 namespace desktop {
 
-class CallbackFlushHandler : public Idle
+class CallbackFlushHandler : public Timer
 {
 public:
 explicit CallbackFlushHandler(LibreOfficeKitCallback pCallback, void* 
pData)
-: Idle( "lokit idle callback" ),
+: Timer( "lokit timer callback" ),
   m_pCallback(pCallback),
   m_pData(pData)
 {
-SetPriority(SchedulerPriority::POST_PAINT);
+SetTimeout(25);
+
+// Add the states that is safe to skip duplicates on,
+// even when not consequent.
+m_states.emplace(LOK_CALLBACK_TEXT_SELECTION_START, "");
+m_states.emplace(LOK_CALLBACK_TEXT_SELECTION_END, "");
+m_states.emplace(LOK_CALLBACK_TEXT_SELECTION, "");
+m_states.emplace(LOK_CALLBACK_INVALIDATE_VISIBLE_CURSOR, "");
+m_states.emplace(LOK_CALLBACK_STATE_CHANGED, "");
 }
 
 virtual ~CallbackFlushHandler()
@@ -62,27 +70,34 @@ namespace desktop {
 }
 }
 
-void queue(const int type, const char* payload)
+void queue(const int type, const char* data)
 {
+const std::string payload(data ? data : "(nil)");
 std::unique_lock lock(m_mutex);
 
-// TODO: Add more state tracking and prune superfluous 
notifications.
-if (type == LOK_CALLBACK_INVALIDATE_TILES || type == 
LOK_CALLBACK_TEXT_SELECTION)
+const auto stateIt = m_states.find(type);
+if (stateIt != m_states.end())
 {
-if (m_queue.empty() || std::get<0>(m_queue.back()) != type)
+// If the state didn't change, it's safe to ignore.
+if (stateIt->second == payload)
 {
-m_queue.emplace_back(type, std::string(payload ? payload : 
"(nil)"));
-
-if (!IsActive())
-{
-Start();
-}
+return;
 }
+
+stateIt->second = payload;
+}
+
+if (type == LOK_CALLBACK_INVALIDATE_TILES &&
+!m_queue.empty() && std::get<0>(m_queue.back()) == type && 
std::get<1>(m_queue.back()) == payload)
+{
+// Supress duplicate invalidation only when they are in 
sequence.
+return;
 }
-else
+
+m_queue.emplace_back(type, payload);
+if (!IsActive())
 {
-m_queue.emplace_back(type, std::string(payload ? payload : 
"(nil)"));
-flush();
+Start();
 }
 }
 
@@ -102,6 +117,7 @@ namespace desktop {
 
 private:
 std::vector> m_queue;
+std::map m_states;
 LibreOfficeKitCallback m_pCallback;
 void *m_pData;
 std::mutex m_mutex;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: vcl/source

2016-04-21 Thread Arnaud Versini

 vcl/source/window/floatwin.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 2e1a724c2029783e84d7c508c6010afac0d6d10f
Author: Arnaud Versini 
Date:   Thu Apr 21 20:50:16 2016 +0200

Try to fix tdf#93967 by using VclPtr to keep the window alive

Change-Id: Ibc03ae15b22eba672475ace602858ad60e95418d
Reviewed-on: https://gerrit.libreoffice.org/24283
Tested-by: Jenkins 
Reviewed-by: Michael Meeks 
Tested-by: Michael Meeks 

diff --git a/vcl/source/window/floatwin.cxx b/vcl/source/window/floatwin.cxx
index a1d0a9b..f3b8e2b 100644
--- a/vcl/source/window/floatwin.cxx
+++ b/vcl/source/window/floatwin.cxx
@@ -96,7 +96,7 @@ void FloatingWindow::ImplInit( vcl::Window* pParent, WinBits 
nStyle )
 }
 else
 {
-ImplBorderWindow* pBorderWin;
+VclPtr pBorderWin;
 sal_uInt16 nBorderStyle = BORDERWINDOW_STYLE_BORDER | 
BORDERWINDOW_STYLE_FLOAT;
 
 if (nStyle & WB_OWNERDRAWDECORATION)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: loolwsd/TileCache.cpp loolwsd/TileCache.hpp

2016-04-21 Thread Miklos Vajna

 loolwsd/TileCache.cpp |4 ++--
 loolwsd/TileCache.hpp |4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 0833a99b37907e5c82251abc0d52b6120ed70d3a
Author: Miklos Vajna 
Date:   Fri Apr 22 08:38:59 2016 +0200

TileCache: avoid copying these for each invocation

Change-Id: Icaf84699d7f54f2f977162a040aed1f4090f680d

diff --git a/loolwsd/TileCache.cpp b/loolwsd/TileCache.cpp
index 996d5f3..f05ffa6 100644
--- a/loolwsd/TileCache.cpp
+++ b/loolwsd/TileCache.cpp
@@ -44,7 +44,7 @@ using Poco::URI;
 
 using namespace LOOLProtocol;
 
-void TileBeingRendered::subscribe(std::weak_ptr session)
+void TileBeingRendered::subscribe(const std::weak_ptr& 
session)
 {
 _subscribers.push_back(session);
 }
@@ -382,7 +382,7 @@ void TileCache::invalidateTiles(const std::string& tiles)
 }
 }
 
-void TileCache::removeFile(const std::string fileName)
+void TileCache::removeFile(const std::string& fileName)
 {
 Log::warn("Removing tile: " + fileName);
 Util::removeFile(_persCacheDir + "/" + fileName);
diff --git a/loolwsd/TileCache.hpp b/loolwsd/TileCache.hpp
index 80c52be..cc4f746 100644
--- a/loolwsd/TileCache.hpp
+++ b/loolwsd/TileCache.hpp
@@ -35,7 +35,7 @@ class TileBeingRendered
 std::vector> _subscribers;
 
 public:
-void subscribe(std::weak_ptr session);
+void subscribe(const std::weak_ptr& session);
 std::vector> getSubscribers();
 };
 
@@ -84,7 +84,7 @@ public:
 void invalidateTiles(int part, int x, int y, int width, int height);
 
 // Removes the given file from both editing and persistent cache
-void removeFile(const std::string fileName);
+void removeFile(const std::string& fileName);
 
 private:
 /// Path of the (sub-)cache dir, the parameter specifies which (sub-)cache 
to use.
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: canvas/source chart2/source dbaccess/source framework/inc framework/source include/uno scp2/inc sc/source sd/source svtools/source UnoControls/inc xmloff/source

2016-04-21 Thread Andrea Gelmini

 UnoControls/inc/basecontrol.hxx  |2 +-
 canvas/source/directx/dx_surfacebitmap.cxx   |2 +-
 chart2/source/view/main/VDataSeries.cxx  |2 +-
 dbaccess/source/core/dataaccess/ModelImpl.hxx|2 +-
 framework/inc/jobs/jobresult.hxx |2 +-
 framework/source/inc/loadenv/loadenvexception.hxx|2 +-
 include/uno/threadpool.h |2 +-
 sc/source/filter/inc/xehelper.hxx|2 +-
 sc/source/ui/vba/vbahyperlinks.cxx   |2 +-
 scp2/inc/macros.inc  |2 +-
 sd/source/ui/slidesorter/inc/model/SlsPageDescriptor.hxx |2 +-
 svtools/source/svhtml/htmlkywd.cxx   |2 +-
 xmloff/source/chart/SchXMLChartContext.cxx   |2 +-
 xmloff/source/chart/SchXMLExport.cxx |2 +-
 xmloff/source/draw/ximpbody.cxx  |2 +-
 15 files changed, 15 insertions(+), 15 deletions(-)

New commits:
commit b2e86d2e26a7675b925b50b26e0ed4b3a946e9b9
Author: Andrea Gelmini 
Date:   Thu Apr 21 23:21:13 2016 +0200

Fix typos

Change-Id: Iea2a1bf1ff934de0e355b9e81979aa1966a3
Reviewed-on: https://gerrit.libreoffice.org/24286
Tested-by: Jenkins 
Reviewed-by: jan iversen 

diff --git a/UnoControls/inc/basecontrol.hxx b/UnoControls/inc/basecontrol.hxx
index 6ea4bd1..3970e75 100644
--- a/UnoControls/inc/basecontrol.hxx
+++ b/UnoControls/inc/basecontrol.hxx
@@ -101,7 +101,7 @@ namespace unocontrols{
 
 struct IMPL_MutexContainer
 {
-// Is necassery to initialize "BaseControl" and make this class 
thread-safe.
+// Is necessary to initialize "BaseControl" and make this class 
thread-safe.
 ::osl::Mutex m_aMutex;
 };
 
diff --git a/canvas/source/directx/dx_surfacebitmap.cxx 
b/canvas/source/directx/dx_surfacebitmap.cxx
index f7a3dde..fac6d9e 100644
--- a/canvas/source/directx/dx_surfacebitmap.cxx
+++ b/canvas/source/directx/dx_surfacebitmap.cxx
@@ -292,7 +292,7 @@ namespace dxcanvas
 {
 // since clients will most probably draw directly
 // to the GDI+ bitmap, we need to mark it as dirty
-// to ensure that the corrosponding dxsurface will
+// to ensure that the corresponding dxsurface will
 // be updated.
 mbIsSurfaceDirty = true;
 
diff --git a/chart2/source/view/main/VDataSeries.cxx 
b/chart2/source/view/main/VDataSeries.cxx
index 1b4748f..83c58e4 100644
--- a/chart2/source/view/main/VDataSeries.cxx
+++ b/chart2/source/view/main/VDataSeries.cxx
@@ -117,7 +117,7 @@ void lcl_clearIfNoValuesButTextIsContained( VDataSequence& 
rData, const uno::Ref
 if( !::rtl::math::isNan( rData.Doubles[i] ) )
 return;
 }
-//no double value is countained
+//no double value is contained
 //is there any text?
 uno::Sequence< OUString > aStrings( DataSequenceToStringSequence( 
xDataSequence ) );
 sal_Int32 nTextCount = aStrings.getLength();
diff --git a/dbaccess/source/core/dataaccess/ModelImpl.hxx 
b/dbaccess/source/core/dataaccess/ModelImpl.hxx
index ca3003e..aca2f56 100644
--- a/dbaccess/source/core/dataaccess/ModelImpl.hxx
+++ b/dbaccess/source/core/dataaccess/ModelImpl.hxx
@@ -484,7 +484,7 @@ private:
 css::uno::Reference< css::embed::XStorage >
 impl_switchToStorage_throw( const css::uno::Reference< 
css::embed::XStorage >& _rxNewRootStorage );
 
-/** switches to the given document URL, which denotes the logical URL of 
the document, not necessariy the
+/** switches to the given document URL, which denotes the logical URL of 
the document, not necessarily the
 URL where the doc was loaded/recovered from
 */
 voidimpl_switchToLogicalURL(
diff --git a/framework/inc/jobs/jobresult.hxx b/framework/inc/jobs/jobresult.hxx
index c4d515b..ef4c7cf 100644
--- a/framework/inc/jobs/jobresult.hxx
+++ b/framework/inc/jobs/jobresult.hxx
@@ -32,7 +32,7 @@ namespace framework{
 
 /**
 @short  represent a result of a finished job execution
-@descr  Such result instance transport all neccessarry
+@descr  Such result instance transport all necessary
 data from the code place where the job was finished
 to the outside code, where e.g. listener must be notified.
  */
diff --git a/framework/source/inc/loadenv/loadenvexception.hxx 
b/framework/source/inc/loadenv/loadenvexception.hxx
index ed7dda9..81dba45 100644
--- a/framework/source/inc/loadenv/loadenvexception.hxx
+++ b/framework/source/inc/loadenv/loadenvexception.hxx
@@ -46,7 +46,7 @@ class LoadEnvException
 ID_UNSUPPORTED_CONTENT,
 
 /** @short  It was not possible to get access to global filter 
configuration.
-@descr  Might som neccsessary services could not be created. */
+@descr  Might some necessary services could not be created. */
 ID_NO_CONFIG_ACCE

[Libreoffice-commits] core.git: sc/source

2016-04-21 Thread Jochen Nitschke

 sc/source/filter/inc/richstring.hxx |   10 --
 1 file changed, 10 deletions(-)

New commits:
commit 608b8cc54e4e1728dec97fc7c27beb587cfbabcf
Author: Jochen Nitschke 
Date:   Wed Apr 20 20:10:54 2016 +0200

remove unused BiffStringFlags

users are gone since bb5fa5773461e14de153266ccfa36e5f454ff9b8

Change-Id: I8a73fdbec0df467bcaa3dc26fae5c965fd5bc612
Reviewed-on: https://gerrit.libreoffice.org/24266
Tested-by: Jenkins 
Reviewed-by: Markus Mohrhard 

diff --git a/sc/source/filter/inc/richstring.hxx 
b/sc/source/filter/inc/richstring.hxx
index 3758714..bfd48f1 100644
--- a/sc/source/filter/inc/richstring.hxx
+++ b/sc/source/filter/inc/richstring.hxx
@@ -34,16 +34,6 @@ namespace com { namespace sun { namespace star {
 namespace oox {
 namespace xls {
 
-/** Flags used to specify import/export mode of strings. */
-typedef sal_Int32 BiffStringFlags;
-
-const BiffStringFlags BIFF_STR_DEFAULT  = 0x;   /// Default string 
settings.
-const BiffStringFlags BIFF_STR_FORCEUNICODE = 0x0001;   /// Always use UCS-2 
characters (default: try to compress). BIFF8 export only.
-const BiffStringFlags BIFF_STR_8BITLENGTH   = 0x0002;   /// 8-bit string 
length field (default: 16-bit).
-const BiffStringFlags BIFF_STR_SMARTFLAGS   = 0x0004;   /// Omit flags on 
empty string (default: read/write always). BIFF8 only.
-const BiffStringFlags BIFF_STR_KEEPFONTS= 0x0008;   /// Keep old fonts 
when reading unformatted string (default: clear fonts). Import only.
-const BiffStringFlags BIFF_STR_EXTRAFONTS   = 0x0010;   /// Read trailing 
rich-string font array (default: nothing). BIFF2-BIFF5 import only.
-
 /** Contains text data and font attributes for a part of a rich formatted 
string. */
 class RichStringPortion : public WorkbookHelper
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

62 matches

Mail list logo