date:20180103

Re: Jenkins incoherence

2018-01-03 Thread Markus Mohrhard

Hey Lionel,

On Thu, Jan 4, 2018 at 8:06 AM, Lionel Elie Mamane  wrote:

> https://ci.libreoffice.org/job/lo_gerrit/25062/
> looks like Jenkins build different code on (Windows and MacOS X) vs
> GNU/Linux. Given the error on the GNU/Linux builds, I don't understand
> how any other platform could build. At first I thought Jenkins build
> without Firebird on MacOS X and Windows, but the build log shows
> connectivity/source/drivers/firebird being built.
>
> Indeed:
>
> git checkout -f adf948a0895896976b138fb2e81c8b558c7af68f # timeout=30
> vs
> git checkout -f be4f19381ef0ae17c6ef964740fc671258ed0b78 # timeout=30
> ___
>
>
Note that we nowadays only build OSX and Windows with jenkins if the linux
build succeeds. As a result your job did not start a build on these
platforms and you can notice that if you select the OSX build you'll get
the results of the 25058 build instead of the 25062.

Sadly the only way to recognize it in the UI is to notice that the green
balls are slightly translucent.

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

Jenkins incoherence

2018-01-03 Thread Lionel Elie Mamane

https://ci.libreoffice.org/job/lo_gerrit/25062/
looks like Jenkins build different code on (Windows and MacOS X) vs
GNU/Linux. Given the error on the GNU/Linux builds, I don't understand
how any other platform could build. At first I thought Jenkins build
without Firebird on MacOS X and Windows, but the build log shows
connectivity/source/drivers/firebird being built.

Indeed:

git checkout -f adf948a0895896976b138fb2e81c8b558c7af68f # timeout=30
vs
git checkout -f be4f19381ef0ae17c6ef964740fc671258ed0b78 # timeout=30
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

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

2018-01-03 Thread Stephan Bergmann

 basic/source/uno/namecont.cxx |   12 
 1 file changed, 8 insertions(+), 4 deletions(-)

New commits:
commit 54227c9a2084d4b46c6ada96f1cc968c387ad893
Author: Stephan Bergmann 
Date:   Wed Jan 3 17:41:44 2018 +0100

Silence loplugin:unnecessarycatchthrow with --disable-debug

(An alternative fix could be to suppress warnings for catch blocks 
containing
preprocessor conditionals, but as these two places seem to be the only ones
affected, keep it simple for now.)

Change-Id: Ia83e56d1eab69bb2920ffdbbfc2182addce47963
Reviewed-on: https://gerrit.libreoffice.org/47331
Tested-by: Jenkins 
Reviewed-by: Stephan Bergmann 

diff --git a/basic/source/uno/namecont.cxx b/basic/source/uno/namecont.cxx
index 54b2f8eb1bf1..de80d937711b 100644
--- a/basic/source/uno/namecont.cxx
+++ b/basic/source/uno/namecont.cxx
@@ -1926,24 +1926,26 @@ void SfxLibraryContainer::storeLibraries_Impl( const 
uno::Reference< embed::XSto
 uno::Reference< embed::XStorage > xLibraryStor;
 if( bStorage )
 {
+#if OSL_DEBUG_LEVEL > 0
 try
 {
+#endif
 xLibraryStor = 
xTargetLibrariesStor->openStorageElement(
 
rLib.aName,
 
embed::ElementModes::READWRITE );
+#if OSL_DEBUG_LEVEL > 0
 }
 catch(const uno::Exception& )
 {
-#if OSL_DEBUG_LEVEL > 0
 Any aError( ::cppu::getCaughtException() );
 SAL_WARN(
 "basic",
 "couldn't create sub storage for library \""
 << rLib.aName << "\". Exception: "
 << comphelper::anyToString(aError));
-#endif
 throw;
 }
+#endif
 }
 
 // Maybe lib is not loaded?!
@@ -2319,8 +2321,10 @@ void SAL_CALL SfxLibraryContainer::loadLibrary( const 
OUString& Name )
 uno::Reference< embed::XStorage > xLibraryStor;
 if( bStorage )
 {
+#if OSL_DEBUG_LEVEL > 0
 try
 {
+#endif
 xLibrariesStor = mxStorage->openStorageElement( 
maLibrariesDir, embed::ElementModes::READ );
 SAL_WARN_IF(
 !xLibrariesStor.is(), "basic",
@@ -2340,19 +2344,19 @@ void SAL_CALL SfxLibraryContainer::loadLibrary( const 
OUString& Name )
 {
 throw uno::RuntimeException("null returned from 
openStorageElement");
 }
+#if OSL_DEBUG_LEVEL > 0
 }
 catch(const uno::Exception& )
 {
-#if OSL_DEBUG_LEVEL > 0
 Any aError( ::cppu::getCaughtException() );
 SAL_WARN(
 "basic",
 "couldn't open sub storage for library \"" << Name
 << "\". Exception: "
 << comphelper::anyToString(aError));
-#endif
 throw;
 }
+#endif
 }
 
 Sequence< OUString > aNames = pImplLib->getElementNames();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2018-01-03 Thread Stephan Bergmann

 xmloff/source/forms/propertyexport.hxx |8 
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit d70dc81f32d984cc045d4448e7ac89f79f05a8af
Author: Stephan Bergmann 
Date:   Wed Jan 3 17:40:55 2018 +0100

loplugin:redundantinline (--disable-debug)

Change-Id: I0252fcbf7835cca1e9d6569db0ccacf30081a8e9
Reviewed-on: https://gerrit.libreoffice.org/47330
Tested-by: Jenkins 
Reviewed-by: Stephan Bergmann 

diff --git a/xmloff/source/forms/propertyexport.hxx 
b/xmloff/source/forms/propertyexport.hxx
index 8bdf3bf0fc93..e01b6c71ad31 100644
--- a/xmloff/source/forms/propertyexport.hxx
+++ b/xmloff/source/forms/propertyexport.hxx
@@ -362,13 +362,13 @@ namespace xmloff
 void AddAttribute(sal_uInt16 _nPrefix, 
::xmloff::token::XMLTokenEnum _eName, ::xmloff::token::XMLTokenEnum _eValue );
 #else
 //  in the product version, inline this, so it does not cost us extra 
time calling into our method
-inline  void AddAttribute(sal_uInt16 _nPrefix, const sal_Char* _pName, 
const OUString& _rValue)
+void AddAttribute(sal_uInt16 _nPrefix, const sal_Char* _pName, const 
OUString& _rValue)
 { m_rContext.getGlobalContext().AddAttribute(_nPrefix, _pName, 
_rValue); }
-inline void AddAttribute( sal_uInt16 _nPrefix, const OUString& _rName, 
const OUString& _rValue )
+void AddAttribute( sal_uInt16 _nPrefix, const OUString& _rName, const 
OUString& _rValue )
 { m_rContext.getGlobalContext().AddAttribute( _nPrefix, _rName, 
_rValue ); }
-inline void AddAttribute(sal_uInt16 _nPrefix, 
::xmloff::token::XMLTokenEnum _eName, const OUString& _rValue)
+void AddAttribute(sal_uInt16 _nPrefix, ::xmloff::token::XMLTokenEnum 
_eName, const OUString& _rValue)
 { m_rContext.getGlobalContext().AddAttribute(_nPrefix, _eName, 
_rValue); }
-inline void AddAttribute(sal_uInt16 _nPrefix, 
::xmloff::token::XMLTokenEnum _eName, ::xmloff::token::XMLTokenEnum _eValue )
+void AddAttribute(sal_uInt16 _nPrefix, ::xmloff::token::XMLTokenEnum 
_eName, ::xmloff::token::XMLTokenEnum _eValue )
 { m_rContext.getGlobalContext().AddAttribute(_nPrefix, _eName, 
_eValue); }
 #endif
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: connectivity/registry connectivity/source include/connectivity

2018-01-03 Thread Lionel Elie Mamane

 connectivity/registry/firebird/org/openoffice/Office/DataAccess/Drivers.xcu |  
 10 ++
 connectivity/source/commontools/dbmetadata.cxx  |  
  9 ++
 connectivity/source/drivers/firebird/Connection.cxx |  
 29 
 connectivity/source/drivers/firebird/Connection.hxx |  
  8 --
 connectivity/source/drivers/jdbc/JConnection.cxx|  
 36 --
 connectivity/source/drivers/odbc/OConnection.cxx|  
  3 
 connectivity/source/drivers/odbc/OPreparedStatement.cxx |  
 19 -
 connectivity/source/inc/odbc/OConnection.hxx|  
  2 
 connectivity/source/parse/sqlnode.cxx   |  
  5 +
 include/connectivity/dbmetadata.hxx |  
  4 +
 10 files changed, 31 insertions(+), 94 deletions(-)

New commits:
commit a29d97e6ddab8ec002ba9827bd5fc874117712e0
Author: Lionel Elie Mamane 
Date:   Tue Jan 2 22:49:31 2018 +0100

tdf#104986 move named parameters substitution into generic layer

Previously, drivers were responsible for making the substitution themselves.
In practice they all (Firebird, ODBC and JDBC) used the LibreOffice SQL
parser to parse the SQL statement and do the substitution.

This had a few negative consequences:
 * The substitition was applied to _all_ SQL commands, including
   queries having the "execute SQL directly" bit set. Which means
   that the SQL was _not_ sent to the DBMS exactly as typed by
   the user. Even if there was no substitution to be made, since
   the SQL command was always round-tripped through the parser,
   thus "normalising" it (which is what led to tdf#104986).
 * "execute SQL directly" queries "magically" behaved slightly
   differently depending on whether the LibreOffice SQL parser
   succeeded in parsing them or not.

Change-Id: Ieedc643f33467435a139e2565a01e6f398af041f
Reviewed-on: https://gerrit.libreoffice.org/47283
Tested-by: Jenkins 
Reviewed-by: Lionel Elie Mamane 

diff --git 
a/connectivity/registry/firebird/org/openoffice/Office/DataAccess/Drivers.xcu 
b/connectivity/registry/firebird/org/openoffice/Office/DataAccess/Drivers.xcu
index e5ff61f28262..03896aff4412 100644
--- 
a/connectivity/registry/firebird/org/openoffice/Office/DataAccess/Drivers.xcu
+++ 
b/connectivity/registry/firebird/org/openoffice/Office/DataAccess/Drivers.xcu
@@ -61,6 +61,11 @@
 false
   
 
+
+  
+true
+  
+
   
   
   
@@ -95,6 +100,11 @@
 false
   
 
+
+  
+true
+  
+
   
   
   
diff --git a/connectivity/source/commontools/dbmetadata.cxx 
b/connectivity/source/commontools/dbmetadata.cxx
index 50abe346fba2..e40cde6c4bcd 100644
--- a/connectivity/source/commontools/dbmetadata.cxx
+++ b/connectivity/source/commontools/dbmetadata.cxx
@@ -301,6 +301,15 @@ namespace dbtools
 return doGenerate;
 }
 
+bool DatabaseMetaData::shouldSubstituteParameterNames() const
+{
+bool doSubstitute( true );
+Any setting;
+if ( lcl_getConnectionSetting( "ParameterNameSubstitution", *m_pImpl, 
setting ) )
+OSL_VERIFY( setting >>= doSubstitute );
+return doSubstitute;
+}
+
 bool DatabaseMetaData::isAutoIncrementPrimaryKey() const
 {
 bool is( true );
diff --git a/connectivity/source/drivers/firebird/Connection.cxx 
b/connectivity/source/drivers/firebird/Connection.cxx
index 32e314029f7f..7d0937e3ae99 100644
--- a/connectivity/source/drivers/firebird/Connection.cxx
+++ b/connectivity/source/drivers/firebird/Connection.cxx
@@ -393,30 +393,6 @@ Reference< XStatement > SAL_CALL 
Connection::createStatement( )
 return xReturn;
 }
 
-OUString Connection::transformPreparedStatement(const OUString& _sSQL)
-{
-OUString sSqlStatement (_sSQL);
-try
-{
-OSQLParser aParser( m_xDriver->getContext() );
-OUString sErrorMessage;
-OUString sNewSql;
-OSQLParseNode* pNode = aParser.parseTree(sErrorMessage,_sSQL);
-if(pNode)
-{   // special handling for parameters
-OSQLParseNode::substituteParameterNames(pNode);
-pNode->parseNodeToStr( sNewSql, this );
-delete pNode;
-sSqlStatement = sNewSql;
-}
-}
-catch(const Exception&)
-{
-SAL_WARN("connectivity.firebird", "failed to remove named parameters 
from '" << _sSQL << "'");
-}
-return sSqlStatement;
-}
-
 Reference< XPreparedStatement > SAL_CALL Connection::prepareStatement(
 const OUString& _sSql)
 {
@@ -428,10 +404,7 @@ Reference< XPreparedStatement > SAL_CALL 
Connection::prepareStatement(
 if(m_aTypeInfo.empty())
 buildTypeInfo();
 
-

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

2018-01-03 Thread Lionel Elie Mamane

 connectivity/source/drivers/firebird/PreparedStatement.cxx |   28 +++--
 1 file changed, 16 insertions(+), 12 deletions(-)

New commits:
commit 1bbadad79d91005dc18a3c1e34de14d02660f6ab
Author: Lionel Elie Mamane 
Date:   Tue Jan 2 22:55:45 2018 +0100

firebird-sdbc: check parameter index before setting in all cases

Change-Id: I291b0436a7cfde07879436a753329b52ff0c1049
Reviewed-on: https://gerrit.libreoffice.org/47284
Tested-by: Jenkins 
Reviewed-by: Lionel Elie Mamane 

diff --git a/connectivity/source/drivers/firebird/PreparedStatement.cxx 
b/connectivity/source/drivers/firebird/PreparedStatement.cxx
index f951537fde28..8b00beb20626 100644
--- a/connectivity/source/drivers/firebird/PreparedStatement.cxx
+++ b/connectivity/source/drivers/firebird/PreparedStatement.cxx
@@ -348,6 +348,7 @@ void SAL_CALL OPreparedStatement::setNull(sal_Int32 nIndex, 
sal_Int32 /*nSqlType
 checkDisposed(OStatementCommonBase_Base::rBHelper.bDisposed);
 ensurePrepared();
 
+checkParameterIndex(nIndex);
 setParameterNull(nIndex);
 }
 
@@ -584,6 +585,7 @@ void OPreparedStatement::setClob( sal_Int32 
nParameterIndex, const OUString& rSt
 {
 ::osl::MutexGuard aGuard( m_aMutex );
 checkDisposed(OStatementCommonBase_Base::rBHelper.bDisposed);
+checkParameterIndex(nParameterIndex);
 
 #if SAL_TYPES_SIZEOFPOINTER == 8
 isc_blob_handle aBlobHandle = 0;
@@ -622,6 +624,7 @@ void SAL_CALL OPreparedStatement::setBlob(sal_Int32 
nParameterIndex,
 {
 ::osl::MutexGuard aGuard(m_aMutex);
 checkDisposed(OStatementCommonBase_Base::rBHelper.bDisposed);
+checkParameterIndex(nParameterIndex);
 
 #if SAL_TYPES_SIZEOFPOINTER == 8
 isc_blob_handle aBlobHandle = 0;
@@ -668,19 +671,19 @@ void SAL_CALL OPreparedStatement::setBlob(sal_Int32 
nParameterIndex,
 }
 
 
-void SAL_CALL OPreparedStatement::setArray( sal_Int32, const Reference< XArray 
>& )
+void SAL_CALL OPreparedStatement::setArray( sal_Int32 nIndex, const Reference< 
XArray >& )
 {
 ::osl::MutexGuard aGuard( m_aMutex );
 checkDisposed(OStatementCommonBase_Base::rBHelper.bDisposed);
-
+checkParameterIndex(nIndex);
 }
 
 
-void SAL_CALL OPreparedStatement::setRef( sal_Int32, const Reference< XRef >& )
+void SAL_CALL OPreparedStatement::setRef( sal_Int32 nIndex, const Reference< 
XRef >& )
 {
 ::osl::MutexGuard aGuard( m_aMutex );
 checkDisposed(OStatementCommonBase_Base::rBHelper.bDisposed);
-
+checkParameterIndex(nIndex);
 }
 
 
@@ -762,19 +765,19 @@ void SAL_CALL OPreparedStatement::setObjectWithInfo( 
sal_Int32 parameterIndex, c
 }
 
 
-void SAL_CALL OPreparedStatement::setObjectNull( sal_Int32, sal_Int32, const 
::rtl::OUString& )
+void SAL_CALL OPreparedStatement::setObjectNull( sal_Int32 nIndex, sal_Int32, 
const ::rtl::OUString& )
 {
 ::osl::MutexGuard aGuard( m_aMutex );
 checkDisposed(OStatementCommonBase_Base::rBHelper.bDisposed);
-
+checkParameterIndex(nIndex);
 }
 
 
-void SAL_CALL OPreparedStatement::setObject( sal_Int32, const Any& )
+void SAL_CALL OPreparedStatement::setObject( sal_Int32 nIndex, const Any& )
 {
 ::osl::MutexGuard aGuard( m_aMutex );
 checkDisposed(OStatementCommonBase_Base::rBHelper.bDisposed);
-
+checkParameterIndex(nIndex);
 }
 
 void SAL_CALL OPreparedStatement::setBytes(sal_Int32 nParameterIndex,
@@ -782,6 +785,7 @@ void SAL_CALL OPreparedStatement::setBytes(sal_Int32 
nParameterIndex,
 {
 ::osl::MutexGuard aGuard(m_aMutex);
 checkDisposed(OStatementCommonBase_Base::rBHelper.bDisposed);
+checkParameterIndex(nParameterIndex);
 
 #if SAL_TYPES_SIZEOFPOINTER == 8
 isc_blob_handle aBlobHandle = 0;
@@ -825,19 +829,19 @@ void SAL_CALL OPreparedStatement::setBytes(sal_Int32 
nParameterIndex,
 }
 
 
-void SAL_CALL OPreparedStatement::setCharacterStream( sal_Int32, const 
Reference< css::io::XInputStream >&, sal_Int32 )
+void SAL_CALL OPreparedStatement::setCharacterStream( sal_Int32 nIndex, const 
Reference< css::io::XInputStream >&, sal_Int32 )
 {
 ::osl::MutexGuard aGuard( m_aMutex );
 checkDisposed(OStatementCommonBase_Base::rBHelper.bDisposed);
-
+checkParameterIndex(nIndex);
 }
 
 
-void SAL_CALL OPreparedStatement::setBinaryStream( sal_Int32, const Reference< 
css::io::XInputStream >&, sal_Int32 )
+void SAL_CALL OPreparedStatement::setBinaryStream( sal_Int32 nIndex, const 
Reference< css::io::XInputStream >&, sal_Int32 )
 {
 ::osl::MutexGuard aGuard( m_aMutex );
 checkDisposed(OStatementCommonBase_Base::rBHelper.bDisposed);
-
+checkParameterIndex(nIndex);
 }
 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2018-01-03 Thread Julien Nabet

 svx/source/form/filtnav.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 93f8172ffb783da95391ac53ab6402f5a055aa44
Author: Julien Nabet 
Date:   Wed Jan 3 19:09:49 2018 +0100

tdf#114788: fix crash in form-based filter

regression from 
https://cgit.freedesktop.org/libreoffice/core/diff/svx/source/form/filtnav.cxx?id=85f93697defd9a812a0cda0bc4e9364e28c0339e

Change-Id: If6f248b460a55aa1e30902d5edeb807dabb37d7b
Reviewed-on: https://gerrit.libreoffice.org/47338
(cherry picked from commit d2c9b749503ef0763a6140a7b509f73adb6015d2)
Reviewed-on: https://gerrit.libreoffice.org/47357
Tested-by: Jenkins 
Reviewed-by: Lionel Elie Mamane 

diff --git a/svx/source/form/filtnav.cxx b/svx/source/form/filtnav.cxx
index 989019e0a702..393c23ff9cbf 100644
--- a/svx/source/form/filtnav.cxx
+++ b/svx/source/form/filtnav.cxx
@@ -1144,7 +1144,7 @@ bool FmFilterNavigator::EditingEntry( SvTreeListEntry* 
pEntry, Selection& rSelec
 if (!SvTreeListBox::EditingEntry( pEntry, rSelection ))
 return false;
 
-return pEntry && dynamic_cast(static_cast(pEntry->GetUserData())) == nullptr;
+return pEntry && dynamic_cast(static_cast(pEntry->GetUserData())) != nullptr;
 }
 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: basegfx/CppunitTest_basegfx.mk basegfx/test solenv/clang-format

2018-01-03 Thread Tomaž Vajngerl

 basegfx/CppunitTest_basegfx.mk   |1 
 basegfx/test/SvgPathImportExport.cxx |  241 +++
 basegfx/test/basegfx2d.cxx   |  233 ++---
 solenv/clang-format/blacklist|1 
 4 files changed, 257 insertions(+), 219 deletions(-)

New commits:
commit d1296f4e02631c06e374a391a6dc12dc35d599e4
Author: TomaÅ¾ Vajngerl 
Date:   Wed Jan 3 18:25:28 2018 +0900

basegfx: extract svg path import/export test to own file

Change-Id: If9925540feb54e5a101c76f8d4cebaa305ac4c75
Reviewed-on: https://gerrit.libreoffice.org/47299
Tested-by: Jenkins 
Reviewed-by: TomaÅ¾ Vajngerl 

diff --git a/basegfx/CppunitTest_basegfx.mk b/basegfx/CppunitTest_basegfx.mk
index 1710423b5e50..472c6ff11049 100644
--- a/basegfx/CppunitTest_basegfx.mk
+++ b/basegfx/CppunitTest_basegfx.mk
@@ -23,6 +23,7 @@ $(eval $(call gb_CppunitTest_use_libraries,basegfx,\
 
 $(eval $(call gb_CppunitTest_add_exception_objects,basegfx,\
 basegfx/test/basegfx2d \
+basegfx/test/SvgPathImportExport \
 basegfx/test/basegfx3d \
 basegfx/test/boxclipper \
 basegfx/test/basegfxtools \
diff --git a/basegfx/test/SvgPathImportExport.cxx 
b/basegfx/test/SvgPathImportExport.cxx
new file mode 100644
index ..fe2c6f500d0a
--- /dev/null
+++ b/basegfx/test/SvgPathImportExport.cxx
@@ -0,0 +1,241 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements. See the NOTICE file distributed
+ *   with this work for additional information regarding copyright
+ *   ownership. The ASF licenses this file to you under the Apache
+ *   License, Version 2.0 (the "License"); you may not use this file
+ *   except in compliance with the License. You may obtain a copy of
+ *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+
+#include 
+#include 
+#include 
+#include 
+
+#include 
+#include 
+
+namespace basegfx
+{
+
+class SvgPathImportExport : public CppUnit::TestFixture
+{
+private:
+OUString aPath0;
+OUString aPath1;
+OUString aPath2;
+OUString aPath3;
+
+public:
+// initialise your test code values here.
+void setUp() override
+{
+// simple rectangle
+aPath0 = "M 10 10-10 10-10-10 10-10Z";
+
+// simple bezier polygon
+aPath1 = "m11430 0c-8890 3810 5715 6985 5715 6985 "
+"0 0-17145-1905-17145-1905 0 0 22860-10160 "
+"16510 6350-6350 16510-3810-11430-3810-11430z";
+
+// '@' as a bezier polygon
+aPath2 = "m1917 1114c-89-189-233-284-430-284-167 "
+"0-306 91-419 273-113 182-170 370-170 564 "
+"0 145 33 259 98 342 65 84 150 126 257 126 "
+"77 0 154-19 231-57 77-38 147-97 210-176 63"
+"-79 99-143 109-190 38-199 76-398 114-598z"
+"m840 1646c-133 73-312 139-537 197-225 57"
+"-440 86-644 87-483-1-866-132-1150-392-284"
+"-261-426-619-426-1076 0-292 67-560 200-803 "
+"133-243 321-433 562-569 241-136 514-204 821"
+"-204 405 0 739 125 1003 374 264 250 396 550 "
+"396 899 0 313-88 576-265 787-177 212-386 318"
+"-627 318-191 0-308-94-352-281-133 187-315 281"
+"-546 281-172 0-315-67-428-200-113-133-170-301"
+"-170-505 0-277 90-527 271-751 181-223 394"
+"-335 640-335 196 0 353 83 470 250 13-68 26"
+"-136 41-204 96 0 192 0 288 0-74 376-148 752"
+"-224 1128-21 101-31 183-31 245 0 39 9 70 26 "
+"93 17 24 39 36 67 36 145 0 279-80 400-240 121"
+"-160 182-365 182-615 0-288-107-533-322-734"
+"-215-201-487-301-816-301-395 0-715 124-960 "
+"373-245 249-368 569-368 958 0 385 119 685 "
+"357 900 237 216 557 324 958 325 189-1 389-27 "
+"600-77 211-52 378-110 503-174 27 70 54 140 81 210z";
+
+// first part of 'Hello World' as a line polygon
+aPath3 = "m1598 125h306v2334h-306v-1105h-1293v1105h-305v"
+"-2334h305v973h1293zm2159 1015 78-44 85 235-91 "
+"47-91 40-90 34-90 29-89 21-88 16-88 10-88 3-102"
+"-4-97-12-91-19-85-26-40-16-39-18-38-20-36-22-34"
+"-24-33-26-32-27-30-30-29-31-27-33-25-33-23-36-21"
+"-36-19-38-18-40-16-40-26-86-18-91-11-97-4-103 3"
+"-98 11-94 17-89 24-84 31-79 37-75 22-35 23-34 24"
+"-33 27-32 28-30 29-28 31-27 31-24 33-22 34-21 35"
+"-18 37-17 38-14 38-13 41-11 41-8 86-12 91-4 82 4 "
+"78 10 37 9 37 9 36 1

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

2018-01-03 Thread Noel Grandin

 sd/source/ui/slidesorter/cache/SlsPageCacheManager.cxx |   32 ++---
 sd/source/ui/slidesorter/inc/cache/SlsPageCacheManager.hxx |   15 ++
 2 files changed, 23 insertions(+), 24 deletions(-)

New commits:
commit 3f54055c18c953a8398bf29e27dcc8fae2592c94
Author: Noel Grandin 
Date:   Wed Jan 3 15:07:58 2018 +0200

drop Cache typedef

Change-Id: Id1c568f7d089c345643227a6e9d0fee09aabfab8
Reviewed-on: https://gerrit.libreoffice.org/47345
Tested-by: Jenkins 
Reviewed-by: Noel Grandin 

diff --git a/sd/source/ui/slidesorter/cache/SlsPageCacheManager.cxx 
b/sd/source/ui/slidesorter/cache/SlsPageCacheManager.cxx
index 14a810712dfe..bffd9fd346d2 100644
--- a/sd/source/ui/slidesorter/cache/SlsPageCacheManager.cxx
+++ b/sd/source/ui/slidesorter/cache/SlsPageCacheManager.cxx
@@ -61,11 +61,11 @@ class RecentlyUsedCacheDescriptor
 {
 public:
 Size maPreviewSize;
-std::shared_ptr< ::sd::slidesorter::cache::PageCacheManager::Cache> 
mpCache;
+std::shared_ptr< ::sd::slidesorter::cache::BitmapCache> mpCache;
 
 RecentlyUsedCacheDescriptor(
 const Size& rPreviewSize,
-const std::shared_ptr< 
::sd::slidesorter::cache::PageCacheManager::Cache>& rpCache)
+const std::shared_ptr< ::sd::slidesorter::cache::BitmapCache>& rpCache)
 :maPreviewSize(rPreviewSize),mpCache(rpCache)
 {}
 };
@@ -110,7 +110,7 @@ namespace sd { namespace slidesorter { namespace cache {
 */
 class PageCacheManager::PageCacheContainer
 : public std::unordered_map,
+ std::shared_ptr,
  CacheDescriptor::Hash,
  CacheDescriptor::Equal>
 {
@@ -121,12 +121,12 @@ public:
 address only.
 */
 class CompareWithCache { public:
-explicit CompareWithCache(const 
std::shared_ptr& rpCache)
+explicit CompareWithCache(const std::shared_ptr& rpCache)
 : mpCache(rpCache) {}
 bool operator () (const PageCacheContainer::value_type& rValue) const
 { return rValue.second == mpCache; }
 private:
-std::shared_ptr mpCache;
+std::shared_ptr mpCache;
 };
 };
 
@@ -189,11 +189,11 @@ PageCacheManager::~PageCacheManager()
 {
 }
 
-std::shared_ptr PageCacheManager::GetCache (
+std::shared_ptr PageCacheManager::GetCache (
 const DocumentKey& pDocument,
 const Size& rPreviewSize)
 {
-std::shared_ptr pResult;
+std::shared_ptr pResult;
 
 // Look for the cache in the list of active caches.
 CacheDescriptor aKey (pDocument, rPreviewSize);
@@ -207,7 +207,7 @@ std::shared_ptr 
PageCacheManager::GetCache (
 
 // Create the cache when no suitable one does exist.
 if (pResult.get() == nullptr)
-pResult.reset(new Cache());
+pResult.reset(new BitmapCache());
 
 // The cache may be newly created and thus empty or is old and may
 // contain previews that are not up-to-date.  Recycle previews from
@@ -222,7 +222,7 @@ std::shared_ptr 
PageCacheManager::GetCache (
 }
 
 void PageCacheManager::Recycle (
-const std::shared_ptr& rpCache,
+const std::shared_ptr& rpCache,
 const DocumentKey& pDocument,
 const Size& rPreviewSize)
 {
@@ -256,7 +256,7 @@ void PageCacheManager::Recycle (
 }
 }
 
-void PageCacheManager::ReleaseCache (const std::shared_ptr& rpCache)
+void PageCacheManager::ReleaseCache (const std::shared_ptr& 
rpCache)
 {
 PageCacheContainer::iterator iCache (::std::find_if(
 mpPageCaches->begin(),
@@ -273,12 +273,12 @@ void PageCacheManager::ReleaseCache (const 
std::shared_ptr& rpCache)
 }
 }
 
-std::shared_ptr PageCacheManager::ChangeSize (
-const std::shared_ptr& rpCache,
+std::shared_ptr PageCacheManager::ChangeSize (
+const std::shared_ptr& rpCache,
 const Size&,
 const Size& rNewPreviewSize)
 {
-std::shared_ptr pResult;
+std::shared_ptr pResult;
 
 if (rpCache.get() != nullptr)
 {
@@ -384,11 +384,11 @@ void PageCacheManager::ReleasePreviewBitmap (const 
SdrPage* pPage)
 iCache->second->ReleaseBitmap(pPage);
 }
 
-std::shared_ptr 
PageCacheManager::GetRecentlyUsedCache (
+std::shared_ptr PageCacheManager::GetRecentlyUsedCache (
 const DocumentKey& pDocument,
 const Size& rPreviewSize)
 {
-std::shared_ptr pCache;
+std::shared_ptr pCache;
 
 // Look for the cache in the list of recently used caches.
 RecentlyUsedPageCaches::iterator iQueue 
(mpRecentlyUsedPageCaches->find(pDocument));
@@ -410,7 +410,7 @@ std::shared_ptr 
PageCacheManager::GetRecentlyUsedCache
 void PageCacheManager::PutRecentlyUsedCache(
 DocumentKey const & pDocument,
 const Size& rPreviewSize,
-const std::shared_ptr& rpCache)
+const std::shared_ptr& rpCache)
 {
 // Look up the list of recently used caches for the given document.
 RecentlyUsedPageCaches::iterator iQueue 
(mpRecentlyUsedPageCaches->find(pDocument));
diff --git a/sd/source/ui/slidesorter/inc/cache/SlsPageCacheManager.hxx 
b/sd/sou

[Libreoffice-commits] core.git: 2 commits - cui/source framework/source include/svx svx/source

2018-01-03 Thread Noel Grandin

 cui/source/inc/align.hxx  |2 -
 cui/source/tabpages/align.cxx |2 -
 framework/source/uiconfiguration/imagemanagerimpl.cxx |   36 --
 include/svx/frmdirlbox.hxx|8 +---
 svx/source/dialog/frmdirlbox.cxx  |   10 ++---
 5 files changed, 27 insertions(+), 31 deletions(-)

New commits:
commit 5328bf4021fc3a9b8c2b031f2eaba55eb1fb249c
Author: Noel Grandin 
Date:   Wed Jan 3 15:13:30 2018 +0200

drop CmdToXGraphicNameAccess typedef

Change-Id: I76dc73c5a6c62b0ec0fff274ae57f084ccdb8c70
Reviewed-on: https://gerrit.libreoffice.org/47347
Tested-by: Jenkins 
Reviewed-by: Noel Grandin 

diff --git a/framework/source/uiconfiguration/imagemanagerimpl.cxx 
b/framework/source/uiconfiguration/imagemanagerimpl.cxx
index 763af8aa13e6..0173374bd498 100644
--- a/framework/source/uiconfiguration/imagemanagerimpl.cxx
+++ b/framework/source/uiconfiguration/imagemanagerimpl.cxx
@@ -92,8 +92,6 @@ namespace framework
 
 static GlobalImageList* pGlobalImageList = nullptr;
 
-typedef GraphicNameAccess CmdToXGraphicNameAccess;
-
 namespace
 {
 class theGlobalImageListMutex
@@ -778,8 +776,8 @@ void ImageManagerImpl::replaceImages(
 const Sequence< OUString >& aCommandURLSequence,
 const Sequence< uno::Reference< XGraphic > >& aGraphicsSequence )
 {
-CmdToXGraphicNameAccess* pInsertedImages( nullptr );
-CmdToXGraphicNameAccess* pReplacedImages( nullptr );
+GraphicNameAccess* pInsertedImages( nullptr );
+GraphicNameAccess* pReplacedImages( nullptr );
 
 {
 SolarMutexGuard g;
@@ -810,14 +808,14 @@ void ImageManagerImpl::replaceImages(
 {
 pImageList->AddImage(aCommandURLSequence[i], Image(xGraphic));
 if ( !pInsertedImages )
-pInsertedImages = new CmdToXGraphicNameAccess();
+pInsertedImages = new GraphicNameAccess();
 pInsertedImages->addElement( aCommandURLSequence[i], xGraphic 
);
 }
 else
 {
 pImageList->ReplaceImage(aCommandURLSequence[i], 
Image(xGraphic));
 if ( !pReplacedImages )
-pReplacedImages = new CmdToXGraphicNameAccess();
+pReplacedImages = new GraphicNameAccess();
 pReplacedImages->addElement( aCommandURLSequence[i], xGraphic 
);
 }
 }
@@ -858,8 +856,8 @@ void ImageManagerImpl::replaceImages(
 
 void ImageManagerImpl::removeImages( ::sal_Int16 nImageType, const Sequence< 
OUString >& aCommandURLSequence )
 {
-CmdToXGraphicNameAccess* pRemovedImages( nullptr );
-CmdToXGraphicNameAccess* pReplacedImages( nullptr );
+GraphicNameAccess* pRemovedImages( nullptr );
+GraphicNameAccess* pReplacedImages( nullptr );
 
 {
 SolarMutexGuard g;
@@ -903,20 +901,20 @@ void ImageManagerImpl::removeImages( ::sal_Int16 
nImageType, const Sequence< OUS
 if ( !aNewImage )
 {
 if ( !pRemovedImages )
-pRemovedImages = new CmdToXGraphicNameAccess();
+pRemovedImages = new GraphicNameAccess();
 pRemovedImages->addElement( aCommandURLSequence[i], 
xEmptyGraphic );
 }
 else
 {
 if ( !pReplacedImages )
-pReplacedImages = new CmdToXGraphicNameAccess();
+pReplacedImages = new GraphicNameAccess();
 pReplacedImages->addElement(aCommandURLSequence[i], 
GetXGraphic(aNewImage));
 }
 } // if ( m_bUseGlobal )
 else
 {
 if ( !pRemovedImages )
-pRemovedImages = new CmdToXGraphicNameAccess();
+pRemovedImages = new GraphicNameAccess();
 pRemovedImages->addElement( aCommandURLSequence[i], 
xEmptyGraphic );
 }
 }
@@ -993,9 +991,9 @@ void ImageManagerImpl::reload()
 pImageList = implts_getUserImageList(i);
 pImageList->GetImageNames( aNewUserCmdImageSet );
 
-CmdToXGraphicNameAccess* pInsertedImages( nullptr );
-CmdToXGraphicNameAccess* pReplacedImages( nullptr );
-CmdToXGraphicNameAccess* pRemovedImages( nullptr );
+GraphicNameAccess* pInsertedImages( nullptr );
+GraphicNameAccess* pReplacedImages( nullptr );
+GraphicNameAccess* pRemovedImages( nullptr );
 
 const sal_uInt32 nNewCount = aNewUserCmdImageSet.size();
 for ( j = 0; j < nNewCount; j++ )
@@ -1005,14 +1003,14 @@ void ImageManagerImpl::reload()
 {
 pIter->second = true;

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

2018-01-03 Thread Noel Grandin

 svtools/source/uno/addrtempuno.cxx |7 +++
 1 file changed, 3 insertions(+), 4 deletions(-)

New commits:
commit 4c57847cb485396c6d914cf64d9f48f0845ffe34
Author: Noel Grandin 
Date:   Wed Jan 3 15:00:17 2018 +0200

drop OAddressBookSourceDialogUnoBase typedef

Change-Id: Iffc9f3bda2293f02ea071cea7ce3f222aa7f9cd2
Reviewed-on: https://gerrit.libreoffice.org/47344
Tested-by: Jenkins 
Reviewed-by: Noel Grandin 

diff --git a/svtools/source/uno/addrtempuno.cxx 
b/svtools/source/uno/addrtempuno.cxx
index 88754128f81e..e9817e217fac 100644
--- a/svtools/source/uno/addrtempuno.cxx
+++ b/svtools/source/uno/addrtempuno.cxx
@@ -40,9 +40,8 @@ namespace {
 using namespace css::beans;
 using namespace css::sdbc;
 
-typedef OGenericUnoDialog OAddressBookSourceDialogUnoBase;
 class OAddressBookSourceDialogUno
-:public OAddressBookSourceDialogUnoBase
+:public OGenericUnoDialog
 ,public ::comphelper::OPropertyArrayUsageHelper< 
OAddressBookSourceDialogUno >
 {
 private:
@@ -130,7 +129,7 @@ namespace {
 
 void OAddressBookSourceDialogUno::executedDialog(sal_Int16 
_nExecutionResult)
 {
-OAddressBookSourceDialogUnoBase::executedDialog(_nExecutionResult);
+OGenericUnoDialog::executedDialog(_nExecutionResult);
 
 if ( _nExecutionResult )
 if ( m_pDialog )
@@ -196,7 +195,7 @@ namespace {
 }
 }
 
-OAddressBookSourceDialogUnoBase::implInitialize( _rValue );
+OGenericUnoDialog::implInitialize( _rValue );
 }
 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2018-01-03 Thread Noel Grandin

 sw/source/core/unocore/unocoll.cxx |6 --
 1 file changed, 6 deletions(-)

New commits:
commit caf4d0525493b2c978f47e10d103cdf7f89363f7
Author: Noel Grandin 
Date:   Wed Jan 3 14:58:35 2018 +0200

drop some unused typedefs in UnoFrameWrap_traits

Change-Id: I80e4916de36f65b28db054367f1a307498456b18
Reviewed-on: https://gerrit.libreoffice.org/47343
Tested-by: Jenkins 
Reviewed-by: Noel Grandin 

diff --git a/sw/source/core/unocore/unocoll.cxx 
b/sw/source/core/unocore/unocoll.cxx
index cc4dcfa4720e..fb30f4624f2b 100644
--- a/sw/source/core/unocore/unocoll.cxx
+++ b/sw/source/core/unocore/unocoll.cxx
@@ -994,8 +994,6 @@ namespace
 template<>
 struct UnoFrameWrap_traits
 {
-typedef SwXTextFrame core_frame_t;
-typedef XTextFrame uno_frame_t;
 static uno::Any wrapFrame(SwFrameFormat & rFrameFormat)
 {
 uno::Reference const xRet(
@@ -1008,8 +1006,6 @@ namespace
 template<>
 struct UnoFrameWrap_traits
 {
-typedef SwXTextGraphicObject core_frame_t;
-typedef XTextContent uno_frame_t;
 static uno::Any wrapFrame(SwFrameFormat & rFrameFormat)
 {
 uno::Reference const xRet(
@@ -1022,8 +1018,6 @@ namespace
 template<>
 struct UnoFrameWrap_traits
 {
-typedef SwXTextEmbeddedObject core_frame_t;
-typedef XEmbeddedObjectSupplier uno_frame_t;
 static uno::Any wrapFrame(SwFrameFormat & rFrameFormat)
 {
 uno::Reference const xRet(
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2018-01-03 Thread Noel Grandin

 vcl/inc/opengl/salbmp.hxx |2 +-
 vcl/inc/salbmp.hxx|   10 --
 vcl/opengl/salbmp.cxx |4 ++--
 vcl/source/gdi/impbmp.cxx |2 +-
 4 files changed, 8 insertions(+), 10 deletions(-)

New commits:
commit 97b008d0e3a76d5b21ca6cc06fd84a90ed4593de
Author: Noel Grandin 
Date:   Wed Jan 3 14:48:55 2018 +0200

drop ChecksumType typedef

adds no value

Change-Id: I14c168d16eb98eb8c065c4c9a8f2a486c59feebb
Reviewed-on: https://gerrit.libreoffice.org/47341
Tested-by: Jenkins 
Reviewed-by: Noel Grandin 

diff --git a/vcl/inc/opengl/salbmp.hxx b/vcl/inc/opengl/salbmp.hxx
index a060f09bdcb4..5c4fcd053464 100644
--- a/vcl/inc/opengl/salbmp.hxx
+++ b/vcl/inc/opengl/salbmp.hxx
@@ -47,7 +47,7 @@ private:
 
 virtual void updateChecksum() const override;
 
-bool calcChecksumGL(OpenGLTexture& rInputTexture, ChecksumType& rChecksum) 
const;
+bool calcChecksumGL(OpenGLTexture& rInputTexture, BitmapChecksum& 
rChecksum) const;
 
 public:
 OpenGLSalBitmap();
diff --git a/vcl/inc/salbmp.hxx b/vcl/inc/salbmp.hxx
index 574e6272d700..6053ab3d6ebd 100644
--- a/vcl/inc/salbmp.hxx
+++ b/vcl/inc/salbmp.hxx
@@ -38,8 +38,6 @@ class VCL_PLUGIN_PUBLIC SalBitmap
 {
 public:
 
-typedef BitmapChecksum  ChecksumType;
-
 SalBitmap()
 : mnChecksum(0)
 , mbChecksumValid(false)
@@ -76,7 +74,7 @@ public:
 return false;
 }
 
-void GetChecksum(ChecksumType& rChecksum) const
+void GetChecksum(BitmapChecksum& rChecksum) const
 {
 updateChecksum();
 if (!mbChecksumValid)
@@ -91,8 +89,8 @@ public:
 }
 
 protected:
-ChecksumType mnChecksum;
-bool mbChecksumValid;
+BitmapChecksum mnChecksum;
+bool   mbChecksumValid;
 
 protected:
 virtual void updateChecksum() const
@@ -100,7 +98,7 @@ protected:
 if (mbChecksumValid)
 return;
 
-ChecksumType nCrc = 0;
+BitmapChecksum nCrc = 0;
 SalBitmap* pThis = const_cast(this);
 BitmapBuffer* pBuf = pThis->AcquireBuffer(BitmapAccessMode::Read);
 if (pBuf)
diff --git a/vcl/opengl/salbmp.cxx b/vcl/opengl/salbmp.cxx
index b3f8f54c960f..93fcf0e670c2 100644
--- a/vcl/opengl/salbmp.cxx
+++ b/vcl/opengl/salbmp.cxx
@@ -642,7 +642,7 @@ sal_uInt16 OpenGLSalBitmap::GetBitCount() const
 return mnBits;
 }
 
-bool OpenGLSalBitmap::calcChecksumGL(OpenGLTexture& rInputTexture, 
ChecksumType& rChecksum) const
+bool OpenGLSalBitmap::calcChecksumGL(OpenGLTexture& rInputTexture, 
BitmapChecksum& rChecksum) const
 {
 OUString FragShader("areaHashCRC64TFragmentShader");
 
@@ -714,7 +714,7 @@ bool OpenGLSalBitmap::calcChecksumGL(OpenGLTexture& 
rInputTexture, ChecksumType&
 std::vector aBuf( aFinalTexture.GetWidth() * 
aFinalTexture.GetHeight() * 4 );
 aFinalTexture.Read(GL_RGBA, GL_UNSIGNED_BYTE, aBuf.data());
 
-ChecksumType nCrc = vcl_get_checksum(0, aBuf.data(), aBuf.size());
+BitmapChecksum nCrc = vcl_get_checksum(0, aBuf.data(), aBuf.size());
 
 rChecksum = nCrc;
 return true;
diff --git a/vcl/source/gdi/impbmp.cxx b/vcl/source/gdi/impbmp.cxx
index 5950da46d7cc..97b5182a7927 100644
--- a/vcl/source/gdi/impbmp.cxx
+++ b/vcl/source/gdi/impbmp.cxx
@@ -92,7 +92,7 @@ void ImpBitmap::ImplReleaseBuffer( BitmapBuffer* pBuffer, 
BitmapAccessMode nMode
 
 BitmapChecksum ImpBitmap::ImplGetChecksum() const
 {
-SalBitmap::ChecksumType aChecksum;
+BitmapChecksum aChecksum;
 mpSalBitmap->GetChecksum(aChecksum);
 return aChecksum;
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2018-01-03 Thread Noel Grandin

 ucb/source/ucp/ftp/ftpdirp.cxx |6 ++
 1 file changed, 2 insertions(+), 4 deletions(-)

New commits:
commit e6fdeed56d8a48f16b818979f2a77c758c31a9d9
Author: Noel Grandin 
Date:   Wed Jan 3 14:57:05 2018 +0200

drop ULONG typedef

Change-Id: I25d0851bd82838f12a4edb3eb9f322bdf30cc175
Reviewed-on: https://gerrit.libreoffice.org/47342
Tested-by: Jenkins 
Reviewed-by: Noel Grandin 

diff --git a/ucb/source/ucp/ftp/ftpdirp.cxx b/ucb/source/ucp/ftp/ftpdirp.cxx
index 98cd4dbccf76..f4ab59afbbe8 100644
--- a/ucb/source/ucp/ftp/ftpdirp.cxx
+++ b/ucb/source/ucp/ftp/ftpdirp.cxx
@@ -29,8 +29,6 @@
 
 using namespace ftp;
 
-typedef sal_uInt32 ULONG;
-
 inline bool ascii_isWhitespace( sal_Unicode ch )
 {
 return ((ch <= 0x20) && ch);
@@ -552,7 +550,7 @@ bool FTPDirectoryParser::parseDOS (
  * The READ, WRITE, and ISLINK mode bits are not supported.
  *
  * The returned size is the  part, multiplied by 512, and with the high
- * order bits truncated to fit into a ULONG.
+ * order bits truncated to fit into a sal_uInt32.
  *
  */
 bool FTPDirectoryParser::parseVMS (
@@ -680,7 +678,7 @@ bool FTPDirectoryParser::parseVMS (
 // Parse  part and set entry's size:
 if (*p < '0' || *p > '9')
 return false;
-ULONG nSize = *p - '0';
+sal_uInt32 nSize = *p - '0';
 if (*p++ != '0')
 while (*p >= '0' && *p <= '9')
 nSize = 10 * rEntry.m_nSize + (*p++ - '0');
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: basctl/source include/sfx2 sc/sdi sc/source sfx2/sdi sfx2/source solenv/vs sw/source

2018-01-03 Thread Noel Grandin

 basctl/source/basicide/basicbox.cxx |2 -
 basctl/source/basicide/basides1.cxx |4 +--
 basctl/source/basicide/moduldl2.cxx |4 +--
 basctl/source/basicide/moduldlg.cxx |2 -
 include/sfx2/frame.hxx  |6 +
 sc/sdi/scalc.sdi|2 -
 sc/source/filter/excel/excel.cxx|4 +--
 sc/source/filter/orcus/orcusfiltersimpl.cxx |2 -
 sc/source/ui/docshell/docsh4.cxx|2 -
 sc/source/ui/view/viewfun5.cxx  |4 +--
 sfx2/sdi/sfx.sdi|6 ++---
 sfx2/sdi/sfxitems.sdi   |2 -
 sfx2/source/appl/appuno.cxx |4 +--
 sfx2/source/doc/docfile.cxx |4 +--
 sfx2/source/view/frame.cxx  |   16 +++---
 solenv/vs/LibreOffice.natvis|2 -
 sw/source/uibase/app/apphdl.cxx |2 -
 sw/source/uibase/app/docsh2.cxx |2 -
 sw/source/uibase/dbui/dbmgr.cxx |2 -
 sw/source/uibase/dochdl/swdtflvr.cxx|   32 ++--
 sw/source/uibase/shells/textsh2.cxx |   18 +++
 sw/source/uibase/uno/unodispatch.cxx|2 -
 22 files changed, 61 insertions(+), 63 deletions(-)

New commits:
commit 31b5c9b9bce461c2a9a9de99bbae2480788c19ca
Author: Noel Grandin 
Date:   Wed Jan 3 14:31:17 2018 +0200

remove SfxUsrAnyItem typedef

and rename SfxUsrAnyItem class to SfxUnoAnyItem, the choice being made
by leaving the most popular one behind

Change-Id: If3818ee0966a50e3036d7e2db951910b6282c91f
Reviewed-on: https://gerrit.libreoffice.org/47313
Tested-by: Jenkins 
Reviewed-by: Noel Grandin 

diff --git a/basctl/source/basicide/basicbox.cxx 
b/basctl/source/basicide/basicbox.cxx
index 6adcdcc54c4d..6af00166696e 100644
--- a/basctl/source/basicide/basicbox.cxx
+++ b/basctl/source/basicide/basicbox.cxx
@@ -304,7 +304,7 @@ void LibBox::NotifyIDE()
 if (LibEntry* pEntry = static_cast(GetEntryData(nSelPos)))
 {
 ScriptDocument aDocument( pEntry->GetDocument() );
-SfxUsrAnyItem aDocumentItem( SID_BASICIDE_ARG_DOCUMENT_MODEL, 
uno::Any( aDocument.getDocumentOrNull() ) );
+SfxUnoAnyItem aDocumentItem( SID_BASICIDE_ARG_DOCUMENT_MODEL, 
uno::Any( aDocument.getDocumentOrNull() ) );
 OUString aLibName = pEntry->GetLibName();
 SfxStringItem aLibNameItem( SID_BASICIDE_ARG_LIBNAME, aLibName );
 if (SfxDispatcher* pDispatcher = GetDispatcher())
diff --git a/basctl/source/basicide/basides1.cxx 
b/basctl/source/basicide/basides1.cxx
index db3945369fc8..5d7420a3d00a 100644
--- a/basctl/source/basicide/basides1.cxx
+++ b/basctl/source/basicide/basides1.cxx
@@ -430,7 +430,7 @@ void Shell::ExecuteGlobal( SfxRequest& rReq )
 case SID_BASICIDE_LIBLOADED:
 {
 DBG_ASSERT( rReq.GetArgs(), "arguments expected" );
-const SfxUsrAnyItem& rShellItem = static_cast(rReq.GetArgs()->Get( SID_BASICIDE_ARG_DOCUMENT_MODEL ));
+const SfxUnoAnyItem& rShellItem = static_cast(rReq.GetArgs()->Get( SID_BASICIDE_ARG_DOCUMENT_MODEL ));
 uno::Reference< frame::XModel > xModel( rShellItem.GetValue(), 
UNO_QUERY );
 ScriptDocument aDocument( xModel.is() ? ScriptDocument( xModel ) : 
ScriptDocument::getApplicationScriptDocument() );
 const SfxStringItem& rLibNameItem = static_cast(rReq.GetArgs()->Get( SID_BASICIDE_ARG_LIBNAME ));
@@ -569,7 +569,7 @@ void Shell::ExecuteGlobal( SfxRequest& rReq )
 pDocument.reset( new ScriptDocument( 
ScriptDocument::getDocumentWithURLOrCaption( sDocumentCaption ) ) );
 }
 
-const SfxUsrAnyItem* pDocModelItem = 
rReq.GetArg(SID_BASICIDE_ARG_DOCUMENT_MODEL);
+const SfxUnoAnyItem* pDocModelItem = 
rReq.GetArg(SID_BASICIDE_ARG_DOCUMENT_MODEL);
 if ( !pDocument.get() && pDocModelItem )
 {
 uno::Reference< frame::XModel > xModel( 
pDocModelItem->GetValue(), UNO_QUERY );
diff --git a/basctl/source/basicide/moduldl2.cxx 
b/basctl/source/basicide/moduldl2.cxx
index 827474abfbce..94c81559ace1 100644
--- a/basctl/source/basicide/moduldl2.cxx
+++ b/basctl/source/basicide/moduldl2.cxx
@@ -618,7 +618,7 @@ IMPL_LINK( LibPage, ButtonHdl, Button *, pButton, void )
 SfxRequest aRequest( SID_BASICIDE_APPEAR, SfxCallMode::SYNCHRON, aArgs 
);
 SfxGetpApp()->ExecuteSlot( aRequest );
 
-SfxUsrAnyItem aDocItem( SID_BASICIDE_ARG_DOCUMENT_MODEL, Any( 
m_aCurDocument.getDocumentOrNull() ) );
+SfxUnoAnyItem aDocItem( SID_BASICIDE_ARG_DOCUMENT_MODEL, Any( 
m_aCurDocument.getDocumentOrNull() ) );
 SvTreeListEntry* pCurEntry = m_pLibBox->GetCurEntry();
 DBG_ASSERT( pCurEntry, "Entry?!" );
 OUString aLibName( SvTabListBox::GetEntryText( pCurEntry, 0 ) );
@@ -1340,7 +1340,7 @@ void LibPage::DeleteCurrent()
 if ( QueryD

[Libreoffice-commits] core.git: comphelper/source compilerplugins/clang connectivity/source cui/source include/comphelper include/oox include/svl include/svx include/unotools oox/source sc/source sdex

2018-01-03 Thread Noel Grandin

 comphelper/source/misc/accimplaccess.cxx   |   13 -
 compilerplugins/clang/unusedfields.cxx |   11 -
 compilerplugins/clang/unusedfields.readonly.results|  102 
--
 compilerplugins/clang/unusedfields.untouched.results   |   32 
---
 compilerplugins/clang/unusedfields.writeonly.results   |   20 +
 connectivity/source/commontools/FDatabaseMetaDataResultSetMetaData.cxx |8 
 connectivity/source/drivers/ado/ADatabaseMetaDataImpl.cxx  |   16 -
 connectivity/source/drivers/mork/MConnection.cxx   |   17 -
 connectivity/source/drivers/mork/MErrorResource.hxx|3 
 connectivity/source/inc/OColumn.hxx|   11 -
 cui/source/dialogs/iconcdlg.cxx|   10 
 cui/source/inc/iconcdlg.hxx|2 
 include/comphelper/accimplaccess.hxx   |9 
 include/oox/ppt/slidepersist.hxx   |3 
 include/svl/style.hxx  |5 
 include/svx/deflt3d.hxx|7 
 include/svx/obj3d.hxx  |3 
 include/svx/polygn3d.hxx   |4 
 include/unotools/textsearch.hxx|2 
 oox/source/ppt/pptimport.cxx   |   19 -
 sc/source/filter/excel/xiescher.cxx|1 
 sc/source/filter/inc/xiescher.hxx  |4 
 sd/source/core/stlsheet.cxx|4 
 sdext/source/presenter/PresenterPaneBase.cxx   |8 
 sdext/source/presenter/PresenterPaneBase.hxx   |2 
 sdext/source/presenter/PresenterSlideSorter.cxx|2 
 sfx2/source/appl/helpinterceptor.hxx   |4 
 sfx2/source/appl/newhelp.cxx   |2 
 svl/source/items/style.cxx |   12 -
 svx/source/dialog/crashreportui.cxx|   12 -
 svx/source/dialog/dlgctl3d.cxx |2 
 svx/source/engine3d/cube3d.cxx |2 
 svx/source/engine3d/extrud3d.cxx   |2 
 svx/source/engine3d/lathe3d.cxx|2 
 svx/source/engine3d/obj3d.cxx  |   15 -
 svx/source/engine3d/polygn3d.cxx   |3 
 svx/source/engine3d/sphere3d.cxx   |2 
 svx/source/form/navigatortreemodel.cxx |4 
 svx/source/inc/fmexpl.hxx  |2 
 sw/inc/hints.hxx   |6 
 sw/source/core/attr/hints.cxx  |2 
 sw/source/core/text/txtfrm.cxx |   20 -
 sw/source/core/unocore/unostyle.cxx|2 
 toolkit/source/awt/vclxaccessiblecomponent.cxx |   80 
+--
 toolkit/source/controls/accessiblecontrolcontext.cxx   |   19 -
 unotools/source/i18n/textsearch.cxx|3 
 uui/source/iahndl-authentication.cxx   |3 
 uui/source/loginerr.hxx|2 
 xmlhelp/source/cxxhelp/provider/urlparameter.cxx   |3 
 xmlhelp/source/cxxhelp/provider/urlparameter.hxx   |1 
 50 files changed, 174 insertions(+), 349 deletions(-)

New commits:
commit 21e0d8162a0e683558c4d042ce688fc9a6833809
Author: Noel Grandin 
Date:   Wed Jan 3 14:08:19 2018 +0200

loplugin:unusedfields

fix the ReturnStmt check

Change-Id: I95076076bd1313d23798c4615ea12910c86ed9a8
Reviewed-on: https://gerrit.libreoffice.org/47309
Tested-by: Jenkins 
Reviewed-by: Noel Grandin 

diff --git a/comphelper/source/misc/accimplaccess.cxx 
b/comphelper/source/misc/accimplaccess.cxx
index 9593b787d3a6..94ac52405517 100644
--- a/comphelper/source/misc/accimplaccess.cxx
+++ b/comphelper/source/misc/accimplaccess.cxx
@@ -35,13 +35,7 @@ namespace comphelper
 using ::com::sun::star::uno::RuntimeException;
 using ::com::sun::star::accessibility::XAccessible;
 
-struct OAccImpl_Impl
-{
-Reference< XAccessible >m_xAccParent;
-};
-
 OAccessibleImplementationAccess::OAccessibleImplementationAccess( )
-

[Libreoffice-commits] core.git: include/test qadevOOo/Jar_OOoRunner.mk qadevOOo/objdsc qadevOOo/tests sc/CppunitTest_sc_autoformatobj.mk sc/Module_sc.mk sc/qa test/Library_subsequenttest.mk test/sourc

2018-01-03 Thread Jens Carl

 include/test/sheet/tableautoformat.hxx  |   34 +++
 qadevOOo/Jar_OOoRunner.mk   |1 
 qadevOOo/objdsc/sc/com.sun.star.comp.office.ScAutoFormatObj.csv |6 
 qadevOOo/tests/java/ifc/sheet/_TableAutoFormat.java |   40 ---
 sc/CppunitTest_sc_autoformatobj.mk  |  105 
++
 sc/Module_sc.mk |1 
 sc/qa/extras/scautoformatobj.cxx|  101 
+
 test/Library_subsequenttest.mk  |1 
 test/source/sheet/tableautoformat.cxx   |   95 
+
 9 files changed, 337 insertions(+), 47 deletions(-)

New commits:
commit 5de151f0fd7b590ae13560086b46ea84e4d9cf9c
Author: Jens Carl 
Date:   Wed Jan 3 22:45:19 2018 +

tdf#45904 Move _TableAutoFormat Java tests to C++

Change-Id: Ib26a2d2a05d926a0d031c86812456996cb368792
Reviewed-on: https://gerrit.libreoffice.org/47361
Tested-by: Jenkins 
Reviewed-by: Jens Carl 

diff --git a/include/test/sheet/tableautoformat.hxx 
b/include/test/sheet/tableautoformat.hxx
new file mode 100644
index ..3a04784a198c
--- /dev/null
+++ b/include/test/sheet/tableautoformat.hxx
@@ -0,0 +1,34 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4; 
fill-column: 100 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#ifndef INCLUDED_TEST_SHEET_TABLEAUTOFORMAT_HXX
+#define INCLUDED_TEST_SHEET_TABLEAUTOFORMAT_HXX
+
+#include 
+#include 
+
+#include 
+
+namespace apitest
+{
+class OOO_DLLPUBLIC_TEST TableAutoFormat
+{
+public:
+virtual css::uno::Reference init() = 0;
+
+void testTableAutoFormatProperties();
+
+protected:
+~TableAutoFormat() {}
+};
+}
+
+#endif // INCLUDED_TEST_SHEET_TABLEAUTOFORMAT_HXX
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s 
cinkeys+=0=break: */
diff --git a/qadevOOo/Jar_OOoRunner.mk b/qadevOOo/Jar_OOoRunner.mk
index b8ed2487e317..bc33f52aa853 100644
--- a/qadevOOo/Jar_OOoRunner.mk
+++ b/qadevOOo/Jar_OOoRunner.mk
@@ -579,7 +579,6 @@ $(eval $(call gb_Jar_add_sourcefiles,OOoRunner,\
 qadevOOo/tests/java/ifc/sheet/_SpreadsheetDocumentSettings \
 qadevOOo/tests/java/ifc/sheet/_SpreadsheetViewSettings \
 qadevOOo/tests/java/ifc/sheet/_SubTotalDescriptor \
-qadevOOo/tests/java/ifc/sheet/_TableAutoFormat \
 qadevOOo/tests/java/ifc/sheet/_TableAutoFormatField \
 qadevOOo/tests/java/ifc/sheet/_XActivationBroadcaster \
 qadevOOo/tests/java/ifc/sheet/_XArrayFormulaRange \
diff --git a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScAutoFormatObj.csv 
b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScAutoFormatObj.csv
index e5015197c6bc..5c2ef08269c9 100644
--- a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScAutoFormatObj.csv
+++ b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScAutoFormatObj.csv
@@ -1,11 +1,5 @@
 "ScAutoFormatObj";"com::sun::star::container::XIndexAccess";"getCount()"
 "ScAutoFormatObj";"com::sun::star::container::XIndexAccess";"getByIndex()"
-"ScAutoFormatObj";"com::sun::star::sheet::TableAutoFormat";"IncludeFont"
-"ScAutoFormatObj";"com::sun::star::sheet::TableAutoFormat";"IncludeJustify"
-"ScAutoFormatObj";"com::sun::star::sheet::TableAutoFormat";"IncludeBorder"
-"ScAutoFormatObj";"com::sun::star::sheet::TableAutoFormat";"IncludeBackground"
-"ScAutoFormatObj";"com::sun::star::sheet::TableAutoFormat";"IncludeNumberFormat"
-"ScAutoFormatObj";"com::sun::star::sheet::TableAutoFormat";"IncludeWidthAndHeight"
 
"ScAutoFormatObj";"com::sun::star::container::XElementAccess";"getElementType()"
 "ScAutoFormatObj";"com::sun::star::container::XElementAccess";"hasElements()"
 "ScAutoFormatObj";"com::sun::star::container::XNamed";"getName()"
diff --git a/qadevOOo/tests/java/ifc/sheet/_TableAutoFormat.java 
b/qadevOOo/tests/java/ifc/sheet/_TableAutoFormat.java
deleted file mode 100644
index 817a4cc55a5f..
--- a/qadevOOo/tests/java/ifc/sheet/_TableAutoFormat.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   ex

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

2018-01-03 Thread Jens Carl

 sc/inc/servuno.hxx  |7 ---
 sc/source/ui/unoobj/servuno.cxx |4 
 2 files changed, 8 insertions(+), 3 deletions(-)

New commits:
commit b0ab92eaa70dd6d6986b348525a901b75dfd7c69
Author: Jens Carl 
Date:   Wed Jan 3 22:36:45 2018 +

Add ServiceProvider "com.sun.star.sheet.TableAutoFormats"

Change-Id: If058d47116e0a287fc5b2155f5ae6b36cbd8fa47
Reviewed-on: https://gerrit.libreoffice.org/47359
Tested-by: Jenkins 
Reviewed-by: Jens Carl 

diff --git a/sc/inc/servuno.hxx b/sc/inc/servuno.hxx
index 00c03b5a5320..d718bf2cda4b 100644
--- a/sc/inc/servuno.hxx
+++ b/sc/inc/servuno.hxx
@@ -31,9 +31,10 @@ public:
 enum class Type
 {
 SHEET , URLFIELD , PAGEFIELD , PAGESFIELD , DATEFIELD , TIMEFIELD , 
TITLEFIELD , FILEFIELD ,
-SHEETFIELD , CELLSTYLE , PAGESTYLE , AUTOFORMAT , CELLRANGES , 
FUNCTIONDESCRIPTIONS ,
-RECENTFUNCTIONS ,
-//  drawing layer tables
+SHEETFIELD , CELLSTYLE , PAGESTYLE ,
+// sheet
+AUTOFORMAT , AUTOFORMATS, CELLRANGES , FUNCTIONDESCRIPTIONS , 
RECENTFUNCTIONS ,
+// drawing layer tables
 GRADTAB , HATCHTAB , BITMAPTAB , TRGRADTAB , MARKERTAB , DASHTAB , 
NUMRULES ,
 
 DOCDEFLTS , DRAWDEFLTS ,
diff --git a/sc/source/ui/unoobj/servuno.cxx b/sc/source/ui/unoobj/servuno.cxx
index 1573bf7f8cb5..bec6c090c3d6 100644
--- a/sc/source/ui/unoobj/servuno.cxx
+++ b/sc/source/ui/unoobj/servuno.cxx
@@ -263,6 +263,7 @@ const ProvNamesId_Type aProvNamesId[] =
 { "com.sun.star.style.CellStyle",   Type::CELLSTYLE },
 { "com.sun.star.style.PageStyle",   Type::PAGESTYLE },
 { "com.sun.star.sheet.TableAutoFormat", Type::AUTOFORMAT },
+{ "com.sun.star.sheet.TableAutoFormats",Type::AUTOFORMATS },
 { "com.sun.star.sheet.SheetCellRanges", Type::CELLRANGES },
 { "com.sun.star.sheet.FunctionDescriptions",
Type::FUNCTIONDESCRIPTIONS },
 { "com.sun.star.sheet.RecentFunctions", Type::RECENTFUNCTIONS 
},
@@ -423,6 +424,9 @@ uno::Reference 
ScServiceProvider::MakeInstance(
 case Type::AUTOFORMAT:
 xRet.set(static_cast(new 
ScAutoFormatObj( SC_AFMTOBJ_INVALID )));
 break;
+case Type::AUTOFORMATS:
+xRet.set(static_cast(new 
ScAutoFormatsObj()));
+break;
 case Type::CELLRANGES:
 //  isn't inserted, rather filled
 //  -> DocShell must be set, but empty ranges
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2018-01-03 Thread Jens Carl

 test/source/sheet/tablevalidation.cxx |1 -
 1 file changed, 1 deletion(-)

New commits:
commit 39f033e54858bc1c55ed82afe74199be05c08817
Author: Jens Carl 
Date:   Wed Jan 3 22:13:48 2018 +

Remove obsolete header.

Change-Id: I7cd358845a048e6eb6df9bd42d022357e553981c
Reviewed-on: https://gerrit.libreoffice.org/47355
Tested-by: Jenkins 
Reviewed-by: Jens Carl 

diff --git a/test/source/sheet/tablevalidation.cxx 
b/test/source/sheet/tablevalidation.cxx
index 24d2ace8d644..6c0852bb15fe 100644
--- a/test/source/sheet/tablevalidation.cxx
+++ b/test/source/sheet/tablevalidation.cxx
@@ -7,7 +7,6 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#include 
 #include 
 
 #include 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Minutes from the design meeting 2018-Jan-03

2018-01-03 Thread Wols Lists

On 03/01/18 20:48, Heiko Tietze wrote:
>=> questionable color names are gold, brick, magenta, indigo, teal, lime
>   opinions are welcome

Does a pantone standard exist? Can we use it?

If so, that would presumably make the most sense. From what I can see,
Pantone define colours in both CMYK, and RGB, so provided we just take
their RGB value and describe it as their colour - eg "Pantone Gold" -
there can't be a problem.

The wiki page about them does say they are (deliberately) unclear about
their legal rights and what is permitted, so it sounds like creating a
complete pantone picklist could be dangerous territory, but simply
saying "We have used Pantone color names where applicable" is going to
be pretty blatant fair use.

I think names like the above are pretty standard, anyway ...

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

Re: Bug 83260

2018-01-03 Thread Matthew J. Francis


On 04/01/2018 09:45, Matthew J. Francis wrote:

On 03/01/2018 17:42, Miklos Vajna wrote:


[...]


We raise a similar warning when deleting a header, you can probably
reuse that code here. And sure, clearing the undo stack instead of
crashing sounds like an improvement (especially if we ask the user
before clearing the undo stack).


I use tracked changes on a regular basis, and would much rather this be 
treated as "maybe difficult but important to get right" than "too hard, 
so don't bother"


[...]

P.S. As I do switch frequently between "show" and "don't show" changes, 
being bothered with a dialog warning that my undo history is going to 
die each time actually sounds like the worst possible thing (for the 
workflow)




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

Re: Bug 83260

2018-01-03 Thread Matthew J. Francis


On 03/01/2018 17:42, Miklos Vajna wrote:

Hi,

On Fri, Dec 22, 2017 at 06:56:53AM +, Yemelyanenko Fyodor 
 wrote:

For now I see 2 possible solutions:
1. Rewrite redlining, so Show option will change how doc is viewed, but
not how it is formed (list of nodes)
2. When toggling change tracking or show option ON/OFF - clean
Undo/Redo.

For now, I prefer option 2 :-)

Do we need to warn user, that we going to purge Undo/Redo (say, by
displaying some warning?)
Any additional suggestions will be appreciated.


We raise a similar warning when deleting a header, you can probably
reuse that code here. And sure, clearing the undo stack instead of
crashing sounds like an improvement (especially if we ask the user
before clearing the undo stack).


I use tracked changes on a regular basis, and would much rather this be 
treated as "maybe difficult but important to get right" than "too hard, 
so don't bother"


When editing a document with tracks, I frequently switch between viewing 
changes and not (alternating focus between "what exactly has been 
changed" and "what the final text should look like"). Not also being 
able to undo at arbitrary times, if for instance I decide after 
switching to "reviewing final text" for a section that I would prefer to 
go back and start again another way, would be a major annoyance in the 
process.
I can't say for certain if other people use the feature the same way, 
but I doubt it's that uncommon as a use case.



Perhaps a few well placed unit tests would clarify what the invariants 
are that should hold in this case, but don't? There must be a middle 
ground to be found between "painful major refactoring/rewrite" and "rip 
it out altogether"


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

Re: LibreOfficeLight / iOS

2018-01-03 Thread Thorsten Behrens

jan iversen wrote:
>  I have just checked my different build environments:
> 
> MACOS (works)
> 
Yes. It's supposed to work there.

> iOS (tools build but cannot run due to missing libassuan dylib)
> 
> 
> config_build.mk
> 
> export BUILD_TYPE=... LIBGPGERROR LIBASSUAN GPGMEPP ...
> 
> export ENABLE_GPGMEPP=TRUE
> 
Sorry for not being clear - please disable GPGME for iOS (for both
build and host). It currently serves no useful purpose on that
platform, and is certainly not necessary for building.

HTH,

-- Thorsten


signature.asc
Description: Digital signature
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

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

2018-01-03 Thread Julien Nabet

 svx/source/form/filtnav.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit d2c9b749503ef0763a6140a7b509f73adb6015d2
Author: Julien Nabet 
Date:   Wed Jan 3 19:09:49 2018 +0100

tdf#114788: fix crash in form-based filter

regression from 
https://cgit.freedesktop.org/libreoffice/core/diff/svx/source/form/filtnav.cxx?id=85f93697defd9a812a0cda0bc4e9364e28c0339e

Change-Id: If6f248b460a55aa1e30902d5edeb807dabb37d7b
Reviewed-on: https://gerrit.libreoffice.org/47338
Tested-by: Jenkins 
Reviewed-by: Lionel Elie Mamane 

diff --git a/svx/source/form/filtnav.cxx b/svx/source/form/filtnav.cxx
index 37a91bf0d4e3..8dd28703a9d9 100644
--- a/svx/source/form/filtnav.cxx
+++ b/svx/source/form/filtnav.cxx
@@ -1144,7 +1144,7 @@ bool FmFilterNavigator::EditingEntry( SvTreeListEntry* 
pEntry, Selection& rSelec
 if (!SvTreeListBox::EditingEntry( pEntry, rSelection ))
 return false;
 
-return pEntry && dynamic_cast(static_cast(pEntry->GetUserData())) == nullptr;
+return pEntry && dynamic_cast(static_cast(pEntry->GetUserData())) != nullptr;
 }
 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: solenv/clang-format sw/source xmlsecurity/inc xmlsecurity/source

2018-01-03 Thread Miklos Vajna

 solenv/clang-format/blacklist  |5 
 sw/source/filter/ww8/docxsdrexport.cxx |  969 -
 xmlsecurity/inc/documentsignaturemanager.hxx   |9 
 xmlsecurity/inc/pdfsignaturehelper.hxx |9 
 xmlsecurity/source/helper/documentsignaturemanager.cxx |  213 ++-
 xmlsecurity/source/helper/pdfsignaturehelper.cxx   |   23 
 6 files changed, 662 insertions(+), 566 deletions(-)

New commits:
commit d8efc393bff9c0ed38eac00f48ce1d525e1d08ce
Author: Miklos Vajna 
Date:   Wed Jan 3 17:45:57 2018 +0100

Turn on clang-format for these files

I (tried to) keep these files consistent locally with astyle in the past,
switching to clang-format makes sure that the recent problem with 
introducing
inconsistencies with automatic loplugin rewrites doesn't happen again.

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

diff --git a/solenv/clang-format/blacklist b/solenv/clang-format/blacklist
index 6eb9adf1d741..d80378d1ab1d 100644
--- a/solenv/clang-format/blacklist
+++ b/solenv/clang-format/blacklist
@@ -15947,7 +15947,6 @@ sw/source/filter/ww8/docxexportfilter.cxx
 sw/source/filter/ww8/docxexportfilter.hxx
 sw/source/filter/ww8/docxfootnotes.hxx
 sw/source/filter/ww8/docxhelper.hxx
-sw/source/filter/ww8/docxsdrexport.cxx
 sw/source/filter/ww8/docxsdrexport.hxx
 sw/source/filter/ww8/docxtablestyleexport.cxx
 sw/source/filter/ww8/docxtablestyleexport.hxx
@@ -19710,7 +19709,6 @@ xmlsecurity/inc/certificatechooser.hxx
 xmlsecurity/inc/certificateviewer.hxx
 xmlsecurity/inc/digitalsignaturesdialog.hxx
 xmlsecurity/inc/documentsignaturehelper.hxx
-xmlsecurity/inc/documentsignaturemanager.hxx
 xmlsecurity/inc/framework/saxeventkeeperimpl.hxx
 xmlsecurity/inc/framework/securityengine.hxx
 xmlsecurity/inc/framework/signaturecreatorimpl.hxx
@@ -19729,7 +19727,6 @@ xmlsecurity/inc/pch/precompiled_xsec_gpg.hxx
 xmlsecurity/inc/pch/precompiled_xsec_xmlsec.cxx
 xmlsecurity/inc/pch/precompiled_xsec_xmlsec.hxx
 xmlsecurity/inc/pdfio/pdfdocument.hxx
-xmlsecurity/inc/pdfsignaturehelper.hxx
 xmlsecurity/inc/resourcemanager.hxx
 xmlsecurity/inc/xmlsec-wrapper.h
 xmlsecurity/inc/xmlsec/errorcallback.hxx
@@ -19787,12 +19784,10 @@ xmlsecurity/source/gpg/XMLSecurityContext.cxx
 xmlsecurity/source/gpg/XMLSecurityContext.hxx
 xmlsecurity/source/gpg/xmlsignature_gpgimpl.cxx
 xmlsecurity/source/helper/documentsignaturehelper.cxx
-xmlsecurity/source/helper/documentsignaturemanager.cxx
 xmlsecurity/source/helper/ooxmlsecexporter.cxx
 xmlsecurity/source/helper/ooxmlsecexporter.hxx
 xmlsecurity/source/helper/ooxmlsecparser.cxx
 xmlsecurity/source/helper/ooxmlsecparser.hxx
-xmlsecurity/source/helper/pdfsignaturehelper.cxx
 xmlsecurity/source/helper/xmlsignaturehelper.cxx
 xmlsecurity/source/helper/xmlsignaturehelper2.cxx
 xmlsecurity/source/helper/xsecctl.cxx
diff --git a/sw/source/filter/ww8/docxsdrexport.cxx 
b/sw/source/filter/ww8/docxsdrexport.cxx
index cdeb103d66e6..b8c4f47dfc63 100644
--- a/sw/source/filter/ww8/docxsdrexport.cxx
+++ b/sw/source/filter/ww8/docxsdrexport.cxx
@@ -41,8 +41,8 @@ using namespace oox;
 
 namespace
 {
-
-uno::Sequence lclGetProperty(const 
uno::Reference& rShape, const OUString& rPropName)
+uno::Sequence lclGetProperty(const 
uno::Reference& rShape,
+   const OUString& rPropName)
 {
 uno::Sequence aResult;
 uno::Reference xPropertySet(rShape, uno::UNO_QUERY);
@@ -62,14 +62,15 @@ uno::Sequence lclGetProperty(const 
uno::Reference 
xShape(const_cast(pObj)->getUnoShape(), uno::UNO_QUERY);
+uno::Reference 
xShape(const_cast(pObj)->getUnoShape(),
+   uno::UNO_QUERY);
 OUString aGrabBagName;
 uno::Reference xServiceInfo(xShape, uno::UNO_QUERY);
 if (xServiceInfo->supportsService("com.sun.star.text.TextFrame"))
 aGrabBagName = "FrameInteropGrabBag";
 else
 aGrabBagName = "InteropGrabBag";
-uno::Sequence< beans::PropertyValue > propList = lclGetProperty(xShape, 
aGrabBagName);
+uno::Sequence propList = lclGetProperty(xShape, 
aGrabBagName);
 for (sal_Int32 nProp = 0; nProp < propList.getLength(); ++nProp)
 {
 OUString aPropName = propList[nProp].Name;
@@ -97,33 +98,30 @@ void lclMovePositionWithRotation(awt::Point& aPos, const 
Size& rSize, sal_Int64
 while (nRotation > 9000)
 nRotation = (18000 - (nRotation % 18000));
 
-double fVal = (double) nRotation * F_PI18000;
-double  fCos = cos(fVal);
-double  fSin = sin(fVal);
+double fVal = (double)nRotation * F_PI18000;
+double fCos = cos(fVal);
+double fSin = sin(fVal);
 
-double  nWidthHalf = (double) rSize.Width() / 2;
-double  nHeightHalf = (double) rSize.Height() / 2;
+double nWidthHalf = (double)rSize.Width() / 2;
+double nHeightHalf = (double)rSize.Height(

[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-3-0' - loleaflet/po

2018-01-03 Thread Andras Timar

 loleaflet/po/templates/loleaflet-ui.pot |  108 +++---
 loleaflet/po/ui-ab.po   |  109 +++
 loleaflet/po/ui-af.po   |  108 +++---
 loleaflet/po/ui-am.po   |  109 +++
 loleaflet/po/ui-an.po   |  108 +++---
 loleaflet/po/ui-anp.po  |  108 +++---
 loleaflet/po/ui-ar.po   |  109 +++
 loleaflet/po/ui-as.po   |  108 +++---
 loleaflet/po/ui-ast.po  |  108 +++---
 loleaflet/po/ui-az.po   |  108 +++---
 loleaflet/po/ui-bar.po  |  108 +++---
 loleaflet/po/ui-be.po   |  108 +++---
 loleaflet/po/ui-bg.po   |  109 +++
 loleaflet/po/ui-bm.po   |  108 +++---
 loleaflet/po/ui-bn.po   |  108 +++---
 loleaflet/po/ui-bn_IN.po|  108 +++---
 loleaflet/po/ui-bo.po   |  108 +++---
 loleaflet/po/ui-br.po   |  108 +++---
 loleaflet/po/ui-brx.po  |  108 +++---
 loleaflet/po/ui-bs.po   |  109 +++
 loleaflet/po/ui-ca-valencia.po  |  108 +++---
 loleaflet/po/ui-ca.po   |  109 +++
 loleaflet/po/ui-ce.po   |  108 +++---
 loleaflet/po/ui-cs.po   |  109 +++
 loleaflet/po/ui-cy.po   |  109 +++
 loleaflet/po/ui-da.po   |  109 +++
 loleaflet/po/ui-de.po   |  109 +++
 loleaflet/po/ui-dgo.po  |  108 +++---
 loleaflet/po/ui-dsb.po  |  109 +++
 loleaflet/po/ui-dz.po   |  108 +++---
 loleaflet/po/ui-el.po   |  109 +++
 loleaflet/po/ui-en_AU.po|  108 +++---
 loleaflet/po/ui-en_GB.po|  109 +++
 loleaflet/po/ui-en_ZA.po|  108 +++---
 loleaflet/po/ui-eo.po   |  109 +++
 loleaflet/po/ui-es.po   |  109 +++
 loleaflet/po/ui-et.po   |  108 +++---
 loleaflet/po/ui-eu.po   |  109 +++
 loleaflet/po/ui-fa.po   |  108 +++---
 loleaflet/po/ui-fi.po   |  108 +++---
 loleaflet/po/ui-fr.po   |  109 +++
 loleaflet/po/ui-fur.po  |  108 +++---
 loleaflet/po/ui-fy.po   |  108 +++---
 loleaflet/po/ui-ga.po   |  108 +++---
 loleaflet/po/ui-gbm.po  |  108 +++---
 loleaflet/po/ui-gd.po   |  109 +++
 loleaflet/po/ui-gl.po   |  109 +++
 loleaflet/po/ui-gu.po   |  108 +++---
 loleaflet/po/ui-gug.po  |  109 +++
 loleaflet/po/ui-he.po   |  109 +++
 loleaflet/po/ui-hi.po   |  108 +++---
 loleaflet/po/ui-hr.po   |  109 +++
 loleaflet/po/ui-hsb.po  |  109 +++
 loleaflet/po/ui-hu.po   |  109 +++
 loleaflet/po/ui-hy.po   |  108 +++---
 loleaflet/po/ui-id.po   |  109 +++
 loleaflet/po/ui-is.po   |  109 +++
 loleaflet/po/ui-it.po   |  109 +++
 loleaflet/po/ui-ja.po   |  108 +++---
 loleaflet/po/ui-jv.po   |  109 +++
 loleaflet/po/ui-ka.po   |  108 +++---
 loleaflet/po/ui-kab.po  |  108 +++---
 loleaflet/po/ui-kk.po   |  109 +++--

[Libreoffice-commits] core.git: Branch 'libreoffice-6-0' - sw/uiconfig

2018-01-03 Thread Yousuf Philips

 sw/uiconfig/swriter/toolbar/standardbar.xml  |3 ++-
 sw/uiconfig/swriter/toolbar/textstylebar.xml |9 ++---
 2 files changed, 8 insertions(+), 4 deletions(-)

New commits:
commit 71604ca2ecebb78af6b8bb6b3ec1d9deae19dd1b
Author: Yousuf Philips 
Date:   Tue Dec 19 03:56:19 2017 +0400

Writer: Restore old symbol button and add new numbering styles

Change-Id: I458ad3fe6c19cd5c65a4beb4758e0ac9aba630a4
Reviewed-on: https://gerrit.libreoffice.org/46757
Reviewed-by: Yousuf Philips 
Tested-by: Yousuf Philips 
(cherry picked from commit 490287a1b22411f4ac32127c93228e06dad4ff22)
Reviewed-on: https://gerrit.libreoffice.org/46878
Tested-by: Jenkins 
Reviewed-by: Heiko Tietze 
Tested-by: Heiko Tietze 

diff --git a/sw/uiconfig/swriter/toolbar/standardbar.xml 
b/sw/uiconfig/swriter/toolbar/standardbar.xml
index 10c5b6edf05b..386aef671eb1 100644
--- a/sw/uiconfig/swriter/toolbar/standardbar.xml
+++ b/sw/uiconfig/swriter/toolbar/standardbar.xml
@@ -60,8 +60,9 @@
  
  
  
+ 
+ 
  
- 
  
  
  
diff --git a/sw/uiconfig/swriter/toolbar/textstylebar.xml 
b/sw/uiconfig/swriter/toolbar/textstylebar.xml
index 7aa997f75984..8b1706705b27 100644
--- a/sw/uiconfig/swriter/toolbar/textstylebar.xml
+++ b/sw/uiconfig/swriter/toolbar/textstylebar.xml
@@ -73,9 +73,12 @@
  
  
  
- 
- 
- 
+ 
+ 
+ 
+ 
+ 
+ 
  
  
  
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Minutes from the design meeting 2018-Jan-03

2018-01-03 Thread Heiko Tietze

Present: Csongor, Jay, Heiko, Stuart, Andreas

 * Toolbar button for Special characters
   + https://gerrit.libreoffice.org/#/c/46878/
   + https://gerrit.libreoffice.org/#/c/46757/2
   + New floating widget with quick access to recent/favorites (Heiko)
 or small button only that just opens the dialog (Jay)
   + don't mind (Consgor, Stuart)
   + Notebookbars provide the new widget (Jay)
   => old standard toolbar will be used

 * Labels at the right pane on the customization dialog
   + https://bugs.documentfoundation.org/show_bug.cgi?id=114701
 or just have a tooltip
   + add labels (Andreas)
   + get rid of all labels in favor of tooltips (Jay)
 + tooltips are not shown at screenshots making it hard to illustrate in 
the help (Csongor)
   + labels above controls (Csongor, Stuart)
   => place text above controls using Search, Category, Function, and 
Description on the left
  and Scope, Target, Function, Customize right
   + use "Target" or make it dependent on tab -> Target is easier for l10n
   + change +/- to add/delete or any other text?
   => tooltips are the better way to explain the function

 * Standard palette rework
   + https://bugs.documentfoundation.org/show_bug.cgi?id=114719
   + original request was to swap the names purple and violet
   + introduction of the new palette would require to redo new gradients and 
table styles
 in order to get proper standard colors
   + 4 light vs 5 light
 4: https://bug-attachments.documentfoundation.org/attachment.cgi?id=138826
 5: https://bug-attachments.documentfoundation.org/attachment.cgi?id=138864
   + RYB document - http://bugs.documentfoundation.org/attachment.cgi?id=131469
   => go with an update of the palette
   => feedback required, please play with the generator (Stuart)
  if there is no objection within one week the latest variant will be 
submitted
   => questionable color names are gold, brick, magenta, indigo, teal, lime
  opinions are welcome

 * New/more Gradients?
  + https://bugs.documentfoundation.org/show_bug.cgi?id=114006
  + Jay asked Andreas to submit proposals
  + patch has been submitted before at 
https://gerrit.libreoffice.org/#/c/46428/7
including localization
  => suggest to have more proposals until the next release (Jay)



signature.asc
Description: OpenPGP digital signature
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

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

2018-01-03 Thread Caolán McNamara

 oox/source/crypto/CryptTools.cxx |   10 ++
 1 file changed, 10 insertions(+)

New commits:
commit e11ff5a47a5e82de797e78e60f88acd9ff446149
Author: CaolÃ¡n McNamara 
Date:   Wed Jan 3 20:13:28 2018 +

ofz#4929 ensure min input len for openssl ciphers

openssl is not the default backend

Change-Id: Id7bd77c1a12a15c0ebb4e7d758362c7778bfc2fd
Reviewed-on: https://gerrit.libreoffice.org/47349
Reviewed-by: CaolÃ¡n McNamara 
Tested-by: CaolÃ¡n McNamara 

diff --git a/oox/source/crypto/CryptTools.cxx b/oox/source/crypto/CryptTools.cxx
index 6de4363c59f4..e0b39f67cca4 100644
--- a/oox/source/crypto/CryptTools.cxx
+++ b/oox/source/crypto/CryptTools.cxx
@@ -128,10 +128,20 @@ Decrypt::Decrypt(std::vector& key, 
std::vector& iv, Crypto
 
 const EVP_CIPHER* cipher = getCipher(type);
 
+const size_t nMinKeySize = EVP_CIPHER_key_length(cipher);
+if (key.size() < nMinKeySize)
+key.resize(nMinKeySize, 0);
+
 if (iv.empty())
 EVP_DecryptInit_ex(&mContext, cipher, nullptr, key.data(), 0);
 else
+{
+const size_t nMinIVSize = EVP_CIPHER_iv_length(cipher);
+if (iv.size() < nMinIVSize)
+iv.resize(nMinIVSize, 0);
+
 EVP_DecryptInit_ex(&mContext, cipher, nullptr, key.data(), iv.data());
+}
 EVP_CIPHER_CTX_set_padding(&mContext, 0);
 #endif
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2018-01-03 Thread Caolán McNamara

 lotuswordpro/source/filter/lwpframelayout.cxx |   14 +++---
 1 file changed, 7 insertions(+), 7 deletions(-)

New commits:
commit 3071ba2af0d50b450975a01789fb1222c4f1ca7f
Author: CaolÃ¡n McNamara 
Date:   Wed Jan 3 15:35:46 2018 +

ofz#4917 Direct-leak

Change-Id: Ia8fdd63e1944055a264549b1ff2272b02f32ef42
Reviewed-on: https://gerrit.libreoffice.org/47327
Tested-by: Jenkins 
Reviewed-by: CaolÃ¡n McNamara 
Tested-by: CaolÃ¡n McNamara 

diff --git a/lotuswordpro/source/filter/lwpframelayout.cxx 
b/lotuswordpro/source/filter/lwpframelayout.cxx
index 645a16602709..badad5b09675 100644
--- a/lotuswordpro/source/filter/lwpframelayout.cxx
+++ b/lotuswordpro/source/filter/lwpframelayout.cxx
@@ -816,29 +816,29 @@ void LwpFrameLayout::XFConvertFrame(XFContentContainer* 
pCont, sal_Int32 nStart
 {
 if(m_pFrame)
 {
-XFFrame* pXFFrame = nullptr;
+rtl::Reference xXFFrame;
 if(nEnd < nStart)
 {
-pXFFrame = new XFFrame();
+xXFFrame.set(new XFFrame);
 }
 else
 {
-pXFFrame = new XFFloatFrame(nStart, nEnd, bAll);
+xXFFrame.set(new XFFloatFrame(nStart, nEnd, bAll));
 }
 
-m_pFrame->Parse(pXFFrame, nStart);
+m_pFrame->Parse(xXFFrame.get(), nStart);
 //if it is a link frame, parse contents only once
 if(!HasPreviousLinkLayout())
 {
 rtl::Reference content = m_Content.obj();
 if (content.is())
 {
-content->DoXFConvert(pXFFrame);
+content->DoXFConvert(xXFFrame.get());
 //set frame size according to ole size
-ApplyGraphicSize(pXFFrame);
+ApplyGraphicSize(xXFFrame.get());
 }
 }
-pCont ->Add(pXFFrame);
+pCont->Add(xXFFrame.get());
 }
 }
 /**
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2018-01-03 Thread Caolán McNamara

 sw/source/filter/ww8/ww8par2.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit da866f69a19c0afac0dd202d854b0030d02deb3d
Author: CaolÃ¡n McNamara 
Date:   Wed Jan 3 15:59:42 2018 +

ofz#4921 limit column check to max legal column index

Change-Id: I8ddc08aa951dfe9d5c5dd36c47a63c86a834588c
Reviewed-on: https://gerrit.libreoffice.org/47336
Tested-by: Jenkins 
Reviewed-by: Michael Stahl 

diff --git a/sw/source/filter/ww8/ww8par2.cxx b/sw/source/filter/ww8/ww8par2.cxx
index a517dffe03ea..54498ea7cc04 100644
--- a/sw/source/filter/ww8/ww8par2.cxx
+++ b/sw/source/filter/ww8/ww8par2.cxx
@@ -2970,7 +2970,7 @@ bool WW8TabDesc::InFirstParaInCell() const
 void WW8TabDesc::StartMiserableHackForUnsupportedDirection(short nWwCol)
 {
 OSL_ENSURE(m_pActBand, "Impossible");
-if (m_pActBand && m_pActBand->maDirections[nWwCol] == 3)
+if (m_pActBand && nWwCol <= MAX_COL && m_pActBand->maDirections[nWwCol] == 
3)
 {
 m_pIo->m_xCtrlStck->NewAttr(*m_pIo->m_pPaM->GetPoint(),
 SvxCharRotateItem(900, false, RES_CHRATR_ROTATE));
@@ -2980,7 +2980,7 @@ void 
WW8TabDesc::StartMiserableHackForUnsupportedDirection(short nWwCol)
 void WW8TabDesc::EndMiserableHackForUnsupportedDirection(short nWwCol)
 {
 OSL_ENSURE(m_pActBand, "Impossible");
-if (m_pActBand && m_pActBand->maDirections[nWwCol] == 3)
+if (m_pActBand && nWwCol <= MAX_COL && m_pActBand->maDirections[nWwCol] == 
3)
 m_pIo->m_xCtrlStck->SetAttr(*m_pIo->m_pPaM->GetPoint(), 
RES_CHRATR_ROTATE);
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2018-01-03 Thread Caolán McNamara

 sw/source/filter/ww8/ww8par2.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit b21c8faf6f54451d1f8cd08bca0359d62440bc3d
Author: CaolÃ¡n McNamara 
Date:   Wed Jan 3 15:59:42 2018 +

ofz#4921 limit column check to max legal column index

Change-Id: I8ddc08aa951dfe9d5c5dd36c47a63c86a834588c
Reviewed-on: https://gerrit.libreoffice.org/47328
Reviewed-by: CaolÃ¡n McNamara 
Tested-by: CaolÃ¡n McNamara 

diff --git a/sw/source/filter/ww8/ww8par2.cxx b/sw/source/filter/ww8/ww8par2.cxx
index 0e70d550f67f..ef14cddc3787 100644
--- a/sw/source/filter/ww8/ww8par2.cxx
+++ b/sw/source/filter/ww8/ww8par2.cxx
@@ -2970,7 +2970,7 @@ bool WW8TabDesc::InFirstParaInCell() const
 void WW8TabDesc::StartMiserableHackForUnsupportedDirection(short nWwCol)
 {
 OSL_ENSURE(m_pActBand, "Impossible");
-if (m_pActBand && m_pActBand->maDirections[nWwCol] == 3)
+if (m_pActBand && nWwCol <= MAX_COL && m_pActBand->maDirections[nWwCol] == 
3)
 {
 m_pIo->m_xCtrlStck->NewAttr(*m_pIo->m_pPaM->GetPoint(),
 SvxCharRotateItem(900, false, RES_CHRATR_ROTATE));
@@ -2980,7 +2980,7 @@ void 
WW8TabDesc::StartMiserableHackForUnsupportedDirection(short nWwCol)
 void WW8TabDesc::EndMiserableHackForUnsupportedDirection(short nWwCol)
 {
 OSL_ENSURE(m_pActBand, "Impossible");
-if (m_pActBand && m_pActBand->maDirections[nWwCol] == 3)
+if (m_pActBand && nWwCol <= MAX_COL && m_pActBand->maDirections[nWwCol] == 
3)
 m_pIo->m_xCtrlStck->SetAttr(*m_pIo->m_pPaM->GetPoint(), 
RES_CHRATR_ROTATE);
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Aditya Sahu license statement

2018-01-03 Thread Aditya Sahu

All of my past & future contributions to LibreOffice may be
   licensed under the MPLv2/LGPLv3+ dual license.


Sent from Mail for Windows 10 by Aditya Sahu

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

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

2018-01-03 Thread Caolán McNamara

 lotuswordpro/source/filter/lwpgrfobj.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 20a639f34f524fa455382bd31a8c4351bc46e6bb
Author: CaolÃ¡n McNamara 
Date:   Wed Jan 3 15:22:21 2018 +

ofz#4923 Divide-by-zero

Change-Id: I141884930c4f148f4d29a9a679642ab4b898bbc1
Reviewed-on: https://gerrit.libreoffice.org/47324
Reviewed-by: CaolÃ¡n McNamara 
Tested-by: CaolÃ¡n McNamara 

diff --git a/lotuswordpro/source/filter/lwpgrfobj.cxx 
b/lotuswordpro/source/filter/lwpgrfobj.cxx
index aaa7f688c6c6..a615e83e79bd 100644
--- a/lotuswordpro/source/filter/lwpgrfobj.cxx
+++ b/lotuswordpro/source/filter/lwpgrfobj.cxx
@@ -510,7 +510,7 @@ void LwpGraphicObject::CreateGrafObject()
 fSclGrafWidth = fOrgGrafWidth;
 fSclGrafHeight = fOrgGrafHeight;
 }
-else if (nScalemode & LwpLayoutScale::MAINTAIN_ASPECT_RATIO)
+else if (nScalemode & LwpLayoutScale::MAINTAIN_ASPECT_RATIO && 
fOrgGrafHeight != 0.0 && fDisFrameHeight != 0.0)
 {
 if (fOrgGrafWidth/fOrgGrafHeight >= 
fDisFrameWidth/fDisFrameHeight)
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2018-01-03 Thread Caolán McNamara

 lotuswordpro/source/filter/lwpgrfobj.cxx |   20 ++--
 1 file changed, 10 insertions(+), 10 deletions(-)

New commits:
commit 20ac7089ad833d0d70c8c3e88a58d20a88530c42
Author: CaolÃ¡n McNamara 
Date:   Wed Jan 3 15:19:47 2018 +

ofz#4909 Direct-leak

Change-Id: I16f2fd93bbc416a5677f8bbe02e22b4615599eaa
Reviewed-on: https://gerrit.libreoffice.org/47323
Tested-by: Jenkins 
Reviewed-by: CaolÃ¡n McNamara 
Tested-by: CaolÃ¡n McNamara 

diff --git a/lotuswordpro/source/filter/lwpgrfobj.cxx 
b/lotuswordpro/source/filter/lwpgrfobj.cxx
index 4d596c82dd3e..aaa7f688c6c6 100644
--- a/lotuswordpro/source/filter/lwpgrfobj.cxx
+++ b/lotuswordpro/source/filter/lwpgrfobj.cxx
@@ -442,18 +442,18 @@ void LwpGraphicObject::CreateGrafObject()
 rtl::Reference pImage = new XFImage();
 
 // set image processing styles
-XFImageStyle* pImageStyle = new XFImageStyle();
+std::unique_ptr xImageStyle(new XFImageStyle);
 if (m_sServerContextFormat[1]!='w' || m_sServerContextFormat[2]!='m' || 
m_sServerContextFormat[3]!='f')
 {
 if (m_aIPData.nBrightness != 50)
 {
 sal_Int32 nSODCBrightness = (sal_Int32)m_aIPData.nBrightness*2 - 
100;
-pImageStyle->SetBrightness(nSODCBrightness);
+xImageStyle->SetBrightness(nSODCBrightness);
 }
 if (m_aIPData.nContrast != 50)
 {
 sal_Int32 nSODCContrast = (sal_Int32)(80 - 
(double)m_aIPData.nContrast*1.6);
-pImageStyle->SetContrast(nSODCContrast);
+xImageStyle->SetContrast(nSODCContrast);
 }
 }
 
@@ -542,8 +542,8 @@ void LwpGraphicObject::CreateGrafObject()
 if (pMyFrameLayout->GetScaleCenter() || 
pMyFrameLayout->GetScaleTile())
 {
 // set center alignment
-pImageStyle->SetXPosType(enumXFFrameXPosCenter, 
enumXFFrameXRelFrame);
-pImageStyle->SetYPosType(enumXFFrameYPosMiddle, 
enumXFFrameYRelFrame);
+xImageStyle->SetXPosType(enumXFFrameXPosCenter, 
enumXFFrameXRelFrame);
+xImageStyle->SetYPosType(enumXFFrameYPosMiddle, 
enumXFFrameYRelFrame);
 
 // need horizontal crop?
 double fClipWidth = 0;
@@ -564,7 +564,7 @@ void LwpGraphicObject::CreateGrafObject()
 
 if (sal_bCropped)
 {
-pImageStyle->SetClip(fClipWidth, fClipWidth, fClipHeight, 
fClipHeight);
+xImageStyle->SetClip(fClipWidth, fClipWidth, fClipHeight, 
fClipHeight);
 pImage->SetWidth(fDisFrameWidth);
 pImage->SetHeight(fDisFrameHeight);
 }
@@ -573,8 +573,8 @@ void LwpGraphicObject::CreateGrafObject()
 else
 {
 // set left-top alignment
-pImageStyle->SetYPosType(enumXFFrameYPosFromTop, 
enumXFFrameYRelFrame);
-pImageStyle->SetXPosType(enumXFFrameXPosFromLeft, 
enumXFFrameXRelFrame);
+xImageStyle->SetYPosType(enumXFFrameYPosFromTop, 
enumXFFrameYRelFrame);
+xImageStyle->SetXPosType(enumXFFrameXPosFromLeft, 
enumXFFrameXRelFrame);
 
 // get image position offset
 LwpPoint& rOffset = pMyScale->GetOffset();
@@ -635,7 +635,7 @@ void LwpGraphicObject::CreateGrafObject()
 aCropRect.fBottom = (aImageRect.fBottom - 
aFrameRect.fBottom) / fYRatio;
 }
 
-pImageStyle->SetClip(aCropRect.fLeft, aCropRect.fRight, 
aCropRect.fTop, aCropRect.fBottom);
+xImageStyle->SetClip(aCropRect.fLeft, aCropRect.fRight, 
aCropRect.fTop, aCropRect.fBottom);
 double fPicWidth = fSclGrafWidth - 
(aCropRect.fLeft+aCropRect.fRight)*fXRatio;
 double fPicHeight = fSclGrafHeight- 
(aCropRect.fTop+aCropRect.fBottom)*fYRatio;
 double fX = fOffsetX > 0 ? fOffsetX : 0.00;
@@ -648,7 +648,7 @@ void LwpGraphicObject::CreateGrafObject()
 
 // set style for the image
 XFStyleManager* pXFStyleManager = 
LwpGlobalMgr::GetInstance()->GetXFStyleManager();
-
pImage->SetStyleName(pXFStyleManager->AddStyle(pImageStyle).m_pStyle->GetStyleName());
+
pImage->SetStyleName(pXFStyleManager->AddStyle(xImageStyle.release()).m_pStyle->GetStyleName());
 
 // set anchor to frame
 pImage->SetAnchorType(enumXFAnchorFrame);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2018-01-03 Thread Caolán McNamara

 lotuswordpro/source/filter/lwplayout.cxx |   16 
 1 file changed, 8 insertions(+), 8 deletions(-)

New commits:
commit ce4ec0b80e9d181dcec64b749083254d61c85c69
Author: CaolÃ¡n McNamara 
Date:   Wed Jan 3 15:29:01 2018 +

ofz#4919 Direct-leak

Change-Id: I476a8760578e2ee9b564903ef2f6a2ed5e702cff
Reviewed-on: https://gerrit.libreoffice.org/47326
Tested-by: Jenkins 
Reviewed-by: CaolÃ¡n McNamara 
Tested-by: CaolÃ¡n McNamara 

diff --git a/lotuswordpro/source/filter/lwplayout.cxx 
b/lotuswordpro/source/filter/lwplayout.cxx
index 33301a77ab26..2d7c61a703df 100644
--- a/lotuswordpro/source/filter/lwplayout.cxx
+++ b/lotuswordpro/source/filter/lwplayout.cxx
@@ -1569,18 +1569,18 @@ XFColumns* LwpLayout::GetXFColumns()
 return nullptr;
 }
 
-XFColumns* pColumns = new XFColumns();
+std::unique_ptr xColumns(new XFColumns);
 //set XFColumnSep
-std::unique_ptr pColumnSep(GetColumnSep());
-if(pColumnSep)
+std::unique_ptr xColumnSep(GetColumnSep());
+if (xColumnSep)
 {
-pColumns->SetSeparator(*pColumnSep);
+xColumns->SetSeparator(*xColumnSep);
 }
 
 //set column count and column gap
-pColumns->SetCount(nCols);
+xColumns->SetCount(nCols);
 double fGap = GetColGap(0);
-pColumns->SetGap(fGap);
+xColumns->SetGap(fGap);
 
 //set xfcolumn
 for(sal_uInt16 nIndex = 0; nIndexAddColumn(aColumn);
+xColumns->AddColumn(aColumn);
 }
 
-return pColumns;
+return xColumns.release();
 }
 
 /**
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2018-01-03 Thread Caolán McNamara

 lotuswordpro/source/filter/lwppara.cxx |   10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

New commits:
commit 2f2ce15d1e20ab0096157b50c6b482b7cc540435
Author: CaolÃ¡n McNamara 
Date:   Wed Jan 3 15:25:46 2018 +

ofz#4920 Direct-leak

Change-Id: I2d4dea7936b1b8bae81bf08362a7d8c1081fdf8e
Reviewed-on: https://gerrit.libreoffice.org/47325
Tested-by: Jenkins 
Reviewed-by: CaolÃ¡n McNamara 
Tested-by: CaolÃ¡n McNamara 

diff --git a/lotuswordpro/source/filter/lwppara.cxx 
b/lotuswordpro/source/filter/lwppara.cxx
index 2a881f58d50e..cb1b40eb3c3b 100644
--- a/lotuswordpro/source/filter/lwppara.cxx
+++ b/lotuswordpro/source/filter/lwppara.cxx
@@ -727,13 +727,13 @@ void LwpPara::RegisterStyle()
 //register tab style
 if(m_Fribs.HasFrib(FRIB_TAG_TAB))
 {
-XFParaStyle* pNewParaStyle = new XFParaStyle;
-*pNewParaStyle = *GetXFParaStyle();
+std::unique_ptr xNewParaStyle(new XFParaStyle);
+*xNewParaStyle = *GetXFParaStyle();
 //pOverStyle->SetStyleName("");
-RegisterTabStyle(pNewParaStyle);
+RegisterTabStyle(xNewParaStyle.get());
 if (!m_ParentStyleName.isEmpty())
-pNewParaStyle->SetParentStyleName(m_ParentStyleName);
-m_StyleName = 
pXFStyleManager->AddStyle(pNewParaStyle).m_pStyle->GetStyleName();
+xNewParaStyle->SetParentStyleName(m_ParentStyleName);
+m_StyleName = 
pXFStyleManager->AddStyle(xNewParaStyle.release()).m_pStyle->GetStyleName();
 }
 
 //register master page;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: distro-configs/LibreOfficeFlatpak.conf solenv/flatpak-manifest.in

2018-01-03 Thread Stephan Bergmann

 distro-configs/LibreOfficeFlatpak.conf |8 ++
 solenv/flatpak-manifest.in |  113 +
 2 files changed, 120 insertions(+), 1 deletion(-)

New commits:
commit 22effe2b8edf46539bde34497c6ac3201d70f5ed
Author: Stephan Bergmann 
Date:   Tue Jan 2 16:57:44 2018 +0100

Add JVM support to Flatpak

...fixing 
"Add JRE-based components".

It appeared to be easiest to install the Ant build-time dependency to
/run/build/libreoffice/ant, instead of making it into a flatpak-builder 
module
of its own.  (The sha512 is as given at
.)

To avoid further dependencies, configure --without-export-validation and
--without-junit, only affecting build-time checks (and the amount of checks 
thus
affected by a plain `make` should be small).

Change-Id: I5b67c37f168533f9dc7ade11c7c4e2c42814b942
Reviewed-on: https://gerrit.libreoffice.org/47322
Tested-by: Jenkins 
Reviewed-by: Stephan Bergmann 

diff --git a/distro-configs/LibreOfficeFlatpak.conf 
b/distro-configs/LibreOfficeFlatpak.conf
index 99cce2765702..bb6b12b567c4 100644
--- a/distro-configs/LibreOfficeFlatpak.conf
+++ b/distro-configs/LibreOfficeFlatpak.conf
@@ -1,10 +1,15 @@
 --disable-odk
 --enable-release-build
+--with-ant-home=/run/build/libreoffice/ant
 --with-extra-buildid=Flatpak version
+--with-jdk-home=/usr/lib/sdk/openjdk9/jvm/openjdk-9
 --with-lang=ALL
 --with-system-libs
 --with-vendor=The Document Foundation
---without-java
+--without-export-validation
+--without-junit
+--without-system-apache-commons
+--without-system-beanshell
 --without-system-bluez
 --without-system-boost
 --without-system-clucene
@@ -13,6 +18,7 @@
 --without-system-firebird
 --without-system-glm
 --without-system-gpgmepp
+--without-system-jfreereport
 --without-system-libabw
 --without-system-libcdr
 --without-system-libcmis
diff --git a/solenv/flatpak-manifest.in b/solenv/flatpak-manifest.in
index f09255a96840..4d84650bc6f2 100644
--- a/solenv/flatpak-manifest.in
+++ b/solenv/flatpak-manifest.in
@@ -3,10 +3,20 @@
 "runtime": "org.gnome.Platform",
 "runtime-version": "3.24",
 "sdk": "org.gnome.Sdk",
+"sdk-extensions": [
+"org.freedesktop.Sdk.Extension.openjdk9"
+],
 "command": "/app/libreoffice/program/soffice",
 "separate-locales": false,
 "modules": [
 {
+"name": "openjdk",
+"buildsystem": "simple",
+"build-commands": [
+"/usr/lib/sdk/openjdk9/install.sh"
+]
+},
+{
 "name": "libreoffice",
 "sources": [
 {
@@ -16,6 +26,12 @@
 "disable-fsckobjects": true
 },
 {
+"type": "archive",
+"url": 
"http://www-us.apache.org/dist/ant/binaries/apache-ant-1.10.1-bin.tar.xz";,
+"sha512": 
"8732ecfd96bcfde626260939f17fdb7e85700092ef69932b250e3572810cd53eaac24e1c72921d89900170804d27cc3100bee7c8b5159d0e5b64c3d79e07bec6",
+"dest": "ant"
+},
+{
 "commands": [
 "mkdir external/tarballs"
 ],
@@ -416,6 +432,102 @@
 "sha256": 
"dca00f5e655f2f217a766faa73a81f542c5c204aa3a47017c3c2be0b31d00a56",
 "type": "file",
 "dest-filename": 
"external/tarballs/ttf-kacst_2.01+mry.tar.gz"
+},
+{
+"url": 
"https://dev-www.libreoffice.org/src/beeca87be45ec87d241ddd0e1bad80c1-bsh-2.0b6-src.zip";,
+"sha256": 
"9e93c73e23aff644b17dfff65674c14150e7f3b38b19635e622235e01c96",
+"type": "file",
+"dest-filename": 
"external/tarballs/beeca87be45ec87d241ddd0e1bad80c1-bsh-2.0b6-src.zip"
+},
+{
+"url": 
"https://dev-www.libreoffice.org/src/commons-logging-1.2-src.tar.gz";,
+"sha256": 
"49665da5a60d033e6dff40fe0a7f9173e886ae859ce6096c1afe34c48b677c81",
+"type": "file",
+"dest-filename": 
"external/tarballs/commons-logging-1.2-src.tar.gz"
+},
+{
+"url": 
"https://dev-www.libreoffice.org/src/ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip";,
+"sha256": 
"233f66e8d25c5dd971716d4200203a612a407649686ef3b52075d04b4c9df0dd",
+"type": "file",
+"dest-filename": 
"external/tarballs/ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip"
+},
+{
+"url": 
"https://dev-www.libreoffice.org/src/d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip";,
+"sha256": 
"1b5b24f7bc543c0362b667692f

[Libreoffice-commits] core.git: solenv/flatpak-manifest.in

2018-01-03 Thread Stephan Bergmann

 solenv/flatpak-manifest.in |   78 ++---
 1 file changed, 60 insertions(+), 18 deletions(-)

New commits:
commit cf1dcd1475a22f10c35105a59e6d02dc342ccb16
Author: Stephan Bergmann 
Date:   Tue Jan 2 16:54:13 2018 +0100

Adapt solenv/flatpak-manifest.in to recent download.lst changes

...and recently added fonts

Change-Id: I2eedcb1b8af28b15b93c912bd0cc2d08d5c4db0d
Reviewed-on: https://gerrit.libreoffice.org/47321
Tested-by: Jenkins 
Reviewed-by: Stephan Bergmann 

diff --git a/solenv/flatpak-manifest.in b/solenv/flatpak-manifest.in
index fce711672617..f09255a96840 100644
--- a/solenv/flatpak-manifest.in
+++ b/solenv/flatpak-manifest.in
@@ -154,10 +154,10 @@
 "dest-filename": "external/tarballs/gpgme-1.9.0.tar.bz2"
 },
 {
-"url": 
"https://dev-www.libreoffice.org/src/libassuan-2.4.3.tar.bz2";,
-"sha256": 
"22843a3bdb256f59be49842abf24da76700354293a066d82ade8134bb5aa2b71",
+"url": 
"https://dev-www.libreoffice.org/src/libassuan-2.5.1.tar.bz2";,
+"sha256": 
"47f96c37b4f2aac289f0bc1bacfa8bd8b4b209a488d3d15e2229cb6cc9b26449",
 "type": "file",
-"dest-filename": 
"external/tarballs/libassuan-2.4.3.tar.bz2"
+"dest-filename": 
"external/tarballs/libassuan-2.5.1.tar.bz2"
 },
 {
 "url": 
"https://dev-www.libreoffice.org/src/libgpg-error-1.27.tar.bz2";,
@@ -208,10 +208,10 @@
 "dest-filename": 
"external/tarballs/libfreehand-0.1.2.tar.xz"
 },
 {
-"url": 
"https://dev-www.libreoffice.org/src/language-subtag-registry-2017-08-15.tar.bz2";,
-"sha256": 
"d6a97fc8da5ae54d867e7f1b65ffb51e816cadd11714e45fc23ee0abf81a51ab",
+"url": 
"https://dev-www.libreoffice.org/src/language-subtag-registry-2017-12-14.tar.bz2";,
+"sha256": 
"0f87b9428cbc2d96d8e4f54a07e3858b4a428e5fec9396bc3b52fb9f248be362",
 "type": "file",
-"dest-filename": 
"external/tarballs/language-subtag-registry-2017-08-15.tar.bz2"
+"dest-filename": 
"external/tarballs/language-subtag-registry-2017-12-14.tar.bz2"
 },
 {
 "url": 
"https://dev-www.libreoffice.org/src/liblangtag-0.6.2.tar.bz2";,
@@ -220,10 +220,10 @@
 "dest-filename": 
"external/tarballs/liblangtag-0.6.2.tar.bz2"
 },
 {
-"url": 
"https://dev-www.libreoffice.org/src/libmspub-0.1.2.tar.bz2";,
-"sha256": 
"26d488527ffbb0b41686d4bab756e3e6aaeb99f88adeb169d0c16d2cde96859a",
+"url": 
"https://dev-www.libreoffice.org/src/libmspub-0.1.3.tar.xz";,
+"sha256": 
"f0225f0ff03f6bec4847d7c2d8719a36cafc4b97a09e504b610372cc5b981c97",
 "type": "file",
-"dest-filename": "external/tarballs/libmspub-0.1.2.tar.bz2"
+"dest-filename": "external/tarballs/libmspub-0.1.3.tar.xz"
 },
 {
 "url": 
"https://dev-www.libreoffice.org/src/libmwaw-0.3.13.tar.xz";,
@@ -316,10 +316,10 @@
 "dest-filename": "external/tarballs/neon-0.30.2.tar.gz"
 },
 {
-"url": 
"https://dev-www.libreoffice.org/src/noto-fonts-20170306.tar.gz";,
-"sha256": 
"8a269926a3c88dd14b124b19138b54408938a45ea6e60db65073469f45ae6ac8",
+"url": 
"https://dev-www.libreoffice.org/src/noto-fonts-20171024.tar.gz";,
+"sha256": 
"29acc15a4c4d6b51201ba5d60f303dfbc2e5acbfdb70413c9ae1ed34fa259994",
 "type": "file",
-"dest-filename": 
"external/tarballs/noto-fonts-20170306.tar.gz"
+"dest-filename": 
"external/tarballs/noto-fonts-20171024.tar.gz"
 },
 {
 "url": 
"https://dev-www.libreoffice.org/src/openldap-2.4.45.tgz";,
@@ -364,16 +364,58 @@
 "dest-filename": 
"external/tarballs/e5be03eda13ef68aabab6e42aa67715e-redland-1.0.17.tar.gz"
 },
 {
-"url": 
"https://dev-www.libreoffice.org/src/libepubgen-0.0.1.tar.bz2";,
-"sha256": 
"eea910b042526ed52f7ab9292b7fa31fca32f9e042285818074ff33664db4fa2",
+"url": 
"https://dev-www.libreoffice.org/src/ReemKufi-0.6.tar.gz";,
+"sha256": 
"4dfbd8b227ea062ca1742fb15d707f0b74398f9ddb231892554f0959048e809b",
 "type": "file",
-"dest-filename": 
"external/tarballs/libepubgen-0.0.1.tar.bz2"
+"dest-filename": "external/tarballs/ReemKufi-0.6.tar

[Libreoffice-commits] core.git: ios/CustomTarget_iOS_prelink.mk

2018-01-03 Thread jan Iversen

 ios/CustomTarget_iOS_prelink.mk |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit d09d90079c93f9364caa7157d0d47dac3047b3ab
Author: jan Iversen 
Date:   Wed Jan 3 18:32:00 2018 +0100

iOS jump version for prelinking

Change-Id: I7dc7c3ef28ced1b80073dcb922454d3d057db452

diff --git a/ios/CustomTarget_iOS_prelink.mk b/ios/CustomTarget_iOS_prelink.mk
index c1f5cc79c2da..718a797f5a34 100644
--- a/ios/CustomTarget_iOS_prelink.mk
+++ b/ios/CustomTarget_iOS_prelink.mk
@@ -30,7 +30,7 @@ $(call gb_CustomTarget_get_target,ios/iOS_prelink): $(IOSKIT)
 FORCE:
 
 $(IOSKIT): $(call gb_StaticLibrary_get_target,iOS_kitBridge) FORCE
-   $(IOSLD) -r -ios_version_min 11.1 \
+   $(IOSLD) -r -ios_version_min 11.2 \
-syslibroot $(MACOSX_SDK_PATH) \
-arch `echo $(CPUNAME) |  tr '[:upper:]' '[:lower:]'` \
-o $(IOSOBJ) \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

tdf#114788 help needed on SvTreeListBox usage

2018-01-03 Thread Lionel Elie Mamane

Hi,

So, Base has (file svx/source/form/filtnav.cxx) class
FmFilterNavigator which is a SvTreeListBox. (See
https://bugs.documentfoundation.org/114788 for how to display it.)

The structure on screen looks like (for example):

MainForm
 Or
  ID: 5
 Or
  f1: 'blah'


The issue is:

 "MainForm" should _not_ be editable. If the user clicks on that, it
 should maybe expand/collapse children, BUT DON'T ALLOW THE USER TO
 EDIT the "MainForm" string.

 "Or" should likewise _not_ be editable.

 The children of "Or" should _be_ editable.

The situation now is that this is inverted. What should be editable is
not, and what should not be is. This has been traced back to
"somewhere between LibreOffice 5.0 and 5.1", but I cannot for the life
of me find the bit of code that decides what is editable and what is
not.

I looked at
 git log -p libreoffice-5-0..libreoffice-5-1 -- svx/source/form/filtnav.*

but that didn't bring any inspiration of why this regression was
introduced in 5.1.

Some kind soul that knows about SvListTreeBox could help us there?

Thanks in advance.

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

[Libreoffice-commits] core.git: cui/Module_cui.mk cui/qa cui/source cui/UITest_cui_dialogs.mk

2018-01-03 Thread Miklos Vajna

 cui/Module_cui.mk |4 +++
 cui/UITest_cui_dialogs.mk |   16 +
 cui/qa/uitest/dialogs/pastedlg.py |   46 ++
 cui/source/dialogs/pastedlg.cxx   |   11 +
 4 files changed, 77 insertions(+)

New commits:
commit dba3cd508116780cf5d115f964b7311dd61e180d
Author: Miklos Vajna 
Date:   Wed Jan 3 13:34:46 2018 +0100

tdf#113357 cui: fix duplicate 'Formatted text [Richtext]' paste option

Prefer RTF when we have both RICHTEXT and RTF.

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

diff --git a/cui/Module_cui.mk b/cui/Module_cui.mk
index 888cd2a9f3cd..58026c6939fd 100644
--- a/cui/Module_cui.mk
+++ b/cui/Module_cui.mk
@@ -26,4 +26,8 @@ $(eval $(call gb_Module_add_screenshot_targets,cui,\
 CppunitTest_cui_dialogs_test_4 \
 ))
 
+$(eval $(call gb_Module_add_uicheck_targets,cui,\
+UITest_cui_dialogs \
+))
+
 # vim: set noet sw=4 ts=4:
diff --git a/cui/UITest_cui_dialogs.mk b/cui/UITest_cui_dialogs.mk
new file mode 100644
index ..d3ad2dc64102
--- /dev/null
+++ b/cui/UITest_cui_dialogs.mk
@@ -0,0 +1,16 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+$(eval $(call gb_UITest_UITest,cui_dialogs))
+
+$(eval $(call gb_UITest_add_modules,cui_dialogs,$(SRCDIR)/cui/qa/uitest,\
+   dialogs/ \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/cui/qa/uitest/dialogs/pastedlg.py 
b/cui/qa/uitest/dialogs/pastedlg.py
new file mode 100644
index ..93973178c254
--- /dev/null
+++ b/cui/qa/uitest/dialogs/pastedlg.py
@@ -0,0 +1,46 @@
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+from libreoffice.uno.propertyvalue import mkPropertyValues
+from uitest.framework import UITestCase
+from uitest.uihelper.common import get_state_as_dict
+
+
+# Test for SvPasteObjectDialog.
+class Test(UITestCase):
+
+def testGetFormat(self):
+# Copy a string in Impress.
+self.ui_test.create_doc_in_start_center("impress")
+template = self.xUITest.getTopFocusWindow()
+self.ui_test.close_dialog_through_button(template.getChild("cancel"))
+doc = self.xUITest.getTopFocusWindow()
+editWin = doc.getChild("impress_win")
+# Select the title shape.
+editWin.executeAction("TYPE", mkPropertyValues({"KEYCODE": "TAB"}))
+editWin.executeAction("TYPE", mkPropertyValues({"TEXT": "t"}))
+self.xUITest.executeCommand(".uno:SelectAll")
+self.xUITest.executeCommand(".uno:Copy")
+
+# Now use paste special to see what formats are offered.
+self.ui_test.execute_dialog_through_command(".uno:PasteSpecial")
+pasteSpecial = self.xUITest.getTopFocusWindow()
+formats = pasteSpecial.getChild("list")
+entryCount = int(get_state_as_dict(formats)["EntryCount"])
+items = []
+for index in range(entryCount):
+formats.executeAction("SELECT", mkPropertyValues({"POS": 
str(index)}))
+items.append(get_state_as_dict(formats)["SelectEntryText"])
+
+# Make sure there is no RTF vs Richtext duplication.
+self.assertTrue("Formatted text [RTF]" in items)
+self.assertFalse("Formatted text [Richtext]" in items)
+
+# Close the dialog and the document.
+
self.ui_test.close_dialog_through_button(pasteSpecial.getChild("cancel"))
+self.ui_test.close_doc()
+
+# vim: set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/cui/source/dialogs/pastedlg.cxx b/cui/source/dialogs/pastedlg.cxx
index 721cf06e1821..33fafa758654 100644
--- a/cui/source/dialogs/pastedlg.cxx
+++ b/cui/source/dialogs/pastedlg.cxx
@@ -161,6 +161,17 @@ SotClipboardFormatId SvPasteObjectDialog::GetFormat( const 
TransferableDataHelpe
 else if( aName.isEmpty() )
 aName = SvPasteObjectHelper::GetSotFormatUIName( nFormat );
 
+// Show RICHTEXT only in case RTF is not present.
+if (nFormat == SotClipboardFormatId::RICHTEXT)
+{
+auto it = std::find_if(pFormats->begin(), pFormats->end(),
+   [](const DataFlavorEx& rFlavor) {
+   return rFlavor.mnSotId == 
SotClipboardFormatId::RTF;
+   });
+if (it != pFormats->end())
+continue;
+}
+
 if( LISTBOX_ENTRY_NOTFOUND == ObjectLB().GetEntryPos( aName ) )

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

2018-01-03 Thread Tor Lillqvist

 framework/source/services/autorecovery.cxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit de84816c1acefe0607827418f73477ff7163728d
Author: Tor Lillqvist 
Date:   Tue Jan 2 12:21:48 2018 +0200

tdf#107039: Avoid deadlock by locking the SolarMutex early on in one place

See bug report for backtraces of the deadlocking threads.

Change-Id: I0334118e173c37b6f9596249e1e2f0d196bbab3f
Reviewed-on: https://gerrit.libreoffice.org/47249
Tested-by: Jenkins 
Reviewed-by: Tor Lillqvist 

diff --git a/framework/source/services/autorecovery.cxx 
b/framework/source/services/autorecovery.cxx
index dd93c89d10d3..8141af180cc9 100644
--- a/framework/source/services/autorecovery.cxx
+++ b/framework/source/services/autorecovery.cxx
@@ -1565,6 +1565,7 @@ void SAL_CALL AutoRecovery::documentEventOccured(const 
css::document::DocumentEv
 (aEvent.EventName == EVENT_ON_SAVEASDONE)
)
 {
+SolarMutexGuard g;
 implts_markDocumentAsSaved(xDocument);
 implts_updateDocumentUsedForSavingState(xDocument, SAVE_FINISHED);
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-5-4' - chart2/source

2018-01-03 Thread Markus Mohrhard

 chart2/source/controller/sidebar/ChartElementsPanel.cxx |6 ++
 1 file changed, 6 insertions(+)

New commits:
commit 97db3448de9937116ebf008961e3321811bd44ec
Author: Markus Mohrhard 
Date:   Thu Dec 21 23:42:19 2017 +0100

prevent crash when trying to edit broken chart documents

Change-Id: Ie5fb706011ca600b42e5e2d3770e919b56347edd
Reviewed-on: https://gerrit.libreoffice.org/46938
Reviewed-by: Markus Mohrhard 
Tested-by: Jenkins 
(cherry picked from commit 1d2eb0b64339a771152bb17831c83373830e5c38)
Reviewed-on: https://gerrit.libreoffice.org/47005
Reviewed-by: Michael Stahl 

diff --git a/chart2/source/controller/sidebar/ChartElementsPanel.cxx 
b/chart2/source/controller/sidebar/ChartElementsPanel.cxx
index 6ee81319f591..612fe89565e6 100644
--- a/chart2/source/controller/sidebar/ChartElementsPanel.cxx
+++ b/chart2/source/controller/sidebar/ChartElementsPanel.cxx
@@ -398,10 +398,16 @@ css::uno::Reference 
getChartType(const css::uno::Refere
 
 css::uno::Sequence> 
xCooSysSequence(xCooSysContainer->getCoordinateSystems());
 
+if (xCooSysSequence.getLength() == 0)
+return css::uno::Reference();
+
 css::uno::Reference 
xChartTypeContainer(xCooSysSequence[0], css::uno::UNO_QUERY_THROW);
 
 css::uno::Sequence> 
xChartTypeSequence(xChartTypeContainer->getChartTypes());
 
+if (xChartTypeSequence.getLength() == 0)
+return css::uno::Reference();
+
 return xChartTypeSequence[0];
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2018-01-03 Thread Markus Mohrhard

 chart2/source/controller/sidebar/ChartElementsPanel.cxx |6 ++
 1 file changed, 6 insertions(+)

New commits:
commit de5d9ffd8879d5a09724fc727a86aae64e3aadc2
Author: Markus Mohrhard 
Date:   Thu Dec 21 23:42:19 2017 +0100

prevent crash when trying to edit broken chart documents

Change-Id: Ie5fb706011ca600b42e5e2d3770e919b56347edd
Reviewed-on: https://gerrit.libreoffice.org/46938
Reviewed-by: Markus Mohrhard 
Tested-by: Jenkins 
(cherry picked from commit 1d2eb0b64339a771152bb17831c83373830e5c38)
Reviewed-on: https://gerrit.libreoffice.org/47004
Reviewed-by: Michael Stahl 

diff --git a/chart2/source/controller/sidebar/ChartElementsPanel.cxx 
b/chart2/source/controller/sidebar/ChartElementsPanel.cxx
index 7f2a471ce0f7..2f9d7ebaec27 100644
--- a/chart2/source/controller/sidebar/ChartElementsPanel.cxx
+++ b/chart2/source/controller/sidebar/ChartElementsPanel.cxx
@@ -397,10 +397,16 @@ css::uno::Reference 
getChartType(const css::uno::Refere
 
 css::uno::Sequence> 
xCooSysSequence(xCooSysContainer->getCoordinateSystems());
 
+if (xCooSysSequence.getLength() == 0)
+return css::uno::Reference();
+
 css::uno::Reference 
xChartTypeContainer(xCooSysSequence[0], css::uno::UNO_QUERY_THROW);
 
 css::uno::Sequence> 
xChartTypeSequence(xChartTypeContainer->getChartTypes());
 
+if (xChartTypeSequence.getLength() == 0)
+return css::uno::Reference();
+
 return xChartTypeSequence[0];
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2018-01-03 Thread Miklos Vajna

 sfx2/source/doc/sfxbasemodel.cxx |4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 050c0422b9c8a859d886748ae70e99274d1d9afa
Author: Miklos Vajna 
Date:   Wed Jan 3 14:55:30 2018 +0100

sfx2: improve reported error message in SfxBaseModel::impl_store()

Old: com.sun.star.io.IOException: SfxBaseModel::impl_store 
 failed: 0x507

New: com.sun.star.io.IOException: SfxBaseModel::impl_store 
 failed: 0x507(Error Area:Io Class:Access 
Code:1287)

It's much easier to find the relevant define in include/vcl/errcode.hxx 
based
on the new output.

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

diff --git a/sfx2/source/doc/sfxbasemodel.cxx b/sfx2/source/doc/sfxbasemodel.cxx
index 2b25ad1f993c..779296f35e7c 100644
--- a/sfx2/source/doc/sfxbasemodel.cxx
+++ b/sfx2/source/doc/sfxbasemodel.cxx
@@ -3013,8 +3013,10 @@ void SfxBaseModel::impl_store(  const   OUString&
   sURL
 SfxGetpApp()->NotifyEvent( SfxEventHint( bSaveTo ? 
SfxEventHintId::SaveToDocFailed : SfxEventHintId::SaveAsDocFailed, 
GlobalEventConfig::GetEventName( bSaveTo ? GlobalEventId::SAVETODOCFAILED : 
GlobalEventId::SAVEASDOCFAILED),
 
m_pData->m_pObjectShell.get() ) );
 
+std::stringstream aErrCode;
+aErrCode << nErrCode;
 throw task::ErrorCodeIOException(
-"SfxBaseModel::impl_store <" + sURL + "> failed: " + 
nErrCode.toHexString(),
+"SfxBaseModel::impl_store <" + sURL + "> failed: " + 
OUString::fromUtf8(aErrCode.str().c_str()),
 Reference< XInterface >(), sal_uInt32(nErrCode));
 }
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2018-01-03 Thread Maxim Monastirsky

 sw/source/uibase/docvw/edtwin.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 612a613a6bad3574f4750b27a3638064963baf14
Author: Maxim Monastirsky 
Date:   Sat Dec 23 22:13:55 2017 +0200

tdf#114670 Make sure to dispose the menu

Change-Id: I30612a0b3cfef7d19ff6a5180db76a8002186bd5
Reviewed-on: https://gerrit.libreoffice.org/47025
Tested-by: Jenkins 
Reviewed-by: Maxim Monastirsky 
(cherry picked from commit baccbd4508a375090f4d95a2dab02c8b5d404ee2)
Reviewed-on: https://gerrit.libreoffice.org/47031
Reviewed-by: Noel Grandin 
Reviewed-by: Xisco FaulÃ 
Reviewed-by: Michael Stahl 
Tested-by: Michael Stahl 

diff --git a/sw/source/uibase/docvw/edtwin.cxx 
b/sw/source/uibase/docvw/edtwin.cxx
index da86a7d49149..bfc5c3dc8585 100644
--- a/sw/source/uibase/docvw/edtwin.cxx
+++ b/sw/source/uibase/docvw/edtwin.cxx
@@ -5287,7 +5287,7 @@ void SwEditWin::Command( const CommandEvent& rCEvt )
 aEvent.SourceWindow = VCLUnoHelper::GetInterface( this 
);
 aEvent.ExecutePosition.X = aPixPos.X();
 aEvent.ExecutePosition.Y = aPixPos.Y();
-VclPtr pMenu;
+ScopedVclPtr pMenu;
 if 
(GetView().TryContextMenuInterception(aROPopup.GetMenu(), 
"private:resource/ReadonlyContextMenu", pMenu, aEvent))
 {
 if ( pMenu )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2018-01-03 Thread Maxim Monastirsky

 sw/source/uibase/docvw/edtwin.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 1fc5b27a72f00b34a681cd9aa63438119436e7dd
Author: Maxim Monastirsky 
Date:   Sat Dec 23 22:13:55 2017 +0200

tdf#114670 Make sure to dispose the menu

Conflicts:
sw/source/uibase/docvw/edtwin.cxx

Change-Id: I30612a0b3cfef7d19ff6a5180db76a8002186bd5
Reviewed-on: https://gerrit.libreoffice.org/47025
Tested-by: Jenkins 
Reviewed-by: Maxim Monastirsky 
(cherry picked from commit baccbd4508a375090f4d95a2dab02c8b5d404ee2)
Reviewed-on: https://gerrit.libreoffice.org/47032
Reviewed-by: Noel Grandin 
Reviewed-by: Xisco FaulÃ 
Reviewed-by: Michael Stahl 

diff --git a/sw/source/uibase/docvw/edtwin.cxx 
b/sw/source/uibase/docvw/edtwin.cxx
index e9097d19fc72..0bd2b7d49347 100644
--- a/sw/source/uibase/docvw/edtwin.cxx
+++ b/sw/source/uibase/docvw/edtwin.cxx
@@ -5280,7 +5280,7 @@ void SwEditWin::Command( const CommandEvent& rCEvt )
 aEvent.SourceWindow = VCLUnoHelper::GetInterface( this 
);
 aEvent.ExecutePosition.X = aPixPos.X();
 aEvent.ExecutePosition.Y = aPixPos.Y();
-VclPtr pMenu;
+ScopedVclPtr pMenu;
 OUString 
sMenuName("private:resource/ReadonlyContextMenu");
 if 
(GetView().TryContextMenuInterception(aROPopup.GetMenu(), sMenuName, pMenu, 
aEvent))
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2018-01-03 Thread Caolán McNamara

 sw/source/ui/frmdlg/wrap.cxx   |   29 +++
 sw/source/ui/table/tabledlg.cxx|   71 ++---
 sw/source/uibase/inc/prcntfld.hxx  |4 +-
 sw/source/uibase/inc/wrap.hxx  |3 +
 sw/source/uibase/table/tablepg.hxx |7 ++-
 5 files changed, 92 insertions(+), 22 deletions(-)

New commits:
commit ccce3d15fdb28786166f9c96cdc12a185c3c078e
Author: CaolÃ¡n McNamara 
Date:   Fri Dec 22 10:35:31 2017 +

Resolves: tdf#114572 immediate update of value while typing unwanted

Revert "connect to modified instead of up/down/focus-lost"

This reverts commit 44bfe8fad4f7c263dc713a65fb2ab0e2f9afcf99

Revert "listening to modify is sufficient to get all changes"

This reverts commit 5c0bb1088a678d36309866c4eee43e58901f6b7b

we probably need to distinguish a modify vs update signal to
get what I wanted here. Back to the original mode for now.

Change-Id: I51ebfc96b3a06cf09905f4a311d526f23ce371f1
Reviewed-on: https://gerrit.libreoffice.org/46959
Tested-by: Jenkins 
Reviewed-by: Michael Stahl 

diff --git a/sw/source/ui/frmdlg/wrap.cxx b/sw/source/ui/frmdlg/wrap.cxx
index 5a9db97e8cee..21f07d980816 100644
--- a/sw/source/ui/frmdlg/wrap.cxx
+++ b/sw/source/ui/frmdlg/wrap.cxx
@@ -90,11 +90,23 @@ SwWrapTabPage::SwWrapTabPage(vcl::Window *pParent, const 
SfxItemSet &rSet)
 
 SetExchangeSupport();
 
-Link aLk = LINK(this, SwWrapTabPage, RangeModifyHdl);
-m_pLeftMarginED->SetModifyHdl(aLk);
-m_pRightMarginED->SetModifyHdl(aLk);
-m_pTopMarginED->SetModifyHdl(aLk);
-m_pBottomMarginED->SetModifyHdl(aLk);
+Link aLk = LINK(this, SwWrapTabPage, RangeModifyHdl);
+Link aLk3 = LINK(this, SwWrapTabPage, RangeLoseFocusHdl);
+m_pLeftMarginED->SetUpHdl(aLk);
+m_pLeftMarginED->SetDownHdl(aLk);
+m_pLeftMarginED->SetLoseFocusHdl(aLk3);
+
+m_pRightMarginED->SetUpHdl(aLk);
+m_pRightMarginED->SetDownHdl(aLk);
+m_pRightMarginED->SetLoseFocusHdl(aLk3);
+
+m_pTopMarginED->SetUpHdl(aLk);
+m_pTopMarginED->SetDownHdl(aLk);
+m_pTopMarginED->SetLoseFocusHdl(aLk3);
+
+m_pBottomMarginED->SetUpHdl(aLk);
+m_pBottomMarginED->SetDownHdl(aLk);
+m_pBottomMarginED->SetLoseFocusHdl(aLk3);
 
 Link aLk2 = LINK(this, SwWrapTabPage, WrapTypeHdl);
 m_pNoWrapRB->SetClickHdl(aLk2);
@@ -552,7 +564,12 @@ DeactivateRC SwWrapTabPage::DeactivatePage(SfxItemSet* 
_pSet)
 return DeactivateRC::LeavePage;
 }
 
-IMPL_LINK( SwWrapTabPage, RangeModifyHdl, Edit&, rSpin, void )
+// range check
+IMPL_LINK( SwWrapTabPage, RangeLoseFocusHdl, Control&, rControl, void )
+{
+RangeModifyHdl( static_cast(rControl) );
+}
+IMPL_LINK( SwWrapTabPage, RangeModifyHdl, SpinField&, rSpin, void )
 {
 MetricField& rEdit = static_cast(rSpin);
 sal_Int64 nValue = rEdit.GetValue();
diff --git a/sw/source/ui/table/tabledlg.cxx b/sw/source/ui/table/tabledlg.cxx
index 1dd146377a8a..9186b9a48642 100644
--- a/sw/source/ui/table/tabledlg.cxx
+++ b/sw/source/ui/table/tabledlg.cxx
@@ -143,12 +143,25 @@ void  SwFormatTablePage::Init()
 m_pRightBtn->SetClickHdl( aLk2 );
 m_pCenterBtn->SetClickHdl( aLk2 );
 
-Link aLk = LINK(this, SwFormatTablePage, UpDownHdl);
-m_pTopMF->SetModifyHdl(aLk);
-m_pBottomMF->SetModifyHdl(aLk);
-m_aRightMF.SetModifyHdl(aLk);
-m_aLeftMF.SetModifyHdl(aLk);
-m_aWidthMF.SetModifyHdl(aLk);
+Link aLk = LINK( this, SwFormatTablePage, UpDownHdl );
+m_pTopMF->SetUpHdl( aLk );
+m_pBottomMF->SetUpHdl( aLk );
+m_aRightMF.SetUpHdl( aLk );
+m_aLeftMF.SetUpHdl( aLk );
+m_aWidthMF.SetUpHdl( aLk );
+
+m_pTopMF->SetDownHdl( aLk );
+m_pBottomMF->SetDownHdl( aLk );
+m_aRightMF.SetDownHdl( aLk );
+m_aLeftMF.SetDownHdl( aLk );
+m_aWidthMF.SetDownHdl( aLk );
+
+Link aLk3 = LINK( this, SwFormatTablePage, LoseFocusHdl );
+m_pTopMF->SetLoseFocusHdl( aLk3 );
+m_pBottomMF->SetLoseFocusHdl( aLk3 );
+m_aRightMF.SetLoseFocusHdl( aLk3 );
+m_aLeftMF.SetLoseFocusHdl( aLk3 );
+m_aWidthMF.SetLoseFocusHdl( aLk3 );
 
 m_pRelWidthCB->SetClickHdl(LINK( this, SwFormatTablePage, RelWidthClickHdl 
));
 }
@@ -269,7 +282,11 @@ void SwFormatTablePage::RightModify()
 }
 }
 
-IMPL_LINK( SwFormatTablePage, UpDownHdl, Edit&, rEdit, void )
+IMPL_LINK( SwFormatTablePage, LoseFocusHdl, Control&, rControl, void )
+{
+UpDownHdl(static_cast(rControl));
+}
+IMPL_LINK( SwFormatTablePage, UpDownHdl, SpinField&, rEdit, void )
 {
 if( m_aRightMF.get() == &rEdit)
 RightModify();
@@ -572,6 +589,7 @@ void  SwFormatTablePage::Reset( const SfxItemSet* )
 m_aRightMF.SetMax( m_aRightMF.NormalizePercent( pTableData->GetSpace() ), 
FUNIT_TWIP );
 m_aLeftMF.SetMax( m_aLeftMF.NormalizePercent( pTableData->GetSpace() ), 
FUNIT_TWIP );
 m_aWidthMF.SetMin( m_aWidthMF.NormalizePercent( nMinTableWidth ), 
FUNIT_TWIP );
+
 }
 
 voidSwFormatTablePage::ActivatePage( const SfxItemSet& rSet )
@@ -826,12 +844,

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

2018-01-03 Thread Andras Timar

 loleaflet/po/ui-sl.po | 2125 +++---
 1 file changed, 167 insertions(+), 1958 deletions(-)

New commits:
commit 24e07de11c51b7ef659f75b851dd497441578877
Author: Andras Timar 
Date:   Wed Jan 3 17:11:48 2018 +0100

Updated Slovenian translation

Change-Id: I69e886f2f798e0c0d0a7e649ab8866c35dd73df2

diff --git a/loleaflet/po/ui-sl.po b/loleaflet/po/ui-sl.po
index e9789769..0073bbd8 100644
--- a/loleaflet/po/ui-sl.po
+++ b/loleaflet/po/ui-sl.po
@@ -4,8 +4,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: LibreOffice Online UI\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-10-08 13:09+0200\n"
-"PO-Revision-Date: 2017-10-08 13:26+0200\n"
+"POT-Creation-Date: 2018-01-03 13:18+0100\n"
+"PO-Revision-Date: 2018-01-03 17:01+0100\n"
 "Last-Translator: Martin Srebotnjak \n"
 "Language-Team: sl.libreoffice.org \n"
 "Language: sl\n"
@@ -14,7 +14,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n"
 "%100==4 ? 2 : 3);\n"
-"X-Generator: Poedit 2.0.4\n"
+"X-Generator: Poedit 2.0.5\n"
 "X-Accelerator-Marker: ~\n"
 "X-Poedit-SourceCharset: UTF-8\n"
 
@@ -118,9 +118,7 @@ msgstr "Grafikon rabe CPE"
 msgid "Network Graph"
 msgstr "Grafikon rabe omreÅ¾ja"
 
-#: admin.strings.js:30 dist/toolbar/toolbar.js:470
-#: src/control/Control.Menubar.js:18 src/control/Control.Menubar.js:193
-#: src/control/Control.Menubar.js:258 src/layer/marker/Annotation.js:198
+#: admin.strings.js:30 src/layer/marker/Annotation.js:222
 msgid "Save"
 msgstr "Shrani"
 
@@ -156,6 +154,18 @@ msgstr ""
 "NajveÄja dovoljena velikost datoteke za pisanje na disk (v MB) â zgolj "
 "zmanjÅ¡ajte"
 
+#: admin.strings.js:38
+msgid "Documents:"
+msgstr "Dokumenti:"
+
+#: admin.strings.js:39
+msgid "Expired:"
+msgstr "Preteklo:"
+
+#: admin.strings.js:40
+msgid "Refresh"
+msgstr "OsveÅ¾i"
+
 #: evol.colorpicker.strings.js:2
 msgid "Theme Colors"
 msgstr "Barve teme"
@@ -176,83 +186,6 @@ msgstr "Nazaj na paleto"
 msgid "No history yet."
 msgstr "Ni zgodovine."
 
-#: unocommands.js:1
-msgid "Copy Hyperlink"
-msgstr "Kopiraj hiperpovezavo"
-
-#: unocommands.js:2
-msgid "Down One Level"
-msgstr "Eno raven niÅ¾je"
-
-#: unocommands.js:3
-msgid "Up One Level"
-msgstr "Eno raven viÅ¡je"
-
-#: unocommands.js:4
-msgid "Edit Comment"
-msgstr "Uredi komentar"
-
-#: unocommands.js:5
-msgid "Insert Comment"
-msgstr "Vstavi komentar"
-
-#: unocommands.js:6
-msgid "Merge"
-msgstr "Spoji"
-
-#: unocommands.js:7
-msgid "Merge Cells..."
-msgstr "Spoji celice â¦"
-
-#: unocommands.js:8
-msgid "Bring Forward"
-msgstr "Postavi naprej"
-
-#: unocommands.js:9
-msgid "Send Backward"
-msgstr "PoÅ¡lji nazaj"
-
-#: unocommands.js:10
-msgid "Paste Special"
-msgstr "Posebno lepljenje"
-
-#: unocommands.js:11
-msgid "Unformatted Text"
-msgstr "Neoblikovano besedilo"
-
-#: unocommands.js:12
-msgid "No Wrap"
-msgstr "Brez oblivanja"
-
-#: unocommands.js:13
-msgid "Wrap Before"
-msgstr "Oblij pred"
-
-#: unocommands.js:14
-msgid "Wrap After"
-msgstr "Oblij po"
-
-#: unocommands.js:15
-msgid "Enable Contour"
-msgstr "OmogoÄi obris"
-
-#: unocommands.js:16
-msgid "Update Index or Table of Contents"
-msgstr "Posodobi kazalo"
-
-#: unocommands.js:17
-msgid "Delete Index or Table of Contents"
-msgstr "IzbriÅ¡i kazalo"
-
-#: unocommands.js:18 src/layer/marker/Annotation.js:201
-#: src/layer/tile/TileLayer.js:194
-msgid "Reply"
-msgstr "Odgovori"
-
-#: unocommands.js:19
-msgid "Refresh"
-msgstr "OsveÅ¾i"
-
 #: dist/errormessages.js:1
 msgid ""
 "No disk space left on server, please contact the server administrator to "
@@ -387,392 +320,236 @@ msgstr "0 uporabnikov"
 msgid "Are you sure you want to delete this page?"
 msgstr "Ali ste prepriÄani, da Å¾elite izbrisati to stran?"
 
-#: dist/toolbar/toolbar.js:461
+#: dist/toolbar/toolbar.js:456
 msgid "Textwrap"
 msgstr "Oblivanje besedila"
 
-#: dist/toolbar/toolbar.js:462
+#: dist/toolbar/toolbar.js:457
 msgid "No wrap"
 msgstr "Brez oblivanja"
 
-#: dist/toolbar/toolbar.js:463
+#: dist/toolbar/toolbar.js:458
 msgid "Page wrap"
 msgstr "Oblivanje strani"
 
-#: dist/toolbar/toolbar.js:464
+#: dist/toolbar/toolbar.js:459
 msgid "Wrap anchor only"
 msgstr "Oblij samo sidro"
 
-#: dist/toolbar/toolbar.js:465
+#: dist/toolbar/toolbar.js:460
 msgid "Ideal wrap"
 msgstr "Idealno oblivanje"
 
-#: dist/toolbar/toolbar.js:466
+#: dist/toolbar/toolbar.js:461
 msgid "Left wrap"
 msgstr "Levo oblivanje"
 
-#: dist/toolbar/toolbar.js:467
+#: dist/toolbar/toolbar.js:462
 msgid "Right wrap"
 msgstr "Desno oblivanje"
 
-#: dist/toolbar/toolbar.js:468
+#: dist/toolbar/toolbar.js:463
 msgid "Wrap through"
 msgstr "Oblij skozi"
 
-#: dist/toolbar/toolbar.js:472 src/control/Control.Menubar.js:30
-#: src/control/Control.Menubar.js:204 src/control/Control.Menubar.js:269
-msgid "Undo"
-msgstr "Razveljavi"
-
-#: dist/toolbar/toolbar.js:473 src/control/Control.Menubar.js:31
-#: src/control/Control.Menubar.js:205 src/control/Control.Menuba

[Libreoffice-commits] core.git: Branch 'libreoffice-5-4' - lotuswordpro/source

2018-01-03 Thread Caolán McNamara

 lotuswordpro/source/filter/lwplayout.cxx |   16 +++-
 lotuswordpro/source/filter/lwplayout.hxx |1 +
 2 files changed, 12 insertions(+), 5 deletions(-)

New commits:
commit a71ce08da071a205aba15c32ae9c42b4b5e44018
Author: CaolÃ¡n McNamara 
Date:   Tue Dec 19 09:18:54 2017 +

ofz#4689 avoid recurse to death

Change-Id: Ie578a767cd8646c4e67c302a67b46ce1f1637122
Reviewed-on: https://gerrit.libreoffice.org/46774
Tested-by: Jenkins 
Reviewed-by: Michael Stahl 

diff --git a/lotuswordpro/source/filter/lwplayout.cxx 
b/lotuswordpro/source/filter/lwplayout.cxx
index 6f0fec06c58b..b000fdbda6c1 100644
--- a/lotuswordpro/source/filter/lwplayout.cxx
+++ b/lotuswordpro/source/filter/lwplayout.cxx
@@ -1942,6 +1942,7 @@ rtl::Reference 
LwpLayout::GetContainerLayout()
 LwpPlacableLayout::LwpPlacableLayout( LwpObjectHeader &objHdr, LwpSvStream* 
pStrm )
 : LwpLayout(objHdr, pStrm)
 , m_bGettingWrapType(false)
+, m_bGettingLayoutRelativity(false)
 , m_nWrapType(0)
 , m_nBuoyancy(0)
 , m_nBaseLineOffset(0)
@@ -2021,11 +2022,15 @@ sal_uInt8 LwpPlacableLayout::GetWrapType()
 */
 LwpLayoutRelativity* LwpPlacableLayout::GetRelativityPiece()
 {
-if(!m_LayRelativity.IsNull())
+if (m_bGettingLayoutRelativity)
+throw std::runtime_error("recursion in layout");
+m_bGettingLayoutRelativity = true;
+LwpLayoutRelativity* pRet = nullptr;
+if (!m_LayRelativity.IsNull())
 {
-if(m_nOverrideFlag & OVER_PLACEMENT)
+if (m_nOverrideFlag & OVER_PLACEMENT)
 {
-return 
dynamic_cast(m_LayRelativity.obj().get());
+pRet = 
dynamic_cast(m_LayRelativity.obj().get());
 }
 }
 else
@@ -2033,10 +2038,11 @@ LwpLayoutRelativity* 
LwpPlacableLayout::GetRelativityPiece()
 rtl::Reference xBase(GetBasedOnStyle());
 if (LwpPlacableLayout* pLay = 
dynamic_cast(xBase.get()))
 {
-return pLay->GetRelativityPiece();
+pRet = pLay->GetRelativityPiece();
 }
 }
-return nullptr;
+m_bGettingLayoutRelativity = false;
+return pRet;
 }
 /**
 * @descr:   Get relative type
diff --git a/lotuswordpro/source/filter/lwplayout.hxx 
b/lotuswordpro/source/filter/lwplayout.hxx
index 2fdfb421362e..1a46b6ab3d07 100644
--- a/lotuswordpro/source/filter/lwplayout.hxx
+++ b/lotuswordpro/source/filter/lwplayout.hxx
@@ -497,6 +497,7 @@ protected:
 void Read() override;
 protected:
 bool m_bGettingWrapType;
+bool m_bGettingLayoutRelativity;
 sal_uInt8 m_nWrapType;
 sal_uInt8 m_nBuoyancy;
 sal_Int32 m_nBaseLineOffset;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2018-01-03 Thread Caolán McNamara

 package/source/zipapi/ZipFile.cxx |   12 ++--
 1 file changed, 10 insertions(+), 2 deletions(-)

New commits:
commit 6a40c4e0ddf606f2fac776764eede2fb5ccde354
Author: CaolÃ¡n McNamara 
Date:   Wed Dec 27 18:38:42 2017 +

ofz#4806 Infinite loop

Change-Id: I89a24fa3ce4034ef207233b96c5e26a7b7787444
Reviewed-on: https://gerrit.libreoffice.org/47101
Tested-by: Jenkins 
Reviewed-by: Michael Stahl 

diff --git a/package/source/zipapi/ZipFile.cxx 
b/package/source/zipapi/ZipFile.cxx
index 61f7ea1dacc1..de4c1a364acd 100644
--- a/package/source/zipapi/ZipFile.cxx
+++ b/package/source/zipapi/ZipFile.cxx
@@ -539,6 +539,7 @@ public:
 const sal_Int32 nBufSize = 8192;
 
 sal_Int32 nRemaining = xSrcStream->available();
+sal_Int32 nRead = 0;
 maBytes.reserve(nRemaining);
 uno::Sequence aBuf(nBufSize);
 
@@ -552,10 +553,17 @@ public:
 };
 
 while (nRemaining > nBufSize)
-nRemaining -= readAndCopy(nBufSize);
+{
+const auto nBytes = readAndCopy(nBufSize);
+if (!nBytes)
+break;
+nRead += nBytes;
+nRemaining -= nBytes;
+}
 
 if (nRemaining)
-readAndCopy(nRemaining);
+nRead += readAndCopy(nRemaining);
+maBytes.resize(nRead);
 }
 
 virtual sal_Int32 SAL_CALL readBytes( uno::Sequence& rData, 
sal_Int32 nBytesToRead ) override
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2018-01-03 Thread Johnny_M

 svtools/source/svrtf/parrtf.cxx |4 ++--
 sw/source/uibase/dochdl/gloshdl.cxx |4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit fa73b3fba95d0939cefe7e8987fbcd438a3b725f
Author: Johnny_M 
Date:   Wed Dec 27 20:29:06 2017 +0100

Translate German comments and debug strings

Additionally, improve an equal earlier translation made on commit
ee536e482b5ad01ea4a8cae79a1fcd9e12db444f
( 
https://gerrit.libreoffice.org/#/c/7303/2/svtools/source/svrtf/parrtf.cxx@199 )

Change-Id: Idf1a95361a1bc54473a24c152902568574e21e69
Reviewed-on: https://gerrit.libreoffice.org/47099
Tested-by: Jenkins 
Reviewed-by: Michael Stahl 

diff --git a/svtools/source/svrtf/parrtf.cxx b/svtools/source/svrtf/parrtf.cxx
index 52e350f52442..04c59e1b0c52 100644
--- a/svtools/source/svrtf/parrtf.cxx
+++ b/svtools/source/svrtf/parrtf.cxx
@@ -200,7 +200,7 @@ int SvRTFParser::GetNextToken_()
 
 if( '\\' == cAnsi &&
 '\'' == ( cAnsi = GetNextChar() ))
-// read on HexValue
+// skip HexValue
 GetHexValue();
 nNextCh = GetNextChar();
 }
@@ -437,7 +437,7 @@ void SvRTFParser::ScanText()
 
 if( '\\' == cAnsi &&
 '\'' == ( cAnsi = GetNextChar() ))
-// HexValue ueberlesen
+// skip HexValue
 GetHexValue();
 nNextCh = GetNextChar();
 }
diff --git a/sw/source/uibase/dochdl/gloshdl.cxx 
b/sw/source/uibase/dochdl/gloshdl.cxx
index 85964f4c1f0c..2fa820fea16f 100644
--- a/sw/source/uibase/dochdl/gloshdl.cxx
+++ b/sw/source/uibase/dochdl/gloshdl.cxx
@@ -258,13 +258,13 @@ sal_uInt16 SwGlossaryHdl::GetGlossaryCnt()
 
 OUString SwGlossaryHdl::GetGlossaryName( sal_uInt16 nId )
 {
-OSL_ENSURE(nId < GetGlossaryCnt(), "Textbausteinarray ueberindiziert.");
+OSL_ENSURE(nId < GetGlossaryCnt(), "Text building block array 
over-indexed.");
 return pCurGrp->GetLongName( nId );
 }
 
 OUString SwGlossaryHdl::GetGlossaryShortName(sal_uInt16 nId)
 {
-OSL_ENSURE(nId < GetGlossaryCnt(), "Textbausteinarray ueberindiziert.");
+OSL_ENSURE(nId < GetGlossaryCnt(), "Text building block array 
over-indexed.");
 return pCurGrp->GetShortName( nId );
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2018-01-03 Thread Caolán McNamara

 lotuswordpro/source/filter/lwpoleobject.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit cef68d0ce9a3f5f4a040fd3cd63ce7d63b241ac9
Author: CaolÃ¡n McNamara 
Date:   Wed Jan 3 13:31:16 2018 +

ofz#4901 Divide-by-zero

Change-Id: Ifc38234b4a99b205681b18b0d0bd2ec2a65dc515
Reviewed-on: https://gerrit.libreoffice.org/47317
Tested-by: Jenkins 
Reviewed-by: CaolÃ¡n McNamara 
Tested-by: CaolÃ¡n McNamara 

diff --git a/lotuswordpro/source/filter/lwpoleobject.cxx 
b/lotuswordpro/source/filter/lwpoleobject.cxx
index 1e0a00e54e77..66cee7b776e6 100644
--- a/lotuswordpro/source/filter/lwpoleobject.cxx
+++ b/lotuswordpro/source/filter/lwpoleobject.cxx
@@ -154,7 +154,7 @@ void LwpGraphicOleObject::GetGrafScaledSize(double & 
fWidth, double & fHeight)
 fSclGrafWidth = fWidth;
 fSclGrafHeight = fHeight;
 }
-else if (nScalemode & LwpLayoutScale::MAINTAIN_ASPECT_RATIO)
+else if (nScalemode & LwpLayoutScale::MAINTAIN_ASPECT_RATIO && 
fHeight != 0.0 && fDisFrameHeight != 0.0)
 {
 if (fWidth/fHeight >= fDisFrameWidth/fDisFrameHeight)
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2018-01-03 Thread Tamás Zolnai

 sfx2/source/sidebar/UnoPanels.cxx |3 +++
 1 file changed, 3 insertions(+)

New commits:
commit ffca194466e08691e381d642b07154121edefece
Author: TamÃ¡s Zolnai 
Date:   Thu Dec 28 14:42:24 2017 +0100

tdf#104870 - Impress crashes switching views in read-only mode

We need to check read only mode similar to SidebarController::CreatePanels()
method. Otherwise SfxUnoPanels::getByName() creates an invalid panel.

Reviewed-on: https://gerrit.libreoffice.org/47116
Tested-by: Xisco FaulÃ 
Reviewed-by: TamÃ¡s Zolnai 
(cherry picked from commit 23a83639f5a06708074b13bc13ea4f6f819f55f0)

Change-Id: Ib7801b81c95f3f505a06c00f749ba4ed5809bfe0
Reviewed-on: https://gerrit.libreoffice.org/47138
Tested-by: Xisco FaulÃ 
Reviewed-by: Michael Stahl 

diff --git a/sfx2/source/sidebar/UnoPanels.cxx 
b/sfx2/source/sidebar/UnoPanels.cxx
index a74763572cdb..49815a9ff649 100644
--- a/sfx2/source/sidebar/UnoPanels.cxx
+++ b/sfx2/source/sidebar/UnoPanels.cxx
@@ -108,6 +108,9 @@ sal_Bool SAL_CALL SfxUnoPanels::hasByName( const OUString& 
aName )
 iPanel(aPanels.begin()), iEnd(aPanels.end());
 iPanel!=iEnd; ++iPanel)
 {
+// Determine if the panel can be displayed.
+if(pSidebarController->IsDocumentReadOnly() && 
!iPanel->mbShowForReadOnlyDocuments)
+continue;
 if (iPanel->msId == aName)
 return true;
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-5-4' - sfx2/source

2018-01-03 Thread Tamás Zolnai

 sfx2/source/sidebar/UnoPanels.cxx |3 +++
 1 file changed, 3 insertions(+)

New commits:
commit 6cc44459833deec6a54a0ed8b0572d345d3e7425
Author: TamÃ¡s Zolnai 
Date:   Thu Dec 28 18:02:57 2017 +0100

tdf#104870 - Impress crashes switching views in read-only mode

We need to check read only mode similar to SidebarController::CreatePanels()
method. Otherwise SfxUnoPanels::getByName() creates an invalid panel.

Reviewed-on: https://gerrit.libreoffice.org/47116
Tested-by: Xisco FaulÃ 
Reviewed-by: TamÃ¡s Zolnai 
(cherry picked from commit 23a83639f5a06708074b13bc13ea4f6f819f55f0)

Change-Id: Ib7801b81c95f3f505a06c00f749ba4ed5809bfe0
Reviewed-on: https://gerrit.libreoffice.org/47144
Tested-by: Xisco FaulÃ 
Reviewed-by: Michael Stahl 

diff --git a/sfx2/source/sidebar/UnoPanels.cxx 
b/sfx2/source/sidebar/UnoPanels.cxx
index 257c75cea4bc..98708d9cf658 100644
--- a/sfx2/source/sidebar/UnoPanels.cxx
+++ b/sfx2/source/sidebar/UnoPanels.cxx
@@ -114,6 +114,9 @@ sal_Bool SAL_CALL SfxUnoPanels::hasByName( const OUString& 
aName )
 iPanel(aPanels.begin()), iEnd(aPanels.end());
 iPanel!=iEnd; ++iPanel)
 {
+// Determine if the panel can be displayed.
+if(pSidebarController->IsDocumentReadOnly() && 
!iPanel->mbShowForReadOnlyDocuments)
+continue;
 if (iPanel->msId == aName)
 return true;
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2018-01-03 Thread Johnny_M

 svx/source/svdraw/svdibrow.cxx |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 27f005c0f90b1fd9bcdb4cab03921663d86c82e0
Author: Johnny_M 
Date:   Thu Dec 28 12:06:37 2017 +0100

Translate German variable name

Change-Id: Iad2185f13c9171dd7d2627a1d93b49e8c9199bb4
Reviewed-on: https://gerrit.libreoffice.org/47132
Tested-by: Jenkins 
Reviewed-by: Michael Stahl 

diff --git a/svx/source/svdraw/svdibrow.cxx b/svx/source/svdraw/svdibrow.cxx
index 71fc3f5c29f7..02df784f9f34 100644
--- a/svx/source/svdraw/svdibrow.cxx
+++ b/svx/source/svdraw/svdibrow.cxx
@@ -386,11 +386,11 @@ void SdrItemBrowserControl::DoubleClick(const 
BrowserMouseEvent&)
 void SdrItemBrowserControl::KeyInput(const KeyEvent& rKEvt)
 {
 sal_uInt16 
nKeyCode=rKEvt.GetKeyCode().GetCode()+rKEvt.GetKeyCode().GetModifier();
-bool bAusgewertet = false;
+bool bEvaluated = false;
 const std::size_t nPos=GetCurrentPos();
 if (nPos!=ITEM_NOT_FOUND) {
 if (nKeyCode==KEY_RETURN) {
-if (BeginChangeEntry(nPos)) bAusgewertet = true;
+if (BeginChangeEntry(nPos)) bEvaluated = true;
 } else if (nKeyCode==KEY_ESCAPE) {
 
 } else if 
(rKEvt.GetKeyCode().GetModifier()==KEY_SHIFT+KEY_MOD1+KEY_MOD2) { // Ctrl
@@ -408,7 +408,7 @@ void SdrItemBrowserControl::KeyInput(const KeyEvent& rKEvt)
 }
 }
 }
-if (!bAusgewertet) BrowseBox::KeyInput(rKEvt);
+if (!bEvaluated) BrowseBox::KeyInput(rKEvt);
 }
 
 void SdrItemBrowserControl::SetDirty()
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2018-01-03 Thread Stephan Bergmann

 sdext/source/presenter/PresenterTimer.cxx |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit e36a36bdc4a081c4b5b1a427ce626eb90acbcc82
Author: Stephan Bergmann 
Date:   Wed Jan 3 15:01:53 2018 +0100

Silence loplugin:unreffun with --disable-assert-always-abort

Change-Id: I1b5a7a6aa2436aa5b8297d5de172035cff3f1306
Reviewed-on: https://gerrit.libreoffice.org/47318
Tested-by: Jenkins 
Reviewed-by: Stephan Bergmann 

diff --git a/sdext/source/presenter/PresenterTimer.cxx 
b/sdext/source/presenter/PresenterTimer.cxx
index eb85119c6bc6..3bd1f9ab9977 100644
--- a/sdext/source/presenter/PresenterTimer.cxx
+++ b/sdext/source/presenter/PresenterTimer.cxx
@@ -96,7 +96,9 @@ public:
 const TimeValue& rTimeValue);
 
 static void NotifyTermination();
+#if !defined NDEBUG
 static bool HasInstance() { return mpInstance != nullptr; }
+#endif
 
 private:
 static std::shared_ptr mpInstance;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2018-01-03 Thread Johnny_M

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

New commits:
commit ca58ddb012b27da4b11fc509c3cbc2e9cb2c0ec2
Author: Johnny_M 
Date:   Thu Dec 28 11:59:47 2017 +0100

Translate German comment

Change-Id: Id65ccfe3b2394c8c30d3531316b70b511e34e366
Reviewed-on: https://gerrit.libreoffice.org/47131
Tested-by: Jenkins 
Reviewed-by: Michael Stahl 

diff --git a/basctl/source/basicide/baside2.cxx 
b/basctl/source/basicide/baside2.cxx
index 08c27f819639..1c438a908e19 100644
--- a/basctl/source/basicide/baside2.cxx
+++ b/basctl/source/basicide/baside2.cxx
@@ -591,7 +591,7 @@ bool ModulWindow::BasicErrorHdl( StarBASIC const * pBasic )
 {
 GetShell()->GetViewFrame()->ToTop();
 
-// ReturnWert: BOOL
+// Return value: BOOL
 //  FALSE:  cancel
 //  TRUE:   go on
 sal_uInt16 nErrorLine = StarBASIC::GetLine() - 1;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2018-01-03 Thread Caolán McNamara

 sw/source/filter/html/swhtml.cxx |   41 ++-
 sw/source/filter/html/swhtml.hxx |2 +
 2 files changed, 26 insertions(+), 17 deletions(-)

New commits:
commit ef3d75d90724b29c6367f6b0dc4502cfb417ac84
Author: CaolÃ¡n McNamara 
Date:   Thu Dec 28 22:28:08 2017 +

ofz#4817 Chaos with multiple body tags

Change-Id: I4f2ab3a3be0909176599963c8ca113e3af85c832
Reviewed-on: https://gerrit.libreoffice.org/47175
Reviewed-by: Michael Stahl 
Tested-by: Michael Stahl 

diff --git a/sw/source/filter/html/swhtml.cxx b/sw/source/filter/html/swhtml.cxx
index 7a6d70b612d1..057dc3ad4c04 100644
--- a/sw/source/filter/html/swhtml.cxx
+++ b/sw/source/filter/html/swhtml.cxx
@@ -296,6 +296,7 @@ SwHTMLParser::SwHTMLParser( SwDoc* pD, SwPaM& rCursor, 
SvStream& rIn,
 m_bInFootEndNoteSymbol( false ),
 m_bIgnoreHTMLComments( bNoHTMLComments ),
 m_bRemoveHidden( false ),
+m_bBodySeen( false ),
 m_pTempViewFrame(nullptr)
 {
 m_nEventId = nullptr;
@@ -1245,25 +1246,31 @@ void SwHTMLParser::NextToken( HtmlTokenId nToken )
 switch( nToken )
 {
 case HtmlTokenId::BODY_ON:
-if( !m_aStyleSource.isEmpty() )
-{
-m_pCSS1Parser->ParseStyleSheet( m_aStyleSource );
-m_aStyleSource.clear();
-}
-if( IsNewDoc() )
+if (m_bBodySeen)
+eState = SvParserState::Error;
+else
 {
-InsertBodyOptions();
-// If there is a template for the first or the right page,
-// it is set here.
-const SwPageDesc *pPageDesc = nullptr;
-if( m_pCSS1Parser->IsSetFirstPageDesc() )
-pPageDesc = m_pCSS1Parser->GetFirstPageDesc();
-else if( m_pCSS1Parser->IsSetRightPageDesc() )
-pPageDesc = m_pCSS1Parser->GetRightPageDesc();
-
-if( pPageDesc )
+m_bBodySeen = true;
+if( !m_aStyleSource.isEmpty() )
 {
-m_xDoc->getIDocumentContentOperations().InsertPoolItem( 
*m_pPam, SwFormatPageDesc( pPageDesc ) );
+m_pCSS1Parser->ParseStyleSheet( m_aStyleSource );
+m_aStyleSource.clear();
+}
+if( IsNewDoc() )
+{
+InsertBodyOptions();
+// If there is a template for the first or the right page,
+// it is set here.
+const SwPageDesc *pPageDesc = nullptr;
+if( m_pCSS1Parser->IsSetFirstPageDesc() )
+pPageDesc = m_pCSS1Parser->GetFirstPageDesc();
+else if( m_pCSS1Parser->IsSetRightPageDesc() )
+pPageDesc = m_pCSS1Parser->GetRightPageDesc();
+
+if( pPageDesc )
+{
+m_xDoc->getIDocumentContentOperations().InsertPoolItem( 
*m_pPam, SwFormatPageDesc( pPageDesc ) );
+}
 }
 }
 break;
diff --git a/sw/source/filter/html/swhtml.hxx b/sw/source/filter/html/swhtml.hxx
index 98b380dbb13c..66f7837704ae 100644
--- a/sw/source/filter/html/swhtml.hxx
+++ b/sw/source/filter/html/swhtml.hxx
@@ -472,6 +472,8 @@ class SwHTMLParser : public SfxHTMLParser, public SwClient
 bool m_bIgnoreHTMLComments : 1;
 bool m_bRemoveHidden : 1; // the filter implementation might set the 
hidden flag
 
+bool m_bBodySeen : 1;
+
 /// the names corresponding to the DOCINFO field subtypes INFO[1-4]
 OUString m_InfoNames[4];
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: loleaflet/dist scripts/downloadpootle.sh

2018-01-03 Thread Andras Timar

 loleaflet/dist/l10n/help-localizations.json   |1 
 loleaflet/dist/l10n/localizations.json|3 
 loleaflet/dist/l10n/locore-localizations.json |1 
 loleaflet/dist/l10n/locore/sl.json|   10 
 loleaflet/dist/l10n/uno-localizations.json|1 
 loleaflet/dist/l10n/uno/hsb.json  |  265 ++
 loleaflet/dist/l10n/uno/vec.json  |  265 ++
 scripts/downloadpootle.sh |2 
 8 files changed, 544 insertions(+), 4 deletions(-)

New commits:
commit 49b4d867f7dadc9b43a8be5a6a16a5f534ba8dca
Author: Andras Timar 
Date:   Wed Jan 3 16:23:02 2018 +0100

l10n: add Upper Sorbian and Venetian

Change-Id: I1da95391d9124a0484d5a7c51e0b90366d87d431

diff --git a/loleaflet/dist/l10n/help-localizations.json 
b/loleaflet/dist/l10n/help-localizations.json
index 41c345cf..c9ed79a8 100644
--- a/loleaflet/dist/l10n/help-localizations.json
+++ b/loleaflet/dist/l10n/help-localizations.json
@@ -113,6 +113,7 @@
 "ur": "l10n/help-ur.json",
 "uz": "l10n/help-uz.json",
 "ve": "l10n/help-ve.json",
+"vec": "l10n/help-vec.json",
 "vi": "l10n/help-vi.json",
 "xh": "l10n/help-xh.json",
 "zh-cn": "l10n/help-zh_CN.json",
diff --git a/loleaflet/dist/l10n/localizations.json 
b/loleaflet/dist/l10n/localizations.json
index f2140a7f..1ad80c0d 100644
--- a/loleaflet/dist/l10n/localizations.json
+++ b/loleaflet/dist/l10n/localizations.json
@@ -107,12 +107,13 @@
 "tn": "l10n/ui-tn.json",
 "tr": "l10n/ui-tr.json",
 "ts": "l10n/ui-ts.json",
-"tt": "l10n/ui-tt.json",
+   "tt": "l10n/ui-tt.json",
 "ug": "l10n/ui-ug.json",
 "uk": "l10n/ui-uk.json",
 "ur": "l10n/ui-ur.json",
 "uz": "l10n/ui-uz.json",
 "ve": "l10n/ui-ve.json",
+"vec": "l10n/ui-vec.json",
 "vi": "l10n/ui-vi.json",
 "xh": "l10n/ui-xh.json",
 "zh-cn": "l10n/ui-zh_CN.json",
diff --git a/loleaflet/dist/l10n/locore-localizations.json 
b/loleaflet/dist/l10n/locore-localizations.json
index b4af332b..7cf8da0b 100644
--- a/loleaflet/dist/l10n/locore-localizations.json
+++ b/loleaflet/dist/l10n/locore-localizations.json
@@ -116,6 +116,7 @@
 "ur": "l10n/locore/ur.json",
 "uz": "l10n/locore/uz.json",
 "ve": "l10n/locore/ve.json",
+"vec": "l10n/locore/vec.json",
 "vi": "l10n/locore/vi.json",
 "xh": "l10n/locore/xh.json",
 "zh-cn": "l10n/locore/zh-CN.json",
diff --git a/loleaflet/dist/l10n/locore/sl.json 
b/loleaflet/dist/l10n/locore/sl.json
index 219e43c7..533ad5b8 100644
--- a/loleaflet/dist/l10n/locore/sl.json
+++ b/loleaflet/dist/l10n/locore/sl.json
@@ -341,10 +341,10 @@
 "Marginalia":"Obrobne opombe",
 "Mari, Hill":"marijski, gornjemarijski",
 "Mari, Meadow":"marijski, dolnjemarijski",
-"Max":"Maks",
+"Max":"NajveÄ",
 "Mbochi":"mboÄi",
 "Median":"Mediana",
-"Min":"Min",
+"Min":"Najmanj",
 "Moksha":"mokÅ¡ijski",
 "Mongolian Cyrillic":"mongolski, cirilica",
 "Mongolian Mongolian":"mongolski, mongolski",
@@ -369,6 +369,7 @@
 "Numbering 1 Cont.":"OÅ¡tevilÄevanje 1 â nadalj.",
 "Numbering 1 End":"OÅ¡tevilÄevanje 1 â konec",
 "Numbering 1 Start":"OÅ¡tevilÄevanje 1 â zaÄetek",
+"Numbering 123":"OÅ¡tevilÄevanje 123",
 "Numbering 2":"OÅ¡tevilÄevanje 2",
 "Numbering 2 Cont.":"OÅ¡tevilÄevanje 2 â nadalj.",
 "Numbering 2 End":"OÅ¡tevilÄevanje 2 â konec",
@@ -385,7 +386,11 @@
 "Numbering 5 Cont.":"OÅ¡tevilÄevanje 5 â nadalj.",
 "Numbering 5 End":"OÅ¡tevilÄevanje 5 â konec",
 "Numbering 5 Start":"OÅ¡tevilÄevanje 5 â zaÄetek",
+"Numbering ABC":"OÅ¡tevilÄevanje ABC",
+"Numbering IVX":"OÅ¡tevilÄevanje IVX",
 "Numbering Symbols":"Simboli za oÅ¡tevilÄevanje",
+"Numbering abc":"OÅ¡tevilÄevanje abc",
+"Numbering ivx":"OÅ¡tevilÄevanje ivx",
 "Nyanja":"njandÅ¾ski",
 "OLE":"OLE",
 "Object Index 1":"Kazalo predmetov 1",
@@ -412,6 +417,7 @@
 "Persian":"perzijski",
 "Pitjantjatjara":"pitjantjatjarski",
 "Placeholder":"Ograda",
+"Plautdietsch":"nizki nemÅ¡ki",
 "Polish":"poljski",
 "Portuguese (Angola)":"portugalski (Angola)",
 "Portuguese (Brazil)":"portugalski (Brazilija)",
diff --git a/loleaflet/dist/l10n/uno-localizations.json 
b/loleaflet/dist/l10n/uno-localizations.json
index e112fec9..cf2980c2 100644
--- a/loleaflet/dist/l10n/uno-localizations.json
+++ b/loleaflet/dist/l10n/uno-localizations.json
@@ -116,6 +116,7 @@
 "ur": "l10n/uno/ur.json",
 "uz": "l10n/uno/uz.json",
 "ve": "l10n/uno/ve.json",
+"vec": "l10n/uno/vec.json",
 "vi": "l10n/uno/vi.json",
 "xh": "l10n/uno/xh.json",
 "zh-cn": "l10n/uno/zh-CN.json",
diff --git a/loleaflet/dist/l10n/uno/hsb.json b/loleaflet/dist/l10n/uno/hsb.json
new file mode 100644
index ..662fd6d7
--- /dev/null
+++ b/loleaflet/dist/l10n/uno/hsb.json
@@ -0,0 +1,265 @@
+{
+"Add Decimal Place":"Decimalne mÄstno pÅidaÄ",
+"Align Left":"NalÄwo wusmÄriÄ",
+"Align Right":"Naprawo wusmÄriÄ",
+"Alig~n":"Wus~mÄriÄ",
+"Anc~hor":"Za~kÃ³twjenje",
+"Arrange":"RjadowaÄ",
+"As C~haracter":"J

Re: LibreOfficeLight / iOS

2018-01-03 Thread jan iversen

>
> Ah, for makefiles, use ENABLE_GPGMEPP to check if that's
> available. HAVE_FEATURE_GPGME is for source code, and defined in
> config_host/config_gpgme.h
>

 I have just checked my different build environments:

MACOS (works)

config_host.mk

export BUILD_TYPE=... LIBGPGERROR LIBASSUAN GPGMEPP ...

export ENABLE_GPGMEPP=TRUE


config_host/config_gpgme.h

#define HAVE_FEATURE_GPGME 1


All builds and works




iOS (tools build but cannot run due to missing libassuan dylib)


config_build.mk

export BUILD_TYPE=... LIBGPGERROR LIBASSUAN GPGMEPP ...

export ENABLE_GPGMEPP=TRUE


config_build/config_gpgme.h

#define HAVE_FEATURE_GPGME 1

config_host.mk

export BUILD_TYPE=... ... (no build of GPG related matters)

export ENABLE_GPGMEPP=


config_host/config_gpgme.h

#define HAVE_FEATURE_GPGME 0



This looks quite OK to me, but when building sfx2, I get the error that
svidl cannot load libassuan. The libassuan dylib exit in

workdir_for_build/UnpackedTarball/libassuan/src/.libs/libassuan.0.dylib


it does not exist in instdir_for_build. Do I need to do something special
in external/libassuan to copy it (I thought it worked automatically) ?


when I copy libassuan.0.dylib, libgpgme.11.dylib and libgpg-error.0.dylib
it works. I am confused because I see other dylib being copied
automatically.


Thanks in advance.

reds

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

[Libreoffice-commits] translations.git: source/sl

2018-01-03 Thread Andras Timar

 source/sl/cui/messages.po  |  691 -
 source/sl/extras/source/autocorr/emoji.po  | 3946 
+-
 source/sl/filter/source/config/fragments/filters.po|   49 
 source/sl/fpicker/messages.po  |4 
 source/sl/helpcontent2/source/text/sbasic/shared.po|  794 +-
 source/sl/helpcontent2/source/text/scalc/01.po |  246 
 source/sl/helpcontent2/source/text/sdraw.po|   60 
 source/sl/helpcontent2/source/text/shared.po   |   68 
 source/sl/helpcontent2/source/text/shared/00.po|   10 
 source/sl/helpcontent2/source/text/shared/01.po|  450 -
 source/sl/helpcontent2/source/text/shared/02.po|   52 
 source/sl/helpcontent2/source/text/shared/05.po|8 
 source/sl/helpcontent2/source/text/shared/autopi.po|   98 
 source/sl/helpcontent2/source/text/shared/explorer/database.po |   10 
 source/sl/helpcontent2/source/text/shared/guide.po |   34 
 source/sl/helpcontent2/source/text/shared/optionen.po  |   48 
 source/sl/helpcontent2/source/text/simpress.po |  306 
 source/sl/helpcontent2/source/text/simpress/04.po  |  306 
 source/sl/helpcontent2/source/text/simpress/guide.po   |  284 
 source/sl/helpcontent2/source/text/smath.po|   68 
 source/sl/helpcontent2/source/text/swriter.po  |2 
 source/sl/helpcontent2/source/text/swriter/00.po   |8 
 source/sl/helpcontent2/source/text/swriter/01.po   |   16 
 source/sl/helpcontent2/source/text/swriter/02.po   |4 
 source/sl/helpcontent2/source/text/swriter/guide.po|   22 
 source/sl/officecfg/registry/data/org/openoffice/Office.po |   22 
 source/sl/officecfg/registry/data/org/openoffice/Office/UI.po  |  281 
 source/sl/sc/messages.po   |  738 -
 source/sl/scaddins/messages.po |   11 
 source/sl/sccomp/messages.po   |4 
 source/sl/sd/messages.po   |  388 
 source/sl/sfx2/messages.po |  323 
 source/sl/svtools/messages.po  |  483 -
 source/sl/svx/messages.po  | 2328 +++--
 source/sl/sw/messages.po   | 2454 ++
 source/sl/vcl/messages.po  |4 
 source/sl/wizards/messages.po  |8 
 source/sl/wizards/source/resources.po  |   12 
 38 files changed, 9933 insertions(+), 4707 deletions(-)

New commits:
commit 241b014e9bb8dbdbecae7b73db6de700cf9d33da
Author: Andras Timar 
Date:   Wed Jan 3 16:13:55 2018 +0100

Updated Slovenian translation

Change-Id: I0e8011927941143ec8d3002be926adc7e10e4dc4

diff --git a/source/sl/cui/messages.po b/source/sl/cui/messages.po
index 6c0c5dd100c..30148359a2d 100644
--- a/source/sl/cui/messages.po
+++ b/source/sl/cui/messages.po
@@ -3,14 +3,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: LibreOffice 6.0\n"
 "Report-Msgid-Bugs-To: 
https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n";
-"POT-Creation-Date: 2017-11-24 12:50+0100\n"
-"PO-Revision-Date: 2017-11-24 14:51+0200\n"
+"POT-Creation-Date: 2017-12-20 12:06+0100\n"
+"PO-Revision-Date: 2017-12-19 21:54+0200\n"
 "Last-Translator: Martin Srebotnjak \n"
 "Language-Team: sl.libreoffice.org\n"
-"Language: sl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: sl\n"
 "Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || 
n%100==4 ? 2 : 3);\n"
 "X-Generator: Virtaal 0.7.1\n"
 "X-Accelerator-Marker: ~\n"
@@ -355,657 +355,667 @@ msgstr "Izberi datoteko za plavajoÄi okvir"
 
 #: strings.hrc:91
 msgctxt "RID_SVXSTR_ALLFUNCTIONS"
-msgid "All categories"
-msgstr "Vse kategorije"
+msgid "All commands"
+msgstr "Vsi ukazi"
 
 #: strings.hrc:92
+msgctxt "RID_SVXSTR_MACROS"
+msgid "Macros"
+msgstr "Makri"
+
+#: strings.hrc:93
 msgctxt "RID_SVXSTR_MYMACROS"
 msgid "My Macros"
 msgstr "Moji makri"
 
-#: strings.hrc:93
+#: strings.hrc:94
 msgctxt "RID_SVXSTR_PRODMACROS"
 msgid "%PRODUCTNAME Macros"
 msgstr "Makri %PRODUCTNAME"
 
-#: strings.hrc:94
+#: strings.hrc:95
+msgctxt "RID_SVXSTR_NOMACRODESC"
+msgid "There is no description available for this macro."
+msgstr "Za ta makro opis ni na voljo."
+
+#: strings.hrc:96
 msgctxt "RID_SVXSTR_SELECTOR_ADD_COMMANDS"
 msgid "Add Commands"
 msgstr "Dodaj ukaze"
 
-#: strings.hrc:95
+#: strings.hrc:97
 msgctxt "RID_SVXSTR_SELECTOR_RUN"
 msgid "Run"
 msgstr "ZaÅ¾eni"
 
-#: strings.hrc:96
+#: strings.hrc:98
 msgctxt "RID_SVXSTR_ROW"
 msgid "Insert Rows"
 msgstr "Vstavi vrsti

[Libreoffice-commits] core.git: translations

2018-01-03 Thread Andras Timar

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

New commits:
commit 74a5c44db134c2609b8ec6e55bac320a3a70a57f
Author: Andras Timar 
Date:   Wed Jan 3 16:13:55 2018 +0100

Updated core
Project: translations  241b014e9bb8dbdbecae7b73db6de700cf9d33da

Updated Slovenian translation

Change-Id: I0e8011927941143ec8d3002be926adc7e10e4dc4

diff --git a/translations b/translations
index b3a5620ad5ed..241b014e9bb8 16
--- a/translations
+++ b/translations
@@ -1 +1 @@
-Subproject commit b3a5620ad5ed08bdb77738d8cb2b8e08495606c7
+Subproject commit 241b014e9bb8dbdbecae7b73db6de700cf9d33da
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] translations.git: Branch 'libreoffice-6-0' - source/sl

2018-01-03 Thread Andras Timar

 source/sl/cui/messages.po |4 
 source/sl/extras/source/autocorr/emoji.po |4 
 source/sl/helpcontent2/source/text/scalc/01.po|   14 
 source/sl/helpcontent2/source/text/shared/01.po   |   14 
 source/sl/helpcontent2/source/text/shared/02.po   |   12 
 source/sl/helpcontent2/source/text/shared/guide.po|4 
 source/sl/helpcontent2/source/text/swriter.po |2 
 source/sl/helpcontent2/source/text/swriter/01.po  |   10 
 source/sl/helpcontent2/source/text/swriter/guide.po   |2 
 source/sl/officecfg/registry/data/org/openoffice/Office.po|   14 
 source/sl/officecfg/registry/data/org/openoffice/Office/UI.po |   12 
 source/sl/sc/messages.po  |  203 +-
 source/sl/scaddins/messages.po|   11 
 source/sl/sd/messages.po  |   16 
 source/sl/svtools/messages.po |   12 
 source/sl/svx/messages.po |   46 +-
 source/sl/sw/messages.po  |   86 ++--
 source/sl/wizards/messages.po |8 
 source/sl/wizards/source/resources.po |   12 
 19 files changed, 251 insertions(+), 235 deletions(-)

New commits:
commit 2c6e8755f6b6a9c92475f1322297940a008f54a1
Author: Andras Timar 
Date:   Wed Jan 3 16:12:40 2018 +0100

Updated Slovenian translation

Change-Id: Ib579134290d642f786abe2bb525a339842ed200e

diff --git a/source/sl/cui/messages.po b/source/sl/cui/messages.po
index 721b5100c42..30148359a2d 100644
--- a/source/sl/cui/messages.po
+++ b/source/sl/cui/messages.po
@@ -10863,7 +10863,7 @@ msgstr "Utripanje"
 #: textanimtabpage.ui:57
 msgctxt "textanimtabpage|liststoreEFFECT"
 msgid "Scroll Through"
-msgstr "Drsenje"
+msgstr "Drsenje prek"
 
 #: textanimtabpage.ui:61
 msgctxt "textanimtabpage|liststoreEFFECT"
@@ -11493,7 +11493,7 @@ msgstr "Spremenljivo:"
 #: zoomdialog.ui:204
 msgctxt "zoomdialog|zoomsb-atkobject"
 msgid "Variable"
-msgstr "Spremenljivka"
+msgstr "Spremenljivo"
 
 #: zoomdialog.ui:229
 msgctxt "zoomdialog|label2"
diff --git a/source/sl/extras/source/autocorr/emoji.po 
b/source/sl/extras/source/autocorr/emoji.po
index 077010dad76..fcc1232e436 100644
--- a/source/sl/extras/source/autocorr/emoji.po
+++ b/source/sl/extras/source/autocorr/emoji.po
@@ -3,14 +3,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: LibreOffice 6.0\n"
 "Report-Msgid-Bugs-To: 
https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n";
-"POT-Creation-Date: 2017-12-20 12:06+0100\n"
+"POT-Creation-Date: 2018-01-03 08:03+0100\n"
 "PO-Revision-Date: 2017-12-21 09:31+0200\n"
 "Last-Translator: Martin Srebotnjak \n"
 "Language-Team: sl.libreoffice.org\n"
-"Language: sl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: sl\n"
 "Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || 
n%100==4 ? 2 : 3);\n"
 "X-Generator: Virtaal 0.7.1\n"
 "X-Accelerator-Marker: ~\n"
diff --git a/source/sl/helpcontent2/source/text/scalc/01.po 
b/source/sl/helpcontent2/source/text/scalc/01.po
index 7ef6f3e08b4..245456f29c0 100644
--- a/source/sl/helpcontent2/source/text/scalc/01.po
+++ b/source/sl/helpcontent2/source/text/scalc/01.po
@@ -25863,7 +25863,7 @@ msgctxt ""
 "par_id3152934\n"
 "help.text"
 msgid "Count"
-msgstr "SeÅ¡tevek"
+msgstr "Å tevec"
 
 #: 04060112.xhp
 msgctxt ""
@@ -26215,7 +26215,7 @@ msgctxt ""
 "par_id3154858\n"
 "help.text"
 msgid "Count"
-msgstr "SeÅ¡tevek"
+msgstr "Å tevec"
 
 #: 04060112.xhp
 msgctxt ""
@@ -26591,7 +26591,7 @@ msgctxt ""
 "par_id3154520\n"
 "help.text"
 msgid "Count"
-msgstr "SeÅ¡tevek"
+msgstr "Å tevec"
 
 #: 04060112.xhp
 msgctxt ""
@@ -64847,7 +64847,7 @@ msgctxt ""
 "par_id1001200\n"
 "help.text"
 msgid "Count"
-msgstr "SeÅ¡tevek"
+msgstr "Å tevec"
 
 #: statistics.xhp
 msgctxt ""
@@ -65559,7 +65559,7 @@ msgctxt ""
 "hd_id1000150\n"
 "help.text"
 msgid "Paired t-test"
-msgstr "Parni t-test"
+msgstr "Parni t-preizkus"
 
 #: statistics.xhp
 msgctxt ""
@@ -65575,7 +65575,7 @@ msgctxt ""
 "par_id1002830\n"
 "help.text"
 msgid "Choose Data - Statistics - Paired 
t-test"
-msgstr "Izberite Podatki â Statistika â Parni 
t-test"
+msgstr "Izberite Podatki â Statistika â Parni 
t-preizkus"
 
 #: statistics.xhp
 msgctxt ""
@@ -65647,7 +65647,7 @@ msgctxt ""
 "par_id1002900\n"
 "help.text"
 msgid "paired t-test"
-msgstr "Parni t-test"
+msgstr "Parni t-preizkus"
 
 #: statistics.xhp
 msgctxt ""
diff --git a/source/sl/helpcontent2/source/text/shared/01.po 
b/source/sl/helpcontent2/source/text/shared/01.po
index ae436c4f31b..d690a3e9a62 100644
--- a/source/sl/helpcontent2/source/text/shared/01.po
+++ b/source/sl/helpcontent2/source/text/shared/01.po
@@ -3,8 +3,8 @@ m

[Libreoffice-commits] core.git: Branch 'libreoffice-6-0' - translations

2018-01-03 Thread Andras Timar

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

New commits:
commit 46597d2b096fffba1863c3172adbc73551312138
Author: Andras Timar 
Date:   Wed Jan 3 16:12:40 2018 +0100

Updated core
Project: translations  2c6e8755f6b6a9c92475f1322297940a008f54a1

Updated Slovenian translation

Change-Id: Ib579134290d642f786abe2bb525a339842ed200e

diff --git a/translations b/translations
index 27c365ae0c96..2c6e8755f6b6 16
--- a/translations
+++ b/translations
@@ -1 +1 @@
-Subproject commit 27c365ae0c967480ce4a6c37ebe0a953dca7ab9b
+Subproject commit 2c6e8755f6b6a9c92475f1322297940a008f54a1
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2018-01-03 Thread Pranav Kant

 loleaflet/src/control/Control.ContextMenu.js |2 +-
 loleaflet/src/control/Control.Menubar.js |6 +-
 loleaflet/unocommands.js |3 +++
 3 files changed, 9 insertions(+), 2 deletions(-)

New commits:
commit a788e58a7acf064caeb37bf67f057300ce3674a2
Author: Pranav Kant 
Date:   Thu Dec 14 20:48:03 2017 +0530

lokdialog: Dialogs related to object and shapes in presentation

Change-Id: If9a2e3d8bdbeab00397d2970f472602201991445
Reviewed-on: https://gerrit.libreoffice.org/46463
Reviewed-by: Jan Holesovsky 
Tested-by: Jan Holesovsky 
(cherry picked from commit ff0c7fb6445003c562179ca5b13f207ad21e68e5)
Reviewed-on: https://gerrit.libreoffice.org/47311
Reviewed-by: Andras Timar 
Tested-by: Andras Timar 

diff --git a/loleaflet/src/control/Control.ContextMenu.js 
b/loleaflet/src/control/Control.ContextMenu.js
index e9006719..f49e924e 100644
--- a/loleaflet/src/control/Control.ContextMenu.js
+++ b/loleaflet/src/control/Control.ContextMenu.js
@@ -39,7 +39,7 @@ L.Control.ContextMenu = L.Control.extend({
 
spreadsheet: ['MergeCells', 'SplitCell', 
'RecalcPivotTable', 'FormatCellDialog'],
 
-   presentation: ['EditStyle'],
+   presentation: ['TransformDialog', 'FormatLine', 
'FormatArea'],
drawing: []
}
// UNOCOMMANDS_EXTRACT_END <- don't remove this line, it's used 
by unocommands.py
diff --git a/loleaflet/src/control/Control.Menubar.js 
b/loleaflet/src/control/Control.Menubar.js
index 2b76e698..b6c03cdf 100644
--- a/loleaflet/src/control/Control.Menubar.js
+++ b/loleaflet/src/control/Control.Menubar.js
@@ -247,7 +247,11 @@ L.Control.Menubar = L.Control.extend({
{uno: '.uno:InsertSymbol'}]
},
{name: _UNO('.uno:FormatMenu', 'presentation'), type: 
'menu', menu: [
-   {uno: '.uno:EditStyle'}
+   {name: _UNO('.uno:FormatObjectMenu', 
'presentation'), type: 'menu', menu: [
+   {uno: '.uno:TransformDialog'},
+   {uno: '.uno:FormatLine'},
+   {uno: '.uno:FormatArea'}
+   ]},
]},
{name: _UNO('.uno:TableMenu', 'text'/*HACK should be 
'presentation', but not in xcu*/), type: 'menu', menu: [
{name: _UNO('.uno:TableInsertMenu', 
'text'/*HACK should be 'presentation', but not in xcu*/), type: 'menu', menu: [
diff --git a/loleaflet/unocommands.js b/loleaflet/unocommands.js
index 15dba49b..beaafaf5 100644
--- a/loleaflet/unocommands.js
+++ b/loleaflet/unocommands.js
@@ -62,7 +62,9 @@ var unoCommandsArray = {
FormatArea:{global:{menu:_('A~rea...'),},},
FormatBulletsMenu:{global:{menu:_('Lis~ts'),},},
FormatCellDialog:{spreadsheet:{context:_('~Format 
Cells...'),menu:_('Ce~lls...'),},},
+   FormatLine:{global:{menu:_('L~ine...'),},},
FormatMenu:{global:{menu:_('F~ormat'),},},
+   FormatObjectMenu:{global:{menu:_('~Object and 
Shape'),},text:{menu:_('Text Box and Shap~e'),},},
FormatSpacingMenu:{global:{menu:_('~Spacing'),},},
FormatTextMenu:{global:{menu:_('Te~xt'),},},
FormattingMarkMenu:{global:{menu:_('Formatting Mark'),},},
@@ -203,6 +205,7 @@ var unoCommandsArray = {
ToggleMergeCells:{spreadsheet:{menu:_('M~erge and Center Cells'),},},
ToolsMenu:{global:{menu:_('~Tools'),},},
TrackChanges:{text:{menu:_('~Record'),},},
+   TransformDialog:{global:{menu:_('Position and Si~ze...'),},},
Underline:{global:{menu:_('Underline'),},},
UnderlineDouble:{presentation:{menu:_('Double Underline 
'),},spreadsheet:{menu:_('Underline: Double'),},text:{menu:_('Double Underline 
'),},},
Undo:{global:{menu:_('Undo'),},},
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: loleaflet/build loleaflet/dist loleaflet/main.js loleaflet/Makefile.am loleaflet/src loleaflet/unocommands.js scripts/unocommandsl10n.sh scripts/unocommands.py

2018-01-03 Thread Jan Holesovsky

 loleaflet/Makefile.am   |2 
 loleaflet/build/build.js|1 
 loleaflet/dist/l10n/uno/ab.json |   15 
 loleaflet/dist/l10n/uno/af.json |  155 +++
 loleaflet/dist/l10n/uno/am.json |  270 +
 loleaflet/dist/l10n/uno/an.json |8 
 loleaflet/dist/l10n/uno/ar.json |  269 +
 loleaflet/dist/l10n/uno/as.json |  174 
 loleaflet/dist/l10n/uno/ast.json|  173 
 loleaflet/dist/l10n/uno/az.json |4 
 loleaflet/dist/l10n/uno/be.json |  269 +
 loleaflet/dist/l10n/uno/bg.json |  270 +
 loleaflet/dist/l10n/uno/bn-IN.json  |  182 +
 loleaflet/dist/l10n/uno/bn.json |  166 
 loleaflet/dist/l10n/uno/bo.json |  154 +++
 loleaflet/dist/l10n/uno/br.json |  223 +++
 loleaflet/dist/l10n/uno/brx.json|  141 +++
 loleaflet/dist/l10n/uno/bs.json |  173 
 loleaflet/dist/l10n/uno/ca-valencia.json|  209 ++
 loleaflet/dist/l10n/uno/ca.json |  270 +
 loleaflet/dist/l10n/uno/cs.json |  266 +
 loleaflet/dist/l10n/uno/cy.json |  270 +
 loleaflet/dist/l10n/uno/da.json |  270 +
 loleaflet/dist/l10n/uno/de.json |  270 +
 loleaflet/dist/l10n/uno/dgo.json|  159 
 loleaflet/dist/l10n/uno/dz.json |  154 +++
 loleaflet/dist/l10n/uno/el.json |  270 +
 loleaflet/dist/l10n/uno/en-GB.json  |  270 +
 loleaflet/dist/l10n/uno/en-ZA.json  |  162 
 loleaflet/dist/l10n/uno/eo.json |  270 +
 loleaflet/dist/l10n/uno/es.json |  270 +
 loleaflet/dist/l10n/uno/et.json |  267 +
 loleaflet/dist/l10n/uno/eu.json |  270 +
 loleaflet/dist/l10n/uno/fa.json |  140 +++
 loleaflet/dist/l10n/uno/fi.json |  266 +
 loleaflet/dist/l10n/uno/fr.json |  270 +
 loleaflet/dist/l10n/uno/ga.json |  270 +
 loleaflet/dist/l10n/uno/gd.json |  270 +
 loleaflet/dist/l10n/uno/gl.json |  270 +
 loleaflet/dist/l10n/uno/gu.json |  174 
 loleaflet/dist/l10n/uno/gug.json|  239 
 loleaflet/dist/l10n/uno/he.json |  197 ++
 loleaflet/dist/l10n/uno/hi.json |  171 
 loleaflet/dist/l10n/uno/hr.json |  270 +
 loleaflet/dist/l10n/uno/hu.json |  266 +
 loleaflet/dist/l10n/uno/id.json |  264 +
 loleaflet/dist/l10n/uno/is.json |  270 +
 loleaflet/dist/l10n/uno/it.json |  270 +
 loleaflet/dist/l10n/uno/ja.json |  262 +
 loleaflet/dist/l10n/uno/jv.json |9 
 loleaflet/dist/l10n/uno/ka.json |  153 +++
 loleaflet/dist/l10n/uno/kk.json |  267 +
 loleaflet/dist/l10n/uno/kl.json |6 
 loleaflet/dist/l10n/uno/km.json |  174 
 loleaflet/dist/l10n/uno/kmr-Latn.json   |  139 +++
 loleaflet/dist/l10n/uno/kn.json |  171 
 loleaflet/dist/l10n/uno/ko.json |  182 +
 loleaflet/dist/l10n/uno/kok.json|  146 +++
 loleaflet/dist/l10n/uno/ks.json |  133 ++
 loleaflet/dist/l10n/uno/ky.json |4 
 loleaflet/dist/l10n/uno/lb.json |   12 
 loleaflet/dist/l10n/uno/lo.json |  135 ++
 loleaflet/dist/l10n/uno/lt.json |  270 +
 loleaflet/dist/l10n/uno/lv.json |  266 +
 loleaflet/dist/l10n/uno/mai.json|  141 +++
 loleaflet/dist/l10n/uno/mk.json |  155 +++
 loleaflet/dist/l10n/uno/ml.json |  171 
 loleaflet/dist/l10n/uno/mn.json |  152 +++
 loleaflet/dist/l10n/uno/mni.json|  135 ++
 loleaflet/dist/l10n/uno/mr.json |  171 
 loleaflet/dist/l10n/uno/my.json |  162 
 loleaflet/dist/l10n/uno/nb.json |  267 +
 loleaflet/dist/l10n/uno/ne.json |  160 
 loleaflet/dist/l10n/uno/nl.json |  270 +
 loleaflet/dist/l10n/uno/nn.json |  270 +
 loleaflet/dist/l10n/uno/nr.json

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

2018-01-03 Thread Caolán McNamara

 sw/source/filter/html/htmltab.cxx |   62 +++---
 1 file changed, 51 insertions(+), 11 deletions(-)

New commits:
commit dfc72242e5bf67bdd5127bf38ed2ad5b3e49cea3
Author: CaolÃ¡n McNamara 
Date:   Tue Jan 2 16:09:56 2018 +

ofz#4872 Null-dereference READ

we're going to need a bigger boat

Change-Id: Ie4ee3ae1ac9f906ca3faec412bbafc0c6a911aaf
Reviewed-on: https://gerrit.libreoffice.org/47269
Reviewed-by: CaolÃ¡n McNamara 
Tested-by: CaolÃ¡n McNamara 

diff --git a/sw/source/filter/html/htmltab.cxx 
b/sw/source/filter/html/htmltab.cxx
index d138e66612db..92ec9aa5c928 100644
--- a/sw/source/filter/html/htmltab.cxx
+++ b/sw/source/filter/html/htmltab.cxx
@@ -4981,6 +4981,48 @@ HTMLTableOptions::HTMLTableOptions( const HTMLOptions& 
rOptions,
 }
 }
 
+namespace
+{
+class FrameDeleteWatch : public SwClient
+{
+SwFrameFormat* m_pObjectFormat;
+bool m_bDeleted;
+public:
+FrameDeleteWatch(SwFrameFormat* pObjectFormat)
+: m_pObjectFormat(pObjectFormat)
+, m_bDeleted(false)
+{
+if (m_pObjectFormat)
+m_pObjectFormat->Add(this);
+
+}
+
+virtual void SwClientNotify(const SwModify& rModify, const SfxHint& 
rHint) override
+{
+SwClient::SwClientNotify(rModify, rHint);
+if (auto pDrawFrameFormatHint = dynamic_cast(&rHint))
+{
+if (pDrawFrameFormatHint->m_eId == 
sw::DrawFrameFormatHintId::DYING)
+{
+m_pObjectFormat->Remove(this);
+m_bDeleted = true;
+}
+}
+}
+
+bool WasDeleted() const
+{
+return m_bDeleted;
+}
+
+virtual ~FrameDeleteWatch() override
+{
+if (!m_bDeleted && m_pObjectFormat)
+m_pObjectFormat->Remove(this);
+}
+};
+}
+
 std::shared_ptr SwHTMLParser::BuildTable(SvxAdjust eParentAdjust,
 bool bIsParentHead,
 bool bHasParentSection,
@@ -5250,20 +5292,18 @@ std::shared_ptr 
SwHTMLParser::BuildTable(SvxAdjust eParentAdjust,
 //if section to be deleted contains a pending m_pMarquee, it will 
be deleted
 //so clear m_pMarquee pointer if that's the case
 SwFrameFormat* pObjectFormat = m_pMarquee ? 
::FindFrameFormat(m_pMarquee) : nullptr;
-if (pObjectFormat)
-{
-const SwFormatAnchor& rAnch = pObjectFormat->GetAnchor();
-if (const SwPosition* pPos = rAnch.GetContentAnchor())
-{
-SwNodeIndex aMarqueeNodeIndex(pPos->nNode);
-SwNodeIndex aSttIdx(*pSttNd), 
aEndIdx(*pSttNd->EndOfSectionNode());
-if (aMarqueeNodeIndex >= aSttIdx && aMarqueeNodeIndex <= 
aEndIdx)
-m_pMarquee = nullptr;
-}
-}
+FrameDeleteWatch aWatch(pObjectFormat);
 
 m_xDoc->getIDocumentContentOperations().DeleteSection(pSttNd);
 xCurTable->SetCaption( nullptr, false );
+
+if (pObjectFormat)
+{
+if (aWatch.WasDeleted())
+m_pMarquee = nullptr;
+else
+pObjectFormat->Remove(&aWatch);
+}
 }
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2018-01-03 Thread Andras Timar

 loleaflet/po/templates/loleaflet-ui.pot | 2289 +++-
 1 file changed, 249 insertions(+), 2040 deletions(-)

New commits:
commit f10cc0450f678c8c290f0d6e601c8c5e6b5d4b4b
Author: Andras Timar 
Date:   Wed Jan 3 13:20:12 2018 +0100

Update UI pot file

Change-Id: I98b027c925b770a20a7be5773ccb7d5ebe08e9fe
Reviewed-on: https://gerrit.libreoffice.org/47312
Reviewed-by: Andras Timar 
Tested-by: Andras Timar 

diff --git a/loleaflet/po/templates/loleaflet-ui.pot 
b/loleaflet/po/templates/loleaflet-ui.pot
index bcb3af80..f9452123 100644
--- a/loleaflet/po/templates/loleaflet-ui.pot
+++ b/loleaflet/po/templates/loleaflet-ui.pot
@@ -8,13 +8,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-10-08 13:09+0200\n"
+"POT-Creation-Date: 2018-01-03 13:18+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME \n"
 "Language-Team: LANGUAGE \n"
 "Language: \n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
 #: admin.strings.js:5
@@ -117,9 +117,7 @@ msgstr ""
 msgid "Network Graph"
 msgstr ""
 
-#: admin.strings.js:30 dist/toolbar/toolbar.js:470
-#: src/control/Control.Menubar.js:18 src/control/Control.Menubar.js:193
-#: src/control/Control.Menubar.js:258 src/layer/marker/Annotation.js:198
+#: admin.strings.js:30 src/layer/marker/Annotation.js:222
 msgid "Save"
 msgstr ""
 
@@ -151,6 +149,18 @@ msgstr ""
 msgid "Maximum file size allowed to write to disk (in MB) - reduce only"
 msgstr ""
 
+#: admin.strings.js:38
+msgid "Documents:"
+msgstr ""
+
+#: admin.strings.js:39
+msgid "Expired:"
+msgstr ""
+
+#: admin.strings.js:40
+msgid "Refresh"
+msgstr ""
+
 #: evol.colorpicker.strings.js:2
 msgid "Theme Colors"
 msgstr ""
@@ -171,83 +181,6 @@ msgstr ""
 msgid "No history yet."
 msgstr ""
 
-#: unocommands.js:1
-msgid "Copy Hyperlink"
-msgstr ""
-
-#: unocommands.js:2
-msgid "Down One Level"
-msgstr ""
-
-#: unocommands.js:3
-msgid "Up One Level"
-msgstr ""
-
-#: unocommands.js:4
-msgid "Edit Comment"
-msgstr ""
-
-#: unocommands.js:5
-msgid "Insert Comment"
-msgstr ""
-
-#: unocommands.js:6
-msgid "Merge"
-msgstr ""
-
-#: unocommands.js:7
-msgid "Merge Cells..."
-msgstr ""
-
-#: unocommands.js:8
-msgid "Bring Forward"
-msgstr ""
-
-#: unocommands.js:9
-msgid "Send Backward"
-msgstr ""
-
-#: unocommands.js:10
-msgid "Paste Special"
-msgstr ""
-
-#: unocommands.js:11
-msgid "Unformatted Text"
-msgstr ""
-
-#: unocommands.js:12
-msgid "No Wrap"
-msgstr ""
-
-#: unocommands.js:13
-msgid "Wrap Before"
-msgstr ""
-
-#: unocommands.js:14
-msgid "Wrap After"
-msgstr ""
-
-#: unocommands.js:15
-msgid "Enable Contour"
-msgstr ""
-
-#: unocommands.js:16
-msgid "Update Index or Table of Contents"
-msgstr ""
-
-#: unocommands.js:17
-msgid "Delete Index or Table of Contents"
-msgstr ""
-
-#: unocommands.js:18 src/layer/marker/Annotation.js:201
-#: src/layer/tile/TileLayer.js:194
-msgid "Reply"
-msgstr ""
-
-#: unocommands.js:19
-msgid "Refresh"
-msgstr ""
-
 #: dist/errormessages.js:1
 msgid ""
 "No disk space left on server, please contact the server administrator to "
@@ -351,390 +284,234 @@ msgstr ""
 msgid "Are you sure you want to delete this page?"
 msgstr ""
 
-#: dist/toolbar/toolbar.js:461
+#: dist/toolbar/toolbar.js:456
 msgid "Textwrap"
 msgstr ""
 
-#: dist/toolbar/toolbar.js:462
+#: dist/toolbar/toolbar.js:457
 msgid "No wrap"
 msgstr ""
 
-#: dist/toolbar/toolbar.js:463
+#: dist/toolbar/toolbar.js:458
 msgid "Page wrap"
 msgstr ""
 
-#: dist/toolbar/toolbar.js:464
+#: dist/toolbar/toolbar.js:459
 msgid "Wrap anchor only"
 msgstr ""
 
-#: dist/toolbar/toolbar.js:465
+#: dist/toolbar/toolbar.js:460
 msgid "Ideal wrap"
 msgstr ""
 
-#: dist/toolbar/toolbar.js:466
+#: dist/toolbar/toolbar.js:461
 msgid "Left wrap"
 msgstr ""
 
-#: dist/toolbar/toolbar.js:467
+#: dist/toolbar/toolbar.js:462
 msgid "Right wrap"
 msgstr ""
 
-#: dist/toolbar/toolbar.js:468
+#: dist/toolbar/toolbar.js:463
 msgid "Wrap through"
 msgstr ""
 
-#: dist/toolbar/toolbar.js:472 src/control/Control.Menubar.js:30
-#: src/control/Control.Menubar.js:204 src/control/Control.Menubar.js:269
-msgid "Undo"
-msgstr ""
-
-#: dist/toolbar/toolbar.js:473 src/control/Control.Menubar.js:31
-#: src/control/Control.Menubar.js:205 src/control/Control.Menubar.js:270
-msgid "Redo"
-msgstr ""
-
-#: dist/toolbar/toolbar.js:474
+#: dist/toolbar/toolbar.js:469
 msgid "Document repair"
 msgstr ""
 
-#: dist/toolbar/toolbar.js:480 src/control/Control.Menubar.js:80
-msgid "Bold"
-msgstr ""
-
-#: dist/toolbar/toolbar.js:481 src/control/Control.Menubar.js:81
-msgid "Italic"
-msgstr ""
-
-#: dist/toolbar/toolbar.js:482 src/control/Control.Menubar.js:82
-msgid "Underline"
-msgstr ""
-
-#: dist/toolbar/toolbar.js:483
-msgid "Strikeout"
-msgstr ""
-
-#: dist/toolbar/toolbar.js:485
-msgid "Insert Footnote"
-msgstr ""
-
-#: dist/toolbar/toolbar.j

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

2018-01-03 Thread Miklos Vajna

 sw/inc/fmtcntnt.hxx|4 +-
 sw/inc/fmturl.hxx  |   26 ++---
 sw/source/core/access/acchyperlink.cxx |   30 +++
 sw/source/core/access/acchyperlink.hxx |8 ++--
 sw/source/core/layout/atrfrm.cxx   |   64 -
 sw/source/uibase/utlui/attrdesc.cxx|   14 +++
 6 files changed, 73 insertions(+), 73 deletions(-)

New commits:
commit 5b7ec49f453c3732e2482b26bce4243eb1a10f40
Author: Miklos Vajna 
Date:   Wed Jan 3 09:06:03 2018 +0100

sw: prefix members of SwFormatContent, SwAccessibleHyperlink and SwFormatURL

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

diff --git a/sw/inc/fmtcntnt.hxx b/sw/inc/fmtcntnt.hxx
index ad864a51fce7..42e513b5a932 100644
--- a/sw/inc/fmtcntnt.hxx
+++ b/sw/inc/fmtcntnt.hxx
@@ -30,7 +30,7 @@ class SwStartNode;
 /// Content, content of frame (header, footer, fly).
 class SW_DLLPUBLIC SwFormatContent: public SfxPoolItem
 {
-std::unique_ptr pStartNode;
+std::unique_ptr m_pStartNode;
 
 SwFormatContent &operator=( const SwFormatContent & ) = delete;
 
@@ -43,7 +43,7 @@ public:
 virtual booloperator==( const SfxPoolItem& ) const override;
 virtual SfxPoolItem*Clone( SfxItemPool* pPool = nullptr ) const 
override;
 
-const SwNodeIndex *GetContentIdx() const { return pStartNode.get(); }
+const SwNodeIndex *GetContentIdx() const { return m_pStartNode.get(); }
 void SetNewContentIdx( const SwNodeIndex *pIdx );
 
 void dumpAsXml(struct _xmlTextWriter* pWriter) const override;
diff --git a/sw/inc/fmturl.hxx b/sw/inc/fmturl.hxx
index de877239563e..9f9db75e9e9b 100644
--- a/sw/inc/fmturl.hxx
+++ b/sw/inc/fmturl.hxx
@@ -32,13 +32,13 @@ class IntlWrapper;
 
 class SW_DLLPUBLIC SwFormatURL: public SfxPoolItem
 {
-OUString  sTargetFrameName; ///< Target frame for URL.
-OUString  sURL; ///< Simple URL.
-OUString  sName;///< Name of the anchor.
+OUString  m_sTargetFrameName; ///< Target frame for URL.
+OUString  m_sURL; ///< Simple URL.
+OUString  m_sName;///< Name of the anchor.
 std::unique_ptr
-  pMap; ///< ClientSide images.
+  m_pMap; ///< ClientSide images.
 
-bool  bIsServerMap; ///< A ServerSideImageMap with the URL.
+bool  m_bIsServerMap; ///< A ServerSideImageMap with the URL.
 
 public:
 SwFormatURL();
@@ -58,18 +58,18 @@ public:
 virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) 
const override;
 virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) 
override;
 
-void SetTargetFrameName( const OUString& rStr ) { sTargetFrameName = rStr; 
}
+void SetTargetFrameName( const OUString& rStr ) { m_sTargetFrameName = 
rStr; }
 void SetURL(const OUString &rURL, bool bServerMap);
 void SetMap( const ImageMap *pM );  ///< Pointer will be copied.
 
-const OUString& GetTargetFrameName()const { return sTargetFrameName; }
-const OUString& GetURL()const { return sURL; }
-  bool  IsServerMap()   const { return bIsServerMap; }
-const ImageMap *GetMap()const { return pMap.get(); }
-  ImageMap *GetMap()  { return pMap.get(); }
+const OUString& GetTargetFrameName()const { return m_sTargetFrameName; }
+const OUString& GetURL()const { return m_sURL; }
+  bool  IsServerMap()   const { return m_bIsServerMap; }
+const ImageMap *GetMap()const { return m_pMap.get(); }
+  ImageMap *GetMap()  { return m_pMap.get(); }
 
-const OUString& GetName() const{ return sName; }
-void SetName( const OUString& rNm ) { sName = rNm; }
+const OUString& GetName() const{ return m_sName; }
+void SetName( const OUString& rNm ) { m_sName = rNm; }
 };
 
 inline const SwFormatURL &SwAttrSet::GetURL(bool bInP) const
diff --git a/sw/source/core/access/acchyperlink.cxx 
b/sw/source/core/access/acchyperlink.cxx
index 9b79637d8ff7..45dc339c7e8a 100644
--- a/sw/source/core/access/acchyperlink.cxx
+++ b/sw/source/core/access/acchyperlink.cxx
@@ -35,23 +35,23 @@ using ::com::sun::star::lang::IndexOutOfBoundsException;
 
 SwAccessibleHyperlink::SwAccessibleHyperlink( size_t nHPos,
 SwAccessibleParagraph *p, sal_Int32 nStt, sal_Int32 nEnd ) :
-nHintPos( nHPos ),
-xPara( p ),
-nStartIdx( nStt ),
-nEndIdx( nEnd )
+m_nHintPosition( nHPos ),
+m_xParagraph( p ),
+m_nStartIndex( nStt ),
+m_nEndIndex( nEnd )
 {
 }
 
 const SwTextAttr *SwAccessibleHyperlink::GetTextAttr() const
 {
 const SwTextAttr *pTextAttr = nullptr;
-if( xPara.is() && xPara->GetMap() )
+if( m_xParagraph.is() && m_xParagraph->GetMap() )
 {
-

Equivalent of the MS Office Interop DLLs

2018-01-03 Thread Kevin Merrill

Where can I find documentation as to how to achieve the same behavior from 
LibreOffice as I get from the exposed objects and methods of the MS Office 
Interop DLLs for Word and Excel
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: framework/qa framework/source qadevOOo/tests test/source

2018-01-03 Thread Andrea Gelmini

 framework/qa/complex/framework/recovery/RecoveryTest.java|2 +-
 framework/source/services/frame.cxx  |4 ++--
 qadevOOo/tests/java/ifc/sdb/_XSingleSelectQueryAnalyzer.java |2 +-
 test/source/sheet/tablevalidation.cxx|4 ++--
 4 files changed, 6 insertions(+), 6 deletions(-)

New commits:
commit 3a355887caacea0ec1c3688d64a2cb85a1fc4c74
Author: Andrea Gelmini 
Date:   Wed Jan 3 10:31:06 2018 +0100

Fix typos

Change-Id: I3f4ad9eff0730d3deea96b37fa7f36dfd038b214
Reviewed-on: https://gerrit.libreoffice.org/47301
Tested-by: Jenkins 
Reviewed-by: Julien Nabet 

diff --git a/framework/qa/complex/framework/recovery/RecoveryTest.java 
b/framework/qa/complex/framework/recovery/RecoveryTest.java
index 4605820e023c..67bda08879cf 100644
--- a/framework/qa/complex/framework/recovery/RecoveryTest.java
+++ b/framework/qa/complex/framework/recovery/RecoveryTest.java
@@ -78,7 +78,7 @@ public class RecoveryTest extends ComplexTestCase {
  * @todo: hidden documents
  * @todo: running presentation
  * @todo: modular dialogs like Hpyerlink-Dialog
- * @todo: sceond view of a document
+ * @todo: second view of a document
  * @todo: remove recovery data before start test
  * @todo: after a second start after the crash there should no documents 
recovered anymore
  * @todo: enable remove of recovery files
diff --git a/framework/source/services/frame.cxx 
b/framework/source/services/frame.cxx
index cb8a6b82024e..4366c26b0944 100644
--- a/framework/source/services/frame.cxx
+++ b/framework/source/services/frame.cxx
@@ -1022,11 +1022,11 @@ css::uno::Reference< css::frame::XFrame > SAL_CALL 
Frame::findFrame( const OUStr
 /* TODO
 Creation not supported yet!
 Wait for new layout manager service because we can't plug 
it
-inside already opened document of this frame ...
+inside already opened document of this frame...
 */
 }
 }
-// We arent a task => forward request to our parent or ignore it.
+// We aren't a task => forward request to our parent or ignore it.
 else if (xParent.is())
 xTarget = xParent->findFrame(SPECIALTARGET_BEAMER,0);
 }
diff --git a/qadevOOo/tests/java/ifc/sdb/_XSingleSelectQueryAnalyzer.java 
b/qadevOOo/tests/java/ifc/sdb/_XSingleSelectQueryAnalyzer.java
index 0eb16534efb7..d69523d5f973 100644
--- a/qadevOOo/tests/java/ifc/sdb/_XSingleSelectQueryAnalyzer.java
+++ b/qadevOOo/tests/java/ifc/sdb/_XSingleSelectQueryAnalyzer.java
@@ -76,7 +76,7 @@ public class _XSingleSelectQueryAnalyzer extends 
MultiMethodTest {
 }
 /**
 * call setQuery() once with valid query, once with invalid
-* query. Has ok if only on sceond call SQLException was thrown
+* query. Has ok if only on second call SQLException was thrown
 */
 public void _setQuery() {
 
diff --git a/test/source/sheet/tablevalidation.cxx 
b/test/source/sheet/tablevalidation.cxx
index e953e0f2f111..24d2ace8d644 100644
--- a/test/source/sheet/tablevalidation.cxx
+++ b/test/source/sheet/tablevalidation.cxx
@@ -142,12 +142,12 @@ void TableValidation::testTableValidationProperties()
 propName = "ShowList";
 sal_Int16 aShowList = 0;
 CPPUNIT_ASSERT(xTableValidation->getPropertyValue(propName) >>= aShowList);
-CPPUNIT_ASSERT_EQUAL_MESSAGE("Unabel to get property value ShowList", 
sal_Int16(1), aShowList);
+CPPUNIT_ASSERT_EQUAL_MESSAGE("Unable to get property value ShowList", 
sal_Int16(1), aShowList);
 
 aNewValue <<= sal_Int16(42);
 xTableValidation->setPropertyValue(propName, aNewValue);
 CPPUNIT_ASSERT(xTableValidation->getPropertyValue(propName) >>= aShowList);
-CPPUNIT_ASSERT_EQUAL_MESSAGE("Unabel to set property value ShowList", 
sal_Int16(42), aShowList);
+CPPUNIT_ASSERT_EQUAL_MESSAGE("Unable to set property value ShowList", 
sal_Int16(42), aShowList);
 }
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2018-01-03 Thread Tor Lillqvist

 connectivity/source/drivers/firebird/Tables.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit e44499a5777e58f08e104d563b51910919d273e4
Author: Tor Lillqvist 
Date:   Mon Jan 1 13:04:36 2018 +0200

Don't call getLength() on OUStringBuffer after makeStringAndClear()

It's the length of the OUString that we just made from the
OUStringBuffer that we want.

Fixes a problem where the code would try to execute an erronoeus SQL
statement like:

')EATE TABLE "Tasks" ("Notes" VARCHAR(32765),"TaskID" INTEGER,"EndDate" 
DATE,"StartDate" DATE,"Description" VARCHAR(65000),'

Too lazy to file a bug for this, the error should be obvious by just
reading the code.

Change-Id: I473cd8a7a9791700ca8b6467a84f4bad5dee4d55
Reviewed-on: https://gerrit.libreoffice.org/47230
Tested-by: Jenkins 
Reviewed-by: Julien Nabet 
(cherry picked from commit d48edd1e854e0df012b61f833d83efcd19fbe99b)
Reviewed-on: https://gerrit.libreoffice.org/47231

diff --git a/connectivity/source/drivers/firebird/Tables.cxx 
b/connectivity/source/drivers/firebird/Tables.cxx
index f1423763ab16..c78939cdc201 100644
--- a/connectivity/source/drivers/firebird/Tables.cxx
+++ b/connectivity/source/drivers/firebird/Tables.cxx
@@ -162,7 +162,7 @@ ObjectType Tables::appendObject(const OUString& rName,
 else
 {
 if ( sSql.endsWith(",") )
-sSql = sSql.replaceAt(aSqlBuffer.getLength()-1, 1, ")");
+sSql = sSql.replaceAt(sSql.getLength()-1, 1, ")");
 else
 sSql += ")";
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: loolkitconfig.xcu

2018-01-03 Thread Pranav Kant

 loolkitconfig.xcu |3 +++
 1 file changed, 3 insertions(+)

New commits:
commit 831c79c0acbca6a7053080061b14381640c4abb7
Author: Pranav Kant 
Date:   Wed Jan 3 16:34:10 2018 +0530

lookitconfig.xcu: Set a work path which is valid in chroot

Since the variables are set outside of chroot, workdir directory is
wrongly picked up as /home/username/Documents or something else. But it
is not guarranteed that this directory would exist in the chroot. Any
attempt to access such an invalid directory, eg. during filepicker
button in hyperlink dialog, freezes the dialog.

Change-Id: I83bfc5787a4f3bd66d8abd30b6204cb1e74e5287

diff --git a/loolkitconfig.xcu b/loolkitconfig.xcu
index 6edaacc3..ae2cd1ed 100644
--- a/loolkitconfig.xcu
+++ b/loolkitconfig.xcu
@@ -10,4 +10,7 @@
 
 false
 
+
+file:///home
+
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Bug 83260

2018-01-03 Thread Miklos Vajna

Hi,

On Fri, Dec 22, 2017 at 06:56:53AM +, Yemelyanenko Fyodor 
 wrote:
> For now I see 2 possible solutions:
> 1. Rewrite redlining, so Show option will change how doc is viewed, but 
> not how it is formed (list of nodes)
> 2. When toggling change tracking or show option ON/OFF - clean 
> Undo/Redo.
> 
> For now, I prefer option 2 :-)
> 
> Do we need to warn user, that we going to purge Undo/Redo (say, by 
> displaying some warning?)
> Any additional suggestions will be appreciated.

We raise a similar warning when deleting a header, you can probably
reuse that code here. And sure, clearing the undo stack instead of
crashing sounds like an improvement (especially if we ask the user
before clearing the undo stack).

Regards,

Miklos


signature.asc
Description: Digital signature
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: compilerplugins/clang include/tools include/unotools sw/source tools/source unotools/source

2018-01-03 Thread Noel Grandin

 compilerplugins/clang/singlevalfields.cxx |   14 
 compilerplugins/clang/singlevalfields.results |   25 +++---
 include/tools/multisel.hxx|1 
 include/unotools/textsearch.hxx   |9 
 sw/source/core/inc/swfont.hxx |2 -
 sw/source/core/text/itrform2.cxx  |8 ---
 sw/source/core/text/itrpaint.cxx  |3 --
 sw/source/core/text/pormulti.cxx  |3 --
 sw/source/core/txtnode/swfont.cxx |3 --
 tools/source/memtools/multisel.cxx|   29 +++---
 unotools/source/i18n/textsearch.cxx   |   15 -
 11 files changed, 37 insertions(+), 75 deletions(-)

New commits:
commit 1b666235f6b0b0f0b13f473bf3b639f4f5f0b12f
Author: Noel Grandin 
Date:   Wed Jan 3 09:08:52 2018 +0200

loplugin:singlevalfields improve copy constructor check

Change-Id: Id1e7fbecd9e9f816553d2e678c3f1b7890fc4db8
Reviewed-on: https://gerrit.libreoffice.org/47293
Tested-by: Jenkins 
Reviewed-by: Noel Grandin 

diff --git a/compilerplugins/clang/singlevalfields.cxx 
b/compilerplugins/clang/singlevalfields.cxx
index 61cfe044d1fd..83733b7a0041 100644
--- a/compilerplugins/clang/singlevalfields.cxx
+++ b/compilerplugins/clang/singlevalfields.cxx
@@ -142,7 +142,7 @@ bool SingleValFields::VisitCXXConstructorDecl( const 
CXXConstructorDecl* decl )
 
 // doesn't count as a write to fields because it's self->self
 if (decl->isCopyOrMoveConstructor())
-return true;
+return true;
 
 for(auto it = decl->init_begin(); it != decl->init_end(); ++it)
 {
@@ -246,9 +246,15 @@ bool SingleValFields::VisitMemberExpr( const MemberExpr* 
memberExpr )
 return true;
 
 const FunctionDecl* parentFunction = getParentFunctionDecl(memberExpr);
-const CXXMethodDecl* methodDecl = 
dyn_cast_or_null(parentFunction);
-if (methodDecl && (methodDecl->isCopyAssignmentOperator() || 
methodDecl->isMoveAssignmentOperator()))
-   return true;
+if (parentFunction)
+{
+auto methodDecl = dyn_cast(parentFunction);
+if (methodDecl && (methodDecl->isCopyAssignmentOperator() || 
methodDecl->isMoveAssignmentOperator()))
+   return true;
+auto cxxConstructorDecl = dyn_cast(parentFunction);
+if (cxxConstructorDecl && 
cxxConstructorDecl->isCopyOrMoveConstructor())
+   return true;
+}
 
 // walk up the tree until we find something interesting
 const Stmt* child = memberExpr;
diff --git a/compilerplugins/clang/singlevalfields.results 
b/compilerplugins/clang/singlevalfields.results
index 823de7ba50d7..d54fac80e7c9 100644
--- a/compilerplugins/clang/singlevalfields.results
+++ b/compilerplugins/clang/singlevalfields.results
@@ -25,6 +25,18 @@ include/svtools/svparser.hxx:74
 include/svtools/svparser.hxx:75
 SvParser::TokenStackType bTokenHasValue
 0
+include/tools/multisel.hxx:41
+MultiSelection bInverseCur
+0
+include/unotools/textsearch.hxx:104
+utl::SearchParam m_bWordOnly
+0
+include/unotools/textsearch.hxx:105
+utl::SearchParam m_bSrchInSel
+0
+include/unotools/textsearch.hxx:110
+utl::SearchParam nTransliterationFlags
+0
 include/vcl/filter/pdfdocument.hxx:173
 vcl::filter::PDFNameElement m_nLength
 0
@@ -67,9 +79,6 @@ sc/inc/compiler.hxx:108
 sc/qa/unit/ucalc.hxx:41
 Test::RangeNameDef mnIndex
 1
-sc/source/ui/inc/undodat.hxx:447
-ScUndoDataForm nStartChangeAction
-0
 sd/inc/sdpptwrp.hxx:42
 SdPPTFilter pBas
 0
@@ -109,6 +118,9 @@ sw/inc/pagepreviewlayout.hxx:49
 sw/source/core/inc/frmtool.hxx:260
 SwBorderAttrs m_bBorderDist
 1
+sw/source/core/inc/swfont.hxx:170
+SwFont m_bURL
+0
 sw/source/core/inc/UndoSort.hxx:38
 SwSortUndoElement::(anonymous union)::(anonymous) nKenn
 4294967295
@@ -133,9 +145,6 @@ sw/source/filter/ww8/ww8par.hxx:651
 sw/source/filter/ww8/ww8par.hxx:660
 WW8FormulaControl mhpsCheckBox
 20
-sw/source/uibase/lingu/sdrhhcwrap.hxx:33
-SdrHHCWrapper pTextObj
-0
 vcl/inc/salprn.hxx:41
 SalPrinterQueueInfo mnStatus
 0
@@ -169,10 +178,10 @@ vcl/source/filter/jpeg/transupp.h:131
 vcl/source/font/font.cxx:539
 (anonymous namespace)::WeightSearchEntry weight
 5
-vcl/source/gdi/pdfwriter_impl.hxx:706
+vcl/source/gdi/pdfwriter_impl.hxx:705
 vcl::PDFWriterImpl m_nInheritedPageWidth
 595
-vcl/source/gdi/pdfwriter_impl.hxx:707
+vcl/source/gdi/pdfwriter_impl.hxx:706
 vcl::PDFWriterImpl m_nInheritedPageHeight
 842
 writerfilter/source/dmapper/GraphicImport.cxx:223
diff --git a/include/tools/multisel.hxx b/include/tools/multisel.hxx
index 903423ae5d9c..854be3768afb 100644
--- a/include/tools/multisel.hxx
+++ b/include/tools/multisel.hxx
@@ -38,7 +38,6 @@ private:
 sal_Int32   nCurSubSel; // index in aSels of current selected index
 sal_Int32   nCurIndex;  // current selected entry

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

2018-01-03 Thread Jan-Marek Glogowski

 vcl/qt5/Qt5Graphics.cxx  |1 +
 vcl/qt5/Qt5Graphics_GDI.cxx  |8 ++--
 vcl/qt5/Qt5VirtualDevice.cxx |8 
 vcl/qt5/Qt5VirtualDevice.hxx |5 +++--
 4 files changed, 14 insertions(+), 8 deletions(-)

New commits:
commit d857e2780e882810bd2d615c0a5252c35c54d987
Author: Jan-Marek Glogowski 
Date:   Sat Dec 9 23:12:02 2017 +

Qt5 fix alpha drawing of start center image

Drawing the bottom-left start center image had multiple errors.
New images didn't set the default clip rect and weren't correctly
resized. The damage handling was also missing for alpha bitmaps.

Change-Id: Idabacbb8b507c990a24006152f064ae4f144b89e
Reviewed-on: https://gerrit.libreoffice.org/47277
Tested-by: Jenkins 
Reviewed-by: Jan-Marek Glogowski 

diff --git a/vcl/qt5/Qt5Graphics.cxx b/vcl/qt5/Qt5Graphics.cxx
index 72226fbc308f..a81c941cf17f 100644
--- a/vcl/qt5/Qt5Graphics.cxx
+++ b/vcl/qt5/Qt5Graphics.cxx
@@ -41,6 +41,7 @@ Qt5Graphics::Qt5Graphics( Qt5Frame *pFrame, QImage *pQImage )
 , m_pTextStyle{ nullptr, }
 , m_aTextColor( MAKE_SALCOLOR(0x00, 0x00, 0x00) )
 {
+ResetClipRegion();
 }
 
 Qt5Graphics::~Qt5Graphics()
diff --git a/vcl/qt5/Qt5Graphics_GDI.cxx b/vcl/qt5/Qt5Graphics_GDI.cxx
index 4d7f8cf1a8b9..7f0bb5929602 100644
--- a/vcl/qt5/Qt5Graphics_GDI.cxx
+++ b/vcl/qt5/Qt5Graphics_GDI.cxx
@@ -151,7 +151,10 @@ bool Qt5Graphics::setClipRegion(const vcl::Region& rRegion)
 
 void Qt5Graphics::ResetClipRegion()
 {
-m_aClipRegion = QRegion(m_pQImage->rect());
+if (m_pQImage)
+m_aClipRegion = QRegion(m_pQImage->rect());
+else
+m_aClipRegion = QRegion();
 if (!m_aClipPath.isEmpty())
 {
 QPainterPath aPath;
@@ -490,7 +493,7 @@ static bool getAlphaImage(const SalBitmap& rSourceBitmap, 
const SalBitmap& rAlph
 if (x && !(x % 8))
 ++alpha_line;
 if (0 == (*alpha_line & (1 << (x % 8
-image_line[0] = 0;
+image_line[3] = 0;
 }
 }
 }
@@ -509,6 +512,7 @@ bool Qt5Graphics::drawAlphaBitmap(const SalTwoRect& 
rPosAry, const SalBitmap& rS
 aPainter.drawImage(
 QPoint(rPosAry.mnDestX, rPosAry.mnDestY), aImage,
 QRect(rPosAry.mnSrcX, rPosAry.mnSrcY, rPosAry.mnSrcWidth, 
rPosAry.mnSrcHeight));
+aPainter.update(rPosAry.mnDestX, rPosAry.mnDestY, rPosAry.mnDestWidth, 
rPosAry.mnDestHeight);
 return true;
 }
 
diff --git a/vcl/qt5/Qt5VirtualDevice.cxx b/vcl/qt5/Qt5VirtualDevice.cxx
index aa8ae4958e0c..fc0c66232853 100644
--- a/vcl/qt5/Qt5VirtualDevice.cxx
+++ b/vcl/qt5/Qt5VirtualDevice.cxx
@@ -58,10 +58,10 @@ bool Qt5VirtualDevice::SetSizeUsingBuffer(long nNewDX, long 
nNewDY, sal_uInt8* p
 if (nNewDY == 0)
 nNewDY = 1;
 
-if (m_pImage && m_aFrameSize.getX() != nNewDX && m_aFrameSize.getY() != 
nNewDY)
+if (m_pImage && m_aFrameSize.width() == nNewDX && m_aFrameSize.height() == 
nNewDY)
 return true;
 
-m_aFrameSize = basegfx::B2IVector(nNewDX, nNewDY);
+m_aFrameSize = QSize(nNewDX, nNewDY);
 
 nNewDX *= m_fScale;
 nNewDY *= m_fScale;
@@ -87,8 +87,8 @@ bool Qt5VirtualDevice::SetSizeUsingBuffer(long nNewDX, long 
nNewDY, sal_uInt8* p
 return true;
 }
 
-long Qt5VirtualDevice::GetWidth() const { return m_pImage ? 
m_aFrameSize.getX() : 0; }
+long Qt5VirtualDevice::GetWidth() const { return m_pImage ? 
m_aFrameSize.width() : 0; }
 
-long Qt5VirtualDevice::GetHeight() const { return m_pImage ? 
m_aFrameSize.getY() : 0; }
+long Qt5VirtualDevice::GetHeight() const { return m_pImage ? 
m_aFrameSize.height() : 0; }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/qt5/Qt5VirtualDevice.hxx b/vcl/qt5/Qt5VirtualDevice.hxx
index 56f3107e4cc7..80ed0fcf92d1 100644
--- a/vcl/qt5/Qt5VirtualDevice.hxx
+++ b/vcl/qt5/Qt5VirtualDevice.hxx
@@ -20,11 +20,12 @@
 #pragma once
 
 #include 
-#include 
 
 #include 
 #include 
 
+#include 
+
 class Qt5Graphics;
 class QImage;
 enum class DeviceFormat;
@@ -34,7 +35,7 @@ class Qt5VirtualDevice : public SalVirtualDevice
 std::list m_aGraphics;
 std::unique_ptr m_pImage;
 DeviceFormat m_eFormat;
-basegfx::B2IVector m_aFrameSize;
+QSize m_aFrameSize;
 double m_fScale;
 
 public:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2018-01-03 Thread Jan-Marek Glogowski

 vcl/qt5/Qt5Frame.cxx  |   27 ++-
 vcl/qt5/Qt5Widget.cxx |3 +++
 2 files changed, 29 insertions(+), 1 deletion(-)

New commits:
commit 15d9087ff1e495e234b2cf073329c3358abb4dc0
Author: Jan-Marek Glogowski 
Date:   Fri Dec 8 11:37:18 2017 +

Qt5 set and update the frame geometry

The geometry is used for mouse hit tests for mapping
LO mouse events to popup positions.
This way (popup) menus become at at least usable.

Change-Id: Ic2b409d7a8937320c70b9f377374fe7d51e4ebf3
Reviewed-on: https://gerrit.libreoffice.org/47276
Tested-by: Jenkins 
Reviewed-by: Jan-Marek Glogowski 

diff --git a/vcl/qt5/Qt5Frame.cxx b/vcl/qt5/Qt5Frame.cxx
index 95e3363efe3f..cb44b71f6e2c 100644
--- a/vcl/qt5/Qt5Frame.cxx
+++ b/vcl/qt5/Qt5Frame.cxx
@@ -99,6 +99,20 @@ Qt5Frame::Qt5Frame(Qt5Frame* pParent, SalFrameStyleFlags 
nStyle, bool bUseCairo)
 if (pParentWindow != pChildWindow)
 pChildWindow->setTransientParent(pParentWindow);
 }
+
+// fake an initial geometry, gets updated via configure event or SetPosSize
+if (m_bDefaultPos || m_bDefaultSize)
+{
+Size aDefSize = CalcDefaultSize();
+maGeometry.nX = -1;
+maGeometry.nY = -1;
+maGeometry.nWidth = aDefSize.Width();
+maGeometry.nHeight = aDefSize.Height();
+maGeometry.nTopDecoration = 0;
+maGeometry.nBottomDecoration = 0;
+maGeometry.nLeftDecoration = 0;
+maGeometry.nRightDecoration = 0;
+}
 }
 
 Qt5Frame::~Qt5Frame()
@@ -292,6 +306,9 @@ void Qt5Frame::SetPosSize(long nX, long nY, long nWidth, 
long nHeight, sal_uInt1
 nY += aRect.y();
 }
 
+maGeometry.nX = nX;
+maGeometry.nY = nY;
+
 m_bDefaultPos = false;
 m_pQWidget->move(nX, nY);
 }
@@ -434,7 +451,15 @@ bool Qt5Frame::MapUnicodeToKeyCode(sal_Unicode aUnicode, 
LanguageType aLangType,
 
 LanguageType Qt5Frame::GetInputLanguage() { return LANGUAGE_DONTKNOW; }
 
-void Qt5Frame::UpdateSettings(AllSettings& rSettings) {}
+void Qt5Frame::UpdateSettings(AllSettings& rSettings)
+{
+StyleSettings style(rSettings.GetStyleSettings());
+
+const int flash_time = QApplication::cursorFlashTime();
+style.SetCursorBlinkTime(flash_time != 0 ? flash_time / 2 : 
STYLE_CURSOR_NOBLINKTIME);
+
+rSettings.SetStyleSettings(style);
+}
 
 void Qt5Frame::Beep() {}
 
diff --git a/vcl/qt5/Qt5Widget.cxx b/vcl/qt5/Qt5Widget.cxx
index c1cb8e7ce9ff..526662b15c34 100644
--- a/vcl/qt5/Qt5Widget.cxx
+++ b/vcl/qt5/Qt5Widget.cxx
@@ -82,6 +82,9 @@ void Qt5Widget::resizeEvent(QResizeEvent*)
 m_pFrame->m_pQImage.reset(pImage);
 }
 
+m_pFrame->maGeometry.nWidth = size().width();
+m_pFrame->maGeometry.nHeight = size().height();
+
 m_pFrame->CallCallback(SalEvent::Resize, nullptr);
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: solenv/bin

2018-01-03 Thread Miklos Vajna

 solenv/bin/native-code.py |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 30a3011a5229ea2e6228f6aa265d80204dd4263c
Author: Miklos Vajna 
Date:   Wed Jan 3 09:13:46 2018 +0100

solenv: fix typo in native-code.py

Change-Id: I191c0586a5bf9b3be1811ff783cb80dd13638c53

diff --git a/solenv/bin/native-code.py b/solenv/bin/native-code.py
index c141a49f3383..6571b24f27de 100755
--- a/solenv/bin/native-code.py
+++ b/solenv/bin/native-code.py
@@ -61,8 +61,8 @@ core_factory_list = [
 ("libxmlscriptlo.a", "xmlscript_component_getFactory"),
 ("libmcnttype.a", "mcnttype_component_getFactory"),
 ("libvcllo.a", "vcl_component_getFactory"),
-("libspelllo.a", "spell_component_getFactory")
-("libsvgiolo.a", "svgio_component_getFactory"),
+("libspelllo.a", "spell_component_getFactory"),
+("libsvgiolo.a", "svgio_component_getFactory")
 ]
 
 core_constructor_list = [
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

80 matches

Mail list logo